re-arrange per-host files
14 files changed, 122 insertions(+), 122 deletions(-)
M flake.nix → flake.nix
@@ -83,7 +83,7 @@ { nixosConfigurations.prefect = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ - ./system/prefect.nix + ./system/hosts/prefect.nix ] ++ (with nixos-hardware.nixosModules; [ common-cpu-amd@@ -99,8 +99,8 @@ modules = [ agenix.nixosModules.default srvos.nixosModules.server srvos.nixosModules.mixins-systemd-boot - ./system/nano.nix - ./system/nano-hardware.nix + ./system/hosts/nano.nix + ./system/hosts/nano-hardware.nix ]; }; nixosConfigurations.linde = nixpkgs.lib.nixosSystem {@@ -125,7 +125,7 @@ mycal.nixosModules.mycal searchix.nixosModules.web golink.nixosModules.default ./packages/modules/nixos/laminar.nix - ./system/linde.nix + ./system/hosts/linde.nix ./private/calendar.nix ]; };@@ -139,14 +139,14 @@ ]; } srvos.darwinModules.desktop angrr.darwinModules.angrr - ./system/marvin.nix + ./system/hosts/marvin.nix ./packages/modules/darwin/caddy ]; }; homeConfigurations."alan@marvin" = mkHomeConfiguration { system = "aarch64-darwin"; modules = [ - ./user/marvin.nix + ./user/hosts/marvin.nix ./private/tabnine.nix ./private/ssh.nix ];@@ -154,7 +154,7 @@ }; homeConfigurations."alan@prefect" = mkHomeConfiguration { system = "x86_64-linux"; modules = [ - ./user/prefect.nix + ./user/hosts/prefect.nix ./private/tabnine.nix ./private/ssh.nix ];@@ -162,13 +162,13 @@ }; homeConfigurations."alan@nano" = mkHomeConfiguration { system = "aarch64-linux"; modules = [ - ./user/nano.nix + ./user/hosts/nano.nix ]; }; homeConfigurations."alan@linde" = mkHomeConfiguration { system = "aarch64-linux"; modules = [ - ./user/server.nix + ./user/hosts/server.nix ]; };
M system/linde.nix → system/hosts/linde.nix
@@ -30,8 +30,8 @@ imports = [ # Include the results of the hardware scan. ./linde-hardware.nix - ./settings/configuration/nix-linux.nix - ./settings/services/git-server.nix + ../settings/configuration/nix-linux.nix + ../settings/services/git-server.nix ]; age.secrets = { paperless =
M system/marvin.nix → system/hosts/marvin.nix
@@ -5,10 +5,10 @@ ... }: { imports = [ - ./settings/darwin.nix - ./settings/dev.nix - ./settings/programs/shell.nix - ./settings/programs/base.nix + ../settings/darwin.nix + ../settings/dev.nix + ../settings/programs/shell.nix + ../settings/programs/base.nix ]; local.web = {
M system/nano.nix → system/hosts/nano.nix
@@ -16,7 +16,7 @@ dnsmasqEnable = true; in { imports = [ - ./settings/configuration/nix-linux.nix + ../settings/configuration/nix-linux.nix ]; age.secrets = { dyndns.file = ../secrets/dyndns.age;
M system/prefect.nix → system/hosts/prefect.nix
@@ -5,37 +5,37 @@ ... }: { imports = [ - ./settings/base.nix - ./settings/configuration/berlin.nix - ./settings/configuration/british-english.nix - ./settings/configuration/nix-linux.nix - ./settings/configuration/user.nix - ./settings/hardware/audio.nix - ./settings/hardware/bare-metal.nix - ./settings/hardware/mouse.nix - ./settings/hardware/systemd-boot.nix - ./settings/hardware/nvidia-gpu.nix - ./settings/hardware/keyboard.nix - ./settings/hardware/keyboard-lofree.nix - ./settings/hardware/trezor.nix - ./settings/services/syncthing.nix - ./settings/services/virtualisation.nix - ./settings/user-interface.nix - ./settings/programs/base.nix - ./settings/programs/kde.nix - ./settings/programs/shell.nix - ./settings/programs/docker.nix - ./settings/dev.nix - ./settings/gaming.nix + ../settings/base.nix + ../settings/configuration/berlin.nix + ../settings/configuration/british-english.nix + ../settings/configuration/nix-linux.nix + ../settings/configuration/user.nix + ../settings/hardware/audio.nix + ../settings/hardware/bare-metal.nix + ../settings/hardware/mouse.nix + ../settings/hardware/systemd-boot.nix + ../settings/hardware/nvidia-gpu.nix + ../settings/hardware/keyboard.nix + ../settings/hardware/keyboard-lofree.nix + ../settings/hardware/trezor.nix + ../settings/services/syncthing.nix + ../settings/services/virtualisation.nix + ../settings/user-interface.nix + ../settings/programs/base.nix + ../settings/programs/kde.nix + ../settings/programs/shell.nix + ../settings/programs/docker.nix + ../settings/dev.nix + ../settings/gaming.nix ]; virtualisation.vmVariant = { disabledModules = [ - ./settings/hardware/nvidia-gpu.nix - ./settings/hardware/bare-metal.nix - ./settings/gaming.nix - ./settings/user-interface.nix - ./settings/programs/kde.nix + ../settings/hardware/nvidia-gpu.nix + ../settings/hardware/bare-metal.nix + ../settings/gaming.nix + ../settings/user-interface.nix + ../settings/programs/kde.nix <nixos-hardware/common/cpu/amd> <nixos-hardware/common/cpu/amd/pstate.nix> <nixos-hardware/common/pc/ssd>
A user/hosts/nano.nix
@@ -0,0 +1,17 @@ +{ pkgs, ... }: +{ + imports = [ + ../settings/base.nix + ../settings/development/base.nix + ../settings/fish.nix + ../settings/git.nix + ../settings/nix.nix + ../settings/nixos.nix + ../settings/ssh.nix + ]; + home = { + username = "alan"; + homeDirectory = "/home/alan"; + stateVersion = "24.11"; + }; +}
A user/hosts/prefect.nix
@@ -0,0 +1,37 @@ +{ + config, + pkgs, + ... +}: +{ + imports = [ + ../settings/base.nix + ../settings/dunst.nix + ../settings/emacs.nix + ../settings/development/base.nix + ../settings/development/golang.nix + ../settings/development/javascript.nix + ../settings/development/web.nix + ../settings/fish.nix + ../settings/git.nix + ../settings/gnupg.nix + ../settings/music.nix + ../settings/nixos.nix + ../settings/passwords.nix + ../settings/ssh.nix + ../settings/tabnine.nix + ../settings/user-interface.nix + ../settings/xresources.nix + <private/ssh.nix> + ]; + + home.username = "alan"; + home.homeDirectory = "/home/alan"; + home.packages = with pkgs; [ + transgui + ]; + + xsession.enable = true; + + home.stateVersion = "22.11"; +}
M user/marvin.nix → user/hosts/marvin.nix
@@ -1,27 +1,27 @@ { config, pkgs, ... }: { imports = [ - ./settings/base.nix - ./settings/development/base.nix - ./settings/development/javascript.nix - ./settings/development/python.nix - ./settings/development/golang.nix - ./settings/development/vlang.nix - ./settings/development/web.nix - ./settings/darwin.nix - ./settings/emacs.nix - ./settings/fish.nix - ./settings/git.nix - ./settings/nixpkgs.nix - ./settings/ssh.nix - ./settings/tabnine.nix - ./settings/aider.nix - ./settings/workstation.nix - ./settings/user-interface.nix - ./settings/nix.nix - ../private/ssh.nix - ../private/tabnine.nix - ../private/llm.nix + ../settings/base.nix + ../settings/development/base.nix + ../settings/development/javascript.nix + ../settings/development/python.nix + ../settings/development/golang.nix + ../settings/development/vlang.nix + ../settings/development/web.nix + ../settings/darwin.nix + ../settings/emacs.nix + ../settings/fish.nix + ../settings/git.nix + ../settings/nixpkgs.nix + ../settings/ssh.nix + ../settings/tabnine.nix + ../settings/aider.nix + ../settings/workstation.nix + ../settings/user-interface.nix + ../settings/nix.nix + ../../private/ssh.nix + ../../private/tabnine.nix + ../../private/llm.nix ]; home.username = "alan";
D user/nano.nix
@@ -1,17 +0,0 @@ -{ pkgs, ... }: -{ - imports = [ - ./settings/base.nix - ./settings/development/base.nix - ./settings/fish.nix - ./settings/git.nix - ./settings/nix.nix - ./settings/nixos.nix - ./settings/ssh.nix - ]; - home = { - username = "alan"; - homeDirectory = "/home/alan"; - stateVersion = "24.11"; - }; -}
D user/prefect.nix
@@ -1,37 +0,0 @@ -{ - config, - pkgs, - ... -}: -{ - imports = [ - ./settings/base.nix - ./settings/dunst.nix - ./settings/emacs.nix - ./settings/development/base.nix - ./settings/development/golang.nix - ./settings/development/javascript.nix - ./settings/development/web.nix - ./settings/fish.nix - ./settings/git.nix - ./settings/gnupg.nix - ./settings/music.nix - ./settings/nixos.nix - ./settings/passwords.nix - ./settings/ssh.nix - ./settings/tabnine.nix - ./settings/user-interface.nix - ./settings/xresources.nix - <private/ssh.nix> - ]; - - home.username = "alan"; - home.homeDirectory = "/home/alan"; - home.packages = with pkgs; [ - transgui - ]; - - xsession.enable = true; - - home.stateVersion = "22.11"; -}
M user/server.nix → user/hosts/server.nix
@@ -1,10 +1,10 @@ { ... }: { imports = [ - ./settings/base.nix - ./settings/git.nix - ./settings/fish.nix - ./settings/nixos.nix + ../settings/base.nix + ../settings/git.nix + ../settings/fish.nix + ../settings/nixos.nix ]; home = { username = "alan";