SebastianStork/nixos-config
1
0
Fork 0
mirror of https://github.com/SebastianStork/nixos-config.git synced 2026-01-21 16:21:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move DE utility modules to deUtils namespace

Browse source
This commit is contained in:
SebastianStork 2025-03-08 20:52:53 +01:00
parent 7e0677ce7d
commit 84be6ec469
19 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/home/de/hyprland/default.nix
View file

@ -19,7 +19,7 @@
pkgs.grimblast pkgs.grimblast
]; ];
myConfig.de = { myConfig.deUtils = {
rofi.enable = true; rofi.enable = true;
hyprpaper.enable = true; hyprpaper.enable = true;
hyprlock.enable = true; hyprlock.enable = true;

4
modules/home/de/hyprland/settings.nix
View file

@ -36,13 +36,13 @@
dark = "rgb(ffffff)"; dark = "rgb(ffffff)";
light = "rgb(000000)"; light = "rgb(000000)";
} }
.${config.myConfig.de.theme}; .${config.myConfig.theme};
"col.inactive_border" = "col.inactive_border" =
{ {
dark = "rgba(ffffff00)"; dark = "rgba(ffffff00)";
light = "rgba(ffffff00)"; light = "rgba(ffffff00)";
} }
.${config.myConfig.de.theme}; .${config.myConfig.theme};
layout = "master"; layout = "master";
}; };

4
modules/home/de/cliphist.nix → modules/home/deUtils/cliphist.nix
View file

@ -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 = { services.cliphist = {
enable = true; enable = true;
allowImages = false; allowImages = false;

4
modules/home/de/gammastep.nix → modules/home/deUtils/gammastep.nix
View file

@ -1,8 +1,8 @@
{ config, lib, ... }: { 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 = { services.gammastep = {
enable = true; enable = true;
provider = "geoclue2"; provider = "geoclue2";

4
modules/home/de/hypridle.nix → modules/home/deUtils/hypridle.nix
View file

@ -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 ]; home.packages = [ pkgs.brightnessctl ];
services.hypridle = { services.hypridle = {

4
modules/home/de/hyprlock.nix → modules/home/deUtils/hyprlock.nix
View file

@ -5,10 +5,10 @@
... ...
}@moduleArgs: }@moduleArgs:
let let
cfg = config.myConfig.de.hyprlock; cfg = config.myConfig.deUtils.hyprlock;
in in
{ {
options.myConfig.de.hyprlock = { options.myConfig.deUtils.hyprlock = {
enable = lib.mkEnableOption ""; enable = lib.mkEnableOption "";
fprintAuth = lib.mkEnableOption "" // { fprintAuth = lib.mkEnableOption "" // {
default = moduleArgs.osConfig.services.fprintd.enable or false; default = moduleArgs.osConfig.services.fprintd.enable or false;

4
modules/home/de/hyprpaper.nix → modules/home/deUtils/hyprpaper.nix
View file

@ -1,8 +1,8 @@
{ config, lib, ... }: { 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 = { services.hyprpaper = {
enable = true; enable = true;

0
modules/home/de/rofi/config.rasi → modules/home/deUtils/rofi/config.rasi
View file

0
modules/home/de/rofi/dark-theme.rasi → modules/home/deUtils/rofi/dark-theme.rasi
View file

6
modules/home/de/rofi/default.nix → modules/home/deUtils/rofi/default.nix
View file

@ -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 ]; home.packages = [ pkgs.rofi-wayland ];
xdg.configFile."rofi/config.rasi".source = xdg.configFile."rofi/config.rasi".source =
@ -17,7 +17,7 @@
dark = ./dark-theme.rasi; dark = ./dark-theme.rasi;
light = ./light-theme.rasi; light = ./light-theme.rasi;
} }
.${config.myConfig.de.theme}; .${config.myConfig.theme};
in in
pkgs.concatText "rofi-config" [ pkgs.concatText "rofi-config" [
./config.rasi ./config.rasi

0
modules/home/de/rofi/light-theme.rasi → modules/home/deUtils/rofi/light-theme.rasi
View file

4
modules/home/de/waybar.nix → modules/home/deUtils/waybar.nix
View file

@ -1,8 +1,8 @@
{ config, lib, ... }: { 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 = { programs.waybar = {
enable = true; enable = true;
systemd.enable = true; systemd.enable = true;

4
modules/home/de/wluma.nix → modules/home/deUtils/wluma.nix
View file

@ -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 ]; home.packages = [ pkgs.wluma ];
xdg.configFile."wluma/config.toml".source = (pkgs.formats.toml { }).generate "wluma-config" { xdg.configFile."wluma/config.toml".source = (pkgs.formats.toml { }).generate "wluma-config" {

2
modules/home/kitty.nix
View file

@ -18,7 +18,7 @@
dark = "default"; dark = "default";
light = "GitHub_Light"; light = "GitHub_Light";
} }
.${config.myConfig.de.theme}; .${config.myConfig.theme};
in in
{ {
include = "${pkgs.kitty-themes}/share/kitty-themes/themes/${theme-name}.conf"; include = "${pkgs.kitty-themes}/share/kitty-themes/themes/${theme-name}.conf";

2
modules/home/shell/aliases.nix
View file

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

8
modules/home/de/theme.nix → modules/home/theme.nix
View file

@ -5,10 +5,10 @@
... ...
}: }:
let let
cfg = config.myConfig.de; cfgTheme = config.myConfig.theme;
in in
{ {
options.myConfig.de.theme = lib.mkOption { options.myConfig.theme = lib.mkOption {
type = lib.types.enum [ type = lib.types.enum [
"dark" "dark"
"light" "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"; dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
gtk.theme.name = "Adwaita-dark"; gtk.theme.name = "Adwaita-dark";
gtk.iconTheme.name = "Papirus-Dark"; gtk.iconTheme.name = "Papirus-Dark";
@ -45,7 +45,7 @@ in
home.pointerCursor.name = "Bibata-Original-Classic"; 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"; dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-light";
gtk.theme.name = "Adwaita"; gtk.theme.name = "Adwaita";
gtk.iconTheme.name = "Papirus"; gtk.iconTheme.name = "Papirus";

2
modules/home/vscode.nix
View file

@ -37,7 +37,7 @@
dark = "GitHub Dark"; dark = "GitHub Dark";
light = "GitHub Light"; light = "GitHub Light";
} }
.${config.myConfig.de.theme}; .${config.myConfig.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;

2
users/seb/@fern/home.nix
View file

@ -4,7 +4,7 @@
home.stateVersion = "24.11"; home.stateVersion = "24.11";
myConfig = { myConfig = {
de.theme = "light"; theme = "light";
hibernation.enable = true; hibernation.enable = true;
}; };

2
users/seb/@north/home.nix
View file

@ -5,7 +5,7 @@
home.stateVersion = "23.11"; home.stateVersion = "23.11";
myConfig = { myConfig = {
de.theme = "dark"; theme = "dark";
hibernation.enable = true; hibernation.enable = true;
}; };