From 88d76a48f4e5f18c6ce8362b86c4c3e7ac39dfd9 Mon Sep 17 00:00:00 2001 From: LUCAZEAU Alexandre Date: Wed, 25 Oct 2023 19:00:10 +0200 Subject: [PATCH] =?UTF-8?q?=09modifi=C3=A9=C2=A0:=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20firefox.nix=20=09modifi=C3=A9=C2=A0:=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20home.nix=20=09modifi=C3=A9=C2=A0:=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?../nixos/configuration.nix=20=09modifi=C3=A9=C2=A0:=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20../../../modules/neovim.nix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hosts/d2nix/home-manager/firefox.nix | 6 +++++- hosts/d2nix/home-manager/home.nix | 4 ++++ hosts/d2nix/nixos/configuration.nix | 1 + modules/neovim.nix | 1 - 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/hosts/d2nix/home-manager/firefox.nix b/hosts/d2nix/home-manager/firefox.nix index 33b3c1b..5ca2eb1 100644 --- a/hosts/d2nix/home-manager/firefox.nix +++ b/hosts/d2nix/home-manager/firefox.nix @@ -1,5 +1,9 @@ -{ config, pkgs, theme, ... }: +{ config, lib, pkgs, theme, ... }: +let + nur-no-pkgs = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {}; +in { +imports = lib.attrValues nur-no-pkgs.repos.moredhel.hmModules.rawModules; programs.firefox = { enable = true; diff --git a/hosts/d2nix/home-manager/home.nix b/hosts/d2nix/home-manager/home.nix index 6c453ea..a4b1f64 100644 --- a/hosts/d2nix/home-manager/home.nix +++ b/hosts/d2nix/home-manager/home.nix @@ -3,6 +3,10 @@ { imports = [ ./firefox.nix + ./packages.nix + ../../../modules/neovim.nix + ../../../modules/tmux.nix + ../../../modules/git.nix ]; # Home Manager needs a bit of information about you and the paths it should # manage. diff --git a/hosts/d2nix/nixos/configuration.nix b/hosts/d2nix/nixos/configuration.nix index 5c82ea4..fb59527 100644 --- a/hosts/d2nix/nixos/configuration.nix +++ b/hosts/d2nix/nixos/configuration.nix @@ -10,6 +10,7 @@ ./hardware-configuration.nix ./services.nix ./extra_hw.nix + ./gnome.nix ]; boot = { diff --git a/modules/neovim.nix b/modules/neovim.nix index 8475a5f..98e6713 100644 --- a/modules/neovim.nix +++ b/modules/neovim.nix @@ -1,6 +1,5 @@ { pkgs, config, ... }: { programs.neovim = { - enable = true ; viAlias = true; vimAlias = true; vimdiffAlias = true;