lass.pds.lassul.us / superconfig
This repository has no description
0
Fork 1

Configure Feed

Select the types of activity you want to include in your feed.

refactor: move common configuration to 2configs/default.nix

- Move clan and stockholm configuration from flake.nix to 2configs/default.nix
- Simplify flake.nix machines definition to only import physical.nix
- Add explicit import of ../../2configs to each machine's config.nix
- This allows for more selective configuration imports per machine

author
lassulus date (Jun 16, 2025, 2:59 PM CEST) commit f8aebefb parent fc3613e3
+46 -19
-18
flake.nix
··· 94 94 }; 95 95 }; 96 96 machines = nixpkgs.lib.mapAttrs (machineName: _: { 97 - 98 97 imports = [ 99 98 ./machines/${machineName}/physical.nix 100 - ( 101 - { config, ... }: 102 - { 103 - clan.core.facts.secretStore = "password-store"; 104 - clan.core.facts.secretUploadDirectory = nixpkgs.lib.mkDefault "/etc/secrets"; 105 - clan.core.vars.settings.secretStore = "password-store"; 106 - clan.core.networking.targetHost = "root@${machineName}"; 107 - krebs.secret.directory = config.clan.core.facts.secretUploadDirectory; 108 - nixpkgs.overlays = [ 109 - self.inputs.stockholm.overlays.default 110 - (import (self.inputs.stockholm.inputs.nix-writers + "/pkgs")) # TODO get rid of that overlay 111 - ]; 112 - } 113 - ) 114 - ./2configs 115 - ./3modules 116 - self.inputs.stockholm.nixosModules.krebs 117 99 ]; 118 100 }) (builtins.readDir ./machines); 119 101 };
+24
2configs/default.nix
··· 6 6 ... 7 7 }: 8 8 { 9 + # Clan core configuration 10 + clan.core.facts.secretStore = "password-store"; 11 + clan.core.facts.secretUploadDirectory = lib.mkDefault "/etc/secrets"; 12 + clan.core.vars.settings.secretStore = "password-store"; 13 + clan.core.networking.targetHost = "root@${config.networking.hostName}"; 14 + 15 + # Stockholm configuration 16 + krebs.secret.directory = config.clan.core.facts.secretUploadDirectory; 17 + 18 + # Nixpkgs overlays 19 + nixpkgs.overlays = [ 20 + self.inputs.stockholm.overlays.default 21 + (import (self.inputs.stockholm.inputs.nix-writers + "/pkgs")) # TODO get rid of that overlay 22 + ]; 23 + 9 24 imports = [ 25 + # Import 3modules 26 + ../3modules 27 + 28 + # Import stockholm krebs module 29 + self.inputs.stockholm.nixosModules.krebs 30 + 31 + # Import individual configurations 10 32 ./security-workarounds.nix 11 33 # ./binary-cache/client.nix 12 34 ./gc.nix ··· 22 44 ./nether.nix 23 45 ./spora.nix 24 46 ./nix.nix 47 + 48 + # Import stockholm modules 25 49 self.inputs.stockholm.nixosModules.users 26 50 self.inputs.stockholm.nixosModules.hosts 27 51 self.inputs.stockholm.nixosModules.kartei
+1
machines/aergia/config.nix
··· 2 2 3 3 { 4 4 imports = [ 5 + ../../2configs 5 6 ../../2configs/retiolum.nix 6 7 ../../2configs/exim-retiolum.nix 7 8 # ../../2configs/desktops/xmonad
+1
machines/coaxmetal/config.nix
··· 6 6 7 7 { 8 8 imports = [ 9 + ../../2configs 9 10 ../../2configs/retiolum.nix 10 11 ../../2configs/exim-retiolum.nix 11 12 ../../2configs/pipewire.nix
+1
machines/daedalus/config.nix
··· 7 7 8 8 { 9 9 imports = [ 10 + ../../2configs 10 11 ../../2configs/retiolum.nix 11 12 ../../2configs/pipewire.nix 12 13 ../../2configs/autoupdate.nix
+1 -1
machines/gui-machine/configuration.nix
··· 1 1 { 2 2 imports = [ 3 - 3 + ../../2configs 4 4 ]; 5 5 6 6 # New machine!
+1
machines/hilum/config.nix
··· 1 1 { config, pkgs, ... }: 2 2 { 3 3 imports = [ 4 + ../../2configs 4 5 ../../2configs/retiolum.nix 5 6 ../../2configs/network-manager.nix 6 7 ../../2configs/syncthing.nix
+1
machines/icarus/config.nix
··· 2 2 3 3 { 4 4 imports = [ 5 + ../../2configs 5 6 ../../2configs/mouse.nix 6 7 ../../2configs/retiolum.nix 7 8 ../../2configs/exim-retiolum.nix
+1
machines/ignavia/config.nix
··· 7 7 8 8 { 9 9 imports = [ 10 + ../../2configs 10 11 ../../2configs/retiolum.nix 11 12 ../../2configs/exim-retiolum.nix 12 13 # ../../2configs/baseX.nix
+10
machines/installer/config.nix
··· 1 + { config, lib, pkgs, ... }: 2 + 3 + { 4 + imports = [ 5 + ../../2configs/installer-tor.nix 6 + ]; 7 + 8 + # Basic installer configuration 9 + networking.hostName = "installer"; 10 + }
+1
machines/mors/config.nix
··· 7 7 8 8 { 9 9 imports = [ 10 + ../../2configs 10 11 ../../2configs/mouse.nix 11 12 ../../2configs/retiolum.nix 12 13 ../../2configs/desktops/qtile/nixos.nix
+1
machines/neoprism/config.nix
··· 2 2 3 3 { 4 4 imports = [ 5 + ../../2configs 5 6 ../../2configs/ssh-redirect.nix 6 7 ../../2configs/retiolum.nix 7 8 ../../2configs/mail/internet-gateway.nix
+1
machines/prism/config.nix
··· 12 12 13 13 system.stateVersion = "23.05"; 14 14 imports = [ 15 + ../../2configs 15 16 { 16 17 # helsinki migration 17 18 users.users.root.openssh.authorizedKeys.keys = [
+1
machines/shodan/config.nix
··· 2 2 3 3 { 4 4 imports = [ 5 + ../../2configs 5 6 ../../2configs/mouse.nix 6 7 ../../2configs/retiolum.nix 7 8 ../../2configs/desktops/qtile/nixos.nix
+1
machines/styx/config.nix
··· 7 7 8 8 { 9 9 imports = [ 10 + ../../2configs 10 11 ../../2configs/mouse.nix 11 12 ../../2configs/retiolum.nix 12 13 ../../2configs/desktops/xmonad