diff --git a/hosts/harmonica-sd/configuration.nix b/hosts/harmonica-sd/configuration.nix index 0433e6a..22c3ac1 100644 --- a/hosts/harmonica-sd/configuration.nix +++ b/hosts/harmonica-sd/configuration.nix @@ -8,7 +8,6 @@ "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" ./hardware-configuration.nix ../../modules - inputs.home-manager.nixosModules.home-manager ]; myModules = { diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index 58a5c81..45e5228 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -6,7 +6,6 @@ imports = [ ./hardware-configuration.nix ../../modules - inputs.home-manager.nixosModules.home-manager ]; myModules = { diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index cfcb186..eee4e7a 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -10,7 +10,6 @@ ../../modules inputs.raspberry-pi-nix.nixosModules.raspberry-pi inputs.nixos-hardware.nixosModules.raspberry-pi-5 - inputs.home-manager.nixosModules.home-manager ]; myModules = { @@ -30,13 +29,6 @@ networking.hostName = "pochita"; # log of shame: osbm blamed nix when he wrote "hostname" instead of "hostName" - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.osbm = import ../../home/home.nix { - inherit config pkgs; - backupFileExtension = "hmbak"; - }; - environment.systemPackages = [ pkgs.raspberrypi-eeprom ]; diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index eb8a08e..3285dbb 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -7,7 +7,6 @@ imports = [ ./hardware-configuration.nix ../../modules - inputs.home-manager.nixosModules.home-manager ]; myModules = { @@ -19,12 +18,6 @@ enableSound = true; }; - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.osbm = import ../../home/home.nix { - inherit config pkgs; - backupFileExtension = "hmbak"; - }; virtualisation.virtualbox.host.enable = true; users.extraGroups.vboxusers.members = ["osbm"]; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 69a9672..073ce20 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -7,7 +7,6 @@ imports = [ ./hardware-configuration.nix ../../modules - inputs.home-manager.nixosModules.home-manager ]; myModules = { @@ -32,12 +31,6 @@ networking.hostName = "ymir"; # Define your hostname. networking.firewall.allowedTCPPorts = [8889 8000]; - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.osbm = import ../../home/home.nix { - inherit config pkgs; - backupFileExtension = "hmbak"; - }; # Enable networking networking.networkmanager.enable = true; diff --git a/modules/default.nix b/modules/default.nix index 2f4429a..2122bba 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -9,6 +9,7 @@ ./emulation.nix ./fonts.nix ./graphical-interface.nix + ./home.nix ./i18n.nix ./minegrub.nix ./nix-settings.nix diff --git a/modules/home.nix b/modules/home.nix new file mode 100644 index 0000000..fe004ea --- /dev/null +++ b/modules/home.nix @@ -0,0 +1,8 @@ +{config, pkgs, ...}:{ + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.osbm = import ../home/home.nix { + inherit config pkgs; + backupFileExtension = "hmbak"; + }; +}