diff --git a/.config/linux/system/flake.nix b/.config/linux/system/flake.nix index f0d49d5..3a88285 100644 --- a/.config/linux/system/flake.nix +++ b/.config/linux/system/flake.nix @@ -1,6 +1,8 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + home-manager.url = "github:nix-community/home-manager"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { self, nixpkgs } @inputs: { @@ -8,6 +10,7 @@ ./module/common/Bootloader.nix ./module/common/Distrobox.nix ./module/common/Firewall.nix + ./module/common/HomeManager.nix ./module/common/Kernel.nix ./module/common/Locale.nix ./module/common/Network.nix @@ -24,11 +27,11 @@ self.nixosModules.common ./host/dasha/Configuration.nix ./module/AmdGpu.nix - ./module/Dasha.nix ./module/Flatpak.nix ./module/Gnome.nix ./module/PowersaveIntel.nix ./module/Print.nix + ./user/Dasha.nix ]; specialArgs.inputs = inputs; system = "x86_64-linux"; @@ -44,7 +47,7 @@ ./module/PowersaveAmd.nix ./module/Print.nix ./module/VirtManager.nix - ./module/Voronind.nix + ./user/Voronind.nix ]; specialArgs.inputs = inputs; system = "x86_64-linux"; @@ -70,7 +73,7 @@ ./module/Ftpd.nix ./module/Gnome.nix ./module/PowersaveAmd.nix - ./module/Voronind.nix + ./user/Voronind.nix ]; specialArgs.inputs = inputs; system = "x86_64-linux"; @@ -81,12 +84,12 @@ self.nixosModules.common ./host/laptop/Configuration.nix ./module/AmdGpu.nix - ./module/Dasha.nix ./module/Flatpak.nix ./module/Gnome.nix ./module/PowersaveAmd.nix ./module/Print.nix - ./module/Voronind.nix + ./user/Dasha.nix + ./user/Voronind.nix ]; specialArgs.inputs = inputs; system = "x86_64-linux"; @@ -101,7 +104,7 @@ ./module/PowersaveIntel.nix ./module/Powerlimit.nix ./module/Print.nix - ./module/Voronind.nix + ./user/Voronind.nix ]; specialArgs.inputs = inputs; system = "x86_64-linux"; diff --git a/.config/linux/system/module/HomeManager.nix b/.config/linux/system/module/HomeManager.nix new file mode 100644 index 0000000..fd6dfa6 --- /dev/null +++ b/.config/linux/system/module/HomeManager.nix @@ -0,0 +1,8 @@ +{ ... }: + +{ + home-manager.nixosModules.home-manager = { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + }; +} diff --git a/.config/linux/system/module/Dasha.nix b/.config/linux/system/user/Dasha.nix similarity index 100% rename from .config/linux/system/module/Dasha.nix rename to .config/linux/system/user/Dasha.nix diff --git a/.config/linux/system/module/Voronind.nix b/.config/linux/system/user/Voronind.nix similarity index 82% rename from .config/linux/system/module/Voronind.nix rename to .config/linux/system/user/Voronind.nix index 85bbab0..547b7c1 100644 --- a/.config/linux/system/module/Voronind.nix +++ b/.config/linux/system/user/Voronind.nix @@ -10,4 +10,8 @@ extraGroups = [ "networkmanager" ]; packages = with pkgs; [ ]; }; + + home-manager.users.voronind = { + programs.firefox.enable = true; + }; }