diff --git a/config/colors/config.nix b/config/colors/config.nix index df4acc2..94da0f8 100644 --- a/config/colors/config.nix +++ b/config/colors/config.nix @@ -5,51 +5,51 @@ nix-colors.homeManagerModules.default ]; - # colorScheme = { - # slug = "gruvbox-light-hard"; - # name = "Gruvbox Light Hard"; - # author = "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)"; - # palette = { - # base00 = "F9F5D7"; - # base01 = "EBDBB2"; - # base02 = "D5C4A1"; - # base03 = "BDAE93"; - # base04 = "665C54"; - # base05 = "504945"; - # base06 = "3C3836"; - # base07 = "282828"; - # base08 = "9D0006"; - # base09 = "AF3A03"; - # base0A = "B57614"; - # base0B = "79740E"; - # base0C = "427B58"; - # base0D = "076678"; - # base0E = "8F3F71"; - # base0F = "D65D0E"; - # }; - # }; - colorScheme = { - slug = "gruvbox-dark-hard"; - name = "Gruvbox Dark Hard"; + slug = "gruvbox-light-hard"; + name = "Gruvbox Light Hard"; author = "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)"; palette = { - base00 = "1D2021"; - base01 = "3C3836"; - base02 = "504945"; - base03 = "665C54"; - base04 = "BDAE93"; - base05 = "D5C4A1"; - base06 = "EBDBB2"; - base07 = "FBF1C7"; - base08 = "FB4934"; - base09 = "FE8019"; - base0A = "FABD2F"; - base0B = "B8BB26"; - base0C = "8EC07C"; - base0D = "83A598"; - base0E = "D3869B"; + base00 = "F9F5D7"; + base01 = "EBDBB2"; + base02 = "D5C4A1"; + base03 = "BDAE93"; + base04 = "665C54"; + base05 = "504945"; + base06 = "3C3836"; + base07 = "282828"; + base08 = "9D0006"; + base09 = "AF3A03"; + base0A = "B57614"; + base0B = "79740E"; + base0C = "427B58"; + base0D = "076678"; + base0E = "8F3F71"; base0F = "D65D0E"; }; }; + + # colorScheme = { + # slug = "gruvbox-dark-hard"; + # name = "Gruvbox Dark Hard"; + # author = "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)"; + # palette = { + # base00 = "1D2021"; + # base01 = "3C3836"; + # base02 = "504945"; + # base03 = "665C54"; + # base04 = "BDAE93"; + # base05 = "D5C4A1"; + # base06 = "EBDBB2"; + # base07 = "FBF1C7"; + # base08 = "FB4934"; + # base09 = "FE8019"; + # base0A = "FABD2F"; + # base0B = "B8BB26"; + # base0C = "8EC07C"; + # base0D = "83A598"; + # base0E = "D3869B"; + # base0F = "D65D0E"; + # }; + # }; } diff --git a/config/gnuplot/config.nix b/config/gnuplot/config.nix new file mode 100644 index 0000000..32d504c --- /dev/null +++ b/config/gnuplot/config.nix @@ -0,0 +1,61 @@ +{ config, pkgs, ... }: + +let + c = config.colorScheme.palette; + hex = cl: "#${cl}"; + fontsConf = pkgs.makeFontsConf { + fontDirectories = [ + pkgs.aporetic-bin + ]; + }; +in +{ + home.packages = with pkgs; [ + gnuplot + aporetic-bin + ]; + + home.sessionVariables = { + FONTCONFIG_FILE = "${fontsConf}"; + }; + + fonts.fontconfig.enable = true; + + home.file.".gnuplot".text = '' + set terminal kittygd enhanced truecolor size 1000,650 \ + font "Aporetic Serif, 18" \ + background rgb "${hex c.base00}" + + set object 1 rectangle from screen 0,0 to screen 1,1 behind \ + fillcolor rgb "${hex c.base00}" fillstyle solid 1.0 noborder + + set border lc rgb "${hex c.base04}" lw 1.2 + set grid lc rgb "${hex c.base02}" lw 1, lc rgb "${hex c.base01}" lw 1 + set key textcolor rgb "${hex c.base05}" + set title textcolor rgb "${hex c.base07}" font "Aporetic Serif,20" + set xlabel textcolor rgb "${hex c.base04}" + set ylabel textcolor rgb "${hex c.base04}" + set xtics textcolor rgb "${hex c.base04}" + set ytics textcolor rgb "${hex c.base04}" + + set linetype 1 lc rgb "${hex c.base08}" lw 2 pt 7 # red + set linetype 2 lc rgb "${hex c.base0B}" lw 2 pt 7 # green + set linetype 3 lc rgb "${hex c.base0D}" lw 2 pt 7 # blue + set linetype 4 lc rgb "${hex c.base0E}" lw 2 pt 7 # purple + set linetype 5 lc rgb "${hex c.base0A}" lw 2 pt 7 # yellow + set linetype 6 lc rgb "${hex c.base0C}" lw 2 pt 7 # aqua + set linetype 7 lc rgb "${hex c.base09}" lw 2 pt 7 # orange + set linetype 8 lc rgb "${hex c.base0F}" lw 2 pt 7 # brown + set linetype cycle 8 + + set palette defined ( \ + 0 "${hex c.base00}", \ + 1 "${hex c.base01}", \ + 2 "${hex c.base0D}", \ + 3 "${hex c.base0C}", \ + 4 "${hex c.base0B}", \ + 5 "${hex c.base0A}", \ + 6 "${hex c.base09}", \ + 7 "${hex c.base08}" ) + ''; +} diff --git a/config/kakoune/config.kak b/config/kakoune/config.kak index 57d1ee0..7548855 100644 --- a/config/kakoune/config.kak +++ b/config/kakoune/config.kak @@ -60,6 +60,7 @@ map global file-mode g ':grep -i ' -docstring 'grep files' map global file-mode c ':e ~/.config/home-manager/config/kakoune/config.kak' -docstring 'open config' map global file-mode t ':e ~/Documents/Notes/TODO.md' -docstring 'open todo' +map global file-mode a ':e ~/Documents/Notes/Agenda.md' -docstring 'open todo' map global file-mode n ':e ~/.config/home-manager/home.nix' -docstring 'open nix' # Search case-insensitive by default @@ -71,9 +72,8 @@ map global normal '' '(?Si)' # Select inner line map global normal X x_ -# Tab jumps to next snippet entry by default in insert mode -# map global insert ':lsp-snippets-select-next-placeholdersi' -# map global insert ':lsp-snippets-select-next-placeholdersi' +# Jump to next snippet entry in insert mode +map global insert ':try lsp-snippets-select-next-placeholders catch %{ execute-keys -with-hooks c-tab> }' -docstring 'Select next snippet placeholder' # When completion menu shows, remap tab to cycle completions — but only if not in a snippet # hook global InsertCompletionShow .* %{ @@ -285,6 +285,25 @@ hook global BufSetOption filetype=markdown %{ } } +hook global BufSetOption filetype=fennel %{ + set-option buffer lsp_servers %exp{ + [fennel-ls] + filetypes = ["fennel"] + root_globs = [".git/", "flsproject.fnl", ".editorconfig", ".kakrc"] + command = "fennel-ls" + } +} + +hook global BufSetOption filetype=python %{ + set-option buffer lsp_servers %exp{ + [basedpyright] + filetypes = ["python"] + root_globs = [".git/", "requirements.txt", ".editorconfig", ".kakrc"] + command = "basedpyright-langserver" + args = ["--stdio"] + } +} + # Enable LSP (Must come just before settings, after everything else lsp) lsp-enable diff --git a/config/programming/config.nix b/config/programming/config.nix index 762a8ba..0982dcb 100644 --- a/config/programming/config.nix +++ b/config/programming/config.nix @@ -4,9 +4,12 @@ imports = [ ./c.nix ./git.nix + ./go.nix + ./java.nix ./lua.nix ./markdown.nix ./nix.nix + ./python.nix ./rust.nix ./typst.nix ]; diff --git a/config/programming/go.nix b/config/programming/go.nix new file mode 100644 index 0000000..123c186 --- /dev/null +++ b/config/programming/go.nix @@ -0,0 +1,14 @@ + +{ pkgs, config, ... }: + +{ + home.packages = with pkgs; [ + go + gotools + gopls + ]; + + home.sessionVariables = { + GOPATH = "${config.home.homeDirectory}/.go"; + }; +} diff --git a/config/programming/java.nix b/config/programming/java.nix new file mode 100644 index 0000000..2d286f9 --- /dev/null +++ b/config/programming/java.nix @@ -0,0 +1,10 @@ +{ pkgs, ... }: + +{ + home.packages = with pkgs; [ + jdk + jdt-language-server + maven + gradle + ]; +} diff --git a/config/programming/lua.nix b/config/programming/lua.nix index 88d7f40..a3f7e4e 100644 --- a/config/programming/lua.nix +++ b/config/programming/lua.nix @@ -4,6 +4,7 @@ home.packages = with pkgs; [ lua-language-server lua5_4 + lux-cli luaPackages.fennel fnlfmt fennel-ls diff --git a/config/programming/python.nix b/config/programming/python.nix new file mode 100644 index 0000000..b1002f8 --- /dev/null +++ b/config/programming/python.nix @@ -0,0 +1,10 @@ +{ pkgs, ... }: + +{ + home.packages = with pkgs; [ + python313 + python313Packages.pip + pipx + basedpyright + ]; +} diff --git a/home.nix b/home.nix index e7ba963..ec69fe6 100644 --- a/home.nix +++ b/home.nix @@ -20,6 +20,7 @@ "zk" "lazygit" "aerc" + "gnuplot" ]; home.stateVersion = "26.05";