improved organization

This commit is contained in:
twoneis 2024-05-08 21:59:33 +02:00
parent 4f70ad62c5
commit 98f3518283
5 changed files with 66 additions and 67 deletions

View file

@ -1,4 +1,8 @@
{ ... }: { { ... }: {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.twoneis = {
imports = [ imports = [
../../system/home/direnv ../../system/home/direnv
../../system/home/editor ../../system/home/editor
@ -15,4 +19,6 @@
}; };
programs.home-manager.enable = true; programs.home-manager.enable = true;
};
};
} }

View file

@ -14,6 +14,11 @@
./virt.nix ./virt.nix
]; ];
# Overlays for nixpkgs
nixpkgs.overlays = [
inputs.nur.overlay
];
# Needed for some nautilus features like auto-mount and trash # Needed for some nautilus features like auto-mount and trash
services.gvfs.enable = true; services.gvfs.enable = true;

View file

@ -1,4 +1,8 @@
{ ... }: { { ... }: {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.twoneis = {
imports = [ imports = [
./art ./art
./browser ./browser
@ -36,4 +40,6 @@
}; };
}; };
}; };
};
};
} }

View file

@ -3,5 +3,6 @@
users.users.twoneis.initialHashedPassword = "$y$j9T$0pmWE8A2JWcr2BDqqZ2u./$Km7K1hml9Gy0fc9DzBsDTvpyCKZ9DW0GOkD.lDcyYw0"; users.users.twoneis.initialHashedPassword = "$y$j9T$0pmWE8A2JWcr2BDqqZ2u./$Km7K1hml9Gy0fc9DzBsDTvpyCKZ9DW0GOkD.lDcyYw0";
users.users.root.initialHashedPassword = "$y$j9T$U8fvYSDoZxqVrkjlZM2Db.$qvkT9GIbVJ23EtB7KcqyI8u7RKJ99pYSXNu8IhVcDx9"; users.users.root.initialHashedPassword = "$y$j9T$U8fvYSDoZxqVrkjlZM2Db.$qvkT9GIbVJ23EtB7KcqyI8u7RKJ99pYSXNu8IhVcDx9";
environment.persistence."/persist" = { environment.persistence."/persist" = {
}; };
} }

View file

@ -10,18 +10,12 @@
modules = [ modules = [
./devices/ellaca ./devices/ellaca
./modules/system ./modules/system
./modules/system/home
./modules/system/persist ./modules/system/persist
./options.nix ./options.nix
niri.nixosModules.niri niri.nixosModules.niri
impermanence.nixosModules.impermanence impermanence.nixosModules.impermanence
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager
nixpkgs.overlays = [ nur.overlay ];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.twoneis = import ./modules/system/home;
};
}
]; ];
}; };
@ -34,17 +28,11 @@
modules = [ modules = [
./devices/akarso ./devices/akarso
./modules/system ./modules/system
./modules/system/home
./options.nix ./options.nix
nixos-hardware.nixosModules.microsoft-surface-pro-intel nixos-hardware.nixosModules.microsoft-surface-pro-intel
niri.nixosModules.niri niri.nixosModules.niri
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager
nixpkgs.overlays = [ nur.overlay ];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.twoneis = import ./modules/system/home;
};
}
]; ];
}; };
@ -58,14 +46,7 @@
modules = [ modules = [
./devices/creosote ./devices/creosote
./modules/server ./modules/server
./options.nix home-manager.nixosModules.home-manager
home-manager.nixosModules.home-manager {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.twoneis = import ./modules/server/home;
};
}
]; ];
}; };
}; };