marc/samfelag
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Flake upgrade

Browse Source
This commit is contained in:
marc
2024-02-18 23:24:30 +01:00
parent 3d89540ff8
commit bf8c91e632
13 changed files with 153 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
modules/app/alacritty.nix
View File

@@ -26,29 +26,29 @@ in
hm.xdg.configFile."alacritty/theme.yml".text = ''
colors:
primary:
background: '0x${config.colorScheme.colors.base00}'
foreground: '0x${config.colorScheme.colors.base05}'
background: '0x${config.colorScheme.palette.base00}'
foreground: '0x${config.colorScheme.palette.base05}'
cursor:
text: '0x${config.colorScheme.colors.base00}'
cursor: '0x${config.colorScheme.colors.base05}'
text: '0x${config.colorScheme.palette.base00}'
cursor: '0x${config.colorScheme.palette.base05}'
normal:
black: '0x${config.colorScheme.colors.base00}'
red: '0x${config.colorScheme.colors.base08}'
green: '0x${config.colorScheme.colors.base0B}'
yellow: '0x${config.colorScheme.colors.base0A}'
blue: '0x${config.colorScheme.colors.base0D}'
magenta: '0x${config.colorScheme.colors.base0E}'
cyan: '0x${config.colorScheme.colors.base0C}'
white: '0x${config.colorScheme.colors.base05}'
black: '0x${config.colorScheme.palette.base00}'
red: '0x${config.colorScheme.palette.base08}'
green: '0x${config.colorScheme.palette.base0B}'
yellow: '0x${config.colorScheme.palette.base0A}'
blue: '0x${config.colorScheme.palette.base0D}'
magenta: '0x${config.colorScheme.palette.base0E}'
cyan: '0x${config.colorScheme.palette.base0C}'
white: '0x${config.colorScheme.palette.base05}'
bright:
black: '0x${config.colorScheme.colors.base03}'
red: '0x${config.colorScheme.colors.base09}'
green: '0x${config.colorScheme.colors.base01}'
yellow: '0x${config.colorScheme.colors.base02}'
blue: '0x${config.colorScheme.colors.base04}'
magenta: '0x${config.colorScheme.colors.base06}'
cyan: '0x${config.colorScheme.colors.base0F}'
white: '0x${config.colorScheme.colors.base07}'
black: '0x${config.colorScheme.palette.base03}'
red: '0x${config.colorScheme.palette.base09}'
green: '0x${config.colorScheme.palette.base01}'
yellow: '0x${config.colorScheme.palette.base02}'
blue: '0x${config.colorScheme.palette.base04}'
magenta: '0x${config.colorScheme.palette.base06}'
cyan: '0x${config.colorScheme.palette.base0F}'
white: '0x${config.colorScheme.palette.base07}'
draw_bold_text_with_bright_colors: false
'';

2
modules/desktop/desktop.nix
View File

