Non stop entertainment! The wackiest NixOS configuration to-date. thevoid.cafe/projects/puzzlevision
nixos flake flake-parts dotfiles home-manager nix

♻️ Move all v3 changes into v2

thevoid.cafe c1e27981 78e45573

verified
+161 -193
+6 -6
flake.lock
··· 76 76 ] 77 77 }, 78 78 "locked": { 79 - "lastModified": 1771683283, 80 - "narHash": "sha256-WxAEkAbo8dP7qiyPM6VN4ZGAxfuBVlNBNPkrqkrXVEc=", 79 + "lastModified": 1771756436, 80 + "narHash": "sha256-Tl2I0YXdhSTufGqAaD1ySh8x+cvVsEI1mJyJg12lxhI=", 81 81 "owner": "nix-community", 82 82 "repo": "home-manager", 83 - "rev": "c6ed3eab64d23520bcbb858aa53fe2b533725d4a", 83 + "rev": "5bd3589390b431a63072868a90c0f24771ff4cbb", 84 84 "type": "github" 85 85 }, 86 86 "original": { ··· 185 185 ] 186 186 }, 187 187 "locked": { 188 - "lastModified": 1771524872, 189 - "narHash": "sha256-eksVUcUsfS9mQx4D9DrYu88u9w70bAf+n6KmTDuIGEE=", 188 + "lastModified": 1771735105, 189 + "narHash": "sha256-MJuVJeszZEziquykEHh/hmgIHYxUcuoG/1aowpLiSeU=", 190 190 "owner": "Mic92", 191 191 "repo": "sops-nix", 192 - "rev": "e85540ffe97322dc1fea14dd11cdc2f59d540ac7", 192 + "rev": "d7755d820f5fa8acf7f223309c33e25d4f92e74f", 193 193 "type": "github" 194 194 }, 195 195 "original": {
+26 -25
flake.nix
··· 1 1 { 2 - description = "Jo's dotfiles"; 2 + description = "Puzzlevision, Non stop entertainment! The wackiest NixOS configuration to-date."; 3 + 4 + outputs = 5 + inputs: 6 + inputs.flake-parts.lib.mkFlake { inherit inputs; } { 7 + imports = [ ./modules/flake ]; 8 + systems = [ "x86_64-linux" ]; 9 + }; 3 10 4 11 nixConfig = { 5 12 experimental-features = [ ··· 21 28 }; 22 29 23 30 inputs = { 24 - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; 25 - nixos-hardware.url = "github:NixOS/nixos-hardware"; 26 - easy-hosts.url = "github:tgirlcloud/easy-hosts"; 27 - 28 - sops-nix = { 29 - url = "github:Mic92/sops-nix"; 30 - inputs.nixpkgs.follows = "nixpkgs"; 31 + nixpkgs = { 32 + url = "github:NixOS/nixpkgs/nixos-unstable"; 31 33 }; 32 34 33 35 flake-parts = { ··· 35 37 inputs.nixpkgs-lib.follows = "nixpkgs"; 36 38 }; 37 39 40 + easy-hosts = { 41 + url = "github:tgirlcloud/easy-hosts"; 42 + }; 43 + 38 44 home-manager = { 39 45 url = "github:nix-community/home-manager"; 40 46 inputs.nixpkgs.follows = "nixpkgs"; 41 47 }; 42 48 43 - nixcord = { 44 - url = "github:FlameFlag/nixcord"; 45 - inputs.flake-parts.follows = "flake-parts"; 49 + nixos-hardware = { 50 + url = "github:NixOS/nixos-hardware"; 51 + }; 52 + 53 + sops-nix = { 54 + url = "github:Mic92/sops-nix"; 46 55 inputs.nixpkgs.follows = "nixpkgs"; 47 56 }; 48 57 49 58 minegrub-theme = { 50 59 url = "github:Lxtharia/minegrub-theme"; 60 + inputs.nixpkgs.follows = "nixpkgs"; 61 + }; 62 + 63 + nixcord = { 64 + url = "github:FlameFlag/nixcord"; 65 + inputs.flake-parts.follows = "flake-parts"; 51 66 inputs.nixpkgs.follows = "nixpkgs"; 52 67 }; 53 68 ··· 61 76 inputs.nixpkgs.follows = "nixpkgs"; 62 77 }; 63 78 }; 64 - 65 - outputs = 66 - { flake-parts, ... }@inputs: 67 - flake-parts.lib.mkFlake { inherit inputs; } { 68 - imports = [ 69 - ./modules/flake 70 - ]; 71 - 72 - systems = [ "x86_64-linux" ]; 73 - flake = { 74 - # Exposing the flake namespace 75 - namespace = "puzzlevision"; 76 - }; 77 - }; 78 79 }
-6
modules/flake/default.nix
··· 1 1 { 2 2 imports = [ 3 - # Automagically imports libs from "/lib/lib-name" and exposes them to the `flake.lib` output. 4 3 ./lib.nix 5 - 6 - # Automagically imports systems from "/systems/arch-classname/system-name". 7 4 ./systems.nix 8 - 9 - # Automagically import custom packages defined in "/pkgs/pkg-name/default.nix" 10 - ./packages.nix 11 5 ]; 12 6 }
+60 -69
modules/flake/lib.nix
··· 4 4 ... 5 5 }: 6 6 let 7 - # Utility function to read a directory and return its contents. 8 - readDirectory = directory: builtins.readDir directory; 7 + /* 8 + Recursively find all .nix files in a directory tree. 9 9 10 - # Utility function to handle each filesystem entity (file or directory). 11 - filesystemEntityToAttrSet = 12 - directory: importArgs: name: type: 13 - if type == "directory" then 14 - dirToAttrSet "${directory}/${name}" importArgs 15 - else if name == "default.nix" then 16 - import "${directory}/${name}" importArgs 17 - else 18 - { }; 10 + This traverses a directory recursively and returns a flat list 11 + of paths to every .nix file found. 19 12 20 - filesystemEntityToList = 21 - directory: name: type: 22 - if type == "directory" then 23 - dirToModuleList "${directory}/${name}" 24 - else if name == "default.nix" then 25 - [ "${directory}/${name}" ] 26 - else 27 - [ ]; 13 + Type: dirToModuleList :: Path -> [Path] 28 14 29 - filesystemEntityToPackage = 30 - directory: pkgs: pkgArgs: name: type: 31 - if type == "directory" then 32 - dirToPkgAttrSet "${directory}/${name}" pkgs pkgArgs 33 - else if name == "default.nix" then 34 - { 35 - ${builtins.unsafeDiscardStringContext (builtins.baseNameOf directory)} = 36 - pkgs.callPackage "${directory}/${name}" pkgArgs; 37 - } 38 - else 39 - { }; 40 - 15 + Example: 16 + dirToModuleList ./modules/nixos 17 + => [ 18 + /path/to/modules/nixos/users/default.nix 19 + /path/to/modules/nixos/networking/default.nix 20 + ] 21 + */ 41 22 dirToModuleList = 42 23 directory: 43 24 let 44 - readDir = readDirectory directory; 25 + entries = builtins.readDir directory; 26 + processEntry = 27 + name: type: 28 + if type == "directory" then 29 + dirToModuleList "${directory}/${name}" 30 + else if lib.hasSuffix ".nix" name then 31 + [ "${directory}/${name}" ] 32 + else 33 + [ ]; 45 34 in 46 - builtins.foldl' ( 47 - acc: name: acc ++ (filesystemEntityToList directory name (builtins.getAttr name readDir)) 48 - ) [ ] (builtins.attrNames readDir); 35 + lib.flatten (lib.mapAttrsToList processEntry entries); 36 + 37 + /* 38 + Recursively import all .nix files from a directory into an attrset. 39 + 40 + Traverses a directory tree, imports each .nix file with the provided 41 + arguments, and merges all results into a single attribute set. 42 + Subdirectories are recursively processed. 43 + 44 + Type: dirToAttrset :: Path -> AttrSet -> AttrSet 45 + 46 + Example: 47 + Given directory structure: 48 + lib/ 49 + strings.nix -> { trim = s: ...; } 50 + math.nix -> { add = a: b: ...; } 49 51 50 - # Utility function to recursively load modules from a directory. 51 - dirToAttrSet = 52 - directory: importArgs: 53 - let 54 - # Read provided directory only once at the very start and save the result. 55 - readDir = readDirectory directory; 56 - in 57 - # Iterate over the attr names of a readDir operation. 58 - builtins.foldl' ( 59 - acc: name: 60 - # Merge outputs of handling a filesystem entity (file or directory) into accumulator. 61 - # Files return attribute sets with their resulting expressions, directories return the result of multiple file handling operations. 62 - acc // (filesystemEntityToAttrSet directory importArgs name (builtins.getAttr name readDir)) 63 - ) { } (builtins.attrNames readDir); 52 + dirToAttrset ./lib { inherit lib; } 53 + => { trim = ...; add = ...; } 64 54 65 - dirToPkgAttrSet = 66 - directory: pkgs: pkgArgs: 55 + Arguments: 56 + directory: Path to scan for .nix files 57 + importArgs: Attribute set to pass to each imported file 58 + */ 59 + dirToAttrset = 60 + directory: importArgs: 67 61 let 68 - # Read provided directory only once at the very start and save the result. 69 - readDir = readDirectory directory; 62 + entries = builtins.readDir directory; 63 + processEntry = 64 + name: type: 65 + if type == "directory" then 66 + dirToAttrset "${directory}/${name}" importArgs 67 + else if lib.hasSuffix ".nix" name then 68 + import "${directory}/${name}" importArgs 69 + else 70 + { }; 70 71 in 71 - builtins.foldl' ( 72 - acc: name: 73 - acc // (filesystemEntityToPackage directory pkgs pkgArgs name (builtins.getAttr name readDir)) 74 - ) { } (builtins.attrNames readDir); 72 + builtins.foldl' (acc: element: acc // element) { } (lib.mapAttrsToList processEntry entries); 75 73 76 - puzzlelib = dirToAttrSet ../../lib { inherit lib self; } // { 77 - inherit 78 - dirToAttrSet 79 - dirToPkgAttrSet 80 - dirToModuleList 81 - filesystemEntityToList 82 - filesystemEntityToAttrSet 83 - filesystemEntityToPackage 84 - ; 85 - }; 86 74 in 87 75 { 88 - # Expose custom library on flake "lib" output 89 - flake.lib = puzzlelib; 76 + flake = { 77 + lib = dirToAttrset ../../lib { inherit lib self; } // { 78 + filesystem = { inherit dirToModuleList dirToAttrset; }; 79 + }; 80 + }; 90 81 }
-11
modules/flake/packages.nix
··· 1 - { 2 - self, 3 - ... 4 - }: 5 - { 6 - perSystem = 7 - { pkgs, ... }: 8 - { 9 - packages = self.lib.dirToPkgAttrSet ../../pkgs pkgs { }; 10 - }; 11 - }
+10 -3
modules/flake/systems.nix
··· 4 4 inputs, 5 5 ... 6 6 }: 7 + let 8 + namespace = "puzzlevision"; 9 + in 7 10 { 8 11 imports = [ 9 12 inputs.easy-hosts.flakeModule 10 13 ]; 11 14 15 + /* 16 + Configure easy-hosts to automatically build nixosConfigurations 17 + System files are collected from the top level "systems" directory 18 + Corresponding modules are automatically injected, based on system type 19 + */ 12 20 easy-hosts = { 13 21 autoConstruct = true; 14 22 path = ../../systems; 15 23 16 24 perClass = class: { 25 + specialArgs = { inherit namespace; }; 17 26 modules = 18 27 (lib.optionals (class == "nixos") [ 19 28 inputs.home-manager.nixosModules.default 20 - inputs.sops-nix.nixosModules.sops 21 - inputs.minegrub-theme.nixosModules.default 22 29 ]) 23 - ++ (self.lib.dirToModuleList ../${class}); # Import modules based on current classname. 30 + ++ (self.lib.filesystem.dirToModuleList ../${class}); 24 31 }; 25 32 }; 26 33 }
+1 -1
modules/home/apps/firefox/default.nix
··· 2 2 lib, 3 3 self, 4 4 config, 5 + namespace, 5 6 ... 6 7 }: 7 8 let 8 - inherit (self) namespace; 9 9 inherit (self.lib) mkOpt; 10 10 inherit (lib) mkEnableOption types mkIf; 11 11
+8 -5
modules/home/apps/zed/default.nix
··· 1 1 { 2 2 lib, 3 3 pkgs, 4 - self, 5 4 config, 5 + namespace, 6 6 ... 7 7 }: 8 8 let 9 9 inherit (lib) mkEnableOption mkIf mkForce; 10 - inherit (self) namespace; 11 10 12 11 cfg = config.${namespace}.apps.zed; 13 12 in ··· 69 68 languages = { 70 69 Nix = mkIf cfg.enable-nix { 71 70 language_servers = [ 71 + "!nil" 72 72 "nixd" 73 - "!nil" 73 + "..." 74 74 ]; 75 75 formatter = { 76 76 external = { ··· 86 86 "!phpactor" 87 87 "!tailwind-language-server" 88 88 "intelephense" 89 + "..." 89 90 ]; 90 91 formatter = { 91 92 external = { ··· 95 96 }; 96 97 TypeScript = mkIf cfg.enable-typescript { 97 98 language_servers = [ 99 + "!eslint" 98 100 "oxfmt" 99 101 "oxlint" 100 102 "vtsls" 101 - "!eslint" 103 + "..." 102 104 ]; 103 105 formatter = "language_server"; 104 106 }; 105 107 SCSS = { 106 108 language_servers = [ 109 + "!some-sass-lsp" 107 110 "scss-lsp" 108 - "!some-sass-lsp" 111 + "..." 109 112 ]; 110 113 }; 111 114 };
+4 -5
modules/home/cli/direnv/default.nix
··· 1 1 { 2 + lib, 3 + pkgs, 4 + config, 2 5 osConfig, 3 - config, 4 - self, 5 - pkgs, 6 - lib, 6 + namespace, 7 7 ... 8 8 }: 9 9 let 10 10 inherit (lib) mkIf mkEnableOption; 11 - inherit (self) namespace; 12 11 13 12 cfg = config.${namespace}.cli.direnv; 14 13 in
+1 -1
modules/home/cli/git/default.nix
··· 3 3 self, 4 4 pkgs, 5 5 config, 6 + namespace, 6 7 ... 7 8 }: 8 9 let 9 10 inherit (lib) mkEnableOption mkIf; 10 - inherit (self) namespace; 11 11 inherit (self.lib) mkBool; 12 12 13 13 cfg = config.${namespace}.cli.git;
+1 -1
modules/home/desktop/gnome/default.nix
··· 4 4 self, 5 5 config, 6 6 osConfig, 7 + namespace, 7 8 ... 8 9 }: 9 10 let 10 11 inherit (lib) mkIf; 11 - inherit (self) namespace; 12 12 inherit (self.lib) mkOpt; 13 13 14 14 cfg = config.${namespace}.desktop.gnome;
+1 -1
modules/home/profile/default.nix
··· 2 2 lib, 3 3 self, 4 4 config, 5 + namespace, 5 6 ... 6 7 }: 7 8 let 8 - inherit (self) namespace; 9 9 inherit (self.lib) mkOpt; 10 10 inherit (lib) types; 11 11
+1 -1
modules/home/security/sops/default.nix
··· 1 1 { config, ... }: 2 2 { 3 3 sops = { 4 - age.keyFile = "/home/${config.home.username}/sops-nix/key.txt"; 4 + age.keyFile = "${config.home.homeDirectory}/sops-nix/key.txt"; 5 5 }; 6 6 }
-16
modules/home/security/ssh/default.nix
··· 1 - { 2 - lib, 3 - pkgs, 4 - osConfig, 5 - ... 6 - }: 7 - let 8 - inherit (lib) mkIf; 9 - 10 - gkEnabled = osConfig.services.gnome.gnome-keyring.enable or false; 11 - in 12 - { 13 - # Enable gnome-keyring user service, only if system also has it 14 - services.gnome-keyring.enable = gkEnabled; 15 - home.packages = mkIf gkEnabled [ pkgs.gcr ]; 16 - }
+1 -2
modules/nixos/archetypes/laptop/default.nix
··· 1 1 { 2 2 lib, 3 - self, 4 3 config, 4 + namespace, 5 5 ... 6 6 }: 7 7 let 8 8 inherit (lib) mkEnableOption mkIf; 9 - inherit (self) namespace; 10 9 11 10 cfg = config.${namespace}.archetypes.laptop; 12 11 in
+1 -2
modules/nixos/archetypes/server/default.nix
··· 1 1 { 2 2 lib, 3 - self, 4 3 config, 4 + namespace, 5 5 ... 6 6 }: 7 7 let 8 8 inherit (lib) mkEnableOption mkIf; 9 - inherit (self) namespace; 10 9 11 10 cfg = config.${namespace}.archetypes.server; 12 11 in
+1 -2
modules/nixos/archetypes/workstation/default.nix
··· 1 1 { 2 2 lib, 3 - self, 4 3 pkgs, 5 4 config, 5 + namespace, 6 6 ... 7 7 }: 8 8 let 9 9 inherit (lib) mkEnableOption mkIf mkDefault; 10 - inherit (self) namespace; 11 10 12 11 cfg = config.${namespace}.archetypes.workstation; 13 12 in
+1 -2
modules/nixos/desktop/gnome/default.nix
··· 1 1 { 2 2 lib, 3 3 pkgs, 4 - self, 5 4 config, 5 + namespace, 6 6 ... 7 7 }: 8 8 let 9 9 inherit (lib) mkEnableOption mkIf; 10 - inherit (self) namespace; 11 10 12 11 cfg = config.${namespace}.desktop.gnome; 13 12 in
+1 -1
modules/nixos/services/atticd/default.nix
··· 2 2 lib, 3 3 self, 4 4 config, 5 + namespace, 5 6 ... 6 7 }: 7 8 let 8 9 inherit (lib) mkEnableOption mkIf types; 9 - inherit (self) namespace; 10 10 inherit (self.lib) mkOpt; 11 11 12 12 cfg = config.${namespace}.services.atticd;
+1 -1
modules/nixos/services/default.nix
··· 1 1 { 2 2 lib, 3 3 self, 4 + namespace, 4 5 ... 5 6 }: 6 7 let 7 8 inherit (lib) types; 8 - inherit (self) namespace; 9 9 inherit (self.lib) mkOpt; 10 10 in 11 11 {
+1 -2
modules/nixos/services/docker/default.nix
··· 1 1 { 2 2 lib, 3 - self, 4 3 config, 4 + namespace, 5 5 ... 6 6 }: 7 7 let 8 8 inherit (lib) mkIf mkEnableOption; 9 - inherit (self) namespace; 10 9 11 10 cfg = config.${namespace}.services.docker; 12 11 in
+1 -1
modules/nixos/services/duckdns/default.nix
··· 2 2 lib, 3 3 self, 4 4 config, 5 + namespace, 5 6 ... 6 7 }: 7 8 let 8 9 inherit (lib) mkEnableOption mkIf types; 9 - inherit (self) namespace; 10 10 inherit (self.lib) mkOpt; 11 11 12 12 cfg = config.${namespace}.services.duckdns;
+1 -1
modules/nixos/services/homepage/default.nix
··· 2 2 lib, 3 3 self, 4 4 config, 5 + namespace, 5 6 ... 6 7 }: 7 8 let 8 9 inherit (lib) mkEnableOption mkIf types; 9 - inherit (self) namespace; 10 10 inherit (self.lib) mkOpt; 11 11 12 12 cfg = config.${namespace}.services.homepage;
+1 -1
modules/nixos/services/traefik/default.nix
··· 2 2 lib, 3 3 self, 4 4 config, 5 + namespace, 5 6 ... 6 7 }: 7 8 let 8 9 inherit (lib) mkEnableOption mkIf types; 9 - inherit (self) namespace; 10 10 inherit (self.lib) mkOpt; 11 11 12 12 cfg = config.${namespace}.services.traefik;
+1 -1
modules/nixos/services/vaultwarden/default.nix
··· 2 2 lib, 3 3 self, 4 4 config, 5 + namespace, 5 6 ... 6 7 }: 7 8 let 8 9 inherit (lib) mkEnableOption mkIf types; 9 - inherit (self) namespace; 10 10 inherit (self.lib) mkOpt; 11 11 12 12 cfg = config.${namespace}.services.vaultwarden;
+1 -2
modules/nixos/system/audio/default.nix
··· 1 1 { 2 2 lib, 3 - self, 4 3 config, 4 + namespace, 5 5 ... 6 6 }: 7 7 let 8 8 inherit (lib) mkEnableOption mkIf; 9 - inherit (self) namespace; 10 9 11 10 cfg = config.${namespace}.system.audio; 12 11 in
+2 -3
modules/nixos/system/bluetooth/default.nix
··· 1 1 { 2 2 lib, 3 3 pkgs, 4 - self, 5 4 config, 5 + namespace, 6 6 ... 7 7 }: 8 8 let 9 9 inherit (lib) mkEnableOption mkIf; 10 - inherit (self) namespace; 11 10 12 11 cfg = config.${namespace}.system.bluetooth; 13 12 in ··· 21 20 22 21 hardware.bluetooth = { 23 22 enable = true; 24 - powerOnBoot = true; 23 + powerOnBoot = false; 25 24 package = pkgs.bluez; 26 25 27 26 settings = {
+1 -2
modules/nixos/system/fonts/default.nix
··· 1 1 { 2 2 lib, 3 3 pkgs, 4 - self, 5 4 config, 5 + namespace, 6 6 ... 7 7 }: 8 8 let 9 9 inherit (lib) mkEnableOption mkIf mkOption; 10 - inherit (self) namespace; 11 10 12 11 cfg = config.${namespace}.system.fonts; 13 12 in
+1 -2
modules/nixos/system/grub/default.nix
··· 1 1 { 2 2 lib, 3 - self, 4 3 config, 4 + namespace, 5 5 ... 6 6 }: 7 7 let 8 8 inherit (lib) mkEnableOption mkIf; 9 - inherit (self) namespace; 10 9 11 10 cfg = config.${namespace}.system.grub; 12 11 in
+1 -1
modules/nixos/system/kernel/default.nix
··· 3 3 pkgs, 4 4 self, 5 5 config, 6 + namespace, 6 7 ... 7 8 }: 8 9 let 9 10 inherit (lib) mkEnableOption mkIf; 10 - inherit (self) namespace; 11 11 inherit (self.lib) mkOpt; 12 12 13 13 cfg = config.${namespace}.system.kernel;
+1 -2
modules/nixos/system/locale/default.nix
··· 1 1 { 2 2 lib, 3 - self, 4 3 config, 4 + namespace, 5 5 ... 6 6 }: 7 7 let 8 8 inherit (lib) mkEnableOption mkIf mkOption; 9 - inherit (self) namespace; 10 9 11 10 cfg = config.${namespace}.system.locale; 12 11 in
+2 -3
modules/nixos/system/networking/default.nix
··· 1 1 { 2 2 lib, 3 - self, 4 3 config, 4 + namespace, 5 5 ... 6 6 }: 7 7 let 8 8 inherit (lib) mkEnableOption mkIf; 9 - inherit (self) namespace; 10 9 11 10 cfg = config.${namespace}.system.networking; 12 11 in 13 12 { 14 13 options.${namespace}.system.networking = { 15 - enable = mkEnableOption "networking."; 14 + enable = mkEnableOption "networking through network-manager."; 16 15 }; 17 16 18 17 config = mkIf cfg.enable {
+1 -1
modules/nixos/system/nix/default.nix
··· 3 3 pkgs, 4 4 self, 5 5 config, 6 + namespace, 6 7 ... 7 8 }: 8 9 let 9 10 inherit (lib) mkEnableOption mkIf types; 10 - inherit (self) namespace; 11 11 inherit (self.lib) mkOpt; 12 12 13 13 cfg = config.${namespace}.system.nix;
+1 -1
modules/nixos/system/shell/default.nix
··· 3 3 pkgs, 4 4 self, 5 5 config, 6 + namespace, 6 7 ... 7 8 }: 8 9 let 9 10 inherit (lib) mkEnableOption mkIf types; 10 - inherit (self) namespace; 11 11 inherit (self.lib) mkOpt; 12 12 13 13 cfg = config.${namespace}.system.shell;
+1 -2
modules/nixos/system/ssh/default.nix
··· 1 1 { 2 2 lib, 3 - self, 4 3 config, 4 + namespace, 5 5 ... 6 6 }: 7 7 let 8 8 inherit (lib) mkEnableOption mkIf; 9 - inherit (self) namespace; 10 9 11 10 cfg = config.${namespace}.system.ssh; 12 11 in
+4 -5
modules/nixos/users/default.nix
··· 4 4 pkgs, 5 5 config, 6 6 inputs, 7 + namespace, 7 8 ... 8 9 }: 9 10 let ··· 13 14 mkOption 14 15 mkIf 15 16 ; 16 - inherit (self) namespace; 17 - inherit (self.lib) dirToModuleList; 17 + inherit (self.lib) filesystem; 18 18 19 19 # The identifier of the current system type, e.g. "x86_64-linux" or "aarch64-darwin" 20 20 system = pkgs.stdenv.hostPlatform.system; ··· 51 51 in 52 52 builtins.pathExists "${path}/default.nix"; 53 53 54 - homeModules = dirToModuleList "${self.outPath}/modules/home"; 54 + homeModules = filesystem.dirToModuleList "${self.outPath}/modules/home"; 55 55 in 56 56 { 57 57 options.${namespace}.users = mkOption { ··· 84 84 useUserPackages = true; 85 85 86 86 extraSpecialArgs = { 87 - inherit self system; 88 - namespace = self.namespace; 87 + inherit self system namespace; 89 88 }; 90 89 91 90 users = lib.mapAttrs (
pkgs/.gitkeep

This is a binary file and will not be displayed.

+8 -1
systems/x86_64-nixos/absolutesolver/default.nix
··· 1 - { pkgs, ... }: 1 + { 2 + pkgs, 3 + inputs, 4 + ... 5 + }: 2 6 { 3 7 imports = [ 8 + inputs.sops-nix.nixosModules.sops 9 + inputs.minegrub-theme.nixosModules.default 10 + 4 11 ./hardware.nix 5 12 ]; 6 13
+7 -1
systems/x86_64-nixos/puzzlevision/default.nix
··· 1 - { ... }: 1 + { 2 + inputs, 3 + ... 4 + }: 2 5 { 3 6 imports = [ 7 + inputs.sops-nix.nixosModules.sops 8 + inputs.minegrub-theme.nixosModules.default 9 + 4 10 ./hardware.nix 5 11 ./hardware-generated.nix 6 12 ];