My Nix Configuration

[flake] more updates and changes and such

Changed files
+21 -19
homeModules
profiles
desktop
programs
hosts
zaphod
services
nixosModules
dn42Wireguard
+2 -2
.nvim.lua
··· 23 23 expr = "(builtins.getFlake (builtins.toString ./.)).currentSystem.options", 24 24 }, 25 25 my_modules = { 26 - exper = "(pkgs.lib.evalModules { modules = (builtins.getFlake (builtins.toString ./.)).nixosModules; }).options" 27 - } 26 + exper = "(pkgs.lib.evalModules { modules = (builtins.getFlake (builtins.toString ./.)).nixosModules; }).options", 27 + }, 28 28 }, 29 29 }, 30 30 },
+13 -10
homeModules/profiles/desktop/default.nix
··· 8 8 cfg = config.py.profiles.desktop; 9 9 inherit (cfg) shell; 10 10 inherit (lib) mkIf mkDefault mkEnableOption; 11 + 12 + mkShellOption = 13 + name: var: 14 + lib.mkOption { 15 + type = lib.types.bool; 16 + default = if (shell == var) then true else false; 17 + description = "Enable ${name}"; 18 + readOnly = true; 19 + visible = false; 20 + internal = true; 21 + }; 11 22 in 12 23 { 13 24 options.py.profiles.desktop = { ··· 20 31 default = "caelestia"; 21 32 description = "The desktop shell to use in the graphical environment"; 22 33 }; 23 - caelestia = lib.mkOption { 24 - type = lib.types.bool; 25 - default = if (shell == "caelestia") then true else false; 26 - description = "Enable caelestia shell"; 27 - }; 28 - dms = lib.mkOption { 29 - type = lib.types.bool; 30 - default = if (shell == "dms") then true else false; 31 - description = "Enable DMS"; 32 - }; 34 + caelestia = mkShellOption "Caelestia shell" "caelestia"; 35 + dms = mkShellOption "DMS" "dms"; 33 36 }; 34 37 config = mkIf cfg.enable { 35 38 py.profiles.base.enable = true;
+2
homeModules/programs/default.nix
··· 1 1 { 2 2 imports = [ 3 + # keep-sorted start 3 4 ./caelestia 4 5 ./chromium 5 6 ./dms ··· 17 18 ./starship 18 19 ./vscodium 19 20 ./zed-editor 21 + # keep-sorted end 20 22 ]; 21 23 }
-1
hosts/zaphod/services/greeter.nix
··· 7 7 hide_version_string = true; 8 8 }; 9 9 }; 10 - security.pam.services.ly.fprintAuth = false; 11 10 }
+4 -6
nixosModules/dn42Wireguard/default.nix
··· 87 87 # so tunnel config overrides defaults 88 88 fc = cfg.tunnelDefaults // (lib.filterAttrs (_: v: v != null) value); 89 89 in 90 - (lib.nameValuePair "wg42_${name}" { 90 + lib.nameValuePair "wg42_${name}" { 91 91 inherit (fc) listenPort privateKeyFile; 92 92 allowedIPsAsRoutes = false; 93 93 peers = [ ··· 110 110 fc.peerAddrs.v6 != null && fc.localAddrs.v6 != null 111 111 ) "${pkgs.iproute2}/bin/ip addr add ${fc.localAddrs.v6} peer ${fc.peerAddrs.v6} dev wg42_${name}"} 112 112 ''; 113 - }) 114 - ) (lib.filterAttrs (_: v: v.enable == true) cfg.tunnels); 113 + } 114 + ) (lib.filterAttrs (_: v: v.enable) cfg.tunnels); 115 115 firewall = { 116 - trustedInterfaces = lib.mapAttrsToList (name: _: "wg42_" + name) ( 117 - lib.filterAttrs (_: v: v.enable == true) cfg.tunnels 118 - ); 116 + trustedInterfaces = lib.mapAttrsToList (name: _: "wg42_" + name) (lib.filterAttrs (_: v: v.enable) cfg.tunnels); 119 117 checkReversePath = false; 120 118 extraInputRules = '' 121 119 ip saddr 172.20.0.0/14 accept