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,18 +1,24 @@
{ ... }: { { ... }: {
imports = [ home-manager = {
../../system/home/direnv useGlobalPkgs = true;
../../system/home/editor useUserPackages = true;
../../system/home/git users.twoneis = {
../../system/home/shell imports = [
./server-utils ../../system/home/direnv
]; ../../system/home/editor
../../system/home/git
../../system/home/shell
./server-utils
];
home = { home = {
username = "twoneis"; username = "twoneis";
homeDirectory = "/home/twoneis"; homeDirectory = "/home/twoneis";
stateVersion = "22.11"; stateVersion = "22.11";
};
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,38 +1,44 @@
{ ... }: { { ... }: {
imports = [ home-manager = {
./art useGlobalPkgs = true;
./browser useUserPackages = true;
./chat users.twoneis = {
./cursor imports = [
./discord ./art
./direnv ./browser
./editor ./chat
./email ./cursor
./gdb ./discord
./git ./direnv
./media ./editor
./niri-setup ./email
./notes ./gdb
./shell ./git
./terminal ./media
./themes ./niri-setup
./utils ./notes
]; ./shell
./terminal
./themes
./utils
];
home = { home = {
username = "twoneis"; username = "twoneis";
homeDirectory = "/home/twoneis"; homeDirectory = "/home/twoneis";
stateVersion = "22.11"; stateVersion = "22.11";
}; };
programs.home-manager.enable = true; programs.home-manager.enable = true;
dconf = { dconf = {
enable = true; enable = true;
settings = { settings = {
"org/gnome/desktop/interface" = { "org/gnome/desktop/interface" = {
color-scheme = "prefer-dark"; color-scheme = "prefer-dark";
};
};
}; };
}; };
}; };

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;
};
}
]; ];
}; };
}; };