From 1ad4a6c5136d77e6addf36c31411d103b5e2a137 Mon Sep 17 00:00:00 2001 From: Adam0 Date: Mon, 1 Jun 2026 23:05:09 +0200 Subject: [PATCH] clean up imports --- flake.lock | 18 +- modules/capabilities.nix | 2 - modules/desktop/hyprland/animations.nix | 2 +- modules/desktop/hyprland/cursor.nix | 9 +- modules/desktop/hyprland/default.nix | 17 +- .../hyprland/keybinds/applications.nix | 15 -- modules/desktop/hyprland/keybinds/default.nix | 15 +- .../keybinds/screenshots-and-color.nix | 3 - modules/desktop/hyprland/plugins.nix | 12 +- modules/desktop/noctalia/bar.nix | 4 +- modules/desktop/noctalia/default.nix | 7 +- modules/desktop/noctalia/launcher.nix | 4 +- modules/desktop/noctalia/location.nix | 9 +- modules/desktop/noctalia/plugins.nix | 11 +- modules/desktop/noctalia/systemmonitor.nix | 12 +- modules/desktop/noctalia/theme.nix | 4 +- modules/desktop/noctalia/wallpaper.nix | 4 +- modules/desktop/overzicht/theme.nix | 4 +- modules/desktop/tuigreet.nix | 10 - modules/desktop/xdg/portal.nix | 18 +- modules/desktop/xdg/terminal.nix | 4 +- modules/hosts/default.nix | 5 +- modules/hosts/euclid/default.nix | 5 +- modules/hosts/laptop/hardware.nix | 4 +- modules/nix/default.nix | 8 +- modules/profiles/base.nix | 191 +++++++++--------- modules/profiles/common/locale.nix | 4 +- modules/profiles/partitioning/ext4.nix | 2 +- modules/profiles/personal.nix | 41 +--- modules/profiles/stylix/base.nix | 4 - modules/profiles/stylix/personal.nix | 11 +- modules/profiles/stylix/server.nix | 18 +- modules/programs/cli/bat.nix | 12 +- modules/programs/cli/bonsai.nix | 4 +- modules/programs/cli/cpond.nix | 4 +- modules/programs/cli/eza/theme.nix | 4 +- modules/programs/cli/fastfetch.nix | 7 - modules/programs/cli/gh.nix | 13 +- modules/programs/cli/gitfetch.nix | 10 +- modules/programs/cli/nh.nix | 4 +- modules/programs/cli/onefetch.nix | 9 +- modules/programs/cli/ripgrep-all/adapters.nix | 4 +- .../cli/ripgrep-all/adapters/gron.nix | 4 +- modules/programs/git.nix | 13 -- modules/programs/gtk.nix | 4 +- modules/programs/gui/beeper.nix | 5 - modules/programs/gui/discord/default.nix | 8 +- .../gui/discord/plugins/communication.nix | 9 +- .../gui/discord/plugins/interface.nix | 4 +- .../programs/gui/discord/themes/default.nix | 4 +- modules/programs/gui/flatseal.nix | 4 +- modules/programs/gui/mcpelauncher.nix | 4 +- modules/programs/gui/onlyoffice.nix | 4 +- modules/programs/gui/optiscaler.nix | 4 +- modules/programs/gui/prism.nix | 9 +- modules/programs/gui/sober.nix | 4 +- modules/programs/gui/spotify/default.nix | 15 +- modules/programs/gui/spotify/theme.nix | 10 +- modules/programs/gui/zaread.nix | 3 - modules/programs/gui/zathura.nix | 4 +- modules/programs/gui/zen/chrome.nix | 4 +- modules/programs/gui/zen/default.nix | 15 +- modules/programs/gui/zen/extensions.nix | 4 +- modules/programs/gui/zen/preferences.nix | 4 +- modules/programs/ssh.nix | 9 +- modules/programs/tui/atuin.nix | 9 +- modules/programs/tui/bluetui.nix | 4 +- modules/programs/tui/cava.nix | 4 +- modules/programs/tui/fzf.nix | 4 +- modules/programs/tui/impala.nix | 4 +- .../tui/neovim/components/bufferline.nix | 4 +- .../tui/neovim/components/dashboard.nix | 4 +- .../tui/neovim/components/telescope.nix | 4 +- .../programs/tui/neovim/components/yazi.nix | 9 +- modules/programs/tui/neovim/default.nix | 20 +- modules/programs/tui/neovim/settings.nix | 4 +- modules/programs/tui/opencode/default.nix | 13 +- .../programs/tui/opencode/mcp-wrappers.nix | 4 +- modules/programs/tui/opencode/plugins.nix | 9 +- modules/programs/tui/opencode/theme.nix | 4 +- modules/programs/tui/television/channels.nix | 13 +- .../tui/television/channels/files.nix | 4 +- .../tui/television/channels/zoxide.nix | 12 +- modules/programs/tui/television/theme.nix | 4 +- modules/programs/tui/wiremix.nix | 4 +- modules/programs/tui/yazi/default.nix | 9 +- modules/programs/tui/yazi/plugins.nix | 15 +- .../tui/yazi/plugins/faster-piper.nix | 4 +- .../programs/tui/yazi/plugins/preview-cbz.nix | 4 +- .../tui/yazi/plugins/preview-epub.nix | 4 +- .../programs/tui/yazi/plugins/preview-git.nix | 4 +- .../programs/tui/yazi/plugins/spot-audio.nix | 4 +- .../programs/tui/yazi/plugins/spot-cbz.nix | 4 +- .../programs/tui/yazi/plugins/spot-image.nix | 4 +- .../programs/tui/yazi/plugins/spot-video.nix | 4 +- modules/programs/tui/yazi/plugins/tv.nix | 4 +- modules/programs/tui/yazi/plugins/ucp.nix | 4 +- modules/services/bluetooth.nix | 4 +- modules/services/geoclue.nix | 4 +- modules/services/godns.nix | 8 +- modules/services/mysql.nix | 3 +- modules/services/network.nix | 9 +- modules/services/podman.nix | 4 +- modules/services/wifi.nix | 4 +- modules/users.nix | 9 +- 105 files changed, 227 insertions(+), 715 deletions(-) diff --git a/flake.lock b/flake.lock index c67e0ad..cc5b733 100644 --- a/flake.lock +++ b/flake.lock @@ -603,11 +603,11 @@ ] }, "locked": { - "lastModified": 1780099287, - "narHash": "sha256-efIPwVGtIWIjWcznhaop6XN6HxnOL8800hF6CBNvlqQ=", + "lastModified": 1780342707, + "narHash": "sha256-wQ56uDoEMaZ9XPHCtSUEGn6beBO7Egy6sCT0N/NM4Fo=", "owner": "nix-community", "repo": "home-manager", - "rev": "7d8127d308c3fb9664f7e643eec944be74ebb37d", + "rev": "5a608a621b001922dd708ca51a6260d5bef9e29b", "type": "github" }, "original": { @@ -1217,11 +1217,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1780158792, - "narHash": "sha256-tAGrRIQOi11zwl7UOLKkNsy3owVTE+/lDU1MJT9K2Qw=", + "lastModified": 1780337753, + "narHash": "sha256-b6dWu3DECKI0hu9VVfA4aW0z44Hl78twPIslpwVFG8A=", "owner": "kaylorben", "repo": "nixcord", - "rev": "d0a08d06b3a00b1038b1780366180068af7c1489", + "rev": "cad2d0078ccb74cbe56fd5d704b596f702f1ea2f", "type": "github" }, "original": { @@ -1438,11 +1438,11 @@ ] }, "locked": { - "lastModified": 1780281641, - "narHash": "sha256-M/+hUKoKbHXpV0xGVfELbN1Ds1aoe3pL5p5/t46YhVo=", + "lastModified": 1780345519, + "narHash": "sha256-7asvwLC+iv5D6VUiyMdWvujy5Qb/x7Zxzkiwp8+B+Ts=", "owner": "nix-community", "repo": "NUR", - "rev": "30f9ae2f04174de63ba8bcf3580ca90843b28a01", + "rev": "1251658e58bf1f938ad87c1d0e55ac5a7252bb1b", "type": "github" }, "original": { diff --git a/modules/capabilities.nix b/modules/capabilities.nix index cff64b0..52bea6b 100644 --- a/modules/capabilities.nix +++ b/modules/capabilities.nix @@ -2,8 +2,6 @@ inherit (lib) mkEnableOption; in { flake.modules.nixos.capabilities = { - key = "nixos-capabilities"; - options.capabilities = { # keep-sorted start bluetooth = mkEnableOption "bluetooth support"; diff --git a/modules/desktop/hyprland/animations.nix b/modules/desktop/hyprland/animations.nix index fcbf36d..9867e5f 100644 --- a/modules/desktop/hyprland/animations.nix +++ b/modules/desktop/hyprland/animations.nix @@ -1,5 +1,5 @@ { - flake.modules.homeManager.hyprland = _: { + flake.modules.homeManager.hyprland = { programs.hylix.animations = { animations = [ # keep-sorted start block=yes newline_separated=yes diff --git a/modules/desktop/hyprland/cursor.nix b/modules/desktop/hyprland/cursor.nix index 8c52516..a0e8fd4 100644 --- a/modules/desktop/hyprland/cursor.nix +++ b/modules/desktop/hyprland/cursor.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.hyprland = { # keep-sorted start config, @@ -9,13 +9,6 @@ }: let inherit (lib) mkForce; in { - imports = with self.modules.homeManager; [ - # keep-sorted start - nur - stylixPersonal - # keep-sorted end - ]; - # Install and export the Hyprcursor theme selected by Stylix. home = { # Hyprcursor variant of the configured Bibata cursor package. diff --git a/modules/desktop/hyprland/default.nix b/modules/desktop/hyprland/default.nix index d9c9304..80bb2c0 100644 --- a/modules/desktop/hyprland/default.nix +++ b/modules/desktop/hyprland/default.nix @@ -27,8 +27,10 @@ pkgs-unstable = inputs.hyprland.inputs.nixpkgs.legacyPackages.${system}; in { nixpkgs.overlays = with self.overlays; [ + # keep-sorted start hyprland hyprland-plugins + # keep-sorted end ]; programs.hyprland = { @@ -45,19 +47,8 @@ }; }; - flake.modules.homeManager.hyprland = { - # keep-sorted start - inputs, - self, - # keep-sorted end - ... - }: { - imports = [ - # keep-sorted start - inputs.hylix.homeManagerModules.default - self.modules.homeManager.uwsm - # keep-sorted end - ]; + flake.modules.homeManager.hyprland = {inputs, ...}: { + imports = [inputs.hylix.homeManagerModules.default]; config = { wayland.windowManager.hyprland = { diff --git a/modules/desktop/hyprland/keybinds/applications.nix b/modules/desktop/hyprland/keybinds/applications.nix index 98e6495..a267831 100644 --- a/modules/desktop/hyprland/keybinds/applications.nix +++ b/modules/desktop/hyprland/keybinds/applications.nix @@ -4,26 +4,11 @@ config, lib, pkgs, - self, # keep-sorted end ... }: let inherit (lib.self) mkHylixBindGroup; in { - imports = with self.modules.homeManager; [ - # keep-sorted start block=yes - ghostty - { - key = "homeManager-discord"; - imports = [discord]; - } - { - key = "homeManager-zen"; - imports = [zen]; - } - # keep-sorted end - ]; - config = let inherit (lib) getExe; diff --git a/modules/desktop/hyprland/keybinds/default.nix b/modules/desktop/hyprland/keybinds/default.nix index 656e3d8..5c8c501 100644 --- a/modules/desktop/hyprland/keybinds/default.nix +++ b/modules/desktop/hyprland/keybinds/default.nix @@ -1,20 +1,7 @@ -{self, ...}: { +{ flake.modules.homeManager.hyprland = {lib, ...}: let inherit (lib) mkOrder; in { - imports = with self.modules.homeManager; [ - # keep-sorted start block=yes - { - key = "homeManager-noctalia"; - imports = [noctalia]; - } - { - key = "homeManager-overzicht"; - imports = [overzicht]; - } - # keep-sorted end - ]; - config.programs.hylix = { _generatedConfig = mkOrder 899 '' local MAX_ZOOM = 3 diff --git a/modules/desktop/hyprland/keybinds/screenshots-and-color.nix b/modules/desktop/hyprland/keybinds/screenshots-and-color.nix index af057ba..43bafc5 100644 --- a/modules/desktop/hyprland/keybinds/screenshots-and-color.nix +++ b/modules/desktop/hyprland/keybinds/screenshots-and-color.nix @@ -4,7 +4,6 @@ config, lib, pkgs, - self, # keep-sorted end ... }: let @@ -17,8 +16,6 @@ screenshotDir = "${config.xdg.userDirs.pictures}/Screenshots"; # keep-sorted end in { - imports = [self.modules.homeManager.xdgDirs]; - config.programs.hylix.bindGroups = [ (mkHylixBindGroup "Screenshots And Color" [ # keep-sorted start block=yes newline_separated=yes diff --git a/modules/desktop/hyprland/plugins.nix b/modules/desktop/hyprland/plugins.nix index 288ea9c..ad585c3 100644 --- a/modules/desktop/hyprland/plugins.nix +++ b/modules/desktop/hyprland/plugins.nix @@ -1,10 +1,4 @@ -{ - # keep-sorted start - inputs, - self, - # keep-sorted end - ... -}: { +{inputs, ...}: { flake-file.inputs = { hyprland-plugins = { url = "github:hyprwm/hyprland-plugins?ref=v0.55.0"; @@ -13,14 +7,14 @@ }; flake.modules.homeManager.hyprland = { + # keep-sorted start lib, pkgs, + # keep-sorted end ... }: let inherit (lib) mkOrder; in { - imports = [self.modules.homeManager.nur]; - wayland.windowManager.hyprland.plugins = [pkgs.hyprlandPlugins.hyprfocus]; programs.hylix = { diff --git a/modules/desktop/noctalia/bar.nix b/modules/desktop/noctalia/bar.nix index f9fb001..91c5360 100644 --- a/modules/desktop/noctalia/bar.nix +++ b/modules/desktop/noctalia/bar.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.noctalia = { # keep-sorted start config, @@ -15,8 +15,6 @@ cfgGpu = config.programs.noctalia-shell.systemMonitor.enableGpu; # keep-sorted end in { - imports = [self.modules.homeManager.wiremix]; - programs.noctalia-shell.settings.bar = { # keep-sorted start backgroundOpacity = 1; diff --git a/modules/desktop/noctalia/default.nix b/modules/desktop/noctalia/default.nix index 55b364a..077e02f 100644 --- a/modules/desktop/noctalia/default.nix +++ b/modules/desktop/noctalia/default.nix @@ -37,12 +37,7 @@ flake.modules.homeManager.noctalia = {lib, ...}: let inherit (lib) mkEnableOption; in { - imports = [ - # keep-sorted start - inputs.noctalia.homeModules.default - self.modules.homeManager.cliphist - # keep-sorted end - ]; + imports = [inputs.noctalia.homeModules.default]; # Expose an enable toggle for battery widgets. options.programs.noctalia-shell.battery.enable = mkEnableOption "Enable the battery service & widgets."; diff --git a/modules/desktop/noctalia/launcher.nix b/modules/desktop/noctalia/launcher.nix index 0938af9..920eed6 100644 --- a/modules/desktop/noctalia/launcher.nix +++ b/modules/desktop/noctalia/launcher.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.noctalia = { # keep-sorted start config, @@ -9,8 +9,6 @@ }: let inherit (lib) getExe; in { - imports = [self.modules.homeManager.xdgTerminal]; - programs.noctalia-shell = { # keep-sorted start block=yes newline_separated=yes # Keep launcher runtime tools in the wrapped shell package path. diff --git a/modules/desktop/noctalia/location.nix b/modules/desktop/noctalia/location.nix index 36521b8..06de7fb 100644 --- a/modules/desktop/noctalia/location.nix +++ b/modules/desktop/noctalia/location.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.noctalia = { # keep-sorted start config, @@ -22,13 +22,6 @@ cfgLocation = config.programs.noctalia-shell.location.source; in { - imports = with self.modules; [ - # keep-sorted start - generic.vars - homeManager.sops - # keep-sorted end - ]; - # Control whether Noctalia reads weather data from autolocation or sops. options.programs.noctalia-shell.location.source = mkOption { description = '' diff --git a/modules/desktop/noctalia/plugins.nix b/modules/desktop/noctalia/plugins.nix index bc63077..8655588 100644 --- a/modules/desktop/noctalia/plugins.nix +++ b/modules/desktop/noctalia/plugins.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.noctalia = { # keep-sorted start config, @@ -25,15 +25,6 @@ colors = config.lib.stylix.colors.withHashtag; in { - imports = with self.modules; [ - # keep-sorted start - generic.vars - homeManager.sops - homeManager.stylixBase - homeManager.xdgDirs - # keep-sorted end - ]; - # keep-sorted start block=yes newline_separated=yes programs.noctalia-shell = { plugins = let diff --git a/modules/desktop/noctalia/systemmonitor.nix b/modules/desktop/noctalia/systemmonitor.nix index 55555a2..3655c28 100644 --- a/modules/desktop/noctalia/systemmonitor.nix +++ b/modules/desktop/noctalia/systemmonitor.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.noctalia = { # keep-sorted start config, @@ -10,16 +10,6 @@ cfgGpu = config.programs.noctalia-shell.systemMonitor.enableGpu; in { - imports = with self.modules.homeManager; [ - # keep-sorted start block=yes - xdgTerminal - { - key = "homeManager-btop"; - imports = [btop]; - } - # keep-sorted end - ]; - # Expose a GPU toggle for Noctalia system monitor widgets. options.programs.noctalia-shell.systemMonitor.enableGpu = mkEnableOption "Enable dGPU monitoring and GPU temperature widgets."; diff --git a/modules/desktop/noctalia/theme.nix b/modules/desktop/noctalia/theme.nix index e8c6d88..46c181c 100644 --- a/modules/desktop/noctalia/theme.nix +++ b/modules/desktop/noctalia/theme.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.noctalia = { # keep-sorted start config, @@ -9,8 +9,6 @@ inherit (lib) mkForce; colors = config.lib.stylix.colors.withHashtag; in { - imports = [self.modules.homeManager.stylixBase]; - stylix.targets.noctalia-shell.colors.override.withHashtag = with colors; { # keep-sorted start base05 = base06; diff --git a/modules/desktop/noctalia/wallpaper.nix b/modules/desktop/noctalia/wallpaper.nix index 691e9c2..28ad520 100644 --- a/modules/desktop/noctalia/wallpaper.nix +++ b/modules/desktop/noctalia/wallpaper.nix @@ -1,9 +1,7 @@ -{self, ...}: { +{ flake.modules.homeManager.noctalia = {config, ...}: let picturesDir = config.xdg.userDirs.pictures; in { - imports = [self.modules.homeManager.xdgDirs]; - # Wallpaper directory and rotation settings. programs.noctalia-shell.settings.wallpaper = { # keep-sorted start block=yes diff --git a/modules/desktop/overzicht/theme.nix b/modules/desktop/overzicht/theme.nix index 3e200c1..9648eb2 100644 --- a/modules/desktop/overzicht/theme.nix +++ b/modules/desktop/overzicht/theme.nix @@ -1,12 +1,10 @@ -{self, ...}: { +{ flake.modules.homeManager.overzicht = {config, ...}: let # keep-sorted start colors = config.lib.stylix.colors.withHashtag; sansSerifFont = config.stylix.fonts.sansSerif.name; # keep-sorted end in { - imports = [self.modules.homeManager.stylixPersonal]; - # Feed the Stylix palette through Overzicht's module options. programs.overzicht = { # keep-sorted start block=yes newline_separated=yes diff --git a/modules/desktop/tuigreet.nix b/modules/desktop/tuigreet.nix index f2b3545..8e19564 100644 --- a/modules/desktop/tuigreet.nix +++ b/modules/desktop/tuigreet.nix @@ -31,16 +31,6 @@ tomlFormat = pkgs.formats.toml {}; in { - imports = with self.modules; [ - # keep-sorted start block=yes - generic.vars - { - key = "nixos-uwsm"; - imports = [nixos.uwsm]; - } - # keep-sorted end - ]; - # keep-sorted start block=yes newline_separated=yes environment = { # Generate tuigreet configuration. diff --git a/modules/desktop/xdg/portal.nix b/modules/desktop/xdg/portal.nix index ceca3a7..c342bcb 100644 --- a/modules/desktop/xdg/portal.nix +++ b/modules/desktop/xdg/portal.nix @@ -1,10 +1,4 @@ -{ - # keep-sorted start - inputs, - self, - # keep-sorted end - ... -}: { +{inputs, ...}: { flake.modules.homeManager.xdgPortal = { # keep-sorted start config, @@ -16,16 +10,6 @@ inherit (lib) getExe; inherit ((import "${inputs.hyprland}/nix/lib.nix" lib)) toHyprlang; in { - imports = with self.modules.homeManager; [ - # keep-sorted start block=yes - xdgTerminal - { - key = "homeManager-hyprland"; - imports = [hyprland]; - } - # keep-sorted end - ]; - xdg.configFile = { "xdg-desktop-portal-termfilechooser/config".text = let terminalCommand = getExe config.xdg.terminal-exec.package; diff --git a/modules/desktop/xdg/terminal.nix b/modules/desktop/xdg/terminal.nix index 0dc0569..1fb5877 100644 --- a/modules/desktop/xdg/terminal.nix +++ b/modules/desktop/xdg/terminal.nix @@ -1,7 +1,5 @@ -{self, ...}: { +{ flake.modules.homeManager.xdgTerminal = { - imports = [self.modules.homeManager.ghostty]; - xdg.terminal-exec = { enable = true; diff --git a/modules/hosts/default.nix b/modules/hosts/default.nix index ddeb264..685dde0 100644 --- a/modules/hosts/default.nix +++ b/modules/hosts/default.nix @@ -17,9 +17,12 @@ hosts = { # keep-sorted start desktop = "x86_64-linux"; - euclid = "x86_64-linux"; laptop = "x86_64-linux"; # keep-sorted end + + # keep-sorted start + euclid = "x86_64-linux"; + # keep-sorted end }; in { flake.nixosConfigurations = mapAttrs (name: system: diff --git a/modules/hosts/euclid/default.nix b/modules/hosts/euclid/default.nix index 3ff2c34..156647e 100644 --- a/modules/hosts/euclid/default.nix +++ b/modules/hosts/euclid/default.nix @@ -1,5 +1,5 @@ {self, ...}: { - flake.modules.nixos.euclid = { + flake.modules.nixos.euclid = {config, ...}: { imports = with self.modules.nixos; [ # Profiles server @@ -7,8 +7,8 @@ # Services # keep-sorted start godns - postgres mysql + postgres # keep-sorted end ]; @@ -19,6 +19,7 @@ # Primary nvme disk for disko partitioning. disko.selectedDisk = "/dev/nvme0n1"; + disko.devices = (self.diskoConfigurations.btrfs config.disko.selectedDisk).disko.devices; # extra data mounts. fileSystems = let diff --git a/modules/hosts/laptop/hardware.nix b/modules/hosts/laptop/hardware.nix index 30f626e..6d4e0ad 100644 --- a/modules/hosts/laptop/hardware.nix +++ b/modules/hosts/laptop/hardware.nix @@ -6,9 +6,7 @@ # keep-sorted end ... }: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [(modulesPath + "/installer/scan/not-detected.nix")]; # keep-sorted start block=yes newline_separated=yes # Kernel modules for laptop hardware support. diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 216faf0..2a279d2 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -1,11 +1,5 @@ -{ - lib, - self, - ... -}: { +{lib, ...}: { flake.modules.nixos.nix = {config, ...}: { - imports = [self.modules.nixos.sops]; - sops = { secrets."nix_access_tokens/github" = {}; templates.access_tokens.content = ''access-tokens = github.com=${config.sops.placeholder."nix_access_tokens/github"}''; diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix index 42d3c6b..821b30b 100644 --- a/modules/profiles/base.nix +++ b/modules/profiles/base.nix @@ -1,113 +1,106 @@ {self, ...}: { flake.modules.nixos.base = { - imports = with self.modules.nixos; [ - # Core - # keep-sorted start - capabilities - disko - envfs - firmware - home-manager - kernel - lanzaboote - nix - nix-ld - users - # keep-sorted end + imports = + [self.modules.generic.vars] + ++ (with self.modules.nixos; [ + # Core + # keep-sorted start + capabilities + disko + envfs + firmware + home-manager + kernel + lanzaboote + nix + nix-ld + nur + sops + users + # keep-sorted end - # Profiles - stylixBase + # Services + # keep-sorted start + ananicy + avahi + bpftune + firewall + locate + network + printing + timesyncd + tmp + udisks2 + zram + # keep-sorted end - # Services - # keep-sorted start - ananicy - avahi - bpftune - firewall - locate - network - printing - timesyncd - tmp - udisks2 - zram - # keep-sorted end + # Common + # keep-sorted start + locale + slim + timezone + tweaks + # keep-sorted end - # Common - # keep-sorted start - locale - slim - timezone - tweaks - # keep-sorted end + # CLI + # keep-sorted start + bandwhich + man + sudo + # keep-sorted end - # CLI - # keep-sorted start - bandwhich - man - sudo - # keep-sorted end - - # TUI - neovim - ]; + # TUI + neovim + ]); }; flake.modules.homeManager.base = { - imports = with self.modules.homeManager; [ - # Profiles - stylixBase - - # Desktop - # keep-sorted start - xdg - xdgCleanup - xdgDirs - # keep-sorted end + imports = + [self.modules.generic.vars] + ++ (with self.modules.homeManager; [ + # Desktop + # keep-sorted start + xdg + xdgCleanup + xdgDirs + # keep-sorted end - # Programs - { - key = "homeManager-git"; - imports = [git]; - } + # Programs + git + nur + sops + shellAbbreviations - # CLI - # keep-sorted start - bat - bun - eza - fastfetch - fd - nh - nix-index - npm - nys - ouch - ripgrep - speedtest - starship - tlrc - # keep-sorted end + # CLI + # keep-sorted start + bat + bun + eza + fastfetch + fd + fish + nh + nix-index + npm + nys + ouch + ripgrep + speedtest + starship + tlrc + zoxide + # keep-sorted end - # TUI - # keep-sorted start block=yes - atuin - fzf - neovim - nvtop - { - key = "homeManager-btop"; - imports = [btop]; - } - { - key = "homeManager-television"; - imports = [television]; - } - { - key = "homeManager-yazi"; - imports = [yazi]; - } - # keep-sorted end - ]; + # TUI + # keep-sorted start block=yes + atuin + btop + fzf + neovim + nvtop + television + yazi + # keep-sorted end + ]); }; } diff --git a/modules/profiles/common/locale.nix b/modules/profiles/common/locale.nix index fca7efe..1d33fd2 100644 --- a/modules/profiles/common/locale.nix +++ b/modules/profiles/common/locale.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.nixos.locale = {vars, ...}: let inherit (vars) @@ -8,8 +8,6 @@ # keep-sorted end ; in { - imports = [self.modules.generic.vars]; - i18n = { inherit defaultLocale; extraLocaleSettings = { diff --git a/modules/profiles/partitioning/ext4.nix b/modules/profiles/partitioning/ext4.nix index ffb2202..fecdf55 100644 --- a/modules/profiles/partitioning/ext4.nix +++ b/modules/profiles/partitioning/ext4.nix @@ -1,4 +1,4 @@ -_: { +{ flake.diskoConfigurations.ext4 = disk: { disko.devices = { disk = { diff --git a/modules/profiles/personal.nix b/modules/profiles/personal.nix index 71b88d8..2cc041d 100644 --- a/modules/profiles/personal.nix +++ b/modules/profiles/personal.nix @@ -16,11 +16,8 @@ polkit tablet tuigreet + uwsm xdgPortal - { - key = "nixos-uwsm"; - imports = [uwsm]; - } # keep-sorted end # Programs @@ -66,24 +63,17 @@ # Desktop # keep-sorted start block=yes + cliphist + ghostty + hyprland + noctalia + overzicht polkit stylixPersonal uwsm xdgApplications xdgPortal xdgTerminal - { - key = "homeManager-hyprland"; - imports = [hyprland]; - } - { - key = "homeManager-noctalia"; - imports = [noctalia]; - } - { - key = "homeManager-overzicht"; - imports = [overzicht]; - } # keep-sorted end # Programs @@ -99,14 +89,6 @@ pipes ripgrep-all rumdl - { - key = "homeManager-fish"; - imports = [fish]; - } - { - key = "homeManager-zoxide"; - imports = [zoxide]; - } # keep-sorted end # TUI @@ -124,8 +106,8 @@ bleachbit crosspipe decibels + discord flatseal - ghostty gimp loupe onlyoffice @@ -136,14 +118,7 @@ upscayl zaread zathura - { - key = "homeManager-discord"; - imports = [discord]; - } - { - key = "homeManager-zen"; - imports = [zen]; - } + zen # keep-sorted end # Services diff --git a/modules/profiles/stylix/base.nix b/modules/profiles/stylix/base.nix index b0ee6fc..9612c55 100644 --- a/modules/profiles/stylix/base.nix +++ b/modules/profiles/stylix/base.nix @@ -46,8 +46,6 @@ in { }; flake.modules.nixos.stylixBase = { - key = "nixos-stylixBase"; - imports = [inputs.stylix.nixosModules.stylix]; stylix = stylixConfig; @@ -58,8 +56,6 @@ in { osConfig ? null, ... }: { - key = "homeManager-stylixBase"; - imports = lib.optional (osConfig == null) inputs.stylix.homeModules.stylix; stylix = stylixConfig; diff --git a/modules/profiles/stylix/personal.nix b/modules/profiles/stylix/personal.nix index c1631e1..64346af 100644 --- a/modules/profiles/stylix/personal.nix +++ b/modules/profiles/stylix/personal.nix @@ -14,14 +14,7 @@ ]; in { flake.modules.nixos.stylixPersonal = {pkgs, ...}: { - key = "nixos-stylixPersonal"; - - imports = with self.modules.nixos; [ - # keep-sorted start - nur - stylixBase - # keep-sorted end - ]; + imports = [self.modules.nixos.stylixBase]; stylix = { cursor = { @@ -66,8 +59,6 @@ in { }; flake.modules.homeManager.stylixPersonal = { - key = "homeManager-stylixPersonal"; - imports = [self.modules.homeManager.stylixBase]; stylix = { diff --git a/modules/profiles/stylix/server.nix b/modules/profiles/stylix/server.nix index c25fc6e..4aad4b8 100644 --- a/modules/profiles/stylix/server.nix +++ b/modules/profiles/stylix/server.nix @@ -1,24 +1,24 @@ {self, ...}: { - flake.modules.nixos.stylixServer = { + flake.modules.nixos.stylixServer = {pkgs, ...}: { imports = [self.modules.nixos.stylixBase]; stylix = { fonts = { sansSerif = { - name = null; - package = null; + name = "DejaVu Sans"; + package = pkgs.dejavu_fonts; }; serif = { - name = null; - package = null; + name = "DejaVu Serif"; + package = pkgs.dejavu_fonts; }; monospace = { - name = null; - package = null; + name = "DejaVu Sans Mono"; + package = pkgs.dejavu_fonts; }; emoji = { - name = null; - package = null; + name = "Noto Color Emoji"; + package = pkgs.noto-fonts-color-emoji; }; }; diff --git a/modules/programs/cli/bat.nix b/modules/programs/cli/bat.nix index 105c090..809f596 100644 --- a/modules/programs/cli/bat.nix +++ b/modules/programs/cli/bat.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.bat = { # keep-sorted start config, @@ -10,16 +10,6 @@ inherit (lib) getExe; bat = getExe config.programs.bat.package; in { - imports = with self.modules.homeManager; [ - # keep-sorted start block=yes - nur - { - key = "homeManager-fish"; - imports = [fish]; - } - # keep-sorted end - ]; - programs.bat = { enable = true; diff --git a/modules/programs/cli/bonsai.nix b/modules/programs/cli/bonsai.nix index f4c62c3..f0d3df5 100644 --- a/modules/programs/cli/bonsai.nix +++ b/modules/programs/cli/bonsai.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.bonsai = { # keep-sorted start lib, @@ -9,8 +9,6 @@ inherit (lib) getExe; bonsai = pkgs.nur.repos.Dev380.rbonsai; in { - imports = [self.modules.homeManager.nur]; - home = { packages = [bonsai]; shellAliases.bonsai = "${getExe bonsai} -S"; diff --git a/modules/programs/cli/cpond.nix b/modules/programs/cli/cpond.nix index 9c2e1a8..ddb4688 100644 --- a/modules/programs/cli/cpond.nix +++ b/modules/programs/cli/cpond.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.cpond = { # keep-sorted start lib, @@ -9,8 +9,6 @@ inherit (lib) getExe; inherit (pkgs.nur.repos.adam0) cpond; in { - imports = [self.modules.homeManager.nur]; - home = { packages = [cpond]; shellAliases.cpond = "${getExe cpond} -b -c 16"; diff --git a/modules/programs/cli/eza/theme.nix b/modules/programs/cli/eza/theme.nix index da985d7..4b683f7 100644 --- a/modules/programs/cli/eza/theme.nix +++ b/modules/programs/cli/eza/theme.nix @@ -1,9 +1,7 @@ -{self, ...}: { +{ flake.modules.homeManager.eza = {config, ...}: let colors = config.lib.stylix.colors.withHashtag; in { - imports = [self.modules.homeManager.stylixBase]; - programs.eza.theme = with colors; { # keep-sorted start block=yes newline_separated=yes colourful = true; diff --git a/modules/programs/cli/fastfetch.nix b/modules/programs/cli/fastfetch.nix index 37e6127..85c9b5f 100644 --- a/modules/programs/cli/fastfetch.nix +++ b/modules/programs/cli/fastfetch.nix @@ -13,13 +13,6 @@ # Escape code for fastfetch color formatting. esc = fromJSON "\"\\u001b\""; in { - imports = [ - { - key = "homeManager-shellAbbreviations"; - imports = [self.modules.homeManager.shellAbbreviations]; - } - ]; - programs.fastfetch = { enable = true; diff --git a/modules/programs/cli/gh.nix b/modules/programs/cli/gh.nix index b5092ac..d167ed3 100644 --- a/modules/programs/cli/gh.nix +++ b/modules/programs/cli/gh.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.gh = { # keep-sorted start config, @@ -22,17 +22,6 @@ ''; }; in { - imports = with self.modules; [ - # keep-sorted start block=yes - generic.vars - homeManager.sops - { - key = "homeManager-git"; - imports = [homeManager.git]; - } - # keep-sorted end - ]; - sops.secrets.github_token = {}; programs.gh = { diff --git a/modules/programs/cli/gitfetch.nix b/modules/programs/cli/gitfetch.nix index 1528c59..1313baa 100644 --- a/modules/programs/cli/gitfetch.nix +++ b/modules/programs/cli/gitfetch.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.gitfetch = { # keep-sorted start config, @@ -20,14 +20,6 @@ ''; }; in { - imports = with self.modules.homeManager; [ - sops - { - key = "homeManager-shellAbbreviations"; - imports = [shellAbbreviations]; - } - ]; - sops.secrets.gitfetch_github_token = {}; home.packages = [gitfetchWrapper]; diff --git a/modules/programs/cli/nh.nix b/modules/programs/cli/nh.nix index 6afbb86..f44a8ca 100644 --- a/modules/programs/cli/nh.nix +++ b/modules/programs/cli/nh.nix @@ -1,9 +1,7 @@ -{self, ...}: { +{ flake.modules.homeManager.nh = {vars, ...}: let inherit (vars) username; in { - imports = [self.modules.generic.vars]; - programs.nh = { enable = true; diff --git a/modules/programs/cli/onefetch.nix b/modules/programs/cli/onefetch.nix index e21e475..6465b8f 100644 --- a/modules/programs/cli/onefetch.nix +++ b/modules/programs/cli/onefetch.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.onefetch = { # keep-sorted start pkgs, @@ -7,13 +7,6 @@ }: let inherit (pkgs) onefetch; in { - imports = [ - { - key = "homeManager-shellAbbreviations"; - imports = [self.modules.homeManager.shellAbbreviations]; - } - ]; - home.packages = [onefetch]; home.shellAbbreviations.of = "onefetch"; }; diff --git a/modules/programs/cli/ripgrep-all/adapters.nix b/modules/programs/cli/ripgrep-all/adapters.nix index 895ac84..2dd759d 100644 --- a/modules/programs/cli/ripgrep-all/adapters.nix +++ b/modules/programs/cli/ripgrep-all/adapters.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.ripgrep-all = { # keep-sorted start lib, @@ -9,8 +9,6 @@ inherit (lib) makeBinPath; inherit (pkgs) symlinkJoin; in { - imports = [self.modules.homeManager.nur]; - programs.ripgrep-all = { # Wrap rga so adapters can find their runtime tools. package = symlinkJoin { diff --git a/modules/programs/cli/ripgrep-all/adapters/gron.nix b/modules/programs/cli/ripgrep-all/adapters/gron.nix index 5e03328..6d9b8dd 100644 --- a/modules/programs/cli/ripgrep-all/adapters/gron.nix +++ b/modules/programs/cli/ripgrep-all/adapters/gron.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.ripgrep-all = { # keep-sorted start lib, @@ -13,8 +13,6 @@ qq = getExe pkgs.nur.repos.adam0.qq-jfryy; # keep-sorted end in { - imports = [self.modules.homeManager.nur]; - programs.ripgrep-all.custom_adapters = [ # keep-sorted start block=yes newline_separated=yes # Convert JSON into line-oriented assignments for grep. diff --git a/modules/programs/git.nix b/modules/programs/git.nix index d3b3d29..2778749 100644 --- a/modules/programs/git.nix +++ b/modules/programs/git.nix @@ -1,9 +1,4 @@ { - # keep-sorted start - self, - # keep-sorted end - ... -}: { flake.modules.homeManager.git = { # keep-sorted start config, @@ -27,14 +22,6 @@ colors = osConfig.lib.stylix.colors.withHashtag; in { - imports = with self.modules; [ - # keep-sorted start - generic.vars - homeManager.sops - homeManager.ssh - # keep-sorted end - ]; - sops = { secrets = { # Per-user git email address stored in sops. diff --git a/modules/programs/gtk.nix b/modules/programs/gtk.nix index 7b8e762..dfbeead 100644 --- a/modules/programs/gtk.nix +++ b/modules/programs/gtk.nix @@ -1,7 +1,5 @@ -{self, ...}: { +{ flake.modules.homeManager.gtk = {config, ...}: { - imports = [self.modules.homeManager.stylixPersonal]; - gtk.gtk4.theme = config.gtk.theme; dconf.settings = { diff --git a/modules/programs/gui/beeper.nix b/modules/programs/gui/beeper.nix index 5775bf8..75103ec 100644 --- a/modules/programs/gui/beeper.nix +++ b/modules/programs/gui/beeper.nix @@ -47,11 +47,6 @@ ]; }; in { - imports = with self.modules.homeManager; [ - nur - stylixPersonal - ]; - home.packages = [pkg]; xdg.configFile."BeeperTexts/custom.css".text = with colors; '' diff --git a/modules/programs/gui/discord/default.nix b/modules/programs/gui/discord/default.nix index aa6df76..7059812 100644 --- a/modules/programs/gui/discord/default.nix +++ b/modules/programs/gui/discord/default.nix @@ -1,7 +1,6 @@ { # keep-sorted start inputs, - self, # keep-sorted end ... }: { @@ -11,12 +10,7 @@ }; flake.modules.homeManager.discord = {config, ...}: { - imports = [ - # keep-sorted start - inputs.nixcord.homeModules.nixcord - self.modules.generic.vars - # keep-sorted end - ]; + imports = [inputs.nixcord.homeModules.nixcord]; # keep-sorted start block=yes newline_separated=yes programs.nixcord = { diff --git a/modules/programs/gui/discord/plugins/communication.nix b/modules/programs/gui/discord/plugins/communication.nix index ee3b124..7ff7171 100644 --- a/modules/programs/gui/discord/plugins/communication.nix +++ b/modules/programs/gui/discord/plugins/communication.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.discord = { # keep-sorted start config, @@ -6,13 +6,6 @@ # keep-sorted end ... }: { - imports = with self.modules; [ - # keep-sorted start - generic.vars - homeManager.stylixPersonal - # keep-sorted end - ]; - programs.nixcord.config.plugins = { # keep-sorted start block=yes newline_separated=yes ClearURLs.enable = true; diff --git a/modules/programs/gui/discord/plugins/interface.nix b/modules/programs/gui/discord/plugins/interface.nix index 6cba93f..14c7c68 100644 --- a/modules/programs/gui/discord/plugins/interface.nix +++ b/modules/programs/gui/discord/plugins/interface.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.discord = { # keep-sorted start lib, @@ -9,8 +9,6 @@ in # Interface and layout related plugins. { - imports = [self.modules.homeManager.stylixPersonal]; - # User option to toggle camera features in plugins. options.programs.nixcord.equibop.camera.enable = mkEnableOption "Enable camera functionality for Equibop plugins."; diff --git a/modules/programs/gui/discord/themes/default.nix b/modules/programs/gui/discord/themes/default.nix index 512d0ed..d562c10 100644 --- a/modules/programs/gui/discord/themes/default.nix +++ b/modules/programs/gui/discord/themes/default.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.discord = { # keep-sorted start config, @@ -24,8 +24,6 @@ (readFile ./system24.css) ); in { - imports = [self.modules.homeManager.stylixPersonal]; - programs.nixcord.config = { # Enable custom css themes. enabledThemes = [ diff --git a/modules/programs/gui/flatseal.nix b/modules/programs/gui/flatseal.nix index 78e3b7e..5141c47 100644 --- a/modules/programs/gui/flatseal.nix +++ b/modules/programs/gui/flatseal.nix @@ -1,7 +1,5 @@ -{self, ...}: { +{ flake.modules.homeManager.flatseal = { - imports = [self.modules.homeManager.flatpak]; - services.flatpak.packages = ["com.github.tchx84.Flatseal"]; }; } diff --git a/modules/programs/gui/mcpelauncher.nix b/modules/programs/gui/mcpelauncher.nix index 9a9658a..36803a6 100644 --- a/modules/programs/gui/mcpelauncher.nix +++ b/modules/programs/gui/mcpelauncher.nix @@ -1,7 +1,5 @@ -{self, ...}: { +{ flake.modules.homeManager.mcpelauncher = { - imports = [self.modules.homeManager.flatpak]; - services.flatpak.packages = ["io.mrarm.mcpelauncher"]; }; } diff --git a/modules/programs/gui/onlyoffice.nix b/modules/programs/gui/onlyoffice.nix index 5ba6f47..f61273f 100644 --- a/modules/programs/gui/onlyoffice.nix +++ b/modules/programs/gui/onlyoffice.nix @@ -1,9 +1,7 @@ -{self, ...}: { +{ flake.modules.homeManager.onlyoffice = {vars, ...}: let inherit (vars) fullName; in { - imports = [self.modules.generic.vars]; - programs.onlyoffice = { # keep-sorted start block=yes newline_separated=yes enable = true; diff --git a/modules/programs/gui/optiscaler.nix b/modules/programs/gui/optiscaler.nix index 29ed876..a4d809b 100644 --- a/modules/programs/gui/optiscaler.nix +++ b/modules/programs/gui/optiscaler.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.nixos.optiscaler = { nix.settings = let cache = "https://uriotv.cachix.org"; @@ -10,8 +10,6 @@ }; flake.modules.homeManager.optiscaler = {pkgs, ...}: { - imports = [self.modules.homeManager.nur]; - home.packages = [pkgs.nur.repos.uriotv.optiscaler-client]; }; } diff --git a/modules/programs/gui/prism.nix b/modules/programs/gui/prism.nix index f4b8cd2..bf924d4 100644 --- a/modules/programs/gui/prism.nix +++ b/modules/programs/gui/prism.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.prism = { # keep-sorted start config, @@ -21,13 +21,6 @@ downloadsDir = config.xdg.userDirs.download; monospaceFont = config.stylix.fonts.monospace.name; in { - imports = with self.modules; [ - # keep-sorted start - generic.vars - homeManager.stylixPersonal - # keep-sorted end - ]; - programs.prismlauncher = { enable = true; diff --git a/modules/programs/gui/sober.nix b/modules/programs/gui/sober.nix index 03dd09c..52bdb8a 100644 --- a/modules/programs/gui/sober.nix +++ b/modules/programs/gui/sober.nix @@ -1,9 +1,7 @@ -{self, ...}: { +{ flake.modules.homeManager.sober = let pkg = "org.vinegarhq.Sober"; in { - imports = [self.modules.homeManager.flatpak]; - # Install the flatpak and expose Discord IPC sockets. services.flatpak = { packages = [pkg]; diff --git a/modules/programs/gui/spotify/default.nix b/modules/programs/gui/spotify/default.nix index 3ea386e..e2ac316 100644 --- a/modules/programs/gui/spotify/default.nix +++ b/modules/programs/gui/spotify/default.nix @@ -1,10 +1,4 @@ -{ - # keep-sorted start - inputs, - self, - # keep-sorted end - ... -}: { +{inputs, ...}: { flake-file.inputs.spicetify-nix = { url = "github:Gerg-L/spicetify-nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -16,12 +10,7 @@ # Access spicetify-nix packages. spicePkgs = inputs.spicetify-nix.legacyPackages.${system}; in { - imports = [ - # keep-sorted start - inputs.spicetify-nix.homeManagerModules.spicetify - self.modules.homeManager.nur - # keep-sorted end - ]; + imports = [inputs.spicetify-nix.homeManagerModules.spicetify]; programs.spicetify = { enable = true; diff --git a/modules/programs/gui/spotify/theme.nix b/modules/programs/gui/spotify/theme.nix index 9fe0ca2..e2bc6d3 100644 --- a/modules/programs/gui/spotify/theme.nix +++ b/modules/programs/gui/spotify/theme.nix @@ -1,10 +1,4 @@ -{ - # keep-sorted start - inputs, - self, - # keep-sorted end - ... -}: { +{inputs, ...}: { flake.modules.homeManager.spotify = { # keep-sorted start config, @@ -18,8 +12,6 @@ font = config.stylix.fonts.monospace.name; spicePkgs = inputs.spicetify-nix.legacyPackages.${system}; in { - imports = [self.modules.homeManager.stylixPersonal]; - # keep-sorted start block=yes newline_separated=yes # Apply local Spicetify overrides on top of the Stylix palette. programs.spicetify = { diff --git a/modules/programs/gui/zaread.nix b/modules/programs/gui/zaread.nix index 157e775..2907c17 100644 --- a/modules/programs/gui/zaread.nix +++ b/modules/programs/gui/zaread.nix @@ -3,12 +3,9 @@ # keep-sorted start lib, pkgs, - self, # keep-sorted end ... }: { - imports = [self.modules.homeManager.zathura]; - # keep-sorted start block=yes newline_separated=yes home.packages = [pkgs.zaread]; diff --git a/modules/programs/gui/zathura.nix b/modules/programs/gui/zathura.nix index f093851..bd5247b 100644 --- a/modules/programs/gui/zathura.nix +++ b/modules/programs/gui/zathura.nix @@ -1,9 +1,7 @@ -{self, ...}: { +{ flake.modules.homeManager.zathura = {config, ...}: let sansSerifFont = config.stylix.fonts.sansSerif.name; in { - imports = [self.modules.homeManager.stylixPersonal]; - programs.zathura = { enable = true; diff --git a/modules/programs/gui/zen/chrome.nix b/modules/programs/gui/zen/chrome.nix index 2fed7f5..f24a0a2 100644 --- a/modules/programs/gui/zen/chrome.nix +++ b/modules/programs/gui/zen/chrome.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake-file.inputs = { nix-userstyles = { url = "github:adam01110/nix-userstyles"; @@ -31,8 +31,6 @@ # Convert the stylix base16 scheme into a format accepted by nix-userstyles. palette = stylixPalette config; in { - imports = [self.modules.homeManager.stylixPersonal]; - # Remove rounded corners in zen browser interface. programs.zen-browser.profiles.default = { userChrome = '' diff --git a/modules/programs/gui/zen/default.nix b/modules/programs/gui/zen/default.nix index bb6ef85..33b2231 100644 --- a/modules/programs/gui/zen/default.nix +++ b/modules/programs/gui/zen/default.nix @@ -1,10 +1,4 @@ -{ - # keep-sorted start - inputs, - self, - # keep-sorted end - ... -}: { +{inputs, ...}: { flake-file.inputs = { zen-browser = { url = "github:0xc000022070/zen-browser-flake?ref=beta"; @@ -18,12 +12,7 @@ }; flake.modules.homeManager.zen = { - imports = [ - # keep-sorted start - inputs.zen-browser.homeModules.beta - self.modules.homeManager.stylixBase - # keep-sorted end - ]; + imports = [inputs.zen-browser.homeModules.beta]; programs.zen-browser.enable = true; diff --git a/modules/programs/gui/zen/extensions.nix b/modules/programs/gui/zen/extensions.nix index 71b03a1..dc562e6 100644 --- a/modules/programs/gui/zen/extensions.nix +++ b/modules/programs/gui/zen/extensions.nix @@ -1,9 +1,7 @@ -{self, ...}: { +{ flake.modules.homeManager.zen = {pkgs, ...}: let inherit (builtins) mapAttrs; in { - imports = [self.modules.homeManager.nur]; - # Add extensions in nur. programs.zen-browser.profiles.default.extensions = { # Force extensions to be enabled. diff --git a/modules/programs/gui/zen/preferences.nix b/modules/programs/gui/zen/preferences.nix index c359f6d..7cc426d 100644 --- a/modules/programs/gui/zen/preferences.nix +++ b/modules/programs/gui/zen/preferences.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.zen = { # keep-sorted start config, @@ -19,8 +19,6 @@ ; inherit (vars) countryCode; in { - imports = [self.modules.generic.vars]; - options.programs.zen-browser.profiles = mkOption { type = types.attrsOf (types.submodule { options.preferences = { diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix index 1161cf0..0a076c2 100644 --- a/modules/programs/ssh.nix +++ b/modules/programs/ssh.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.ssh = { # keep-sorted start config, @@ -8,13 +8,6 @@ }: let inherit (vars) username; in { - imports = with self.modules; [ - # keep-sorted start - generic.vars - homeManager.sops - # keep-sorted end - ]; - sops = { secrets = { # Hostname for the euclid server host, stored in sops. diff --git a/modules/programs/tui/atuin.nix b/modules/programs/tui/atuin.nix index 637debc..6af5a1e 100644 --- a/modules/programs/tui/atuin.nix +++ b/modules/programs/tui/atuin.nix @@ -1,14 +1,7 @@ -{self, ...}: { +{ flake.modules.homeManager.atuin = {config, ...}: let inherit (config.xdg) cacheHome; in { - imports = [ - { - key = "homeManager-fish"; - imports = [self.modules.homeManager.fish]; - } - ]; - programs.atuin = let logLevel = "error"; in { diff --git a/modules/programs/tui/bluetui.nix b/modules/programs/tui/bluetui.nix index e33607e..8e76a7c 100644 --- a/modules/programs/tui/bluetui.nix +++ b/modules/programs/tui/bluetui.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.bluetui = { # keep-sorted start config, @@ -20,8 +20,6 @@ cfgBluetooth = osConfig.capabilities.bluetooth; pkg = pkgs.bluetui; in { - imports = [self.modules.homeManager.xdgTerminal]; - config = # Only install when bluetooth is enabled. mkIf cfgBluetooth { diff --git a/modules/programs/tui/cava.nix b/modules/programs/tui/cava.nix index 165e5a2..d9f967b 100644 --- a/modules/programs/tui/cava.nix +++ b/modules/programs/tui/cava.nix @@ -1,7 +1,5 @@ -{self, ...}: { +{ flake.modules.homeManager.cava = { - imports = [self.modules.homeManager.stylixBase]; - programs.cava = { enable = true; diff --git a/modules/programs/tui/fzf.nix b/modules/programs/tui/fzf.nix index 7f37334..89c7ee9 100644 --- a/modules/programs/tui/fzf.nix +++ b/modules/programs/tui/fzf.nix @@ -1,9 +1,7 @@ -{self, ...}: { +{ flake.modules.homeManager.fzf = {lib, ...}: let inherit (lib) mkForce; in { - imports = [self.modules.homeManager.stylixBase]; - programs.fzf = let enableShellIntegration = false; in { diff --git a/modules/programs/tui/impala.nix b/modules/programs/tui/impala.nix index 7882752..43e1691 100644 --- a/modules/programs/tui/impala.nix +++ b/modules/programs/tui/impala.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.impala = { # keep-sorted start config, @@ -20,8 +20,6 @@ cfgWifi = osConfig.capabilities.wifi; pkg = pkgs.impala; in { - imports = [self.modules.homeManager.xdgTerminal]; - config = # Only install when wifi is enabled. mkIf cfgWifi { diff --git a/modules/programs/tui/neovim/components/bufferline.nix b/modules/programs/tui/neovim/components/bufferline.nix index 9604282..80d4442 100644 --- a/modules/programs/tui/neovim/components/bufferline.nix +++ b/modules/programs/tui/neovim/components/bufferline.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.neovim = { # keep-sorted start config, @@ -9,8 +9,6 @@ colors = config.lib.stylix.colors.withHashtag; inherit (lib.generators) mkLuaInline; in { - imports = [self.modules.homeManager.stylixBase]; - # keep-sorted start block=yes newline_separated=yes programs.nvf.settings.vim.luaConfigPreSnippets = [ '' diff --git a/modules/programs/tui/neovim/components/dashboard.nix b/modules/programs/tui/neovim/components/dashboard.nix index 1c39b43..2ac1994 100644 --- a/modules/programs/tui/neovim/components/dashboard.nix +++ b/modules/programs/tui/neovim/components/dashboard.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.neovim = { # keep-sorted start config, @@ -12,8 +12,6 @@ colors = config.lib.stylix.colors.withHashtag; in { - imports = [self.modules.homeManager.stylixBase]; - # keep-sorted start block=yes newline_separated=yes # Capture dashboard metrics once so the footer can read cached values. programs.nvf.settings.vim.luaConfigPreSnippets = [ diff --git a/modules/programs/tui/neovim/components/telescope.nix b/modules/programs/tui/neovim/components/telescope.nix index 4bfb3fa..6500bad 100644 --- a/modules/programs/tui/neovim/components/telescope.nix +++ b/modules/programs/tui/neovim/components/telescope.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.neovim = { # keep-sorted start config, @@ -8,8 +8,6 @@ }: let colors = config.lib.stylix.colors.withHashtag; in { - imports = [self.modules.homeManager.stylixBase]; - programs.nvf.settings.vim.luaConfigPreSnippets = [ # Install Telescope as the global vim.ui.select provider after UI startup. '' diff --git a/modules/programs/tui/neovim/components/yazi.nix b/modules/programs/tui/neovim/components/yazi.nix index 9f1b704..5a8754e 100644 --- a/modules/programs/tui/neovim/components/yazi.nix +++ b/modules/programs/tui/neovim/components/yazi.nix @@ -1,12 +1,5 @@ -{self, ...}: { +{ flake.modules.homeManager.neovim = {config, ...}: { - imports = [ - { - key = "homeManager-yazi"; - imports = [self.modules.homeManager.yazi]; - } - ]; - programs.nvf.settings.vim.utility.yazi-nvim = { enable = true; diff --git a/modules/programs/tui/neovim/default.nix b/modules/programs/tui/neovim/default.nix index 6d4fbc6..274f75a 100644 --- a/modules/programs/tui/neovim/default.nix +++ b/modules/programs/tui/neovim/default.nix @@ -1,10 +1,4 @@ -{ - # keep-sorted start - inputs, - self, - # keep-sorted end - ... -}: { +{inputs, ...}: { flake-file.inputs = { nvf = { url = "github:adam01110/nvf?ref=personal"; @@ -43,17 +37,7 @@ cfg = config.programs.nvf.settings.vim; in { - imports = - [inputs.nvf.homeManagerModules.default] - ++ (with self.modules.homeManager; [ - # keep-sorted start block=yes - stylixBase - { - key = "homeManager-git"; - imports = [git]; - } - # keep-sorted end - ]); + imports = [inputs.nvf.homeManagerModules.default]; options.programs.nvf.settings.vim = { # keep-sorted start block=yes newline_separated=yes diff --git a/modules/programs/tui/neovim/settings.nix b/modules/programs/tui/neovim/settings.nix index e9d791c..14d0d0b 100644 --- a/modules/programs/tui/neovim/settings.nix +++ b/modules/programs/tui/neovim/settings.nix @@ -1,9 +1,7 @@ -{self, ...}: { +{ flake.modules.homeManager.neovim = {config, ...}: let colors = config.lib.stylix.colors.withHashtag; in { - imports = [self.modules.homeManager.stylixBase]; - programs.nvf.settings.vim = { searchCase = "smart"; diff --git a/modules/programs/tui/opencode/default.nix b/modules/programs/tui/opencode/default.nix index be75251..c9d0c72 100644 --- a/modules/programs/tui/opencode/default.nix +++ b/modules/programs/tui/opencode/default.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.opencode = { # keep-sorted start config, @@ -43,17 +43,6 @@ env ); in { - imports = with self.modules.homeManager; [ - # keep-sorted start block=yes - nur - xdgTerminal - { - key = "homeManager-shellAbbreviations"; - imports = [shellAbbreviations]; - } - # keep-sorted end - ]; - # keep-sorted start block=yes newline_separated=yes home.shellAbbreviations.oc = "opencode"; diff --git a/modules/programs/tui/opencode/mcp-wrappers.nix b/modules/programs/tui/opencode/mcp-wrappers.nix index c5d3e7f..47990c7 100644 --- a/modules/programs/tui/opencode/mcp-wrappers.nix +++ b/modules/programs/tui/opencode/mcp-wrappers.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.opencode = { # keep-sorted start config, @@ -39,8 +39,6 @@ }; # keep-sorted end in { - imports = [self.modules.homeManager.sops]; - options.programs.opencode.mcpServers = mkOption { description = "MCP server packages added to the wrapped opencode launcher PATH."; diff --git a/modules/programs/tui/opencode/plugins.nix b/modules/programs/tui/opencode/plugins.nix index 56ab804..c4f83f7 100644 --- a/modules/programs/tui/opencode/plugins.nix +++ b/modules/programs/tui/opencode/plugins.nix @@ -1,11 +1,6 @@ -{self, ...}: { +{ flake.modules.homeManager.opencode = {pkgs, ...}: { - imports = [ - # keep-sorted start - pkgs.nur.repos.adam0.hmModules.opencode-plugins - self.modules.homeManager.nur - # keep-sorted end - ]; + imports = [pkgs.nur.repos.adam0.hmModules.opencode-plugins]; programs.opencode.plugins = { # keep-sorted start diff --git a/modules/programs/tui/opencode/theme.nix b/modules/programs/tui/opencode/theme.nix index 54a491d..d73ce3a 100644 --- a/modules/programs/tui/opencode/theme.nix +++ b/modules/programs/tui/opencode/theme.nix @@ -1,7 +1,5 @@ -{self, ...}: { +{ flake.modules.homeManager.opencode = { - imports = [self.modules.homeManager.stylixBase]; - # Keep the opencode background transparent to match stylix. stylix.targets.opencode = { enable = true; diff --git a/modules/programs/tui/television/channels.nix b/modules/programs/tui/television/channels.nix index edbbede..3070401 100644 --- a/modules/programs/tui/television/channels.nix +++ b/modules/programs/tui/television/channels.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.television = { # keep-sorted start config, @@ -6,17 +6,6 @@ # keep-sorted end ... }: { - imports = with self.modules.homeManager; [ - # keep-sorted start - bat - eza - { - key = "homeManager-zoxide"; - imports = [zoxide]; - } - # keep-sorted end - ]; - programs.television.package = pkgs.television.withPackages ( _: # Bundle tools that channel commands shell out to. diff --git a/modules/programs/tui/television/channels/files.nix b/modules/programs/tui/television/channels/files.nix index ccb0f49..c038af9 100644 --- a/modules/programs/tui/television/channels/files.nix +++ b/modules/programs/tui/television/channels/files.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.television = { # keep-sorted start config, @@ -11,8 +11,6 @@ fd = getExe config.programs.fd.package; in { - imports = [self.modules.homeManager.fd]; - programs.television.channels.files = { # keep-sorted start block=yes newline_separated=yes actions.edit = { diff --git a/modules/programs/tui/television/channels/zoxide.nix b/modules/programs/tui/television/channels/zoxide.nix index cf589ab..0519c48 100644 --- a/modules/programs/tui/television/channels/zoxide.nix +++ b/modules/programs/tui/television/channels/zoxide.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.television = { # keep-sorted start config, @@ -24,16 +24,6 @@ # keep-sorted end ; in { - imports = with self.modules.homeManager; [ - # keep-sorted start - eza - { - key = "homeManager-zoxide"; - imports = [zoxide]; - } - # keep-sorted end - ]; - programs.television.channels.zoxide = let zoxide = getExe config.programs.zoxide.package; in { diff --git a/modules/programs/tui/television/theme.nix b/modules/programs/tui/television/theme.nix index c3c5bf6..782e984 100644 --- a/modules/programs/tui/television/theme.nix +++ b/modules/programs/tui/television/theme.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.television = { # keep-sorted start config, @@ -10,8 +10,6 @@ colors = config.lib.stylix.colors.withHashtag; in { - imports = [self.modules.homeManager.stylixBase]; - xdg.configFile."television/themes/".source = with colors; tomlFormat.generate "television-stylix.toml" { # general diff --git a/modules/programs/tui/wiremix.nix b/modules/programs/tui/wiremix.nix index b81bbab..e3a45e1 100644 --- a/modules/programs/tui/wiremix.nix +++ b/modules/programs/tui/wiremix.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.wiremix = { # keep-sorted start config, @@ -11,8 +11,6 @@ pkg = pkgs.wiremix; in { - imports = [self.modules.homeManager.xdgTerminal]; - # keep-sorted start block=yes newline_separated=yes home.packages = [pkg]; diff --git a/modules/programs/tui/yazi/default.nix b/modules/programs/tui/yazi/default.nix index 50f6548..ef34a47 100644 --- a/modules/programs/tui/yazi/default.nix +++ b/modules/programs/tui/yazi/default.nix @@ -1,12 +1,5 @@ -{self, ...}: { +{ flake.modules.homeManager.yazi = { - imports = [ - { - key = "homeManager-git"; - imports = [self.modules.homeManager.git]; - } - ]; - # Yazi tui file manager. programs.yazi = { enable = true; diff --git a/modules/programs/tui/yazi/plugins.nix b/modules/programs/tui/yazi/plugins.nix index de2c879..a95365a 100644 --- a/modules/programs/tui/yazi/plugins.nix +++ b/modules/programs/tui/yazi/plugins.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.yazi = { # keep-sorted start config, @@ -9,19 +9,6 @@ }: let inherit (pkgs.lib.generators) mkLuaInline; in { - imports = with self.modules.homeManager; [ - # keep-sorted start block=yes - bat - fd - nur - ripgrep - { - key = "homeManager-television"; - imports = [television]; - } - # keep-sorted end - ]; - programs.yazi = { package = pkgs.yazi.override { optionalDeps = diff --git a/modules/programs/tui/yazi/plugins/faster-piper.nix b/modules/programs/tui/yazi/plugins/faster-piper.nix index a5330dc..661b49a 100644 --- a/modules/programs/tui/yazi/plugins/faster-piper.nix +++ b/modules/programs/tui/yazi/plugins/faster-piper.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.homeManager.yazi = { # keep-sorted start lib, @@ -13,8 +13,6 @@ systemdStatusPreview = getExe pkgs.systemd-status-preview; usePreloader = "faster-piper --rely-on-preloader"; in { - imports = [self.modules.homeManager.nur]; - programs.yazi = { plugins.faster-piper = pkgs.nur.repos.adam0.yaziPlugins.faster-piper; diff --git a/modules/programs/tui/yazi/plugins/preview-cbz.nix b/modules/programs/tui/yazi/plugins/preview-cbz.nix index 72706a6..e5a4a60 100644 --- a/modules/programs/tui/yazi/plugins/preview-cbz.nix +++ b/modules/programs/tui/yazi/plugins/preview-cbz.nix @@ -1,7 +1,5 @@ -{self, ...}: { +{ flake.modules.homeManager.yazi = {pkgs, ...}: { - imports = [self.modules.homeManager.nur]; - programs.yazi = { plugins.preview-cbz = pkgs.nur.repos.adam0.yaziPlugins.preview-cbz; diff --git a/modules/programs/tui/yazi/plugins/preview-epub.nix b/modules/programs/tui/yazi/plugins/preview-epub.nix index 80ec6a5..04f62e2 100644 --- a/modules/programs/tui/yazi/plugins/preview-epub.nix +++ b/modules/programs/tui/yazi/plugins/preview-epub.nix @@ -1,7 +1,5 @@ -{self, ...}: { +{ flake.modules.homeManager.yazi = {pkgs, ...}: { - imports = [self.modules.homeManager.nur]; - programs.yazi = { plugins.preview-epub = pkgs.nur.repos.adam0.yaziPlugins.preview-epub; diff --git a/modules/programs/tui/yazi/plugins/preview-git.nix b/modules/programs/tui/yazi/plugins/preview-git.nix index e955e13..4bc20a3 100644 --- a/modules/programs/tui/yazi/plugins/preview-git.nix +++ b/modules/programs/tui/yazi/plugins/preview-git.nix @@ -1,7 +1,5 @@ -{self, ...}: { +{ flake.modules.homeManager.yazi = {pkgs, ...}: { - imports = [self.modules.homeManager.nur]; - programs.yazi = { plugins.preview-git = pkgs.nur.repos.adam0.yaziPlugins.preview-git; diff --git a/modules/programs/tui/yazi/plugins/spot-audio.nix b/modules/programs/tui/yazi/plugins/spot-audio.nix index d0d2de6..21916e3 100644 --- a/modules/programs/tui/yazi/plugins/spot-audio.nix +++ b/modules/programs/tui/yazi/plugins/spot-audio.nix @@ -1,7 +1,5 @@ -{self, ...}: { +{ flake.modules.homeManager.yazi = {pkgs, ...}: { - imports = [self.modules.homeManager.nur]; - programs.yazi = { plugins.spot-audio = pkgs.nur.repos.adam0.yaziPlugins.spot-audio; diff --git a/modules/programs/tui/yazi/plugins/spot-cbz.nix b/modules/programs/tui/yazi/plugins/spot-cbz.nix index b5dd382..12cefb8 100644 --- a/modules/programs/tui/yazi/plugins/spot-cbz.nix +++ b/modules/programs/tui/yazi/plugins/spot-cbz.nix @@ -1,7 +1,5 @@ -{self, ...}: { +{ flake.modules.homeManager.yazi = {pkgs, ...}: { - imports = [self.modules.homeManager.nur]; - programs.yazi = { plugins.spot-cbz = pkgs.nur.repos.adam0.yaziPlugins.spot-cbz; diff --git a/modules/programs/tui/yazi/plugins/spot-image.nix b/modules/programs/tui/yazi/plugins/spot-image.nix index d44d34f..8c53c48 100644 --- a/modules/programs/tui/yazi/plugins/spot-image.nix +++ b/modules/programs/tui/yazi/plugins/spot-image.nix @@ -1,7 +1,5 @@ -{self, ...}: { +{ flake.modules.homeManager.yazi = {pkgs, ...}: { - imports = [self.modules.homeManager.nur]; - programs.yazi = { plugins.spot-image = pkgs.nur.repos.adam0.yaziPlugins.spot-image; diff --git a/modules/programs/tui/yazi/plugins/spot-video.nix b/modules/programs/tui/yazi/plugins/spot-video.nix index 977126b..069902d 100644 --- a/modules/programs/tui/yazi/plugins/spot-video.nix +++ b/modules/programs/tui/yazi/plugins/spot-video.nix @@ -1,7 +1,5 @@ -{self, ...}: { +{ flake.modules.homeManager.yazi = {pkgs, ...}: { - imports = [self.modules.homeManager.nur]; - programs.yazi = { plugins.spot-v = pkgs.nur.repos.adam0.yaziPlugins.spot-video; diff --git a/modules/programs/tui/yazi/plugins/tv.nix b/modules/programs/tui/yazi/plugins/tv.nix index b3dc5dc..8326606 100644 --- a/modules/programs/tui/yazi/plugins/tv.nix +++ b/modules/programs/tui/yazi/plugins/tv.nix @@ -1,7 +1,5 @@ -{self, ...}: { +{ flake.modules.homeManager.yazi = {pkgs, ...}: { - imports = [self.modules.homeManager.nur]; - programs.yazi = { plugins.tv = pkgs.nur.repos.adam0.yaziPlugins.tv; diff --git a/modules/programs/tui/yazi/plugins/ucp.nix b/modules/programs/tui/yazi/plugins/ucp.nix index 48c7623..90eeb0a 100644 --- a/modules/programs/tui/yazi/plugins/ucp.nix +++ b/modules/programs/tui/yazi/plugins/ucp.nix @@ -1,7 +1,5 @@ -{self, ...}: { +{ flake.modules.homeManager.yazi = {pkgs, ...}: { - imports = [self.modules.homeManager.nur]; - programs.yazi = { plugins.ucp = pkgs.nur.repos.adam0.yaziPlugins.ucp; diff --git a/modules/services/bluetooth.nix b/modules/services/bluetooth.nix index 90a48de..b225c5f 100644 --- a/modules/services/bluetooth.nix +++ b/modules/services/bluetooth.nix @@ -1,7 +1,5 @@ -{self, ...}: { +{ flake.modules.nixos.bluetooth = { - imports = [self.modules.nixos.capabilities]; - config = { capabilities.bluetooth = true; diff --git a/modules/services/geoclue.nix b/modules/services/geoclue.nix index b187a8b..3cf0adc 100644 --- a/modules/services/geoclue.nix +++ b/modules/services/geoclue.nix @@ -1,9 +1,7 @@ -{self, ...}: { +{ flake.modules.nixos.geoclue = {config, ...}: let cfgWifi = config.capabilities.wifi; in { - imports = [self.modules.nixos.capabilities]; - services.geoclue2 = { enable = true; diff --git a/modules/services/godns.nix b/modules/services/godns.nix index 65066ad..343cc5f 100644 --- a/modules/services/godns.nix +++ b/modules/services/godns.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.nixos.godns = { # keep-sorted start config, @@ -16,8 +16,6 @@ secrets = config.sops.secrets; in { - imports = [self.modules.nixos.sops]; - sops.secrets = { # keep-sorted startr "godns/login_token" = {}; @@ -38,8 +36,8 @@ }; in [ # keep-sorted start - (mkDomain orbitDomain) (mkDomain groundDomain) + (mkDomain orbitDomain) # keep-sorted end ]; @@ -49,10 +47,10 @@ ip_urls = [ # keep-sorted start + "https://api-ipv4.ip.sb/ip" "https://api.ip.sb/ip" "https://api.ipify.org" "https://myip.biturl.top" - "https://api-ipv4.ip.sb/ip" # keep-sorted end ]; }; diff --git a/modules/services/mysql.nix b/modules/services/mysql.nix index 8f61f56..730b802 100644 --- a/modules/services/mysql.nix +++ b/modules/services/mysql.nix @@ -1,7 +1,8 @@ { - flake.modules.nixos.mysql = { + flake.modules.nixos.mysql = {pkgs, ...}: { services.mysql = { enable = true; + package = pkgs.mariadb; }; }; } diff --git a/modules/services/network.nix b/modules/services/network.nix index 57cad6d..905705b 100644 --- a/modules/services/network.nix +++ b/modules/services/network.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.nixos.network = { # keep-sorted start config, @@ -10,13 +10,6 @@ inherit (lib) concatStringsSep; inherit (vars) username; in { - imports = with self.modules; [ - # keep-sorted start - generic.vars - nixos.sops - # keep-sorted end - ]; - sops = let hostname = config.networking.hostName; in { diff --git a/modules/services/podman.nix b/modules/services/podman.nix index 47823ca..fe46e01 100644 --- a/modules/services/podman.nix +++ b/modules/services/podman.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.nixos.podman = { # keep-sorted start pkgs, @@ -8,8 +8,6 @@ }: let inherit (vars) username; in { - imports = [self.modules.generic.vars]; - virtualisation = { podman = { # Enable podman service and tooling. diff --git a/modules/services/wifi.nix b/modules/services/wifi.nix index 9a4b9e3..0b9ea83 100644 --- a/modules/services/wifi.nix +++ b/modules/services/wifi.nix @@ -1,7 +1,5 @@ -{self, ...}: { +{ flake.modules.nixos.wifi = { - imports = [self.modules.nixos.capabilities]; - config = { capabilities.wifi = true; diff --git a/modules/users.nix b/modules/users.nix index e3b026e..4f60063 100644 --- a/modules/users.nix +++ b/modules/users.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{ flake.modules.nixos.users = { # keep-sorted start config, @@ -15,13 +15,6 @@ # keep-sorted end ; in { - imports = with self.modules; [ - # keep-sorted start - generic.vars - nixos.sops - # keep-sorted end - ]; - # Ensure the user account can be created with a password managed by sops-nix. sops.secrets.user_password.neededForUsers = true; -- 2.51.2