diff --git a/modules/home/de-utils/brightnessctl.nix b/modules/home/de-utils/brightnessctl.nix index a5745ff..d4421b3 100644 --- a/modules/home/de-utils/brightnessctl.nix +++ b/modules/home/de-utils/brightnessctl.nix @@ -5,9 +5,9 @@ ... }: { - options.myConfig.deUtils.brightnessctl.enable = lib.mkEnableOption ""; + options.custom.deUtils.programs.brightnessctl.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.deUtils.brightnessctl.enable { + config = lib.mkIf config.custom.deUtils.programs.brightnessctl.enable { home.packages = [ pkgs.brightnessctl ]; }; } diff --git a/modules/home/de-utils/cliphist.nix b/modules/home/de-utils/cliphist.nix index 59d0e3b..0cf0e44 100644 --- a/modules/home/de-utils/cliphist.nix +++ b/modules/home/de-utils/cliphist.nix @@ -5,12 +5,12 @@ ... }: { - options.myConfig.deUtils.cliphist.enable = lib.mkEnableOption ""; + options.custom.deUtils.services.cliphist.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.deUtils.cliphist.enable { + config = lib.mkIf config.custom.deUtils.services.cliphist.enable { assertions = [ { - assertion = config.myConfig.deUtils.rofi.enable; + assertion = config.custom.deUtils.programs.rofi.enable; message = "cliphist requires rofi"; } ]; diff --git a/modules/home/de-utils/gammastep.nix b/modules/home/de-utils/gammastep.nix index 89e4fc7..12728d5 100644 --- a/modules/home/de-utils/gammastep.nix +++ b/modules/home/de-utils/gammastep.nix @@ -1,8 +1,8 @@ { config, lib, ... }@moduleArgs: { - options.myConfig.deUtils.gammastep.enable = lib.mkEnableOption ""; + options.custom.deUtils.services.gammastep.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.deUtils.gammastep.enable { + config = lib.mkIf config.custom.deUtils.services.gammastep.enable { assertions = [ { assertion = diff --git a/modules/home/de-utils/hypridle.nix b/modules/home/de-utils/hypridle.nix index 75db5c6..b267886 100644 --- a/modules/home/de-utils/hypridle.nix +++ b/modules/home/de-utils/hypridle.nix @@ -4,21 +4,21 @@ ... }: { - options.myConfig.deUtils.hypridle.enable = lib.mkEnableOption ""; + options.custom.deUtils.services.hypridle.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.deUtils.hypridle.enable { + config = lib.mkIf config.custom.deUtils.services.hypridle.enable { services.hypridle = { enable = true; settings = { general = { - lock_cmd = lib.mkIf config.myConfig.deUtils.hyprlock.enable "pidof hyprlock || hyprlock"; + lock_cmd = lib.mkIf config.custom.deUtils.programs.hyprlock.enable "pidof hyprlock || hyprlock"; before_sleep_cmd = "loginctl lock-session"; after_sleep_cmd = "hyprctl dispatch dpms on"; }; listener = [ - (lib.mkIf config.myConfig.deUtils.brightnessctl.enable { + (lib.mkIf config.custom.deUtils.programs.brightnessctl.enable { timeout = 5 * 60; on-timeout = "brightnessctl --save --exponent set 10%"; on-resume = "brightnessctl --restore"; diff --git a/modules/home/de-utils/hyprlock.nix b/modules/home/de-utils/hyprlock.nix index 9aa814a..2fcee96 100644 --- a/modules/home/de-utils/hyprlock.nix +++ b/modules/home/de-utils/hyprlock.nix @@ -4,10 +4,10 @@ ... }@moduleArgs: let - cfg = config.myConfig.deUtils.hyprlock; + cfg = config.custom.deUtils.programs.hyprlock; in { - options.myConfig.deUtils.hyprlock = { + options.custom.deUtils.programs.hyprlock = { enable = lib.mkEnableOption ""; fprintAuth = lib.mkEnableOption "" // { default = moduleArgs.osConfig.services.fprintd.enable or false; @@ -17,7 +17,6 @@ in config = lib.mkIf cfg.enable { programs.hyprlock = { enable = true; - settings = { general.immediate_render = true; auth."fingerprint:enabled" = cfg.fprintAuth; diff --git a/modules/home/de-utils/hyprpaper.nix b/modules/home/de-utils/hyprpaper.nix index 30818f2..2e79035 100644 --- a/modules/home/de-utils/hyprpaper.nix +++ b/modules/home/de-utils/hyprpaper.nix @@ -1,11 +1,10 @@ { config, lib, ... }: { - options.myConfig.deUtils.hyprpaper.enable = lib.mkEnableOption ""; + options.custom.deUtils.services.hyprpaper.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.deUtils.hyprpaper.enable { + config = lib.mkIf config.custom.deUtils.services.hyprpaper.enable { services.hyprpaper = { enable = true; - settings = { preload = [ "~/Pictures/.wallpaper" ]; wallpaper = [ ", ~/Pictures/.wallpaper" ]; diff --git a/modules/home/de-utils/rofi/default.nix b/modules/home/de-utils/rofi/default.nix index 540f544..8ad9759 100644 --- a/modules/home/de-utils/rofi/default.nix +++ b/modules/home/de-utils/rofi/default.nix @@ -5,9 +5,9 @@ ... }: { - options.myConfig.deUtils.rofi.enable = lib.mkEnableOption ""; + options.custom.deUtils.programs.rofi.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.deUtils.rofi.enable { + config = lib.mkIf config.custom.deUtils.programs.rofi.enable { home.packages = [ pkgs.rofi-wayland ]; xdg.configFile."rofi/config.rasi".source = @@ -17,7 +17,7 @@ dark = ./dark-theme.rasi; light = ./light-theme.rasi; } - .${config.myConfig.theme}; + .${config.custom.theme}; in pkgs.concatText "rofi-config" [ ./config.rasi diff --git a/modules/home/de-utils/waybar.nix b/modules/home/de-utils/waybar.nix index 737453f..65b5a50 100644 --- a/modules/home/de-utils/waybar.nix +++ b/modules/home/de-utils/waybar.nix @@ -1,8 +1,8 @@ { config, lib, ... }: { - options.myConfig.deUtils.waybar.enable = lib.mkEnableOption ""; + options.custom.deUtils.services.waybar.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.deUtils.waybar.enable { + config = lib.mkIf config.custom.deUtils.services.waybar.enable { programs.waybar = { enable = true; systemd.enable = true; diff --git a/modules/home/de/hyprland/default.nix b/modules/home/de/hyprland/default.nix index 1b962a3..3053c15 100644 --- a/modules/home/de/hyprland/default.nix +++ b/modules/home/de/hyprland/default.nix @@ -5,11 +5,11 @@ ... }@moduleArgs: { - options.myConfig.de.hyprland.enable = lib.mkEnableOption "" // { + options.custom.de.hyprland.enable = lib.mkEnableOption "" // { default = moduleArgs.osConfig.custom.de.hyprland.enable or false; }; - config = lib.mkIf config.myConfig.de.hyprland.enable { + config = lib.mkIf config.custom.de.hyprland.enable { wayland.windowManager.hyprland = { enable = true; package = null; @@ -21,14 +21,19 @@ pkgs.grimblast ]; - myConfig.deUtils = { - rofi.enable = true; - hyprpaper.enable = true; - hyprlock.enable = true; - hypridle.enable = true; - waybar.enable = true; - cliphist.enable = true; - gammastep.enable = true; + custom.deUtils = { + services = { + hyprpaper.enable = true; + hypridle.enable = true; + waybar.enable = true; + cliphist.enable = true; + gammastep.enable = true; + }; + + programs = { + rofi.enable = true; + hyprlock.enable = true; + }; }; services.dunst.enable = true; diff --git a/modules/home/de/hyprland/keybinds.nix b/modules/home/de/hyprland/keybinds.nix index b3e3440..9d98ef5 100644 --- a/modules/home/de/hyprland/keybinds.nix +++ b/modules/home/de/hyprland/keybinds.nix @@ -1,6 +1,6 @@ { config, lib, ... }: { - config = lib.mkIf config.myConfig.de.hyprland.enable { + config = lib.mkIf config.custom.de.hyprland.enable { wayland.windowManager.hyprland.extraConfig = '' # Bindflags: # r = release @@ -83,7 +83,7 @@ bindel = SUPER ALT, down, exec, $volume-down bindl = SUPER ALT, M, exec, $mute-mic - ${lib.optionalString config.myConfig.deUtils.brightnessctl.enable '' + ${lib.optionalString config.custom.deUtils.programs.brightnessctl.enable '' # Adjust brightness bindel = , XF86MonBrightnessUp, exec, brightnessctl --exponent set +2% bindel = , XF86MonBrightnessDown, exec, brightnessctl --exponent set 2%- diff --git a/modules/home/de/hyprland/settings.nix b/modules/home/de/hyprland/settings.nix index 02eff90..bbd360b 100644 --- a/modules/home/de/hyprland/settings.nix +++ b/modules/home/de/hyprland/settings.nix @@ -1,6 +1,6 @@ { config, lib, ... }: { - config = lib.mkIf config.myConfig.de.hyprland.enable { + config = lib.mkIf config.custom.de.hyprland.enable { wayland.windowManager.hyprland.settings = { input = { kb_layout = "de"; @@ -36,13 +36,13 @@ dark = "rgb(ffffff)"; light = "rgb(000000)"; } - .${config.myConfig.theme}; + .${config.custom.theme}; "col.inactive_border" = { dark = "rgba(ffffff00)"; light = "rgba(ffffff00)"; } - .${config.myConfig.theme}; + .${config.custom.theme}; layout = "master"; }; diff --git a/modules/home/firefox.nix b/modules/home/firefox.nix index 4380473..b72726a 100644 --- a/modules/home/firefox.nix +++ b/modules/home/firefox.nix @@ -6,9 +6,9 @@ ... }: { - options.myConfig.firefox.enable = lib.mkEnableOption ""; + options.custom.programs.firefox.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.firefox.enable { + config = lib.mkIf config.custom.programs.firefox.enable { programs.firefox = { enable = true; diff --git a/modules/home/git.nix b/modules/home/git.nix index 624a714..64970c3 100644 --- a/modules/home/git.nix +++ b/modules/home/git.nix @@ -1,8 +1,8 @@ { config, lib, ... }: { - options.myConfig.git.enable = lib.mkEnableOption ""; + options.custom.programs.git.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.git.enable { + config = lib.mkIf config.custom.programs.git.enable { sops.secrets = { "ssh-key/github" = { }; "ssh-key/hda-gitlab" = { }; diff --git a/modules/home/kitty.nix b/modules/home/kitty.nix index bd8869b..88f6b5b 100644 --- a/modules/home/kitty.nix +++ b/modules/home/kitty.nix @@ -5,9 +5,9 @@ ... }: { - options.myConfig.kitty.enable = lib.mkEnableOption ""; + options.custom.programs.kitty.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.kitty.enable { + config = lib.mkIf config.custom.programs.kitty.enable { programs.kitty = { enable = true; @@ -18,7 +18,7 @@ dark = "default"; light = "GitHub_Light"; } - .${config.myConfig.theme}; + .${config.custom.theme}; in { include = "${pkgs.kitty-themes}/share/kitty-themes/themes/${theme-name}.conf"; diff --git a/modules/home/shell/aliases.nix b/modules/home/shell/aliases.nix index b9dea22..cc66587 100644 --- a/modules/home/shell/aliases.nix +++ b/modules/home/shell/aliases.nix @@ -5,7 +5,7 @@ ... }: { - config = lib.mkIf config.myConfig.shell.zsh.enable { + config = lib.mkIf config.custom.shell.zsh.enable { home.packages = [ pkgs.eza pkgs.bat @@ -28,7 +28,7 @@ dark = ""; light = "GitHub"; } - .${config.myConfig.theme}; + .${config.custom.theme}; in { cat = "bat --plain --theme=${theme}"; diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix index 2c0a186..6986c2b 100644 --- a/modules/home/shell/default.nix +++ b/modules/home/shell/default.nix @@ -5,9 +5,9 @@ ... }: { - options.myConfig.shell.zsh.enable = lib.mkEnableOption ""; + options.custom.shell.zsh.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.shell.zsh.enable { + config = lib.mkIf config.custom.shell.zsh.enable { programs = { zsh = { enable = true; diff --git a/modules/home/shell/p10k/default.nix b/modules/home/shell/p10k/default.nix index ea4fe1e..834e3d0 100644 --- a/modules/home/shell/p10k/default.nix +++ b/modules/home/shell/p10k/default.nix @@ -5,7 +5,7 @@ ... }: { - config = lib.mkIf config.myConfig.shell.zsh.enable { + config = lib.mkIf config.custom.shell.zsh.enable { programs.zsh = { plugins = [ { diff --git a/modules/home/sops.nix b/modules/home/sops.nix index 1f1d5fc..22b8f19 100644 --- a/modules/home/sops.nix +++ b/modules/home/sops.nix @@ -8,9 +8,9 @@ { imports = [ inputs.sops-nix.homeManagerModules.sops ]; - options.myConfig.sops.enable = lib.mkEnableOption ""; + options.custom.sops.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.sops.enable { + config = lib.mkIf config.custom.sops.enable { sops = { age.sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ]; defaultSopsFile = diff --git a/modules/home/tailscale.nix b/modules/home/tailscale.nix index b9e802c..121c2ca 100644 --- a/modules/home/tailscale.nix +++ b/modules/home/tailscale.nix @@ -1,10 +1,10 @@ { config, lib, ... }@moduleArgs: { - options.myConfig.tailscale.enable = lib.mkEnableOption "" // { + options.custom.services.tailscale.enable = lib.mkEnableOption "" // { default = moduleArgs.osConfig.custom.services.tailscale.enable or false; }; - config = lib.mkIf config.myConfig.tailscale.enable { + config = lib.mkIf config.custom.services.tailscale.enable { programs.ssh = { enable = true; matchBlocks.installer.extraOptions = { diff --git a/modules/home/theme.nix b/modules/home/theme.nix index a973ec9..d445014 100644 --- a/modules/home/theme.nix +++ b/modules/home/theme.nix @@ -5,10 +5,10 @@ ... }: let - cfgTheme = config.myConfig.theme; + cfgTheme = config.custom.theme; in { - options.myConfig.theme = lib.mkOption { + options.custom.theme = lib.mkOption { type = lib.types.enum [ "dark" "light" diff --git a/modules/home/virt-manager.nix b/modules/home/virt-manager.nix index c0af4b5..d0c7674 100644 --- a/modules/home/virt-manager.nix +++ b/modules/home/virt-manager.nix @@ -1,10 +1,10 @@ { config, lib, ... }@moduleArgs: { - options.myConfig.virt-manager.enable = lib.mkEnableOption "" // { + options.custom.programs.virt-manager.enable = lib.mkEnableOption "" // { default = moduleArgs.osConfig.programs.virt-manager.enable or false; }; - config = lib.mkIf config.myConfig.virt-manager.enable { + config = lib.mkIf config.custom.programs.virt-manager.enable { dconf.settings."org/virt-manager/virt-manager/connections" = { autoconnect = [ "qemu:///system" ]; uris = [ "qemu:///system" ]; diff --git a/modules/home/vscode.nix b/modules/home/vscode.nix index b03716d..82744f3 100644 --- a/modules/home/vscode.nix +++ b/modules/home/vscode.nix @@ -7,9 +7,9 @@ ... }: { - options.myConfig.vscode.enable = lib.mkEnableOption ""; + options.custom.programs.vscode.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.vscode.enable { + config = lib.mkIf config.custom.programs.vscode.enable { programs.vscode = { enable = true; package = pkgs-unstable.vscodium; @@ -37,7 +37,7 @@ dark = "GitHub Dark"; light = "GitHub Light"; } - .${config.myConfig.theme}; + .${config.custom.theme}; "workbench.iconTheme" = "material-icon-theme"; "editor.fontFamily" = "JetBrainsMono Nerd Font"; "explorer.confirmDelete" = false; diff --git a/users/seb/@fern/home.nix b/users/seb/@fern/home.nix index b6c4fc3..fefc7ad 100644 --- a/users/seb/@fern/home.nix +++ b/users/seb/@fern/home.nix @@ -3,9 +3,9 @@ _: { home.stateVersion = "24.11"; - myConfig = { + custom = { theme = "light"; - deUtils.brightnessctl.enable = true; + deUtils.programs.brightnessctl.enable = true; }; wayland.windowManager.hyprland.settings.monitor = [ diff --git a/users/seb/@north/home.nix b/users/seb/@north/home.nix index 133d974..0bec4b6 100644 --- a/users/seb/@north/home.nix +++ b/users/seb/@north/home.nix @@ -4,7 +4,7 @@ home.stateVersion = "23.11"; - myConfig.theme = "dark"; + custom.theme = "dark"; home.packages = [ pkgs.ffmpeg diff --git a/users/seb/home.nix b/users/seb/home.nix index fec6425..a164a93 100644 --- a/users/seb/home.nix +++ b/users/seb/home.nix @@ -23,13 +23,16 @@ in home.sessionVariables.NH_FLAKE = "~/Projects/nixos-config"; - myConfig = { - kitty.enable = true; - firefox.enable = true; + custom = { sops.enable = true; shell.zsh.enable = true; - git.enable = true; - vscode.enable = true; + + programs = { + kitty.enable = true; + firefox.enable = true; + git.enable = true; + vscode.enable = true; + }; }; home.packages = [