diff --git a/home.nix b/home.nix index 29a6e9c..90ad304 100644 --- a/home.nix +++ b/home.nix @@ -44,7 +44,10 @@ in gnome.eog gnome.evince gnomeExtensions.appindicator + gnomeExtensions.caffeine gnomeExtensions.dash-to-dock + gnomeExtensions.dynamic-panel-transparency + gnomeExtensions.just-perfection gnomeExtensions.topicons-plus gnome.file-roller gnome.ghex diff --git a/modules/bat.nix b/modules/bat.nix index 67b047b..65d3b6c 100644 --- a/modules/bat.nix +++ b/modules/bat.nix @@ -1,3 +1,9 @@ { - programs.bat = { enable = true; config.theme = "Nord"; }; + programs.bat = { + enable = true; + config = { + theme = "Nord"; + tabs = "2"; + }; + }; } diff --git a/modules/kakoune.nix b/modules/kakoune.nix index 9e58451..4093966 100644 --- a/modules/kakoune.nix +++ b/modules/kakoune.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let kakCmd = "kak"; - + strPalette = with pkgs.rice; palette.toRgbShortHex colorPalette; rustPlugins = with pkgs; [ cargo cargo-watch @@ -41,7 +41,6 @@ let yaml-language-server nodePackages.vscode-langservers-extracted ]; - in { home.sessionVariables = { @@ -138,7 +137,36 @@ in ] ) ++ rustPlugins ++ bashPlugins ++ cppPlugins ++ pythonPlugins ++ javascriptPlugins ++ latexPlugins ++ nixPlugins ++ spellingPlugins ++ dataFormats; }; - xdg.configFile."kak/colors/nord.kak".source = ../configs/kak/colors/nord.kak; + + xdg.configFile."kak/colors/nord.kak".text = with strPalette; '' + set-face global value rgb:${normal.magenta},default + set-face global type rgb:${bright.white},default + set-face global identifier rgb:${normal.cyan},default + set-face global string rgb:${normal.green},default + set-face global error rgb:${normal.red},default + set-face global keyword rgb:${normal.blue},default + set-face global operator rgb:${normal.blue},default + set-face global attribute rgb:${dark.blue},default + set-face global comment rgb:${bright.blue},default + set-face global meta rgb:${normal.yellow},default + set-face global Default rgb:${normal.white},default + set-face global PrimarySelection rgb:${normal.black},rgb:${normal.white} + set-face global SecondarySelection rgb:${bright.white},rgb:${bright.black} + set-face global PrimaryCursor rgb:${dark.black},rgb:${normal.yellow} + set-face global SecondaryCursor rgb:${dark.black},rgb:${dark.white} + set-face global MenuForeground rgb:${dark.white},rgb:${dark.white} + set-face global MenuBackground default,rgb:${normal.black} + set-face global MenuInfo default,rgb:${normal.black} + set-face global Information rgb:${dark.black},rgb:${normal.cyan} + set-face global StatusLine rgb:${normal.white},rgb:${normal.black} + set-face global StatusLineMode rgb:${normal.blue},rgb:${normal.black} + set-face global StatusLineInfo rgb:${normal.blue},rgb:${normal.black} + set-face global StatusLineValue rgb:${normal.blue},rgb:${normal.black} + set-face global StatusCursor rgb:${dark.black},rgb:${normal.yellow} + set-face global Prompt rgb:${normal.cyan},rgb:${normal.black} + set-face global BufferPadding default,default + ''; + xdg.configFile."kak-lsp/kak-lsp.toml".text = '' snippet_support = false verbosity = 2 diff --git a/overlays/rice.nix b/overlays/rice.nix index b2518d7..72c8356 100644 --- a/overlays/rice.nix +++ b/overlays/rice.nix @@ -6,7 +6,7 @@ let sha256 = "1is70gjf59sxccwhz1hl9hdxsd4z8vqsr2rdk3imnmxj9n3jf6j8"; } ) {}; - nord = import ../themes/nord.nix; + nord = with nix-rice; palette.tPalette color.hexToRgba (import ../themes/nord.nix); onedark = import ../themes/onedark.nix; in ( @@ -14,20 +14,27 @@ in rice = nix-rice // { colorPalette = with nix-rice; rec { normal = { - black = color.hexToRgba nord.n0; - red = color.hexToRgba nord.n11; - green = color.hexToRgba nord.n14; - yellow = color.hexToRgba nord.n13; - blue = color.hexToRgba nord.n10; - magenta = color.hexToRgba nord.n15; - cyan = color.hexToRgba nord.n8; - white = color.hexToRgba nord.n4; + black = nord.n1; + blue = nord.n10; + cyan = nord.n8; + green = nord.n14; + magenta = nord.n15; + red = nord.n11; + white = nord.n5; + yellow = nord.n13; }; bright = palette.brighten 10 normal // { - white = color.hexToRgba nord.n6; - red = color.hexToRgba nord.n12; + blue = nord.n9; + black = nord.n2; + red = nord.n12; + white = nord.n6; + }; + dark = palette.darken 10 normal // { + black = nord.n0; + blue = nord.n3; + cyan = nord.n7; + white = nord.n4; }; - dark = palette.darken 10 normal; }; font = { normal = { @@ -45,7 +52,7 @@ in size = 10; }; }; - opacity = 0.9; + opacity = 0.95; }; } )