diff --git a/modules/home/de/hyprland/default.nix b/modules/home/de/hyprland/default.nix index 7f56159..0dbdebb 100644 --- a/modules/home/de/hyprland/default.nix +++ b/modules/home/de/hyprland/default.nix @@ -19,7 +19,7 @@ pkgs.grimblast ]; - myConfig.de = { + myConfig.deUtils = { rofi.enable = true; hyprpaper.enable = true; hyprlock.enable = true; diff --git a/modules/home/de/hyprland/settings.nix b/modules/home/de/hyprland/settings.nix index dcef4a4..14367ee 100644 --- a/modules/home/de/hyprland/settings.nix +++ b/modules/home/de/hyprland/settings.nix @@ -36,13 +36,13 @@ dark = "rgb(ffffff)"; light = "rgb(000000)"; } - .${config.myConfig.de.theme}; + .${config.myConfig.theme}; "col.inactive_border" = { dark = "rgba(ffffff00)"; light = "rgba(ffffff00)"; } - .${config.myConfig.de.theme}; + .${config.myConfig.theme}; layout = "master"; }; diff --git a/modules/home/de/cliphist.nix b/modules/home/deUtils/cliphist.nix similarity index 76% rename from modules/home/de/cliphist.nix rename to modules/home/deUtils/cliphist.nix index eff0cb7..1b99917 100644 --- a/modules/home/de/cliphist.nix +++ b/modules/home/deUtils/cliphist.nix @@ -5,9 +5,9 @@ ... }: { - options.myConfig.de.cliphist.enable = lib.mkEnableOption ""; + options.myConfig.deUtils.cliphist.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.de.cliphist.enable { + config = lib.mkIf config.myConfig.deUtils.cliphist.enable { services.cliphist = { enable = true; allowImages = false; diff --git a/modules/home/de/gammastep.nix b/modules/home/deUtils/gammastep.nix similarity index 60% rename from modules/home/de/gammastep.nix rename to modules/home/deUtils/gammastep.nix index e64e3c1..6216462 100644 --- a/modules/home/de/gammastep.nix +++ b/modules/home/deUtils/gammastep.nix @@ -1,8 +1,8 @@ { config, lib, ... }: { - options.myConfig.de.gammastep.enable = lib.mkEnableOption ""; + options.myConfig.deUtils.gammastep.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.de.gammastep.enable { + config = lib.mkIf config.myConfig.deUtils.gammastep.enable { services.gammastep = { enable = true; provider = "geoclue2"; diff --git a/modules/home/de/hypridle.nix b/modules/home/deUtils/hypridle.nix similarity index 88% rename from modules/home/de/hypridle.nix rename to modules/home/deUtils/hypridle.nix index e23e59c..d8b3878 100644 --- a/modules/home/de/hypridle.nix +++ b/modules/home/deUtils/hypridle.nix @@ -5,9 +5,9 @@ ... }: { - options.myConfig.de.hypridle.enable = lib.mkEnableOption ""; + options.myConfig.deUtils.hypridle.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.de.hypridle.enable { + config = lib.mkIf config.myConfig.deUtils.hypridle.enable { home.packages = [ pkgs.brightnessctl ]; services.hypridle = { diff --git a/modules/home/de/hyprlock.nix b/modules/home/deUtils/hyprlock.nix similarity index 89% rename from modules/home/de/hyprlock.nix rename to modules/home/deUtils/hyprlock.nix index eac1818..fbcccec 100644 --- a/modules/home/de/hyprlock.nix +++ b/modules/home/deUtils/hyprlock.nix @@ -5,10 +5,10 @@ ... }@moduleArgs: let - cfg = config.myConfig.de.hyprlock; + cfg = config.myConfig.deUtils.hyprlock; in { - options.myConfig.de.hyprlock = { + options.myConfig.deUtils.hyprlock = { enable = lib.mkEnableOption ""; fprintAuth = lib.mkEnableOption "" // { default = moduleArgs.osConfig.services.fprintd.enable or false; diff --git a/modules/home/de/hyprpaper.nix b/modules/home/deUtils/hyprpaper.nix similarity index 61% rename from modules/home/de/hyprpaper.nix rename to modules/home/deUtils/hyprpaper.nix index d21a8b4..30818f2 100644 --- a/modules/home/de/hyprpaper.nix +++ b/modules/home/deUtils/hyprpaper.nix @@ -1,8 +1,8 @@ { config, lib, ... }: { - options.myConfig.de.hyprpaper.enable = lib.mkEnableOption ""; + options.myConfig.deUtils.hyprpaper.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.de.hyprpaper.enable { + config = lib.mkIf config.myConfig.deUtils.hyprpaper.enable { services.hyprpaper = { enable = true; diff --git a/modules/home/de/rofi/config.rasi b/modules/home/deUtils/rofi/config.rasi similarity index 100% rename from modules/home/de/rofi/config.rasi rename to modules/home/deUtils/rofi/config.rasi diff --git a/modules/home/de/rofi/dark-theme.rasi b/modules/home/deUtils/rofi/dark-theme.rasi similarity index 100% rename from modules/home/de/rofi/dark-theme.rasi rename to modules/home/deUtils/rofi/dark-theme.rasi diff --git a/modules/home/de/rofi/default.nix b/modules/home/deUtils/rofi/default.nix similarity index 69% rename from modules/home/de/rofi/default.nix rename to modules/home/deUtils/rofi/default.nix index e6b2457..540f544 100644 --- a/modules/home/de/rofi/default.nix +++ b/modules/home/deUtils/rofi/default.nix @@ -5,9 +5,9 @@ ... }: { - options.myConfig.de.rofi.enable = lib.mkEnableOption ""; + options.myConfig.deUtils.rofi.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.de.rofi.enable { + config = lib.mkIf config.myConfig.deUtils.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.de.theme}; + .${config.myConfig.theme}; in pkgs.concatText "rofi-config" [ ./config.rasi diff --git a/modules/home/de/rofi/light-theme.rasi b/modules/home/deUtils/rofi/light-theme.rasi similarity index 100% rename from modules/home/de/rofi/light-theme.rasi rename to modules/home/deUtils/rofi/light-theme.rasi diff --git a/modules/home/de/waybar.nix b/modules/home/deUtils/waybar.nix similarity index 94% rename from modules/home/de/waybar.nix rename to modules/home/deUtils/waybar.nix index 5de9c6d..737453f 100644 --- a/modules/home/de/waybar.nix +++ b/modules/home/deUtils/waybar.nix @@ -1,8 +1,8 @@ { config, lib, ... }: { - options.myConfig.de.waybar.enable = lib.mkEnableOption ""; + options.myConfig.deUtils.waybar.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.de.waybar.enable { + config = lib.mkIf config.myConfig.deUtils.waybar.enable { programs.waybar = { enable = true; systemd.enable = true; diff --git a/modules/home/de/wluma.nix b/modules/home/deUtils/wluma.nix similarity index 89% rename from modules/home/de/wluma.nix rename to modules/home/deUtils/wluma.nix index cc97418..41dd618 100644 --- a/modules/home/de/wluma.nix +++ b/modules/home/deUtils/wluma.nix @@ -5,9 +5,9 @@ ... }: { - options.myConfig.de.wluma.enable = lib.mkEnableOption ""; + options.myConfig.deUtils.wluma.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.de.wluma.enable { + config = lib.mkIf config.myConfig.deUtils.wluma.enable { home.packages = [ pkgs.wluma ]; xdg.configFile."wluma/config.toml".source = (pkgs.formats.toml { }).generate "wluma-config" { diff --git a/modules/home/kitty.nix b/modules/home/kitty.nix index 4de1e25..be54f1a 100644 --- a/modules/home/kitty.nix +++ b/modules/home/kitty.nix @@ -18,7 +18,7 @@ dark = "default"; light = "GitHub_Light"; } - .${config.myConfig.de.theme}; + .${config.myConfig.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 aee3376..b9dea22 100644 --- a/modules/home/shell/aliases.nix +++ b/modules/home/shell/aliases.nix @@ -28,7 +28,7 @@ dark = ""; light = "GitHub"; } - .${config.myConfig.de.theme}; + .${config.myConfig.theme}; in { cat = "bat --plain --theme=${theme}"; diff --git a/modules/home/de/theme.nix b/modules/home/theme.nix similarity index 88% rename from modules/home/de/theme.nix rename to modules/home/theme.nix index 496054e..a973ec9 100644 --- a/modules/home/de/theme.nix +++ b/modules/home/theme.nix @@ -5,10 +5,10 @@ ... }: let - cfg = config.myConfig.de; + cfgTheme = config.myConfig.theme; in { - options.myConfig.de.theme = lib.mkOption { + options.myConfig.theme = lib.mkOption { type = lib.types.enum [ "dark" "light" @@ -37,7 +37,7 @@ in }; } - (lib.mkIf (cfg.theme == "dark") { + (lib.mkIf (cfgTheme == "dark") { dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark"; gtk.theme.name = "Adwaita-dark"; gtk.iconTheme.name = "Papirus-Dark"; @@ -45,7 +45,7 @@ in home.pointerCursor.name = "Bibata-Original-Classic"; }) - (lib.mkIf (cfg.theme == "light") { + (lib.mkIf (cfgTheme == "light") { dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-light"; gtk.theme.name = "Adwaita"; gtk.iconTheme.name = "Papirus"; diff --git a/modules/home/vscode.nix b/modules/home/vscode.nix index 8127a4d..dac4db5 100644 --- a/modules/home/vscode.nix +++ b/modules/home/vscode.nix @@ -37,7 +37,7 @@ dark = "GitHub Dark"; light = "GitHub Light"; } - .${config.myConfig.de.theme}; + .${config.myConfig.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 85eecde..cde9ae5 100644 --- a/users/seb/@fern/home.nix +++ b/users/seb/@fern/home.nix @@ -4,7 +4,7 @@ home.stateVersion = "24.11"; myConfig = { - de.theme = "light"; + theme = "light"; hibernation.enable = true; }; diff --git a/users/seb/@north/home.nix b/users/seb/@north/home.nix index 39b07b2..d2a677e 100644 --- a/users/seb/@north/home.nix +++ b/users/seb/@north/home.nix @@ -5,7 +5,7 @@ home.stateVersion = "23.11"; myConfig = { - de.theme = "dark"; + theme = "dark"; hibernation.enable = true; };