@@ -63,7 +63,7 @@ in
extraStartup = [
{ command = "systemctl --user restart polybar"; always = true; notification = false; }
{ command = "feh --bg-fill -B \"#${config.colorScheme.colors.base00}\" -z --no-fehbg ${cfg.wallpaper}"; always = true; notification = false; }
{ command = "feh --bg-fill -B \"#${config.colorScheme.palette.base00}\" -z --no-fehbg ${cfg.wallpaper}"; always = true; notification = false; }
];
extraKeybindings = {

42
modules/desktop/i3.nix
View File

@@ -208,34 +208,34 @@ in {
# - Themeing ---------------------------------
colors = {
background = "#${config.colorScheme.colors.base00}";
background = "#${config.colorScheme.palette.base00}";
focused = {
border = "#${config.colorScheme.colors.base03}";
background = "#${config.colorScheme.colors.base0B}";
text = "#${config.colorScheme.colors.base03}";
indicator = "#${config.colorScheme.colors.base04}";
childBorder = "#${config.colorScheme.colors.base03}";
border = "#${config.colorScheme.palette.base03}";
background = "#${config.colorScheme.palette.base0B}";
text = "#${config.colorScheme.palette.base03}";
indicator = "#${config.colorScheme.palette.base04}";
childBorder = "#${config.colorScheme.palette.base03}";
};
focusedInactive = {
border = "#${config.colorScheme.colors.base03}";
background = "#${config.colorScheme.colors.base04}";
text = "#${config.colorScheme.colors.base03}";
indicator = "#${config.colorScheme.colors.base04}";
childBorder = "#${config.colorScheme.colors.base03}";
border = "#${config.colorScheme.palette.base03}";
background = "#${config.colorScheme.palette.base04}";
text = "#${config.colorScheme.palette.base03}";
indicator = "#${config.colorScheme.palette.base04}";
childBorder = "#${config.colorScheme.palette.base03}";
};
unfocused = {
border = "#${config.colorScheme.colors.base02}";
background = "#${config.colorScheme.colors.base01}";
text = "#${config.colorScheme.colors.base03}";
indicator = "#${config.colorScheme.colors.base03}";
childBorder = "#${config.colorScheme.colors.base02}";
border = "#${config.colorScheme.palette.base02}";
background = "#${config.colorScheme.palette.base01}";
text = "#${config.colorScheme.palette.base03}";
indicator = "#${config.colorScheme.palette.base03}";
childBorder = "#${config.colorScheme.palette.base02}";
};
urgent = {
border = "#${config.colorScheme.colors.base02}";
background = "#${config.colorScheme.colors.base0A}";
text = "#${config.colorScheme.colors.base02}";
indicator = "#${config.colorScheme.colors.base03}";
childBorder = "#${config.colorScheme.colors.base02}";
border = "#${config.colorScheme.palette.base02}";
background = "#${config.colorScheme.palette.base0A}";
text = "#${config.colorScheme.palette.base02}";
indicator = "#${config.colorScheme.palette.base03}";
childBorder = "#${config.colorScheme.palette.base02}";
};
};
};

32
modules/desktop/polybar.nix
View File

@@ -38,22 +38,22 @@ in {
# - Themeing ---------------------------------
hm.xdg.configFile."polybar/colour-scheme.ini".text = ''
[colour-scheme]
base00 = #${config.colorScheme.colors.base00}
base01 = #${config.colorScheme.colors.base01}
base02 = #${config.colorScheme.colors.base02}
base03 = #${config.colorScheme.colors.base03}
base04 = #${config.colorScheme.colors.base04}
base05 = #${config.colorScheme.colors.base05}
base06 = #${config.colorScheme.colors.base06}
base07 = #${config.colorScheme.colors.base07}
base08 = #${config.colorScheme.colors.base08}
base09 = #${config.colorScheme.colors.base09}
base0A = #${config.colorScheme.colors.base0A}
base0B = #${config.colorScheme.colors.base0B}
base0C = #${config.colorScheme.colors.base0C}
base0D = #${config.colorScheme.colors.base0D}
base0E = #${config.colorScheme.colors.base0E}
base0F = #${config.colorScheme.colors.base0F}
base00 = #${config.colorScheme.palette.base00}
base01 = #${config.colorScheme.palette.base01}
base02 = #${config.colorScheme.palette.base02}
base03 = #${config.colorScheme.palette.base03}
base04 = #${config.colorScheme.palette.base04}
base05 = #${config.colorScheme.palette.base05}
base06 = #${config.colorScheme.palette.base06}
base07 = #${config.colorScheme.palette.base07}
base08 = #${config.colorScheme.palette.base08}
base09 = #${config.colorScheme.palette.base09}
base0A = #${config.colorScheme.palette.base0A}
base0B = #${config.colorScheme.palette.base0B}
base0C = #${config.colorScheme.palette.base0C}
base0D = #${config.colorScheme.palette.base0D}
base0E = #${config.colorScheme.palette.base0E}
base0F = #${config.colorScheme.palette.base0F}
'';
# - Dependencies -----------------------------

12
modules/desktop/rofi.nix
View File

@@ -25,12 +25,12 @@ in
hm.xdg.configFile."rofi/theme.rasi".text = ''
* {
font: "Iosevka Nerd Font 10";
background: #${config.colorScheme.colors.base00};
background-alt: #${config.colorScheme.colors.base02};
foreground: #${config.colorScheme.colors.base05};
selected: #${config.colorScheme.colors.base03};
active: #${config.colorScheme.colors.base07};
urgent: #${config.colorScheme.colors.base06};
background: #${config.colorScheme.palette.base00};
background-alt: #${config.colorScheme.palette.base02};
foreground: #${config.colorScheme.palette.base05};
selected: #${config.colorScheme.palette.base03};
active: #${config.colorScheme.palette.base07};
urgent: #${config.colorScheme.palette.base06};
}
'';

34
modules/editors/emacs.nix
View File

@@ -7,7 +7,7 @@ let
emacsPackages = epkgs: [
epkgs.vterm
];
emacsWithPackages = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages emacsPackages);
emacsWithPackages = with pkgs; ((emacsPackagesFor emacs-unstable).emacsWithPackages emacsPackages);
in {
options.samfelag.modules.editors.emacs = {
enable = mkEnableOption "emacs";
@@ -68,22 +68,22 @@ in {
# "doom/themes/base16-samfelag-theme.el".text = ''
# (require 'base16-theme)
# (defvar base16-samfelag-theme-colors
# '(:base00 "#${config.colorScheme.colors.base00}"
# :base01 "#${config.colorScheme.colors.base01}"
# :base02 "#${config.colorScheme.colors.base02}"
# :base03 "#${config.colorScheme.colors.base03}"
# :base04 "#${config.colorScheme.colors.base04}"
# :base05 "#${config.colorScheme.colors.base05}"
# :base06 "#${config.colorScheme.colors.base06}"
# :base07 "#${config.colorScheme.colors.base07}"
# :base08 "#${config.colorScheme.colors.base08}"
# :base09 "#${config.colorScheme.colors.base09}"
# :base0A "#${config.colorScheme.colors.base0A}"
# :base0B "#${config.colorScheme.colors.base0B}"
# :base0C "#${config.colorScheme.colors.base0C}"
# :base0D "#${config.colorScheme.colors.base0D}"
# :base0E "#${config.colorScheme.colors.base0E}"
# :base0F "#${config.colorScheme.colors.base0F}")
# '(:base00 "#${config.colorScheme.palette.base00}"
# :base01 "#${config.colorScheme.palette.base01}"
# :base02 "#${config.colorScheme.palette.base02}"
# :base03 "#${config.colorScheme.palette.base03}"
# :base04 "#${config.colorScheme.palette.base04}"
# :base05 "#${config.colorScheme.palette.base05}"
# :base06 "#${config.colorScheme.palette.base06}"
# :base07 "#${config.colorScheme.palette.base07}"
# :base08 "#${config.colorScheme.palette.base08}"
# :base09 "#${config.colorScheme.palette.base09}"
# :base0A "#${config.colorScheme.palette.base0A}"
# :base0B "#${config.colorScheme.palette.base0B}"
# :base0C "#${config.colorScheme.palette.base0C}"
# :base0D "#${config.colorScheme.palette.base0D}"
# :base0E "#${config.colorScheme.palette.base0E}"
# :base0F "#${config.colorScheme.palette.base0F}")
# "All colors for Base16 Samfelag are defined here.")
# (deftheme base16-samfelag)
# (base16-theme-define 'base16-samfelag base16-samfelag-theme-colors)