Make gammastep and theming part of DE configuration

This commit is contained in:
SebastianStork 2024-08-14 15:32:51 +02:00
parent aceeeef689
commit 8cc1a65fd8
9 changed files with 12 additions and 12 deletions

View file

@ -17,7 +17,7 @@
systemd.user.services.cliphist.Service.ExecStartPre = "${lib.getExe config.services.cliphist.package} wipe"; systemd.user.services.cliphist.Service.ExecStartPre = "${lib.getExe config.services.cliphist.package} wipe";
home.packages = [ home.packages = [
(wrappers.rofi { inherit (config.myConfig) theme; }) (wrappers.rofi { inherit (config.myConfig.de) theme; })
pkgs.wl-clipboard pkgs.wl-clipboard
(pkgs.writeScriptBin "rofi-clipboard" "cliphist list | rofi -dmenu -display-columns 2 | cliphist decode | wl-copy") (pkgs.writeScriptBin "rofi-clipboard" "cliphist list | rofi -dmenu -display-columns 2 | cliphist decode | wl-copy")
]; ];

View file

@ -1,8 +1,8 @@
{ config, lib, ... }: { config, lib, ... }:
{ {
options.myConfig.night-light.enable = lib.mkEnableOption ""; options.myConfig.de.gammastep.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.night-light.enable { config = lib.mkIf config.myConfig.de.gammastep.enable {
services.gammastep = { services.gammastep = {
enable = true; enable = true;
provider = "geoclue2"; provider = "geoclue2";

View file

@ -14,7 +14,7 @@
wayland.windowManager.hyprland.enable = true; wayland.windowManager.hyprland.enable = true;
home.packages = [ home.packages = [
(wrappers.rofi { inherit (config.myConfig) theme; }) (wrappers.rofi { inherit (config.myConfig.de) theme; })
pkgs.wl-clipboard pkgs.wl-clipboard
pkgs.playerctl pkgs.playerctl
pkgs.brightnessctl pkgs.brightnessctl
@ -26,6 +26,7 @@
hypridle.enable = true; hypridle.enable = true;
waybar.enable = true; waybar.enable = true;
cliphist.enable = true; cliphist.enable = true;
gammastep.enable = true;
}; };
services.dunst.enable = true; services.dunst.enable = true;

View file

@ -5,10 +5,10 @@
... ...
}: }:
let let
cfg = config.myConfig; cfg = config.myConfig.de;
in in
{ {
options.myConfig.theme = lib.mkOption { type = lib.types.str; }; options.myConfig.de.theme = lib.mkOption { type = lib.types.str; };
config = lib.mkMerge [ config = lib.mkMerge [
(lib.mkIf ((cfg.theme == "dark") || (cfg.theme == "light")) { (lib.mkIf ((cfg.theme == "dark") || (cfg.theme == "light")) {

View file

@ -73,7 +73,7 @@
dark = ""; dark = "";
light = "GitHub"; light = "GitHub";
} }
.${config.myConfig.theme}; .${config.myConfig.de.theme};
in in
{ {
cat = "bat --plain --theme=${theme}"; cat = "bat --plain --theme=${theme}";

View file

@ -36,7 +36,7 @@
dark = "GitHub Dark"; dark = "GitHub Dark";
light = "GitHub Light"; light = "GitHub Light";
} }
.${config.myConfig.theme}; .${config.myConfig.de.theme};
"workbench.iconTheme" = "material-icon-theme"; "workbench.iconTheme" = "material-icon-theme";
"editor.fontFamily" = "JetBrainsMono Nerd Font"; "editor.fontFamily" = "JetBrainsMono Nerd Font";
"explorer.confirmDelete" = false; "explorer.confirmDelete" = false;

View file

@ -2,7 +2,7 @@
imports = [ ../home.nix ]; imports = [ ../home.nix ];
home.stateVersion = "23.11"; home.stateVersion = "23.11";
myConfig.theme = "light"; myConfig.de.theme = "light";
wayland.windowManager.hyprland.settings.monitor = [ wayland.windowManager.hyprland.settings.monitor = [
"eDP-1,1920x1080@60,0x0,1" "eDP-1,1920x1080@60,0x0,1"

View file

@ -3,7 +3,7 @@
imports = [ ../home.nix ]; imports = [ ../home.nix ];
home.stateVersion = "23.11"; home.stateVersion = "23.11";
myConfig.theme = "dark"; myConfig.de.theme = "dark";
home.packages = [ home.packages = [
pkgs.ffmpeg pkgs.ffmpeg

View file

@ -15,14 +15,13 @@
git.enable = true; git.enable = true;
vscode.enable = true; vscode.enable = true;
equalizer.enable = true; equalizer.enable = true;
night-light.enable = true;
}; };
home.packages = [ home.packages = [
wrappers.bottom wrappers.bottom
pkgs.fastfetch pkgs.fastfetch
(wrappers.kitty { inherit (config.myConfig) theme; }) (wrappers.kitty { inherit (config.myConfig.de) theme; })
wrappers.firefox wrappers.firefox
pkgs.nemo-with-extensions pkgs.nemo-with-extensions
pkgs.jetbrains.idea-community pkgs.jetbrains.idea-community