diff --git a/modules/base-system.nix b/modules/base-system.nix index 7d621be..45c0960 100644 --- a/modules/base-system.nix +++ b/modules/base-system.nix @@ -141,7 +141,7 @@ in { # Printing! services.printing = lib.mkIf cfg.printing.enable { enable = true; - drivers = [ pkgs.samsung-unified-linux-driver ]; + drivers = [pkgs.samsung-unified-linux-driver]; }; hardware.printers = lib.mkIf cfg.printing.enable { ensureDefaultPrinter = "Laser-Boi"; diff --git a/users/malte/kakoune.nix b/users/malte/kakoune.nix index d76b569..64ecb57 100644 --- a/users/malte/kakoune.nix +++ b/users/malte/kakoune.nix @@ -166,37 +166,39 @@ lightModeConfig = let bg62 = col.bg.rgbWithAlpha 0.62; fg1 = col.light1.rgb; - in pkgs.writeText "lightmoderc" '' - colorscheme gruvbox-light - face global PrimarySelection rgba:${bg62},rgba:8ec07c40 - face global SecondarySelection rgba:${bg62},rgba:83a59840 - face global MatchingChar rgb:${col.bg.rgb},rgb:${fg1}+bf - face global Reference rgb:${fg1} - face global Information Default - remove-hooks global theme - # FZF - hook global -group theme ModuleLoaded fzf %{ - set-option global fzf_default_opts '--color=light,gutter:-1' - } - try %{ set-option global fzf_default_opts '--color=light,gutter:-1' } - ''; + in + pkgs.writeText "lightmoderc" '' + colorscheme gruvbox-light + face global PrimarySelection rgba:${bg62},rgba:8ec07c40 + face global SecondarySelection rgba:${bg62},rgba:83a59840 + face global MatchingChar rgb:${col.bg.rgb},rgb:${fg1}+bf + face global Reference rgb:${fg1} + face global Information Default + remove-hooks global theme + # FZF + hook global -group theme ModuleLoaded fzf %{ + set-option global fzf_default_opts '--color=light,gutter:-1' + } + try %{ set-option global fzf_default_opts '--color=light,gutter:-1' } + ''; darkModeConfig = let fg62 = col.fg.rgbWithAlpha 0.62; bg1 = col.dark1.rgb; - in pkgs.writeText "darkmoderc" '' - colorscheme gruvbox-dark - face global PrimarySelection rgba:${fg62},rgba:8ec07c40 - face global SecondarySelection rgba:${fg62},rgba:83a59840 - face global MatchingChar rgb:${col.fg.rgb},rgb:${bg1}+bf - face global Reference rgb:${bg1} - face global Information Default - remove-hooks global theme - # FZF - hook global -group theme ModuleLoaded fzf %{ - set-option global fzf_default_opts '--color=dark,gutter:-1' - } - try %{ set-option global fzf_default_opts '--color=dark,gutter:-1' } - ''; + in + pkgs.writeText "darkmoderc" '' + colorscheme gruvbox-dark + face global PrimarySelection rgba:${fg62},rgba:8ec07c40 + face global SecondarySelection rgba:${fg62},rgba:83a59840 + face global MatchingChar rgb:${col.fg.rgb},rgb:${bg1}+bf + face global Reference rgb:${bg1} + face global Information Default + remove-hooks global theme + # FZF + hook global -group theme ModuleLoaded fzf %{ + set-option global fzf_default_opts '--color=dark,gutter:-1' + } + try %{ set-option global fzf_default_opts '--color=dark,gutter:-1' } + ''; currentThemeFile = "${configDir}/theme"; linkTheme = theme: '' ln -sf ${theme} ${currentThemeFile}