From 41978ad794fa43618e151b5f2825d35dbf9e2b96 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 24 Jan 2025 18:23:50 -0600 Subject: [PATCH] WIP --- configurations/darwin/khanelimac/default.nix | 3 +- configurations/home/bruddy/default.nix | 2 +- configurations/home/khaneliman/default.nix | 3 +- configurations/home/khaneliman@/default.nix | 3 +- configurations/home/nixos/default.nix | 3 +- configurations/nixos/khanelilab/default.nix | 3 +- flake/configs.nix | 42 +++---- flake/lib.nix | 1 + flake/overlays.nix | 5 +- lib/default.nix | 9 +- lib/file/default.nix | 108 +++++++++++++++++- modules/darwin/archetypes/default.nix | 7 -- modules/darwin/default.nix | 20 ++-- modules/darwin/desktop/addons/default.nix | 6 - modules/darwin/desktop/bars/default.nix | 5 - modules/darwin/desktop/default.nix | 7 -- modules/darwin/desktop/wms/default.nix | 5 - modules/darwin/home/default.nix | 19 +-- modules/darwin/nix/default.nix | 3 +- modules/darwin/programs/default.nix | 6 - .../programs/graphical/apps/default.nix | 5 - modules/darwin/programs/graphical/default.nix | 5 - modules/darwin/programs/terminal/default.nix | 5 - .../programs/terminal/tools/default.nix | 5 - .../programs/terminal/tools/ssh/default.nix | 4 +- modules/darwin/security/default.nix | 6 - modules/darwin/security/sops/default.nix | 3 +- modules/darwin/services/default.nix | 7 -- modules/darwin/suites/common/default.nix | 8 +- modules/darwin/suites/default.nix | 16 --- modules/darwin/system/default.nix | 8 -- modules/darwin/system/fonts/default.nix | 4 +- modules/darwin/tools/default.nix | 5 - modules/home/default.nix | 11 +- modules/home/programs/default.nix | 6 - .../graphical/bars/waybar/default.nix | 3 +- .../bars/waybar/modules/default-modules.nix | 3 +- .../graphical/editors/vscode/default.nix | 3 +- .../screenlockers/hyprlock/default.nix | 3 +- modules/home/programs/terminal/default.nix | 10 -- .../programs/terminal/editors/default.nix | 7 -- .../terminal/editors/neovim/default.nix | 3 +- .../programs/terminal/emulators/default.nix | 10 -- .../terminal/emulators/wezterm/default.nix | 3 +- .../terminal/social/slack-term/default.nix | 3 +- .../terminal/social/twitch-tui/default.nix | 3 +- .../programs/terminal/tools/git/default.nix | 3 +- modules/home/services/default.nix | 17 --- modules/home/services/sops/default.nix | 3 +- modules/home/suites/default.nix | 17 --- modules/home/system/default.nix | 5 - modules/home/theme/default.nix | 7 -- modules/nixos/archetypes/default.nix | 10 -- modules/nixos/default.nix | 17 +-- modules/nixos/display-managers/default.nix | 9 -- modules/nixos/hardware/cpu/default.nix | 5 - modules/nixos/hardware/default.nix | 15 --- modules/nixos/hardware/gpu/default.nix | 5 - modules/nixos/hardware/rgb/default.nix | 6 - modules/nixos/nix/default.nix | 4 +- modules/nixos/programs/default.nix | 6 - .../programs/graphical/addons/default.nix | 10 -- .../nixos/programs/graphical/apps/default.nix | 8 -- modules/nixos/programs/graphical/default.nix | 9 -- .../graphical/desktop-environment/default.nix | 5 - .../graphical/file-managers/default.nix | 7 -- .../nixos/programs/graphical/wms/default.nix | 6 - modules/nixos/programs/terminal/default.nix | 5 - .../nixos/programs/terminal/tools/default.nix | 8 -- .../programs/terminal/tools/ssh/default.nix | 4 +- modules/nixos/security/default.nix | 16 --- modules/nixos/security/sops/default.nix | 3 +- modules/nixos/services/default.nix | 25 ---- modules/nixos/suites/common/default.nix | 3 +- modules/nixos/suites/default.nix | 11 -- modules/nixos/system/default.nix | 12 -- modules/nixos/system/fonts/default.nix | 4 +- modules/nixos/theme/default.nix | 5 - modules/nixos/virtualisation/default.nix | 6 - 79 files changed, 196 insertions(+), 489 deletions(-) delete mode 100644 modules/darwin/archetypes/default.nix delete mode 100644 modules/darwin/desktop/addons/default.nix delete mode 100644 modules/darwin/desktop/bars/default.nix delete mode 100644 modules/darwin/desktop/default.nix delete mode 100644 modules/darwin/desktop/wms/default.nix delete mode 100644 modules/darwin/programs/default.nix delete mode 100644 modules/darwin/programs/graphical/apps/default.nix delete mode 100644 modules/darwin/programs/graphical/default.nix delete mode 100644 modules/darwin/programs/terminal/default.nix delete mode 100644 modules/darwin/programs/terminal/tools/default.nix delete mode 100644 modules/darwin/security/default.nix delete mode 100644 modules/darwin/services/default.nix delete mode 100644 modules/darwin/suites/default.nix delete mode 100644 modules/darwin/system/default.nix delete mode 100644 modules/darwin/tools/default.nix delete mode 100644 modules/home/programs/default.nix delete mode 100644 modules/home/programs/terminal/default.nix delete mode 100644 modules/home/programs/terminal/editors/default.nix delete mode 100644 modules/home/programs/terminal/emulators/default.nix delete mode 100644 modules/home/services/default.nix delete mode 100644 modules/home/suites/default.nix delete mode 100644 modules/home/system/default.nix delete mode 100644 modules/home/theme/default.nix delete mode 100644 modules/nixos/archetypes/default.nix delete mode 100644 modules/nixos/display-managers/default.nix delete mode 100644 modules/nixos/hardware/default.nix delete mode 100644 modules/nixos/hardware/rgb/default.nix delete mode 100644 modules/nixos/programs/default.nix delete mode 100644 modules/nixos/programs/graphical/addons/default.nix delete mode 100644 modules/nixos/programs/graphical/apps/default.nix delete mode 100644 modules/nixos/programs/graphical/default.nix delete mode 100644 modules/nixos/programs/graphical/desktop-environment/default.nix delete mode 100644 modules/nixos/programs/graphical/file-managers/default.nix delete mode 100644 modules/nixos/programs/graphical/wms/default.nix delete mode 100644 modules/nixos/programs/terminal/default.nix delete mode 100644 modules/nixos/programs/terminal/tools/default.nix delete mode 100644 modules/nixos/security/default.nix delete mode 100644 modules/nixos/services/default.nix delete mode 100644 modules/nixos/suites/default.nix delete mode 100644 modules/nixos/system/default.nix delete mode 100644 modules/nixos/virtualisation/default.nix diff --git a/configurations/darwin/khanelimac/default.nix b/configurations/darwin/khanelimac/default.nix index dfee47a64..f5662a4b5 100644 --- a/configurations/darwin/khanelimac/default.nix +++ b/configurations/darwin/khanelimac/default.nix @@ -2,7 +2,6 @@ config, inputs, lib, - root, khanelinix-lib, ... }: @@ -24,7 +23,7 @@ in sops = { enable = true; sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - defaultSopsFile = root + "/secrets/khanelimac/default.yaml"; + defaultSopsFile = khanelinix-lib.getFile "secrets/khanelimac/default.yaml"; }; }; diff --git a/configurations/home/bruddy/default.nix b/configurations/home/bruddy/default.nix index 68f10fc29..1a07947de 100644 --- a/configurations/home/bruddy/default.nix +++ b/configurations/home/bruddy/default.nix @@ -78,7 +78,7 @@ in # sops = { # enable = true; - # defaultSopsFile = root + "/secrets/khanelinix/khaneliman/default.yaml"; + # defaultSopsFile = khanelinix-lib.getFile "secrets/khanelinix/khaneliman/default.yaml"; # sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ]; # }; }; diff --git a/configurations/home/khaneliman/default.nix b/configurations/home/khaneliman/default.nix index 316b8e31b..8eeb98370 100644 --- a/configurations/home/khaneliman/default.nix +++ b/configurations/home/khaneliman/default.nix @@ -1,7 +1,6 @@ { config, lib, - root, khanelinix-lib, ... }: @@ -85,7 +84,7 @@ in services = { sops = { enable = true; - defaultSopsFile = root + "/secrets/khanelimac/khaneliman/default.yaml"; + defaultSopsFile = khanelinix-lib.getFile "secrets/khanelimac/khaneliman/default.yaml"; sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ]; }; }; diff --git a/configurations/home/khaneliman@/default.nix b/configurations/home/khaneliman@/default.nix index 4d191b6db..6a341561b 100644 --- a/configurations/home/khaneliman@/default.nix +++ b/configurations/home/khaneliman@/default.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - root, khanelinix-lib, self, system, @@ -219,7 +218,7 @@ in sops = { enable = true; - defaultSopsFile = root + "/secrets/khanelinix/khaneliman/default.yaml"; + defaultSopsFile = khanelinix-lib.getFile "secrets/khanelinix/khaneliman/default.yaml"; sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ]; }; }; diff --git a/configurations/home/nixos/default.nix b/configurations/home/nixos/default.nix index aa204d0d1..71d8921e2 100644 --- a/configurations/home/nixos/default.nix +++ b/configurations/home/nixos/default.nix @@ -2,7 +2,6 @@ config, lib, osConfig, - root, khanelinix-lib, ... }: @@ -50,7 +49,7 @@ in services = { sops = { enable = true; - defaultSopsFile = root + "/secrets/CORE/nixos/default.yaml"; + defaultSopsFile = khanelinix-lib.getFile "secrets/CORE/nixos/default.yaml"; sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ]; }; }; diff --git a/configurations/nixos/khanelilab/default.nix b/configurations/nixos/khanelilab/default.nix index c8dde9f24..55f0d68f6 100644 --- a/configurations/nixos/khanelilab/default.nix +++ b/configurations/nixos/khanelilab/default.nix @@ -1,6 +1,5 @@ { config, - root, khanelinix-lib, ... }: @@ -119,7 +118,7 @@ in sops = { enable = true; sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - defaultSopsFile = root + "/secrets/khanelilab/default.yaml"; + defaultSopsFile = khanelinix-lib.getFile "secrets/khanelilab/default.yaml"; }; }; diff --git a/flake/configs.nix b/flake/configs.nix index d08ac3b0e..37880fb8a 100644 --- a/flake/configs.nix +++ b/flake/configs.nix @@ -24,33 +24,33 @@ darwin = { configurationsDirectory = ../configurations/darwin; modulesDirectory = ../modules/darwin; - hosts = { - khanelimac.userHomeModules = [ - "khaneliman" - ]; - }; + # hosts = { + # khanelimac.userHomeModules = [ + # "khaneliman" + # ]; + # }; }; - home = { - configurationsDirectory = ../configurations/home; - modulesDirectory = ../modules/home; - }; + # home = { + # configurationsDirectory = ../configurations/home; + # modulesDirectory = ../modules/home; + # }; nixos = { configurationsDirectory = ../configurations/nixos; modulesDirectory = ../modules/nixos; - hosts = { - CORE-PW00LM92.userHomeModules = [ - "nixos" - ]; - bruddynix.userHomeModules = [ - "khaneliman" - "bruddy" - ]; - khanelinix.userHomeModules = [ - "khaneliman" - ]; - }; + # hosts = { + # CORE-PW00LM92.userHomeModules = [ + # "nixos" + # ]; + # bruddynix.userHomeModules = [ + # "khaneliman" + # "bruddy" + # ]; + # khanelinix.userHomeModules = [ + # "khaneliman" + # ]; + # }; }; }; } diff --git a/flake/lib.nix b/flake/lib.nix index 814cf0301..2ee0cf9b9 100644 --- a/flake/lib.nix +++ b/flake/lib.nix @@ -9,6 +9,7 @@ flake.lib = { khanelinix = lib.makeOverridable (import ../lib) { inherit lib self; + root = ../.; }; }; } diff --git a/flake/overlays.nix b/flake/overlays.nix index 12bb249a4..0e21e0183 100644 --- a/flake/overlays.nix +++ b/flake/overlays.nix @@ -2,10 +2,9 @@ let children = dir: - with builtins; lib.pipe dir [ - readDir - attrNames + builtins.readDir + builtins.attrNames (map (name: dir + "/${name}")) ]; in diff --git a/lib/default.nix b/lib/default.nix index 9058b840d..77388c35d 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,6 +1,7 @@ { lib, self, + root, ... }: lib.makeExtensible ( @@ -16,7 +17,7 @@ lib.makeExtensible ( deploy = call ./deploy/default.nix { inherit (self) inputs; }; - file = call ./file/default.nix { }; + file = call ./file/default.nix { inherit lib root; }; module = call ./module/default.nix { }; packages = call ./packages/default.nix { }; network = call ./network/default.nix { @@ -38,5 +39,11 @@ lib.makeExtensible ( nested-default-attrs nested-force-attrs ; + + inherit (self'.file) + getDefaultNixFiles + getDefaultNixFilesRecursive + getFile + ; } ) diff --git a/lib/file/default.nix b/lib/file/default.nix index bf01041a7..75a116fb2 100644 --- a/lib/file/default.nix +++ b/lib/file/default.nix @@ -1,4 +1,18 @@ -_: { +{ + lib, + root, + ... +}: +let + inherit (builtins) readDir pathExists; + inherit (lib) + filterAttrs + mapAttrsToList + ; + + fileNameRegex = "(.*)\\.(.*)$"; +in +rec { fileWithText = file: text: '' ${builtins.readFile file} ${text}''; @@ -6,4 +20,96 @@ _: { fileWithText' = file: text: '' ${text} ${builtins.readFile file}''; + + hasAnyFileExtension = + file: + let + match = builtins.match fileNameRegex (toString file); + in + match != null; + + getFileExtension = + file: + if hasAnyFileExtension file then + let + match = builtins.match fileNameRegex (toString file); + in + lib.last match + else + ""; + + hasFileExtension = + extension: file: if hasAnyFileExtension file then extension == getFileExtension file else false; + + # Convert a store path back to a source path + sourcePathFromStorePath = + path: + let + pathStr = toString path; + # Match the nix store path pattern and extract the path after the hash + match = builtins.match "/nix/store/[a-z0-9]+-source(.*)" pathStr; + in + if match != null then builtins.head match else pathStr; + + # Convert a store path to a relative path by removing the root prefix + makeRelative = + path: + let + pathStr = toString path; + rootStr = toString root; + sourcePath = sourcePathFromStorePath pathStr; + in + if lib.hasPrefix rootStr sourcePath then lib.removePrefix "${rootStr}/" sourcePath else sourcePath; + + getFile = path: "${root}/${path}"; + + safeReadDirectory = path: if pathExists path then readDir path else { }; + + getDirectories = + path: + let + entries = safeReadDirectory path; + filteredEntries = filterAttrs (_name: kind: kind == "directory") entries; + in + mapAttrsToList (name: _kind: "${path}/${name}") filteredEntries; + + getFiles = + path: + let + entries = safeReadDirectory path; + filteredEntries = filterAttrs (_name: kind: kind == "regular") entries; + in + mapAttrsToList (name: _kind: makeRelative "${path}/${name}") filteredEntries; + getFilesRecursive = + path: + let + actualPath = sourcePathFromStorePath path; + entries = safeReadDirectory actualPath; + filteredEntries = filterAttrs (_: kind: (kind == "regular") || (kind == "directory")) entries; + mapFile = + name: kind: + let + path' = "${actualPath}/${name}"; + in + if kind == "directory" then getFilesRecursive path' else makeRelative path'; + in + lib.flatten (mapAttrsToList mapFile filteredEntries); + + getNixFiles = path: builtins.filter (hasFileExtension "nix") (getFiles path); + + getNixFilesRecursive = path: builtins.filter (hasFileExtension "nix") (getFilesRecursive path); + + getDefaultNixFiles = + path: builtins.filter (name: builtins.baseNameOf name == "default.nix") (getFiles path); + + getDefaultNixFilesRecursive = + path: + let + allFiles = getFilesRecursive path; + # Ignore the top-level default.nix + topLevelDefaultNix = "${makeRelative path}/default.nix"; + in + builtins.filter ( + name: (builtins.baseNameOf name == "default.nix") && (name != topLevelDefaultNix) + ) allFiles; } diff --git a/modules/darwin/archetypes/default.nix b/modules/darwin/archetypes/default.nix deleted file mode 100644 index fbe41c7e9..000000000 --- a/modules/darwin/archetypes/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - imports = [ - ./personal - ./vm - ./workstation - ]; -} diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix index d20031888..fb213e42f 100644 --- a/modules/darwin/default.nix +++ b/modules/darwin/default.nix @@ -1,15 +1,9 @@ +{ khanelinix-lib, ... }: { - imports = [ - ./archetypes - ./desktop - ./home - ./nix - ./programs - ./security - ./services - ./suites - ./system - ./tools - ./user - ]; + imports = khanelinix-lib.getDefaultNixFilesRecursive ./.; + + # FIXME: Should be inheriting pkgs with this already set + nixpkgs.config = { + allowUnfree = true; + }; } diff --git a/modules/darwin/desktop/addons/default.nix b/modules/darwin/desktop/addons/default.nix deleted file mode 100644 index b6a20f5a4..000000000 --- a/modules/darwin/desktop/addons/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./jankyborders - ./skhd - ]; -} diff --git a/modules/darwin/desktop/bars/default.nix b/modules/darwin/desktop/bars/default.nix deleted file mode 100644 index c313d418e..000000000 --- a/modules/darwin/desktop/bars/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./sketchybar - ]; -} diff --git a/modules/darwin/desktop/default.nix b/modules/darwin/desktop/default.nix deleted file mode 100644 index 62f207c66..000000000 --- a/modules/darwin/desktop/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - imports = [ - ./addons - ./bars - ./wms - ]; -} diff --git a/modules/darwin/desktop/wms/default.nix b/modules/darwin/desktop/wms/default.nix deleted file mode 100644 index 12990e386..000000000 --- a/modules/darwin/desktop/wms/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./yabai - ]; -} diff --git a/modules/darwin/home/default.nix b/modules/darwin/home/default.nix index 4405ccfe8..6cdb58475 100644 --- a/modules/darwin/home/default.nix +++ b/modules/darwin/home/default.nix @@ -1,4 +1,5 @@ { + config, khanelinix-lib, lib, options, @@ -24,15 +25,17 @@ in config = lib.optionalAttrs (inputs.home-manager ? darwinModules) { khanelinix.home.extraOptions = { - home.file = lib.mkAliasDefinitions options.khanelinix.home.file; - xdg.enable = true; - xdg.configFile = lib.mkAliasDefinitions options.khanelinix.home.configFile; + home = { + file = lib.mkAliasDefinitions options.khanelinix.home.file; + # TODO: better default + stateVersion = lib.mkDefault "24.11"; + }; + xdg = { + enable = true; + configFile = lib.mkAliasDefinitions options.khanelinix.home.configFile; + }; }; - # FIXME: - # snowfallorg.users.${config.khanelinix.user.name}.home.config = - # lib.mkAliasDefinitions options.khanelinix.home.extraOptions; - home-manager = { # enables backing up existing files instead of erroring if conflicts exist backupFileExtension = "hm.old"; @@ -40,6 +43,8 @@ in useUserPackages = true; useGlobalPkgs = true; + users.${config.khanelinix.user.name} = lib.mkAliasDefinitions options.khanelinix.home.extraOptions; + verbose = true; }; }; diff --git a/modules/darwin/nix/default.nix b/modules/darwin/nix/default.nix index cadbb1da8..4292eea74 100644 --- a/modules/darwin/nix/default.nix +++ b/modules/darwin/nix/default.nix @@ -2,14 +2,13 @@ config, khanelinix-lib, lib, - root, ... }: let cfg = config.khanelinix.nix; in { - imports = [ (root + "/modules/shared/nix/default.nix") ]; + imports = [ (khanelinix-lib.getFile "modules/shared/nix/default.nix") ]; config = lib.mkIf cfg.enable { nix = { diff --git a/modules/darwin/programs/default.nix b/modules/darwin/programs/default.nix deleted file mode 100644 index 35abed499..000000000 --- a/modules/darwin/programs/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./graphical - ./terminal - ]; -} diff --git a/modules/darwin/programs/graphical/apps/default.nix b/modules/darwin/programs/graphical/apps/default.nix deleted file mode 100644 index 75731c093..000000000 --- a/modules/darwin/programs/graphical/apps/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./_1password - ]; -} diff --git a/modules/darwin/programs/graphical/default.nix b/modules/darwin/programs/graphical/default.nix deleted file mode 100644 index 3631cb5cb..000000000 --- a/modules/darwin/programs/graphical/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./apps - ]; -} diff --git a/modules/darwin/programs/terminal/default.nix b/modules/darwin/programs/terminal/default.nix deleted file mode 100644 index 9753b32f7..000000000 --- a/modules/darwin/programs/terminal/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./tools - ]; -} diff --git a/modules/darwin/programs/terminal/tools/default.nix b/modules/darwin/programs/terminal/tools/default.nix deleted file mode 100644 index f9e42e8c3..000000000 --- a/modules/darwin/programs/terminal/tools/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./ssh - ]; -} diff --git a/modules/darwin/programs/terminal/tools/ssh/default.nix b/modules/darwin/programs/terminal/tools/ssh/default.nix index 5303503b1..3821d4898 100644 --- a/modules/darwin/programs/terminal/tools/ssh/default.nix +++ b/modules/darwin/programs/terminal/tools/ssh/default.nix @@ -1,7 +1,7 @@ { - root, + khanelinix-lib, ... }: { - imports = [ (root + "/modules/shared/programs/terminal/tools/ssh/default.nix") ]; + imports = [ (khanelinix-lib.getFile "modules/shared/programs/terminal/tools/ssh/default.nix") ]; } diff --git a/modules/darwin/security/default.nix b/modules/darwin/security/default.nix deleted file mode 100644 index 12ca65375..000000000 --- a/modules/darwin/security/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./gpg - ./sops - ]; -} diff --git a/modules/darwin/security/sops/default.nix b/modules/darwin/security/sops/default.nix index 29e45e4ef..22ff5cbd5 100644 --- a/modules/darwin/security/sops/default.nix +++ b/modules/darwin/security/sops/default.nix @@ -3,7 +3,6 @@ inputs, khanelinix-lib, lib, - root, ... }: let @@ -33,7 +32,7 @@ in sops.secrets = { "khanelimac_khaneliman_ssh_key" = { - sopsFile = root + "/secrets/khanelimac/khaneliman/default.yaml"; + sopsFile = khanelinix-lib.getFile "secrets/khanelimac/khaneliman/default.yaml"; }; }; }; diff --git a/modules/darwin/services/default.nix b/modules/darwin/services/default.nix deleted file mode 100644 index c492739eb..000000000 --- a/modules/darwin/services/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - imports = [ - ./nix-daemon - ./openssh - ./tailscale - ]; -} diff --git a/modules/darwin/suites/common/default.nix b/modules/darwin/suites/common/default.nix index 75ccf5adf..d50fc072b 100644 --- a/modules/darwin/suites/common/default.nix +++ b/modules/darwin/suites/common/default.nix @@ -3,7 +3,7 @@ lib, pkgs, khanelinix-lib, - root, + self, ... }: let @@ -13,7 +13,7 @@ let cfg = config.khanelinix.suites.common; in { - imports = [ (root + "/modules/shared/suites/common/default.nix") ]; + imports = [ (khanelinix-lib.getFile "modules/shared/suites/common/default.nix") ]; config = mkIf cfg.enable { programs.zsh.enable = mkDefault true; @@ -32,8 +32,8 @@ in gnupg gnused gnutls - self.packages.${system}.trace-symlink - self.packages.${system}.trace-which + self.packages.${pkgs.stdenv.system}.trace-symlink + self.packages.${pkgs.stdenv.system}.trace-which mas terminal-notifier trash-cli diff --git a/modules/darwin/suites/default.nix b/modules/darwin/suites/default.nix deleted file mode 100644 index 8d57803fa..000000000 --- a/modules/darwin/suites/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - imports = [ - ./art - ./business - ./common - ./desktop - ./development - ./games - ./music - ./networking - ./photo - ./social - ./video - ./vm - ]; -} diff --git a/modules/darwin/system/default.nix b/modules/darwin/system/default.nix deleted file mode 100644 index 21692108c..000000000 --- a/modules/darwin/system/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - imports = [ - ./fonts - ./input - ./interface - ./networking - ]; -} diff --git a/modules/darwin/system/fonts/default.nix b/modules/darwin/system/fonts/default.nix index 0222d40fa..da5c9f38a 100644 --- a/modules/darwin/system/fonts/default.nix +++ b/modules/darwin/system/fonts/default.nix @@ -1,8 +1,8 @@ { config, + khanelinix-lib, pkgs, lib, - root, ... }: let @@ -11,7 +11,7 @@ let cfg = config.khanelinix.system.fonts; in { - imports = [ (root + "/modules/shared/system/fonts/default.nix") ]; + imports = [ (khanelinix-lib.getFile "modules/shared/system/fonts/default.nix") ]; config = mkIf cfg.enable { fonts = { diff --git a/modules/darwin/tools/default.nix b/modules/darwin/tools/default.nix deleted file mode 100644 index fca53e743..000000000 --- a/modules/darwin/tools/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./homebrew - ]; -} diff --git a/modules/home/default.nix b/modules/home/default.nix index 983cfb8aa..bc1b083d6 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,11 +1,4 @@ +{ khanelinix-lib, ... }: { - imports = [ - ./host - ./programs - ./services - ./suites - ./system - ./theme - ./user - ]; + imports = khanelinix-lib.getDefaultNixFilesRecursive ./.; } diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix deleted file mode 100644 index 35abed499..000000000 --- a/modules/home/programs/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./graphical - ./terminal - ]; -} diff --git a/modules/home/programs/graphical/bars/waybar/default.nix b/modules/home/programs/graphical/bars/waybar/default.nix index 611ee243c..de1e3ceff 100644 --- a/modules/home/programs/graphical/bars/waybar/default.nix +++ b/modules/home/programs/graphical/bars/waybar/default.nix @@ -5,7 +5,6 @@ lib, pkgs, system, - root, osConfig, ... }: @@ -151,7 +150,7 @@ in sops.secrets = lib.mkIf osConfig.khanelinix.security.sops.enable { weather_config = { - sopsFile = root + "/secrets/khaneliman/default.yaml"; + sopsFile = khanelinix-lib.getFile "secrets/khaneliman/default.yaml"; path = "${config.home.homeDirectory}/weather_config.json"; }; }; diff --git a/modules/home/programs/graphical/bars/waybar/modules/default-modules.nix b/modules/home/programs/graphical/bars/waybar/modules/default-modules.nix index d0d4f58d8..7a3bfafcb 100644 --- a/modules/home/programs/graphical/bars/waybar/modules/default-modules.nix +++ b/modules/home/programs/graphical/bars/waybar/modules/default-modules.nix @@ -1,13 +1,12 @@ { lib, pkgs, - root, ... }: let inherit (lib) getExe getExe'; - catppuccin = import (root + "/modules/home/theme/catppuccin/colors.nix"); + catppuccin = import (khanelinix-lib.getFile "modules/home/theme/catppuccin/colors.nix"); in { backlight = diff --git a/modules/home/programs/graphical/editors/vscode/default.nix b/modules/home/programs/graphical/editors/vscode/default.nix index d09fc6bb2..69fc715c6 100644 --- a/modules/home/programs/graphical/editors/vscode/default.nix +++ b/modules/home/programs/graphical/editors/vscode/default.nix @@ -4,7 +4,6 @@ lib, osConfig, pkgs, - root, ... }: let @@ -203,7 +202,7 @@ in sops.secrets = lib.mkIf osConfig.khanelinix.security.sops.enable { wakatime = { - sopsFile = root + "/secrets/khaneliman/default.yaml"; + sopsFile = khanelinix-lib.getFile "secrets/khaneliman/default.yaml"; path = "${config.home.homeDirectory}/.wakatime.cfg"; }; }; diff --git a/modules/home/programs/graphical/screenlockers/hyprlock/default.nix b/modules/home/programs/graphical/screenlockers/hyprlock/default.nix index 8ad4776d8..1dd1d0193 100644 --- a/modules/home/programs/graphical/screenlockers/hyprlock/default.nix +++ b/modules/home/programs/graphical/screenlockers/hyprlock/default.nix @@ -3,14 +3,13 @@ khanelinix-lib, lib, osConfig, - root, ... }: let inherit (lib) mkIf; inherit (khanelinix-lib) mkBoolOpt; - catppuccin = import (root + "/modules/home/theme/catppuccin/colors.nix"); + catppuccin = import (khanelinix-lib.getFile "modules/home/theme/catppuccin/colors.nix"); cfg = config.khanelinix.programs.graphical.screenlockers.hyprlock; in diff --git a/modules/home/programs/terminal/default.nix b/modules/home/programs/terminal/default.nix deleted file mode 100644 index c5273da93..000000000 --- a/modules/home/programs/terminal/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - imports = [ - ./editors - ./emulators - ./media - ./shells - ./social - ./tools - ]; -} diff --git a/modules/home/programs/terminal/editors/default.nix b/modules/home/programs/terminal/editors/default.nix deleted file mode 100644 index 235a864ab..000000000 --- a/modules/home/programs/terminal/editors/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - imports = [ - ./helix - ./micro - ./neovim - ]; -} diff --git a/modules/home/programs/terminal/editors/neovim/default.nix b/modules/home/programs/terminal/editors/neovim/default.nix index 99598f9a3..fd625a92f 100644 --- a/modules/home/programs/terminal/editors/neovim/default.nix +++ b/modules/home/programs/terminal/editors/neovim/default.nix @@ -5,7 +5,6 @@ lib, osConfig, pkgs, - root, system, ... }: @@ -50,7 +49,7 @@ in sops.secrets = lib.mkIf osConfig.khanelinix.security.sops.enable { wakatime = { - sopsFile = root + "/secrets/khaneliman/default.yaml"; + sopsFile = khanelinix-lib.getFile "secrets/khaneliman/default.yaml"; path = "${config.home.homeDirectory}/.wakatime.cfg"; }; }; diff --git a/modules/home/programs/terminal/emulators/default.nix b/modules/home/programs/terminal/emulators/default.nix deleted file mode 100644 index d5b1149d6..000000000 --- a/modules/home/programs/terminal/emulators/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - imports = [ - ./alacritty - ./foot - ./ghostty - ./kitty - ./warp - ./wezterm - ]; -} diff --git a/modules/home/programs/terminal/emulators/wezterm/default.nix b/modules/home/programs/terminal/emulators/wezterm/default.nix index 8e595af20..404da87b1 100644 --- a/modules/home/programs/terminal/emulators/wezterm/default.nix +++ b/modules/home/programs/terminal/emulators/wezterm/default.nix @@ -4,7 +4,6 @@ lib, system, khanelinix-lib, - root, ... }: let @@ -13,7 +12,7 @@ let inherit (inputs) wezterm; cfg = config.khanelinix.programs.terminal.emulators.wezterm; - catppuccin = import (root + "/modules/home/theme/catppuccin/colors.nix"); + catppuccin = import (khanelinix-lib.getFile "modules/home/theme/catppuccin/colors.nix"); in { options.khanelinix.programs.terminal.emulators.wezterm = { diff --git a/modules/home/programs/terminal/social/slack-term/default.nix b/modules/home/programs/terminal/social/slack-term/default.nix index 4b0218615..dafc0e669 100644 --- a/modules/home/programs/terminal/social/slack-term/default.nix +++ b/modules/home/programs/terminal/social/slack-term/default.nix @@ -4,7 +4,6 @@ lib, osConfig, pkgs, - root, ... }: let @@ -23,7 +22,7 @@ in sops.secrets = lib.mkIf osConfig.khanelinix.security.sops.enable { slack-term = { - sopsFile = root + "/secrets/khaneliman/default.yaml"; + sopsFile = khanelinix-lib.getFile "secrets/khaneliman/default.yaml"; path = "${config.home.homeDirectory}/.config/slack-term/config"; }; }; diff --git a/modules/home/programs/terminal/social/twitch-tui/default.nix b/modules/home/programs/terminal/social/twitch-tui/default.nix index fab5e691d..d55d20233 100644 --- a/modules/home/programs/terminal/social/twitch-tui/default.nix +++ b/modules/home/programs/terminal/social/twitch-tui/default.nix @@ -3,7 +3,6 @@ lib, khanelinix-lib, pkgs, - root, osConfig, ... }: @@ -22,7 +21,7 @@ in sops.secrets = lib.mkIf osConfig.khanelinix.security.sops.enable { twitch-tui = { - sopsFile = root + "/secrets/khaneliman/default.yaml"; + sopsFile = khanelinix-lib.getFile "secrets/khaneliman/default.yaml"; path = "${config.home.homeDirectory}/.config/twt/config.toml"; }; }; diff --git a/modules/home/programs/terminal/tools/git/default.nix b/modules/home/programs/terminal/tools/git/default.nix index 482b3d2c1..10f5c967d 100644 --- a/modules/home/programs/terminal/tools/git/default.nix +++ b/modules/home/programs/terminal/tools/git/default.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - root, khanelinix-lib, osConfig, ... @@ -175,7 +174,7 @@ in sops.secrets = lib.mkIf osConfig.khanelinix.security.sops.enable { "github/access-token" = { - sopsFile = root + "/secrets/khaneliman/default.yaml"; + sopsFile = khanelinix-lib.getFile "secrets/khaneliman/default.yaml"; path = "${config.home.homeDirectory}/.config/gh/access-token"; }; }; diff --git a/modules/home/services/default.nix b/modules/home/services/default.nix deleted file mode 100644 index 096a4dee9..000000000 --- a/modules/home/services/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - imports = [ - ./cliphist - ./easyeffects - ./hypridle - ./hyprpaper - ./keyring - ./mpd - ./noisetorch - ./rnnoise - ./sops - ./ssh-agent - ./swayidle - ./tray - ./udiskie - ]; -} diff --git a/modules/home/services/sops/default.nix b/modules/home/services/sops/default.nix index d7ce9a690..ba4ef10a5 100644 --- a/modules/home/services/sops/default.nix +++ b/modules/home/services/sops/default.nix @@ -3,7 +3,6 @@ inputs, lib, pkgs, - root, khanelinix-lib, ... }: @@ -41,7 +40,7 @@ in secrets = { nix = { - sopsFile = root + "/secrets/khaneliman/default.yaml"; + sopsFile = khanelinix-lib.getFile "secrets/khaneliman/default.yaml"; path = "${config.home.homeDirectory}/.config/nix/nix.conf"; }; }; diff --git a/modules/home/suites/default.nix b/modules/home/suites/default.nix deleted file mode 100644 index 2c1af5446..000000000 --- a/modules/home/suites/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - imports = [ - ./art - ./business - ./common - ./desktop - ./development - ./emulation - ./games - ./music - ./networking - ./photo - ./social - ./video - ./wlroots - ]; -} diff --git a/modules/home/system/default.nix b/modules/home/system/default.nix deleted file mode 100644 index 19ee900a8..000000000 --- a/modules/home/system/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./xdg - ]; -} diff --git a/modules/home/theme/default.nix b/modules/home/theme/default.nix deleted file mode 100644 index b265a0b47..000000000 --- a/modules/home/theme/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - imports = [ - ./catppuccin - ./gtk - ./qt - ]; -} diff --git a/modules/nixos/archetypes/default.nix b/modules/nixos/archetypes/default.nix deleted file mode 100644 index b041adaf9..000000000 --- a/modules/nixos/archetypes/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - imports = [ - ./gaming - ./personal - ./server - ./vm - ./workstation - ./wsl - ]; -} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index c95c158b1..bc1b083d6 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -1,17 +1,4 @@ +{ khanelinix-lib, ... }: { - imports = [ - ./archetypes - ./display-managers - ./hardware - ./home - ./nix - ./programs - ./security - ./services - ./suites - ./system - ./theme - ./user - ./virtualisation - ]; + imports = khanelinix-lib.getDefaultNixFilesRecursive ./.; } diff --git a/modules/nixos/display-managers/default.nix b/modules/nixos/display-managers/default.nix deleted file mode 100644 index 37bdee1b4..000000000 --- a/modules/nixos/display-managers/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - imports = [ - ./gdm - ./lightdm - ./regreet - ./sddm - ./tuigreet - ]; -} diff --git a/modules/nixos/hardware/cpu/default.nix b/modules/nixos/hardware/cpu/default.nix index e52df6385..5c91231d1 100644 --- a/modules/nixos/hardware/cpu/default.nix +++ b/modules/nixos/hardware/cpu/default.nix @@ -3,11 +3,6 @@ let inherit (khanelinix-lib) mkBoolOpt; in { - imports = [ - ./amd - ./intel - ]; - options.khanelinix.hardware.cpu = { enable = mkBoolOpt false "No-op used for setting up hierarchy."; }; diff --git a/modules/nixos/hardware/default.nix b/modules/nixos/hardware/default.nix deleted file mode 100644 index ae05f311e..000000000 --- a/modules/nixos/hardware/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - imports = [ - ./audio - ./bluetooth - ./cpu - ./fingerprint - ./gpu - ./opengl - ./power - ./rgb - ./storage - ./tpm - ./yubikey - ]; -} diff --git a/modules/nixos/hardware/gpu/default.nix b/modules/nixos/hardware/gpu/default.nix index 5d2dd709b..ffab4d1f5 100644 --- a/modules/nixos/hardware/gpu/default.nix +++ b/modules/nixos/hardware/gpu/default.nix @@ -3,11 +3,6 @@ let inherit (khanelinix-lib) mkBoolOpt; in { - imports = [ - ./amd - ./nvidia - ]; - options.khanelinix.hardware.gpu = { enable = mkBoolOpt false "No-op for setting up hierarchy."; }; diff --git a/modules/nixos/hardware/rgb/default.nix b/modules/nixos/hardware/rgb/default.nix deleted file mode 100644 index 271d73e3b..000000000 --- a/modules/nixos/hardware/rgb/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./ckb-next - ./openrgb - ]; -} diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix index 5e2bfe8f1..8ba04a7a2 100644 --- a/modules/nixos/nix/default.nix +++ b/modules/nixos/nix/default.nix @@ -1,7 +1,7 @@ { config, lib, - root, + khanelinix-lib, ... }: let @@ -10,7 +10,7 @@ let cfg = config.khanelinix.nix; in { - imports = [ (root + "/modules/shared/nix/default.nix") ]; + imports = [ (khanelinix-lib.getFile "modules/shared/nix/default.nix") ]; config = mkIf cfg.enable { documentation = { diff --git a/modules/nixos/programs/default.nix b/modules/nixos/programs/default.nix deleted file mode 100644 index 35abed499..000000000 --- a/modules/nixos/programs/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./graphical - ./terminal - ]; -} diff --git a/modules/nixos/programs/graphical/addons/default.nix b/modules/nixos/programs/graphical/addons/default.nix deleted file mode 100644 index 2f6d1ed0e..000000000 --- a/modules/nixos/programs/graphical/addons/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - imports = [ - ./gamemode - ./gamescope - ./keyring - ./looking-glass-client - ./noisetorch - ./xdg-portal - ]; -} diff --git a/modules/nixos/programs/graphical/apps/default.nix b/modules/nixos/programs/graphical/apps/default.nix deleted file mode 100644 index 185cfc5c9..000000000 --- a/modules/nixos/programs/graphical/apps/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - imports = [ - ./_1password - ./partitionmanager - ./steam - ./virtualbox - ]; -} diff --git a/modules/nixos/programs/graphical/default.nix b/modules/nixos/programs/graphical/default.nix deleted file mode 100644 index f69c3182e..000000000 --- a/modules/nixos/programs/graphical/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - imports = [ - ./addons - ./apps - ./desktop-environment - ./file-managers - ./wms - ]; -} diff --git a/modules/nixos/programs/graphical/desktop-environment/default.nix b/modules/nixos/programs/graphical/desktop-environment/default.nix deleted file mode 100644 index 7c1002ba2..000000000 --- a/modules/nixos/programs/graphical/desktop-environment/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./gnome - ]; -} diff --git a/modules/nixos/programs/graphical/file-managers/default.nix b/modules/nixos/programs/graphical/file-managers/default.nix deleted file mode 100644 index 19070d8a2..000000000 --- a/modules/nixos/programs/graphical/file-managers/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - imports = [ - ./dolphin - ./nautilus - ./thunar - ]; -} diff --git a/modules/nixos/programs/graphical/wms/default.nix b/modules/nixos/programs/graphical/wms/default.nix deleted file mode 100644 index 83e551094..000000000 --- a/modules/nixos/programs/graphical/wms/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./hyprland - ./sway - ]; -} diff --git a/modules/nixos/programs/terminal/default.nix b/modules/nixos/programs/terminal/default.nix deleted file mode 100644 index 9753b32f7..000000000 --- a/modules/nixos/programs/terminal/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./tools - ]; -} diff --git a/modules/nixos/programs/terminal/tools/default.nix b/modules/nixos/programs/terminal/tools/default.nix deleted file mode 100644 index cdd83d385..000000000 --- a/modules/nixos/programs/terminal/tools/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - imports = [ - ./bandwhich - ./nix-ld - ./qmk - ./ssh - ]; -} diff --git a/modules/nixos/programs/terminal/tools/ssh/default.nix b/modules/nixos/programs/terminal/tools/ssh/default.nix index 5303503b1..3821d4898 100644 --- a/modules/nixos/programs/terminal/tools/ssh/default.nix +++ b/modules/nixos/programs/terminal/tools/ssh/default.nix @@ -1,7 +1,7 @@ { - root, + khanelinix-lib, ... }: { - imports = [ (root + "/modules/shared/programs/terminal/tools/ssh/default.nix") ]; + imports = [ (khanelinix-lib.getFile "modules/shared/programs/terminal/tools/ssh/default.nix") ]; } diff --git a/modules/nixos/security/default.nix b/modules/nixos/security/default.nix deleted file mode 100644 index 5d0aaa0a2..000000000 --- a/modules/nixos/security/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - imports = [ - ./acme - ./auditd - ./clamav - ./doas - ./gpg - ./keyring - ./pam - ./polkit - ./sops - ./sudo - ./sudo-rs - ./usbguard - ]; -} diff --git a/modules/nixos/security/sops/default.nix b/modules/nixos/security/sops/default.nix index e77f4f274..6dca00bcc 100644 --- a/modules/nixos/security/sops/default.nix +++ b/modules/nixos/security/sops/default.nix @@ -2,7 +2,6 @@ config, inputs, lib, - root, khanelinix-lib, ... }: @@ -33,7 +32,7 @@ in sops.secrets = { "khanelinix_khaneliman_ssh_key" = { - sopsFile = root + "/secrets/khanelinix/khaneliman/default.yaml"; + sopsFile = khanelinix-lib.getFile "secrets/khanelinix/khaneliman/default.yaml"; }; }; }; diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix deleted file mode 100644 index 964b8a4d1..000000000 --- a/modules/nixos/services/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - imports = [ - ./avahi - ./cloudflared - ./dbus - ./ddc - ./earlyoom - ./flatpak - ./geoclue - ./logind - ./logrotate - ./oomd - ./openssh - ./power - ./printing - ./rustdesk-server - ./samba - ./seatd - ./snapper - ./spice-vdagentd - ./spice-webdav - ./tailscale - ./udisks2 - ]; -} diff --git a/modules/nixos/suites/common/default.nix b/modules/nixos/suites/common/default.nix index c94ac6da5..703da5c6e 100644 --- a/modules/nixos/suites/common/default.nix +++ b/modules/nixos/suites/common/default.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - root, self, khanelinix-lib, ... @@ -14,7 +13,7 @@ let cfg = config.khanelinix.suites.common; in { - imports = [ (root + "/modules/shared/suites/common/default.nix") ]; + imports = [ (khanelinix-lib.getFile "modules/shared/suites/common/default.nix") ]; config = mkIf cfg.enable { diff --git a/modules/nixos/suites/default.nix b/modules/nixos/suites/default.nix deleted file mode 100644 index a8070cecd..000000000 --- a/modules/nixos/suites/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - imports = [ - ./common - ./desktop - ./development - ./games - ./video - ./vm - ./wlroots - ]; -} diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix deleted file mode 100644 index 00c29725c..000000000 --- a/modules/nixos/system/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - imports = [ - ./boot - ./env - ./fonts - ./locale - ./networking - ./realtime - ./time - ./xkb - ]; -} diff --git a/modules/nixos/system/fonts/default.nix b/modules/nixos/system/fonts/default.nix index 8ad14e868..95f1e91a4 100644 --- a/modules/nixos/system/fonts/default.nix +++ b/modules/nixos/system/fonts/default.nix @@ -1,8 +1,8 @@ { config, + khanelinix-lib, lib, pkgs, - root, ... }: let @@ -11,7 +11,7 @@ let cfg = config.khanelinix.system.fonts; in { - imports = [ (root + "/modules/shared/system/fonts/default.nix") ]; + imports = [ (khanelinix-lib.getFile "modules/shared/system/fonts/default.nix") ]; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ diff --git a/modules/nixos/theme/default.nix b/modules/nixos/theme/default.nix index d25a48035..9a6bb8fae 100644 --- a/modules/nixos/theme/default.nix +++ b/modules/nixos/theme/default.nix @@ -40,11 +40,6 @@ let ]; in { - imports = [ - ./gtk - ./qt - ]; - # TODO: consolidate home-manager and nixos module options.khanelinix.theme = { enable = mkEnableOption "Enable custom theme use for applications."; diff --git a/modules/nixos/virtualisation/default.nix b/modules/nixos/virtualisation/default.nix deleted file mode 100644 index bf5893d3a..000000000 --- a/modules/nixos/virtualisation/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./kvm - ./podman - ]; -}