Jan
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue with building

This commit is contained in:
Jan Bulthuis 2024-07-19 03:51:40 +02:00
parent 7379afe613
commit 47365d05f5
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/users/modules/default.nix
View File

@ -10,6 +10,7 @@
./fontconfig/default.nix ./fontconfig/default.nix
./foot/default.nix ./foot/default.nix
./mako/default.nix ./mako/default.nix
./neovim/default.nix
./obsidian/default.nix ./obsidian/default.nix
./qutebrowser/default.nix ./qutebrowser/default.nix
./rofi/default.nix ./rofi/default.nix

23
modules/users/modules/desktop/bar/waybar.nix
View File

@ -3,6 +3,8 @@
with lib; with lib;
let let
cfg = config.modules.waybar; cfg = config.modules.waybar;
theme = config.theming;
colors = theme.colors;
in { in {
options.modules.waybar = { options.modules.waybar = {
enable = mkEnableOption "waybar"; enable = mkEnableOption "waybar";
@ -81,15 +83,16 @@ in {
}; };
}; };
}; };
# TODO: Replace base03 color with named color
style = '' style = ''
window#waybar { window#waybar {
color: #${colors.base05}; color: #${colors.fg};
background-color: #${colors.base00}; background-color: #${colors.bg};
border-style: none none solid none; border-style: none none solid none;
border-width: ${toString borderSize}px; border-width: ${toString theme.layout.borderSize}px;
border-color: #${colors.base01}; border-color: #${colors.unfocused};
font-size: 12px; font-size: 12px;
font-family: "${fonts.monospace.name}"; font-family: "${theme.fonts.monospace.name}";
} }
.modules-right { .modules-right {
@ -97,7 +100,7 @@ in {
} }
#tags button { #tags button {
color: #${colors.base03}; color: #${theme.schemeColors.base03};
padding: 0 5px 1px 5px; padding: 0 5px 1px 5px;
border-radius: 0; border-radius: 0;
font-size: 16px; font-size: 16px;
@ -105,15 +108,11 @@ in {
} }
#tags button.occupied { #tags button.occupied {
color: #${colors.base05}; color: #${colors.fg};
} }
#tags button.focused { #tags button.focused {
color: #${colors.base09}; color: #${colors.accent};
}
#tags.button.bell {
color: #${colors.base0A};
} }
''; '';
}; };

3
modules/users/modules/desktop/window-manager/river.nix
View File

@ -24,6 +24,9 @@ in {
# Close waybar # Close waybar
PATH="${pkgs.procps}/bin:$PATH" $DRY_RUN_CMD pkill waybar PATH="${pkgs.procps}/bin:$PATH" $DRY_RUN_CMD pkill waybar
# Kill rivertile
PATH="${pkgs.procps}/bin:$PATH" $DRY_RUN_CMD pkill rivertile
# Restart river # Restart river
PATH="${pkgs.river}/bin:$PATH" $DRY_RUN_CMD ~/.config/river/init PATH="${pkgs.river}/bin:$PATH" $DRY_RUN_CMD ~/.config/river/init
''; '';

4
modules/users/modules/neovim/default.nix
View File

@ -3,6 +3,8 @@
with lib; with lib;
let let
cfg = config.modules.neovim; cfg = config.modules.neovim;
theme = config.theming;
colors = theme.colors;
in { in {
options.modules.neovim = { options.modules.neovim = {
enable = mkEnableOption "neovim"; enable = mkEnableOption "neovim";
@ -96,7 +98,7 @@ in {
highlight = { highlight = {
Comment = { Comment = {
italic = true; italic = true;
fg = colors.withHashtag.base03; fg = theme.schemeColors.withHashtag.base03; # TODO: Come up with a good name colors.muted maybe?
}; };
}; };

2
users/jan.nix
View File

@ -47,7 +47,7 @@
# Color scheme # Color scheme
themes.catppuccin = { themes.catppuccin = {
enable = true; enable = true;
flavor = "mocha"; flavor = "frappe";
}; };
}; };
}; };