From ccd522d03e1f0fd5d46cfeae45aa19ed5e01a703 Mon Sep 17 00:00:00 2001 From: Quinn Unger Date: Sat, 19 Sep 2026 17:40:49 +0100 Subject: [PATCH] use import-tree for common config dir --- common/default.nix | 17 ---------------- common/hm/compositor/default.nix | 13 ------------ common/hm/default.nix | 20 ------------------- common/hm/noctalia/default.nix | 14 ------------- common/hm/programs/default.nix | 24 ---------------------- common/hm/programs/helix/default.nix | 16 --------------- common/os/default.nix | 19 ------------------ common/os/programs/default.nix | 9 --------- common/os/services/default.nix | 13 ------------ common/os/services/openssh.nix | 25 ++++++++++------------- common/os/tweaks/default.nix | 12 ----------- flake.nix | 30 ++++++++++++++++++---------- homeModules/default.nix | 25 ----------------------- hosts/lala/os/configuration.nix | 2 +- hosts/tsumugi/os/configuration.nix | 2 +- nixosModules/default.nix | 14 ------------- 16 files changed, 33 insertions(+), 222 deletions(-) delete mode 100644 common/default.nix delete mode 100644 common/hm/compositor/default.nix delete mode 100644 common/hm/default.nix delete mode 100644 common/hm/noctalia/default.nix delete mode 100644 common/hm/programs/default.nix delete mode 100644 common/hm/programs/helix/default.nix delete mode 100644 common/os/default.nix delete mode 100644 common/os/programs/default.nix delete mode 100644 common/os/services/default.nix delete mode 100644 common/os/tweaks/default.nix delete mode 100644 homeModules/default.nix delete mode 100644 nixosModules/default.nix diff --git a/common/default.nix b/common/default.nix deleted file mode 100644 index 79d5df2..0000000 --- a/common/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -let - cfg = config.sidonia; -in -{ - imports = [ - ./os - ]; - home-manager.users.${cfg.userName}.imports = [ - ./hm - ]; -} diff --git a/common/hm/compositor/default.nix b/common/hm/compositor/default.nix deleted file mode 100644 index 17f2e17..0000000 --- a/common/hm/compositor/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - osConfig, - config, - pkgs, - lib, - ... -}: -{ - imports = [ - ./niri.nix - ./keybinds.nix - ]; -} diff --git a/common/hm/default.nix b/common/hm/default.nix deleted file mode 100644 index fa3b25a..0000000 --- a/common/hm/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - osConfig, - config, - pkgs, - lib, - ... -}: -{ - imports = [ - ./compositor - ./noctalia - ./programs - ./gtk.nix - ./keyring.nix - ./packages.nix - ./pointerCursor.nix - ./qt.nix - ./xdg.nix - ]; -} diff --git a/common/hm/noctalia/default.nix b/common/hm/noctalia/default.nix deleted file mode 100644 index 71070d5..0000000 --- a/common/hm/noctalia/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - osConfig, - config, - pkgs, - lib, - ... -}: -{ - imports = [ - ./compositorOverrides.nix - ./keybinds.nix - ./noctalia.nix - ]; -} diff --git a/common/hm/programs/default.nix b/common/hm/programs/default.nix deleted file mode 100644 index 2c8dcb3..0000000 --- a/common/hm/programs/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - osConfig, - config, - pkgs, - lib, - ... -}: -{ - imports = [ - ./bemenu.nix - ./defaultApps.nix - ./foot.nix - ./gtkwave.nix - ./helix - ./missioncenter.nix - ./nemo.nix - ./sublime.nix - ./vscodium.nix - ./yazi.nix - ./zellij.nix - ./zenBrowser.nix - ./zsh.nix - ]; -} diff --git a/common/hm/programs/helix/default.nix b/common/hm/programs/helix/default.nix deleted file mode 100644 index e4dc75d..0000000 --- a/common/hm/programs/helix/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - osConfig, - config, - pkgs, - lib, - ... -}: -{ - imports = [ - ./dnsZone.nix - ./fusesoc.nix - ./haskell.nix - ./helix.nix - ./verilog.nix - ]; -} diff --git a/common/os/default.nix b/common/os/default.nix deleted file mode 100644 index cf5474f..0000000 --- a/common/os/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -let - cfg = config.sidonia; -in -{ - imports = [ - ./configuration.nix - ./lix.nix - ./niri.nix - ./programs - ./services - ./tweaks - ]; -} diff --git a/common/os/programs/default.nix b/common/os/programs/default.nix deleted file mode 100644 index dbe17a2..0000000 --- a/common/os/programs/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -{ - imports = [ ./steam.nix ]; -} diff --git a/common/os/services/default.nix b/common/os/services/default.nix deleted file mode 100644 index 76b2a5b..0000000 --- a/common/os/services/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -{ - imports = [ - ./bandcampsync.nix - ./coreServices.nix - ./displayManager.nix - ]; -} diff --git a/common/os/services/openssh.nix b/common/os/services/openssh.nix index 7eb7c91..83592cd 100644 --- a/common/os/services/openssh.nix +++ b/common/os/services/openssh.nix @@ -7,28 +7,25 @@ ... }: let - forEachOtherHost = f: builtins.map f otherHosts; + forEachOtherHost = f: map f otherHosts; in { - # Enable the OpenSSH daemon. services.openssh = { - enable = true; ports = [ 22 ]; settings = { - PasswordAuthentication = false; + PasswordAuthentication = lib.mkDefault false; AllowUsers = [ config.sidonia.userName ]; - UseDns = false; - X11Forwarding = false; - PermitRootLogin = "no"; + UseDns = lib.mkDefault false; + X11Forwarding = lib.mkDefault false; + PermitRootLogin = lib.mkDefault "no"; }; }; users.users.${config.sidonia.userName}.openssh.authorizedKeys.keys = - (lib.concatLists ( - forEachOtherHost (remote: with remote.config.sidonia.ssh; lib.optional (pubKey != "") pubKey) - )) - ++ [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+PU2qFuxv85HjylmQTqmsgR1h9un6bhFeoFlQJ0MgJHNZWPYOavpQqEUQ/SvMH+X7FkiPPyn3u26POhTyUZtgJtVgABi7rs1v1B19ADZ9/9NVW6jNqho7YQpmruNEXqJnIJPMRItq6a6mH9L22X76ti2KjMdh2lluzf9BIBCfiU177VkRx1M4mXdKy2Gd2eLsqoJDnKh/6LqAyO/qzGx6pufAg+id44J9iNrRmJZKm+bZCJUaaRrX5qmNyL/DO7wD+ulFBimt/DEn86R3H1/K04/8ZV4jEmFVKsYh2fGes0ZiHM3oqNCt2okDQpQqqcsZ1bKiA2qSSgCwWJgaIHE9 quinn@QUINN-RYZEN" - ]; - + lib.mkIf config.services.openssh.enable + ( + lib.concatLists ( + forEachOtherHost (remote: with remote.config.sidonia.ssh; lib.optional (pubKey != "") pubKey) + ) + ); } diff --git a/common/os/tweaks/default.nix b/common/os/tweaks/default.nix deleted file mode 100644 index bdc908e..0000000 --- a/common/os/tweaks/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -{ - imports = [ - ./memory.nix - ./audio.nix - ]; -} diff --git a/flake.nix b/flake.nix index 18d39f6..0f79767 100644 --- a/flake.nix +++ b/flake.nix @@ -61,13 +61,18 @@ systemCfg = ./hosts/${host}/os; in { - specialArgs = { - inherit inputs otherHosts; - unstable = import inputs.unstable { + specialArgs = + let inherit (self.nixosConfigurations.${host}.pkgs.stdenv.hostPlatform) system; - config.allowUnfree = true; + in + { + inherit inputs otherHosts; + unstable = import inputs.unstable { + inherit system; + config.allowUnfree = true; + }; + moppkgs = inputs.moppkgs.packages.${system}; }; - }; modules = [ inputs.aagl.nixosModules.default inputs.catppuccin.nixosModules.catppuccin @@ -75,13 +80,15 @@ inputs.niri.nixosModules.default inputs.nix-monitored.nixosModules.default inputs.noctalia-greeter.nixosModules.default + (inputs.import-tree [ + ./common/os + ./nixosModules + systemCfg + ]) inputs.sops-nix.nixosModules.default - ./common - ./nixosModules - (inputs.import-tree systemCfg) { home-manager.sharedModules = [ - ./homeModules + (inputs.import-tree ./homeModules) inputs.catppuccin.homeModules.catppuccin inputs.niri.homeModules.default inputs.noctalia.homeModules.default @@ -119,7 +126,10 @@ } ]; users.${config.sidonia.userName} = { - imports = lib.optional (lib.pathExists homeCfg) (inputs.import-tree homeCfg); + imports = [ + (inputs.import-tree ./common/hm) + ] + ++ (lib.optional (lib.pathExists homeCfg) (inputs.import-tree homeCfg)); home = { username = config.sidonia.userName; homeDirectory = "/home/${config.sidonia.userName}"; diff --git a/homeModules/default.nix b/homeModules/default.nix deleted file mode 100644 index 065b92a..0000000 --- a/homeModules/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - osConfig, - config, - pkgs, - lib, - ... -}: -{ - imports = [ - ./bemenu.nix - ./discord.nix - ./gtkwave.nix - ./helix.nix - ./hyprland.nix - ./keybinds.nix - ./niri.nix - ./noctalia.nix - ./sublimeMerge.nix - ./sublimeText.nix - ./surfer.nix - ./vesktop.nix - ./wayvr.nix - ./window.nix - ]; -} diff --git a/hosts/lala/os/configuration.nix b/hosts/lala/os/configuration.nix index 87c6d84..c057042 100644 --- a/hosts/lala/os/configuration.nix +++ b/hosts/lala/os/configuration.nix @@ -6,7 +6,7 @@ ... }: { - imports = [ ../../../common/os/services/openssh.nix ]; + services.openssh.enable = true; catppuccin = { enable = true; flavor = "mocha"; diff --git a/hosts/tsumugi/os/configuration.nix b/hosts/tsumugi/os/configuration.nix index 0a97e96..8c09c8e 100644 --- a/hosts/tsumugi/os/configuration.nix +++ b/hosts/tsumugi/os/configuration.nix @@ -6,7 +6,7 @@ ... }: { - imports = [ ../../../common/os/services/openssh.nix ]; + services.openssh.enable = true; networking.hostName = "tsumugi"; nix.settings = { keep-outputs = true; diff --git a/nixosModules/default.nix b/nixosModules/default.nix deleted file mode 100644 index 2e96c90..0000000 --- a/nixosModules/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -{ - imports = [ - ./distributedBuilds.nix - ./netbird.nix - ./sidonia.nix - ./vr.nix - ]; -} -- 2.51.2