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

Extract theming from the de configuration

Browse source
This commit is contained in:
SebastianStork 2024-05-28 20:55:16 +02:00
parent 73afff8799
commit 10bb7b5c31
10 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/home/de/default.nix
View file

@ -1,6 +0,0 @@
{
imports = [
./hyprland
./theme.nix
];
}

3
modules/home/default.nix
View file

@ -1,6 +1,7 @@
{ {
imports = [ imports = [
./de ./hyprland
./theme.nix
./vscode.nix ./vscode.nix
./shell ./shell
./ssh-client.nix ./ssh-client.nix

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

@ -16,7 +16,7 @@
wrappers.waybar wrappers.waybar
wrappers.hyprlock wrappers.hyprlock
(wrappers.rofi { inherit (config.myConfig.de) theme; }) (wrappers.rofi { inherit (config.myConfig) theme; })
pkgs.cliphist pkgs.cliphist
pkgs.wl-clipboard pkgs.wl-clipboard
(pkgs.writeScriptBin "clipboard" "cliphist list | rofi -dmenu -display-columns 2 | cliphist decode | wl-copy") (pkgs.writeScriptBin "clipboard" "cliphist list | rofi -dmenu -display-columns 2 | cliphist decode | wl-copy")

0
modules/home/de/hyprland/keybinds.nix → modules/home/hyprland/keybinds.nix
View file

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

@ -84,7 +84,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}";

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

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

2
modules/home/vscode.nix
View file

@ -41,7 +41,7 @@
dark = "Gruvbox Dark Hard"; dark = "Gruvbox Dark Hard";
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/@inspiron.nix
View file

@ -5,6 +5,6 @@
home-manager.users.seb = { home-manager.users.seb = {
home.packages = [ (wrappers.hypridle { lockOnSleep = true; }) ]; home.packages = [ (wrappers.hypridle { lockOnSleep = true; }) ];
myConfig.de.theme = "light"; myConfig.theme = "light";
}; };
} }

2
users/seb/@north.nix
View file

@ -11,6 +11,6 @@
(wrappers.hypridle { lockOnSleep = false; }) (wrappers.hypridle { lockOnSleep = false; })
]; ];
myConfig.de.theme = "dark"; myConfig.theme = "dark";
}; };
} }

4
users/seb/home.nix
View file

@ -8,9 +8,7 @@
{ {
myConfig = { myConfig = {
de.hyprland.enable = osConfig.myConfig.de.hyprland.enable; de.hyprland.enable = osConfig.myConfig.de.hyprland.enable;
shell.enable = true; shell.enable = true;
ssh-client.enable = true; ssh-client.enable = true;
git.enable = true; git.enable = true;
vscode.enable = true; vscode.enable = true;
@ -37,6 +35,6 @@
wrappers.obsidian wrappers.obsidian
wrappers.marktext wrappers.marktext
wrappers.webcord wrappers.webcord
(wrappers.kitty { inherit (config.myConfig.de) theme; }) (wrappers.kitty { inherit (config.myConfig) theme; })
]; ];
} }