From 9d1dfa44d7fd4336d2692c05db0c469aaf00fd5c Mon Sep 17 00:00:00 2001 From: vali Date: Wed, 22 May 2024 14:04:58 +0200 Subject: [PATCH] working NixVim! --- flake.lock | 62 +- modules/editors/nixvim/colors/aquarium.nix | 18 + modules/editors/nixvim/colors/decay.nix | 18 + modules/editors/nixvim/colors/everblush.nix | 18 + modules/editors/nixvim/colors/everforest.nix | 18 + modules/editors/nixvim/colors/gruvbox.nix | 18 + modules/editors/nixvim/colors/jellybeans.nix | 18 + modules/editors/nixvim/colors/mountain.nix | 18 + modules/editors/nixvim/colors/paradise.nix | 18 + modules/editors/nixvim/colors/tokyonight.nix | 18 + modules/editors/nixvim/default.nix | 4 +- modules/editors/nixvim/highlight.nix | 121 +++ modules/editors/nixvim/keys.nix | 716 +++++++++--------- modules/editors/nixvim/nixvim.nix | 33 +- .../editors/nixvim/plug/completion/cmp.nix | 4 +- modules/editors/nixvim/plug/git/gitsigns.nix | 4 +- modules/editors/nixvim/plug/lsp/none-ls.nix | 2 + modules/editors/nixvim/plug/lsp/trouble.nix | 2 +- .../editors/nixvim/plug/snippets/luasnip.nix | 2 +- .../nixvim/plug/statusline/lualine.nix | 42 +- .../plug/treesitter/treesitter-context.nix | 2 +- .../treesitter/treesitter-textobjects.nix | 2 +- .../nixvim/plug/treesitter/treesitter.nix | 2 + modules/editors/nixvim/plug/ui/alpha.nix | 30 +- modules/editors/nixvim/plug/ui/btw.nix | 2 + modules/editors/nixvim/plug/ui/bufferline.nix | 4 +- modules/editors/nixvim/plug/ui/noice.nix | 2 +- .../editors/nixvim/plug/ui/nvim-notify.nix | 2 + modules/editors/nixvim/plug/ui/telescope.nix | 2 + modules/editors/nixvim/plug/utils/comment.nix | 2 +- modules/editors/nixvim/plug/utils/copilot.nix | 2 + modules/editors/nixvim/plug/utils/flash.nix | 2 + modules/editors/nixvim/plug/utils/grapple.nix | 2 + .../editors/nixvim/plug/utils/hardtime.nix | 2 +- modules/editors/nixvim/plug/utils/harpoon.nix | 2 +- .../editors/nixvim/plug/utils/illuminate.nix | 2 +- .../nixvim/plug/utils/nvim-autopairs.nix | 2 +- modules/editors/nixvim/plug/utils/oil.nix | 2 + modules/editors/nixvim/plug/utils/ufo.nix | 2 +- .../editors/nixvim/plug/utils/undotree.nix | 2 + .../editors/nixvim/plug/utils/whichkey.nix | 2 +- modules/gui/stylix.nix | 2 +- 42 files changed, 774 insertions(+), 454 deletions(-) create mode 100644 modules/editors/nixvim/colors/aquarium.nix create mode 100644 modules/editors/nixvim/colors/decay.nix create mode 100644 modules/editors/nixvim/colors/everblush.nix create mode 100644 modules/editors/nixvim/colors/everforest.nix create mode 100644 modules/editors/nixvim/colors/gruvbox.nix create mode 100644 modules/editors/nixvim/colors/jellybeans.nix create mode 100644 modules/editors/nixvim/colors/mountain.nix create mode 100644 modules/editors/nixvim/colors/paradise.nix create mode 100644 modules/editors/nixvim/colors/tokyonight.nix create mode 100644 modules/editors/nixvim/highlight.nix diff --git a/flake.lock b/flake.lock index 8c760dc..0ebfc80 100644 --- a/flake.lock +++ b/flake.lock @@ -261,11 +261,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1716311169, - "narHash": "sha256-hCt9zCXnuvra2X0+fQiejAfpr6nNdR1hSfl63UxmVbM=", + "lastModified": 1716368878, + "narHash": "sha256-lo7AHe+F4+VJshf4AZWtXpnHUvJsrMJxnqCfeIBn/54=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "04c759ffb7af09dbce3c9068c4da7f2f0343da89", + "rev": "35e5b442c1602ed30b588addb66d3289f33dfb76", "type": "github" }, "original": { @@ -282,11 +282,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1716272846, - "narHash": "sha256-MtL0YhG20cngHsS6PIdpA3bkLnSx6XJBd2V8R9RaEc4=", + "lastModified": 1716359173, + "narHash": "sha256-pYcjP6Gy7i6jPWrjiWAVV0BCQp+DdmGaI/k65lBb/kM=", "owner": "nix-community", "repo": "fenix", - "rev": "063d7e5fac454edd35b7e2cedb6ca9fb1410c79b", + "rev": "b6fc5035b28e36a98370d0eac44f4ef3fd323df6", "type": "github" }, "original": { @@ -920,11 +920,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1716316196, - "narHash": "sha256-ynu+Ii1PTtnz4YdjP2CJbnxaie9aETNAds9lwDzeQus=", + "lastModified": 1716365376, + "narHash": "sha256-941FKboG8Wc/hb1wvrEEKnC4DwDlSLgrjRL+whgWwUU=", "ref": "refs/heads/main", - "rev": "e419ef1873de01b0762f7f1a411994170a4d8cab", - "revCount": 4723, + "rev": "93fea890433ec11d7a915f5e0466b2e8b513e895", + "revCount": 4724, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1276,11 +1276,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1716315695, - "narHash": "sha256-F6mniYkD9gZTo8ufpjtKf16+63+xnnpbcfdB0rTGbfM=", + "lastModified": 1716366111, + "narHash": "sha256-1i1YJjeGBiIzBjZir1pQBwueHjRkpcPEsSrNbiyqMg4=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "2b6362ef6935cf4b1514a4d4b1f29a7dd8a14b36", + "rev": "088d7d9e7278f38cd9d01a4099e47fad5b1da66d", "type": "github" }, "original": { @@ -1307,11 +1307,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716137900, - "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", + "lastModified": 1716293225, + "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", + "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", "type": "github" }, "original": { @@ -1355,11 +1355,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1716137900, - "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", + "lastModified": 1716293225, + "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", + "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", "type": "github" }, "original": { @@ -1387,11 +1387,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1716137900, - "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", + "lastModified": 1716293225, + "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", + "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", "type": "github" }, "original": { @@ -1448,11 +1448,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1716294469, - "narHash": "sha256-1RdJkVa+axdzLhbeoWJoC3BPODxfx+/Rv7HE+e4CK/Y=", + "lastModified": 1716326274, + "narHash": "sha256-1LyTvpjb8Cmlg3TRnP56rvqK1WSNa518pD6F0tjgM+U=", "owner": "nix-community", "repo": "nixvim", - "rev": "1c9f2a23a6cb9406c35980f4af1a4356f56771e9", + "rev": "5d2e01495944dcf7cf7ee53a7074c4010165d756", "type": "github" }, "original": { @@ -1463,11 +1463,11 @@ }, "nur": { "locked": { - "lastModified": 1716316781, - "narHash": "sha256-ybuEOdUtk7/X9GjZp72npoSk5GHT+9jpL7aPoXaTu7A=", + "lastModified": 1716375775, + "narHash": "sha256-2X4zwYV6Xudaqo3IhlwsMAQT+bZHs2nBD8Gv3ENHqTg=", "owner": "nix-community", "repo": "NUR", - "rev": "83bfd9ae2490c05fac7381100a13211cd27c3109", + "rev": "0ed3297ed7a3d5308db5a57ccd067beaf196e4a7", "type": "github" }, "original": { @@ -1832,11 +1832,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1716025334, - "narHash": "sha256-ND9F+BJeyKaGZFu94SWIj6HtyZTzWf5qVyp3cI3a7Is=", + "lastModified": 1716362227, + "narHash": "sha256-o+OVh6c6CW6NNidCbRfdp+9JpERyzrAB/2Eaza0Q6r4=", "owner": "Alexays", "repo": "Waybar", - "rev": "8ad7c75d79f76c27a9c6b87460b79d1787c8855b", + "rev": "35a9ca476dc2595c28fd1d3a34cc26be4f14077a", "type": "github" }, "original": { diff --git a/modules/editors/nixvim/colors/aquarium.nix b/modules/editors/nixvim/colors/aquarium.nix new file mode 100644 index 0000000..2a680a6 --- /dev/null +++ b/modules/editors/nixvim/colors/aquarium.nix @@ -0,0 +1,18 @@ +_: { + base01 = "#2c2e3e"; + base00 = "#20202A"; + base02 = "#3D4059"; + base03 = "#313449"; + base04 = "#63718b"; + base05 = "#ced4df"; + base06 = "#414560"; + base07 = "#63718b"; + base08 = "#ebb9b9"; + base09 = "#e8cca7"; + base0A = "#e6dfb8"; + base0B = "#b1dba4"; + base0C = "#b8dceb"; + base0D = "#a3b8ef"; + base0E = "#f6bbe7"; + base0F = "#eAc1c1"; +} diff --git a/modules/editors/nixvim/colors/decay.nix b/modules/editors/nixvim/colors/decay.nix new file mode 100644 index 0000000..b357784 --- /dev/null +++ b/modules/editors/nixvim/colors/decay.nix @@ -0,0 +1,18 @@ +_: { + base00 = "#171B20"; + base01 = "#21262e"; + base02 = "#2b323b"; + base03 = "#3c4453"; + base04 = "#485263"; + base05 = "#b6beca"; + base06 = "#dee1e6"; + base07 = "#dee1e6"; + base08 = "#70A5EB"; + base09 = "#e9a180"; + base0A = "#f1cf8a"; + base0B = "#78DBA9"; + base0C = "#e26c7c"; + base0D = "#86aaec"; + base0E = "#c68aee"; + base0F = "#9cd1ff"; +} diff --git a/modules/editors/nixvim/colors/everblush.nix b/modules/editors/nixvim/colors/everblush.nix new file mode 100644 index 0000000..1001cf7 --- /dev/null +++ b/modules/editors/nixvim/colors/everblush.nix @@ -0,0 +1,18 @@ +_: { + base00 = "#101618"; + base01 = "#232a2d"; + base02 = "#2d3437"; + base03 = "#404749"; + base04 = "#4f5658"; + base05 = "#cacaca"; + base06 = "#d2d2d2"; + base07 = "#dadada"; + base08 = "#e57474"; + base09 = "#e19d5c"; + base0A = "#e5c76b"; + base0B = "#8ccf7e"; + base0C = "#71baf2"; + base0D = "#67cbe7"; + base0E = "#c47fd5"; + base0F = "#ef7d7d"; +} diff --git a/modules/editors/nixvim/colors/everforest.nix b/modules/editors/nixvim/colors/everforest.nix new file mode 100644 index 0000000..3dcab6a --- /dev/null +++ b/modules/editors/nixvim/colors/everforest.nix @@ -0,0 +1,18 @@ +_: { + base00 = "#2b3339"; + base01 = "#323c41"; + base02 = "#3a4248"; + base03 = "#868d80"; + base04 = "#d3c6aa"; + base05 = "#d3c6aa"; + base06 = "#e9e8d2"; + base07 = "#fff9e8"; + base08 = "#7fbbb3"; + base09 = "#d699b6"; + base0A = "#83c092"; + base0B = "#dbbc7f"; + base0C = "#e69875"; + base0D = "#a7c080"; + base0E = "#e67e80"; + base0F = "#d699b6"; +} diff --git a/modules/editors/nixvim/colors/gruvbox.nix b/modules/editors/nixvim/colors/gruvbox.nix new file mode 100644 index 0000000..a8c168b --- /dev/null +++ b/modules/editors/nixvim/colors/gruvbox.nix @@ -0,0 +1,18 @@ +_: { + base00 = "#1e2122"; + base01 = "#2c2f30"; + base02 = "#36393a"; + base03 = "#404344"; + base04 = "#d4be98"; + base05 = "#c0b196"; + base06 = "#c3b499"; + base07 = "#c7b89d"; + base08 = "#ec6b64"; + base09 = "#e78a4e"; + base0A = "#e0c080"; + base0B = "#a9b665"; + base0C = "#86b17f"; + base0D = "#7daea3"; + base0E = "#d3869b"; + base0F = "#d65d0e"; +} diff --git a/modules/editors/nixvim/colors/jellybeans.nix b/modules/editors/nixvim/colors/jellybeans.nix new file mode 100644 index 0000000..c50828b --- /dev/null +++ b/modules/editors/nixvim/colors/jellybeans.nix @@ -0,0 +1,18 @@ +_: { + base00 = "#151515"; + base01 = "#1c1c1c"; + base02 = "#404040"; + base03 = "#888888"; + base04 = "#ddddbf"; + base05 = "#e8e8d3"; + base06 = "#eeeede"; + base07 = "#f1f1e5"; + base08 = "#cf6a4c"; + base09 = "#d8ad4c"; + base0A = "#d8ad4c"; + base0B = "#99ad6a"; + base0C = "#71b9f8"; + base0D = "#597bc5"; + base0E = "#c6b6ee"; + base0F = "#d8ad4c"; +} diff --git a/modules/editors/nixvim/colors/mountain.nix b/modules/editors/nixvim/colors/mountain.nix new file mode 100644 index 0000000..78990a5 --- /dev/null +++ b/modules/editors/nixvim/colors/mountain.nix @@ -0,0 +1,18 @@ +_: { + base00 = "#0f0f0f"; + base01 = "#151515"; + base02 = "#191919"; + base03 = "#323232"; + base04 = "#535353"; + base05 = "#f0f0f0"; + base06 = "#d8d8d8"; + base07 = "#414141"; + base08 = "#ac8a8c"; + base09 = "#d3d0ad"; + base0A = "#ACA98A"; + base0B = "#8aac8b"; + base0C = "#9EC3C4"; + base0D = "#8fb4b5"; + base0E = "#C49EC4"; + base0F = "#9d9a7b"; +} diff --git a/modules/editors/nixvim/colors/paradise.nix b/modules/editors/nixvim/colors/paradise.nix new file mode 100644 index 0000000..544bdd7 --- /dev/null +++ b/modules/editors/nixvim/colors/paradise.nix @@ -0,0 +1,18 @@ +_: { + base00 = "#151515"; + base01 = "#1F1F1F"; + base02 = "#2E2E2E"; + base03 = "#424242"; + base04 = "#BBB6B6"; + base05 = "#E8E3E3"; + base06 = "#E8E3E3"; + base07 = "#E8E3E3"; + base08 = "#B66467"; + base09 = "#D9BC8C"; + base0A = "#D9BC8C"; + base0B = "#8C977D"; + base0C = "#8AA6A2"; + base0D = "#8DA3B9"; + base0E = "#A988B0"; + base0F = "#BBB6B6"; +} diff --git a/modules/editors/nixvim/colors/tokyonight.nix b/modules/editors/nixvim/colors/tokyonight.nix new file mode 100644 index 0000000..4b226a3 --- /dev/null +++ b/modules/editors/nixvim/colors/tokyonight.nix @@ -0,0 +1,18 @@ +_: { + base00 = "#1A1B26"; + base01 = "#3b4261"; + base02 = "#3b4261"; + base03 = "#545c7e"; + base04 = "#565c64"; + base05 = "#a9b1d6"; + base06 = "#bbc5f0"; + base07 = "#c0caf5"; + base08 = "#f7768e"; + base09 = "#ff9e64"; + base0A = "#e0af68"; + base0B = "#9ece6a"; + base0C = "#2ac3de"; + base0D = "#7aa2f7"; + base0E = "#9d7cd8"; + base0F = "#9abdf5"; +} diff --git a/modules/editors/nixvim/default.nix b/modules/editors/nixvim/default.nix index 2d69264..e746d42 100644 --- a/modules/editors/nixvim/default.nix +++ b/modules/editors/nixvim/default.nix @@ -1,3 +1,3 @@ -_:{ - imports = [./nixvim.nix ]; +_: { + imports = [./nixvim.nix]; } diff --git a/modules/editors/nixvim/highlight.nix b/modules/editors/nixvim/highlight.nix new file mode 100644 index 0000000..8c4e538 --- /dev/null +++ b/modules/editors/nixvim/highlight.nix @@ -0,0 +1,121 @@ +{ + config, + lib, + ... +}: let + colors = import ./colors/${config.theme}.nix {}; +in { + config = lib.mkIf config.colorschemes.base16.enable { + highlight = { + CursorLine = { + fg = "none"; + bg = "none"; + }; + CursorLineNr = { + fg = "none"; + bg = "none"; + }; + + AlphaHeader = { + fg = colors.base0E; + bg = "none"; + }; + + StatusNormal = { + bg = "none"; + fg = "none"; + }; + + TelescopePromptBorder = { + fg = colors.base01; + bg = colors.base01; + }; + TelescopePromptNormal = { + fg = "none"; + bg = colors.base01; + }; + TelescopePromptPrefix = { + fg = colors.base08; + bg = colors.base01; + }; + + TelescopeSelection = { + fg = "none"; + bg = colors.base01; + }; + + Pmenu = { + fg = "none"; + bg = colors.base01; + }; + PmenuSbar = { + fg = "none"; + bg = colors.base01; + }; + PmenuThumb = { + fg = "none"; + bg = colors.base01; + }; + PmenuSel = { + fg = "none"; + bg = colors.base02; + }; + + CmpItemAbbrMatch = { + fg = colors.base05; + bg = "none"; + }; + CmpItemAbbrMatchFuzzy = { + fg = colors.base05; + bg = "none"; + }; + CmpItemAbbr = { + fg = colors.base03; + bg = "none"; + }; + CmpItemKind = { + fg = colors.base0E; + bg = "none"; + }; + CmpItemMenu = { + fg = colors.base0E; + bg = "none"; + }; + CmpItemKindSnippet = { + fg = colors.base0E; + bg = "none"; + }; + + VertSplit = { + fg = colors.base01; + bg = "none"; + }; + FloatBorder = { + fg = colors.base01; + bg = colors.base01; + }; + NormalFloat = { + fg = "none"; + bg = colors.base01; + }; + + LineNr = { + fg = colors.base03; + bg = "none"; + }; + + NoiceCmdlinePopup = { + fg = colors.base04; + bg = colors.base01; + }; + NoiceCmdlinePopupBorder = { + fg = colors.base01; + bg = colors.base01; + }; + NoiceCmdlinePopupBorderSearch = { + fg = colors.base01; + bg = colors.base01; + }; + }; + }; +} diff --git a/modules/editors/nixvim/keys.nix b/modules/editors/nixvim/keys.nix index 73878ab..e419581 100644 --- a/modules/editors/nixvim/keys.nix +++ b/modules/editors/nixvim/keys.nix @@ -1,408 +1,408 @@ { -programs.nixvim = { - globals.mapleader = " "; + programs.nixvim = { + globals.mapleader = " "; - keymaps = [ - { - mode = "n"; - key = "f"; - action = "+find/file"; - desc = "Find a file"; - } - { - mode = "n"; - key = "s"; - action = "+search"; - desc = "Search in your file"; - } + keymaps = [ + { + mode = "n"; + key = "f"; + action = "+find/file"; + options.desc = "Find a file"; + } + { + mode = "n"; + key = "s"; + action = "+search"; + options.desc = "Search in your file"; + } - { - mode = "n"; - key = "q"; - action = "+quit/session"; - desc = "Quit the current session"; - } + { + mode = "n"; + key = "q"; + action = "+quit/session"; + options.desc = "Quit the current session"; + } - { - mode = ["n" "v"]; - key = "g"; - action = "+git"; - } + { + mode = ["n" "v"]; + key = "g"; + action = "+git"; + } - { - mode = "n"; - key = "u"; - action = "+ui"; - } + { + mode = "n"; + key = "u"; + action = "+ui"; + } - { - mode = "n"; - key = "w"; - action = "+windows"; - } + { + mode = "n"; + key = "w"; + action = "+windows"; + } - { - mode = "n"; - key = ""; - action = "+tab"; - } + { + mode = "n"; + key = ""; + action = "+tab"; + } - { - mode = ["n" "v"]; - key = "d"; - action = "+debug"; - } + { + mode = ["n" "v"]; + key = "d"; + action = "+debug"; + } - { - mode = ["n" "v"]; - key = "c"; - action = "+code"; - } + { + mode = ["n" "v"]; + key = "c"; + action = "+code"; + } - { - mode = ["n" "v"]; - key = "t"; - action = "+test"; - } + { + mode = ["n" "v"]; + key = "t"; + action = "+test"; + } - # Tabs - { - mode = "n"; - key = ""; - action = "tabnew"; - options = { - silent = true; - desc = "New Tab"; - }; - } + # Tabs + { + mode = "n"; + key = ""; + action = "tabnew"; + options = { + silent = true; + desc = "New Tab"; + }; + } - { - mode = "n"; - key = "d"; - action = "tabclose"; - options = { - silent = true; - desc = "Close tab"; - }; - } + { + mode = "n"; + key = "d"; + action = "tabclose"; + options = { + silent = true; + desc = "Close tab"; + }; + } - # Windows - { - mode = "n"; - key = "ww"; - action = "p"; - options = { - silent = true; - desc = "Other window"; - }; - } + # Windows + { + mode = "n"; + key = "ww"; + action = "p"; + options = { + silent = true; + desc = "Other window"; + }; + } - { - mode = "n"; - key = "wd"; - action = "c"; - options = { - silent = true; - desc = "Delete window"; - }; - } + { + mode = "n"; + key = "wd"; + action = "c"; + options = { + silent = true; + desc = "Delete window"; + }; + } - { - mode = "n"; - key = "w-"; - action = "s"; - options = { - silent = true; - desc = "Split window below"; - }; - } + { + mode = "n"; + key = "w-"; + action = "s"; + options = { + silent = true; + desc = "Split window below"; + }; + } - { - mode = "n"; - key = "w|"; - action = "v"; - options = { - silent = true; - desc = "Split window right"; - }; - } + { + mode = "n"; + key = "w|"; + action = "v"; + options = { + silent = true; + desc = "Split window right"; + }; + } - { - mode = "n"; - key = ""; - action = "h"; - options = { - silent = true; - desc = "Move to window left"; - }; - } + { + mode = "n"; + key = ""; + action = "h"; + options = { + silent = true; + desc = "Move to window left"; + }; + } - { - mode = "n"; - key = ""; - action = "l"; - options = { - silent = true; - desc = "Move to window right"; - }; - } + { + mode = "n"; + key = ""; + action = "l"; + options = { + silent = true; + desc = "Move to window right"; + }; + } - { - mode = "n"; - key = ""; - action = "k"; - options = { - silent = true; - desc = "Move to window over"; - }; - } + { + mode = "n"; + key = ""; + action = "k"; + options = { + silent = true; + desc = "Move to window over"; + }; + } - { - mode = "n"; - key = ""; - action = "j"; - options = { - silent = true; - desc = "Move to window bellow"; - }; - } + { + mode = "n"; + key = ""; + action = "j"; + options = { + silent = true; + desc = "Move to window bellow"; + }; + } - { - mode = "n"; - key = ""; - action = "w"; - options = { - silent = true; - desc = "Save file"; - }; - } + { + mode = "n"; + key = ""; + action = "w"; + options = { + silent = true; + desc = "Save file"; + }; + } - # Quit/Session - { - mode = "n"; - key = "qq"; - action = "quitall"; - options = { - silent = true; - desc = "Quit all"; - }; - } + # Quit/Session + { + mode = "n"; + key = "qq"; + action = "quitall"; + options = { + silent = true; + desc = "Quit all"; + }; + } - { - mode = "n"; - key = "ul"; - action = ":lua ToggleLineNumber()"; - options = { - silent = true; - desc = "Toggle Line Numbers"; - }; - } + { + mode = "n"; + key = "ul"; + action = ":lua ToggleLineNumber()"; + options = { + silent = true; + desc = "Toggle Line Numbers"; + }; + } - { - mode = "n"; - key = "uL"; - action = ":lua ToggleRelativeLineNumber()"; - options = { - silent = true; - desc = "Toggle Relative Line Numbers"; - }; - } + { + mode = "n"; + key = "uL"; + action = ":lua ToggleRelativeLineNumber()"; + options = { + silent = true; + desc = "Toggle Relative Line Numbers"; + }; + } - { - mode = "n"; - key = "uw"; - action = ":lua ToggleWrap()"; - options = { - silent = true; - desc = "Toggle Line Wrap"; - }; - } + { + mode = "n"; + key = "uw"; + action = ":lua ToggleWrap()"; + options = { + silent = true; + desc = "Toggle Line Wrap"; + }; + } - { - mode = "v"; - key = "J"; - action = ":m '>+1gv=gv"; - options = {desc = "Use move command when line is highlighted ";}; - } + { + mode = "v"; + key = "J"; + action = ":m '>+1gv=gv"; + options = {desc = "Use move command when line is highlighted ";}; + } - { - mode = "v"; - key = "K"; - action = ":m '>-2gv=gv"; - options = {desc = "Use move command when line is highlighted ";}; - } + { + mode = "v"; + key = "K"; + action = ":m '>-2gv=gv"; + options = {desc = "Use move command when line is highlighted ";}; + } - { - mode = "n"; - key = "J"; - action = "mzJ`z"; - options = { - desc = "Allow cursor to stay in the same place after appending to current line "; - }; - } + { + mode = "n"; + key = "J"; + action = "mzJ`z"; + options = { + desc = "Allow cursor to stay in the same place after appending to current line "; + }; + } - { - mode = "n"; - key = ""; - action = "zz"; - options = { - desc = "Allow C-d and C-u to keep the cursor in the middle"; - }; - } + { + mode = "n"; + key = ""; + action = "zz"; + options = { + desc = "Allow C-d and C-u to keep the cursor in the middle"; + }; + } - { - mode = "n"; - key = ""; - action = "zz"; - options = { - desc = "Allow C-d and C-u to keep the cursor in the middle"; - }; - } + { + mode = "n"; + key = ""; + action = "zz"; + options = { + desc = "Allow C-d and C-u to keep the cursor in the middle"; + }; + } - { - mode = "n"; - key = "n"; - action = "nzzzv"; - options = {desc = "Allow search terms to stay in the middle ";}; - } + { + mode = "n"; + key = "n"; + action = "nzzzv"; + options = {desc = "Allow search terms to stay in the middle ";}; + } - { - mode = "n"; - key = "N"; - action = "Nzzzv"; - options = {desc = "Allow search terms to stay in the middle ";}; - } + { + mode = "n"; + key = "N"; + action = "Nzzzv"; + options = {desc = "Allow search terms to stay in the middle ";}; + } - # Paste stuff without saving the deleted word into the buffer - { - mode = "x"; - key = "p"; - action = ''"_dP''; - options = {desc = "Deletes to void register and paste over";}; - } + # Paste stuff without saving the deleted word into the buffer + { + mode = "x"; + key = "p"; + action = ''"_dP''; + options = {desc = "Deletes to void register and paste over";}; + } - # Copy stuff to system clipboard with + y or just y to have it just in vim - { - mode = ["n" "v"]; - key = "y"; - action = ''"+y''; - options = {desc = "Copy to system clipboard";}; - } + # Copy stuff to system clipboard with + y or just y to have it just in vim + { + mode = ["n" "v"]; + key = "y"; + action = ''"+y''; + options = {desc = "Copy to system clipboard";}; + } - { - mode = ["n" "v"]; - key = "Y"; - action = ''"+Y''; - options = {desc = "Copy to system clipboard";}; - } + { + mode = ["n" "v"]; + key = "Y"; + action = ''"+Y''; + options = {desc = "Copy to system clipboard";}; + } - # Delete to void register - { - mode = ["n" "v"]; - key = "D"; - action = ''"_d''; - options = {desc = "Delete to void register";}; - } + # Delete to void register + { + mode = ["n" "v"]; + key = "D"; + action = ''"_d''; + options = {desc = "Delete to void register";}; + } - # instead of pressing esc just because - { - mode = "i"; - key = ""; - action = ""; - } + # instead of pressing esc just because + { + mode = "i"; + key = ""; + action = ""; + } - { - mode = "n"; - key = "zz"; - action = " ZenMode | Pencil"; - options = {desc = "Toggle writting mode";}; - } + { + mode = "n"; + key = "zz"; + action = " ZenMode | Pencil"; + options = {desc = "Toggle writting mode";}; + } - { - mode = "n"; - key = "m"; - action = " Grapple toggle "; - options = {desc = "Grapple Toggle tag";}; - } + { + mode = "n"; + key = "m"; + action = " Grapple toggle "; + options = {desc = "Grapple Toggle tag";}; + } - { - mode = "n"; - key = "k"; - action = " Grapple toggle_tags "; - options = {desc = "Grapple Toggle tag";}; - } + { + mode = "n"; + key = "k"; + action = " Grapple toggle_tags "; + options = {desc = "Grapple Toggle tag";}; + } - { - mode = "n"; - key = "K"; - action = " Grapple toggle_scopes "; - options = {desc = "Grapple Toggle scopes";}; - } + { + mode = "n"; + key = "K"; + action = " Grapple toggle_scopes "; + options = {desc = "Grapple Toggle scopes";}; + } - { - mode = "n"; - key = "j"; - action = " Grapple cycle forward "; - options = {desc = "Grapple Cycle forward";}; - } + { + mode = "n"; + key = "j"; + action = " Grapple cycle forward "; + options = {desc = "Grapple Cycle forward";}; + } - { - mode = "n"; - key = "J"; - action = " Grapple cycle backward "; - options = {desc = "Grapple Cycle backward";}; - } + { + mode = "n"; + key = "J"; + action = " Grapple cycle backward "; + options = {desc = "Grapple Cycle backward";}; + } - { - mode = "n"; - key = "1"; - action = " Grapple select index=1"; - options = {desc = "Grapple Select 1";}; - } + { + mode = "n"; + key = "1"; + action = " Grapple select index=1"; + options = {desc = "Grapple Select 1";}; + } - { - mode = "n"; - key = "2"; - action = " Grapple select index=2"; - options = {desc = "Grapple Select 2";}; - } + { + mode = "n"; + key = "2"; + action = " Grapple select index=2"; + options = {desc = "Grapple Select 2";}; + } - { - mode = "n"; - key = "3"; - action = " Grapple select index=3"; - options = {desc = "Grapple Select 3";}; - } + { + mode = "n"; + key = "3"; + action = " Grapple select index=3"; + options = {desc = "Grapple Select 3";}; + } - { - mode = "n"; - key = "4"; - action = " Grapple select index=4"; - options = {desc = "Grapple Select 4";}; - } - ]; - extraConfigLua = '' - function ToggleLineNumber() - if vim.wo.number then - vim.wo.number = false - else - vim.wo.number = true - vim.wo.relativenumber = false - end - end - - function ToggleRelativeLineNumber() - if vim.wo.relativenumber then + { + mode = "n"; + key = "4"; + action = " Grapple select index=4"; + options = {desc = "Grapple Select 4";}; + } + ]; + extraConfigLua = '' + function ToggleLineNumber() + if vim.wo.number then + vim.wo.number = false + else + vim.wo.number = true vim.wo.relativenumber = false - else - vim.wo.relativenumber = true - vim.wo.number = false - end - end + end + end - function ToggleWrap() - vim.wo.wrap = not vim.wo.wrap - end - ''; -}; + function ToggleRelativeLineNumber() + if vim.wo.relativenumber then + vim.wo.relativenumber = false + else + vim.wo.relativenumber = true + vim.wo.number = false + end + end + + function ToggleWrap() + vim.wo.wrap = not vim.wo.wrap + end + ''; + }; } diff --git a/modules/editors/nixvim/nixvim.nix b/modules/editors/nixvim/nixvim.nix index d9a9854..25849d1 100644 --- a/modules/editors/nixvim/nixvim.nix +++ b/modules/editors/nixvim/nixvim.nix @@ -1,9 +1,13 @@ -{ config, lib, ... }: -let cfg = config.modules.editors.nixvim; +{ + config, + lib, + ... +}: let + cfg = config.modules.editors.nixvim; in { options.modules.editors.nixvim.enable = lib.mkEnableOption "nixvim"; imports = [ - #./keys.nix + ./keys.nix ./settings.nix ./plug/completion/cmp.nix #./plug/completion/copilot-cmp.nix @@ -30,7 +34,7 @@ in { ./plug/treesitter/treesitter-textobjects.nix ./plug/treesitter/treesitter.nix - #./plug/ui/alpha.nix + ./plug/ui/alpha.nix ./plug/ui/btw.nix ./plug/ui/bufferline.nix ./plug/ui/noice.nix @@ -38,7 +42,7 @@ in { ./plug/ui/telescope.nix ./plug/utils/comment.nix - ./plug/utils/copilot.nix + #./plug/utils/copilot.nix ./plug/utils/flash.nix ./plug/utils/hardtime.nix #./plug/utils/harpoon.nix @@ -49,15 +53,18 @@ in { ./plug/utils/undotree.nix ./plug/utils/ufo.nix ./plug/utils/whichkey.nix - ]; - config = lib.mkIf cfg.enable { - programs.nixvim = { - enable = true; - colorschemes.gruvbox = { - enable = true; - settings.transparent_mode = true; - }; + options = { + theme = lib.mkOption { + default = "gruvbox"; + type = lib.types.enum ["paradise" "decay" "mountain" "tokyonight" "everforest" "everblush" "jellybeans" "aquarium" "gruvbox"]; }; }; + config = lib.mkIf cfg.enable { + programs.nixvim.enable = true; + theme = "gruvbox"; + programs.nixvim.extraConfigLua = '' + _G.theme = "${config.theme}" + ''; + }; } diff --git a/modules/editors/nixvim/plug/completion/cmp.nix b/modules/editors/nixvim/plug/completion/cmp.nix index 47059c4..038d3d4 100644 --- a/modules/editors/nixvim/plug/completion/cmp.nix +++ b/modules/editors/nixvim/plug/completion/cmp.nix @@ -1,5 +1,6 @@ { - programs.nixvim.plugins = { + programs.nixvim = { + plugins = { cmp-emoji = {enable = true;}; cmp = { enable = true; @@ -117,4 +118,5 @@ -- end -- } }) ''; + }; } diff --git a/modules/editors/nixvim/plug/git/gitsigns.nix b/modules/editors/nixvim/plug/git/gitsigns.nix index c8ed868..bb72997 100644 --- a/modules/editors/nixvim/plug/git/gitsigns.nix +++ b/modules/editors/nixvim/plug/git/gitsigns.nix @@ -1,5 +1,6 @@ { - programs.nixvim.plugins.gitsigns = { + programs.nixvim = { + plugins.gitsigns = { enable = true; settings = { trouble = true; @@ -73,4 +74,5 @@ }; } ]; +}; } diff --git a/modules/editors/nixvim/plug/lsp/none-ls.nix b/modules/editors/nixvim/plug/lsp/none-ls.nix index d7c4245..2799a30 100644 --- a/modules/editors/nixvim/plug/lsp/none-ls.nix +++ b/modules/editors/nixvim/plug/lsp/none-ls.nix @@ -1,4 +1,5 @@ { + programs.nixvim = { plugins.none-ls = { enable = true; enableLspFormat = true; @@ -47,4 +48,5 @@ }; } ]; +}; } diff --git a/modules/editors/nixvim/plug/lsp/trouble.nix b/modules/editors/nixvim/plug/lsp/trouble.nix index 343c92f..f11b89a 100644 --- a/modules/editors/nixvim/plug/lsp/trouble.nix +++ b/modules/editors/nixvim/plug/lsp/trouble.nix @@ -1,5 +1,5 @@ { - plugins.trouble = { + programs.nixvim.plugins.trouble = { enable = true; }; } diff --git a/modules/editors/nixvim/plug/snippets/luasnip.nix b/modules/editors/nixvim/plug/snippets/luasnip.nix index 3a3c41a..70a161c 100644 --- a/modules/editors/nixvim/plug/snippets/luasnip.nix +++ b/modules/editors/nixvim/plug/snippets/luasnip.nix @@ -1,5 +1,5 @@ {pkgs, ...}: { - plugins.luasnip = { + programs.nixvim.plugins.luasnip = { enable = true; extraConfig = { enable_autosnippets = true; diff --git a/modules/editors/nixvim/plug/statusline/lualine.nix b/modules/editors/nixvim/plug/statusline/lualine.nix index b47efbd..fc8cd20 100644 --- a/modules/editors/nixvim/plug/statusline/lualine.nix +++ b/modules/editors/nixvim/plug/statusline/lualine.nix @@ -1,30 +1,30 @@ { - plugins.lualine = { + programs.nixvim.plugins.lualine = { enable = true; globalstatus = true; disabledFiletypes = { statusline = ["dashboard" "alpha" "starter"]; }; - theme = { - normal = { - a = { - bg = "#b4befe"; - fg = "#1c1d21"; - }; - b = { - bg = "nil"; - }; - c = { - bg = "nil"; - }; - z = { - bg = "nil"; - }; - y = { - bg = "nil"; - }; - }; - }; +# theme = { +# normal = { +# a = { +# bg = "#b4befe"; +# fg = "#1c1d21"; +# }; +# b = { +# bg = "nil"; +# }; +# c = { +# bg = "nil"; +# }; +# z = { +# bg = "nil"; +# }; +# y = { +# bg = "nil"; +# }; +# }; +# }; sections = { lualine_a = [ { diff --git a/modules/editors/nixvim/plug/treesitter/treesitter-context.nix b/modules/editors/nixvim/plug/treesitter/treesitter-context.nix index b588c8f..5e08da4 100644 --- a/modules/editors/nixvim/plug/treesitter/treesitter-context.nix +++ b/modules/editors/nixvim/plug/treesitter/treesitter-context.nix @@ -1,5 +1,5 @@ { - plugins.treesitter-context = { + programs.nixvim.plugins.treesitter-context = { enable = true; }; } diff --git a/modules/editors/nixvim/plug/treesitter/treesitter-textobjects.nix b/modules/editors/nixvim/plug/treesitter/treesitter-textobjects.nix index 29820cf..090c11e 100644 --- a/modules/editors/nixvim/plug/treesitter/treesitter-textobjects.nix +++ b/modules/editors/nixvim/plug/treesitter/treesitter-textobjects.nix @@ -1,5 +1,5 @@ { - plugins.treesitter-textobjects = { + programs.nixvim.plugins.treesitter-textobjects = { enable = false; select = { enable = true; diff --git a/modules/editors/nixvim/plug/treesitter/treesitter.nix b/modules/editors/nixvim/plug/treesitter/treesitter.nix index c4f4d71..35be148 100644 --- a/modules/editors/nixvim/plug/treesitter/treesitter.nix +++ b/modules/editors/nixvim/plug/treesitter/treesitter.nix @@ -10,6 +10,7 @@ }; }; in { + programs.nixvim = { filetype.extension.liq = "liquidsoap"; filetype.extension.nu = "nu"; @@ -41,4 +42,5 @@ in { filetype = "nu", } ''; +}; } diff --git a/modules/editors/nixvim/plug/ui/alpha.nix b/modules/editors/nixvim/plug/ui/alpha.nix index c6e1d9c..7bc388c 100644 --- a/modules/editors/nixvim/plug/ui/alpha.nix +++ b/modules/editors/nixvim/plug/ui/alpha.nix @@ -1,19 +1,22 @@ { +programs.nixvim = { plugins.alpha = let nixFlake = [ - " " - " ▓█████ ██▓ ▓██ ██▓▄▄▄█████▓ ██░ ██ " - " ▓█ ▀ ▓██▒ ▒██ ██▒▓ ██▒ ▓▒▓██░ ██▒ " - " ▒███ ▒██░ ▒██ ██░▒ ▓██░ ▒░▒██▀▀██░ " - " ▒▓█ ▄ ▒██░ ░ ▐██▓░░ ▓██▓ ░ ░▓█ ░██ " - " ░▒████▒░██████▒ ░ ██▒▓░ ▒██▒ ░ ░▓█▒░██▓ " - " ░░ ▒░ ░░ ▒░▓ ░ ██▒▒▒ ▒ ░░ ▒ ░░▒░▒ " - " ░ ░ ░░ ░ ▒ ░▓██ ░▒░ ░ ▒ ░▒░ ░ " - " ░ ░ ░ ▒ ▒ ░░ ░ ░ ░░ ░ " - " ░ ░ ░ ░░ ░ ░ ░ ░ " - " ░ ░ " - " " - " git@github.com:elythh " + "⠄⠄⠄⢰⣧⣼⣯⠄⣸⣠⣶⣶⣦⣾⠄⠄⠄⠄⡀⠄⢀⣿⣿⠄⠄⠄⢸⡇⠄⠄" + "⠄⠄⠄⣾⣿⠿⠿⠶⠿⢿⣿⣿⣿⣿⣦⣤⣄⢀⡅⢠⣾⣛⡉⠄⠄⠄⠸⢀⣿⠄" + "⠄⠄⢀⡋⣡⣴⣶⣶⡀⠄⠄⠙⢿⣿⣿⣿⣿⣿⣴⣿⣿⣿⢃⣤⣄⣀⣥⣿⣿⠄" + "⠄⠄⢸⣇⠻⣿⣿⣿⣧⣀⢀⣠⡌⢻⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⠿⠿⣿⣿⣿⠄" + "⠄⢀⢸⣿⣷⣤⣤⣤⣬⣙⣛⢿⣿⣿⣿⣿⣿⣿⡿⣿⣿⡍⠄⠄⢀⣤⣄⠉⠋⣰" + "⠄⣼⣖⣿⣿⣿⣿⣿⣿⣿⣿⣿⢿⣿⣿⣿⣿⣿⢇⣿⣿⡷⠶⠶⢿⣿⣿⠇⢀⣤" + "⠘⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣽⣿⣿⣿⡇⣿⣿⣿⣿⣿⣿⣷⣶⣥⣴⣿⡗" + "⢀⠈⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡟⠄" + "⢸⣿⣦⣌⣛⣻⣿⣿⣧⠙⠛⠛⡭⠅⠒⠦⠭⣭⡻⣿⣿⣿⣿⣿⣿⣿⣿⡿⠃⠄" + "⠘⣿⣿⣿⣿⣿⣿⣿⣿⡆⠄⠄⠄⠄⠄⠄⠄⠄⠹⠈⢋⣽⣿⣿⣿⣿⣵⣾⠃⠄" + "⠄⠘⣿⣿⣿⣿⣿⣿⣿⣿⠄⣴⣿⣶⣄⠄⣴⣶⠄⢀⣾⣿⣿⣿⣿⣿⣿⠃⠄⠄" + "⠄⠄⠈⠻⣿⣿⣿⣿⣿⣿⡄⢻⣿⣿⣿⠄⣿⣿⡀⣾⣿⣿⣿⣿⣛⠛⠁⠄⠄⠄" + "⠄⠄⠄⠄⠈⠛⢿⣿⣿⣿⠁⠞⢿⣿⣿⡄⢿⣿⡇⣸⣿⣿⠿⠛⠁⠄⠄⠄⠄⠄" + "⠄⠄⠄⠄⠄⠄⠄⠉⠻⣿⣿⣾⣦⡙⠻⣷⣾⣿⠃⠿⠋⠁⠄⠄⠄⠄⠄⢀⣠⣴" + "⣿⣿⣿⣶⣶⣮⣥⣒⠲⢮⣝⡿⣿⣿⡆⣿⡿⠃⠄⠄⠄⠄⠄⠄⠄⣠⣴⣿⣿⣿" ]; in { enable = true; @@ -86,4 +89,5 @@ } ]; }; +}; } diff --git a/modules/editors/nixvim/plug/ui/btw.nix b/modules/editors/nixvim/plug/ui/btw.nix index 5e063cd..42db20d 100644 --- a/modules/editors/nixvim/plug/ui/btw.nix +++ b/modules/editors/nixvim/plug/ui/btw.nix @@ -1,4 +1,5 @@ {pkgs, ...}: { + programs.nixvim = { extraPlugins = with pkgs.vimUtils; [ (buildVimPlugin { pname = "btw.nvim"; @@ -17,4 +18,5 @@ text = "I use Neovim (and NixOS, BTW)", }) ''; +}; } diff --git a/modules/editors/nixvim/plug/ui/bufferline.nix b/modules/editors/nixvim/plug/ui/bufferline.nix index 975b2f4..df440e2 100644 --- a/modules/editors/nixvim/plug/ui/bufferline.nix +++ b/modules/editors/nixvim/plug/ui/bufferline.nix @@ -5,11 +5,12 @@ }: let colors = import ../../colors/${config.theme}.nix {}; in { + programs.nixvim = { plugins = { bufferline = { enable = true; separatorStyle = "thick"; # “slant”, “padded_slant”, “slope”, “padded_slope”, “thick”, “thin” - highlights = lib.mkIf config.colorschemes.base16.enable { + highlights = { fill = { fg = colors.base00; bg = colors.base00; @@ -172,4 +173,5 @@ in { }; } ]; +}; } diff --git a/modules/editors/nixvim/plug/ui/noice.nix b/modules/editors/nixvim/plug/ui/noice.nix index 51db89d..7d96f43 100644 --- a/modules/editors/nixvim/plug/ui/noice.nix +++ b/modules/editors/nixvim/plug/ui/noice.nix @@ -1,5 +1,5 @@ { - plugins.noice = { + programs.nixvim.plugins.noice = { enable = true; notify = { enabled = false; diff --git a/modules/editors/nixvim/plug/ui/nvim-notify.nix b/modules/editors/nixvim/plug/ui/nvim-notify.nix index 644e708..810aa1c 100644 --- a/modules/editors/nixvim/plug/ui/nvim-notify.nix +++ b/modules/editors/nixvim/plug/ui/nvim-notify.nix @@ -1,4 +1,5 @@ { + programs.nixvim = { plugins.notify = { enable = true; backgroundColour = "#000000"; @@ -42,4 +43,5 @@ return notify(message, level, merged_opts) end ''; +}; } diff --git a/modules/editors/nixvim/plug/ui/telescope.nix b/modules/editors/nixvim/plug/ui/telescope.nix index ddcb801..9946048 100644 --- a/modules/editors/nixvim/plug/ui/telescope.nix +++ b/modules/editors/nixvim/plug/ui/telescope.nix @@ -1,4 +1,5 @@ { + programs.nixvim = { plugins.telescope = { enable = true; extensions = { @@ -207,4 +208,5 @@ } } ''; +}; } diff --git a/modules/editors/nixvim/plug/utils/comment.nix b/modules/editors/nixvim/plug/utils/comment.nix index 7ee4440..b55ef26 100644 --- a/modules/editors/nixvim/plug/utils/comment.nix +++ b/modules/editors/nixvim/plug/utils/comment.nix @@ -1,5 +1,5 @@ { - plugins.comment = { + programs.nixvim.plugins.comment = { enable = true; }; } diff --git a/modules/editors/nixvim/plug/utils/copilot.nix b/modules/editors/nixvim/plug/utils/copilot.nix index 92b88d7..a1c802a 100644 --- a/modules/editors/nixvim/plug/utils/copilot.nix +++ b/modules/editors/nixvim/plug/utils/copilot.nix @@ -10,6 +10,7 @@ hash = "sha256-Q+g81BQVQTY5J2c2ZWB7bjJLuNSdI0PAan+75YJ7mI0="; }; in { + programs.nixvim = { extraPlugins = with pkgs.vimUtils; [ (buildVimPlugin { pname = "copilotchat"; @@ -53,4 +54,5 @@ in { action = "CopilotChatCommit"; } ]; +}; } diff --git a/modules/editors/nixvim/plug/utils/flash.nix b/modules/editors/nixvim/plug/utils/flash.nix index 68de079..0493876 100644 --- a/modules/editors/nixvim/plug/utils/flash.nix +++ b/modules/editors/nixvim/plug/utils/flash.nix @@ -1,4 +1,5 @@ { + programs.nixvim = { plugins.flash = { enable = true; labels = "asdfghjklqwertyuiopzxcvbnm"; @@ -53,4 +54,5 @@ }; } ]; +}; } diff --git a/modules/editors/nixvim/plug/utils/grapple.nix b/modules/editors/nixvim/plug/utils/grapple.nix index 31bd6b9..d8ba0bf 100644 --- a/modules/editors/nixvim/plug/utils/grapple.nix +++ b/modules/editors/nixvim/plug/utils/grapple.nix @@ -1,4 +1,5 @@ {pkgs, ...}: { + programs.nixvim = { extraPlugins = with pkgs.vimUtils; [ (buildVimPlugin { pname = "grapple.nvim"; @@ -17,4 +18,5 @@ scope = "git_branch", }) ''; + }; } diff --git a/modules/editors/nixvim/plug/utils/hardtime.nix b/modules/editors/nixvim/plug/utils/hardtime.nix index ef8cbfb..b908500 100644 --- a/modules/editors/nixvim/plug/utils/hardtime.nix +++ b/modules/editors/nixvim/plug/utils/hardtime.nix @@ -1,5 +1,5 @@ { - plugins.hardtime = { + programs.nixvim.plugins.hardtime = { enable = true; enabled = true; disableMouse = true; diff --git a/modules/editors/nixvim/plug/utils/harpoon.nix b/modules/editors/nixvim/plug/utils/harpoon.nix index b55df68..0338407 100644 --- a/modules/editors/nixvim/plug/utils/harpoon.nix +++ b/modules/editors/nixvim/plug/utils/harpoon.nix @@ -1,5 +1,5 @@ { - plugins.harpoon = { + programs.nixvim.plugins.harpoon = { enable = true; enableTelescope = true; keymapsSilent = true; diff --git a/modules/editors/nixvim/plug/utils/illuminate.nix b/modules/editors/nixvim/plug/utils/illuminate.nix index 7bfedb7..f0bd7d4 100644 --- a/modules/editors/nixvim/plug/utils/illuminate.nix +++ b/modules/editors/nixvim/plug/utils/illuminate.nix @@ -1,5 +1,5 @@ { - plugins.illuminate = { + programs.nixvim.plugins.illuminate = { enable = true; underCursor = false; filetypesDenylist = [ diff --git a/modules/editors/nixvim/plug/utils/nvim-autopairs.nix b/modules/editors/nixvim/plug/utils/nvim-autopairs.nix index b748672..d86c709 100644 --- a/modules/editors/nixvim/plug/utils/nvim-autopairs.nix +++ b/modules/editors/nixvim/plug/utils/nvim-autopairs.nix @@ -1,5 +1,5 @@ { - plugins.nvim-autopairs = { + programs.nixvim.plugins.nvim-autopairs = { enable = true; }; } diff --git a/modules/editors/nixvim/plug/utils/oil.nix b/modules/editors/nixvim/plug/utils/oil.nix index bacaf4e..0a0ba37 100644 --- a/modules/editors/nixvim/plug/utils/oil.nix +++ b/modules/editors/nixvim/plug/utils/oil.nix @@ -1,4 +1,5 @@ { + programs.nixvim = { plugins.oil = { enable = true; settings = { @@ -47,4 +48,5 @@ }; } ]; +}; } diff --git a/modules/editors/nixvim/plug/utils/ufo.nix b/modules/editors/nixvim/plug/utils/ufo.nix index fe621f8..c796c4b 100644 --- a/modules/editors/nixvim/plug/utils/ufo.nix +++ b/modules/editors/nixvim/plug/utils/ufo.nix @@ -1,5 +1,5 @@ { - plugins.nvim-ufo = { + programs.nixvim.plugins.nvim-ufo = { enable = true; }; } diff --git a/modules/editors/nixvim/plug/utils/undotree.nix b/modules/editors/nixvim/plug/utils/undotree.nix index 1d6923c..79d8304 100644 --- a/modules/editors/nixvim/plug/utils/undotree.nix +++ b/modules/editors/nixvim/plug/utils/undotree.nix @@ -1,4 +1,5 @@ { + programs.nixvim = { plugins.undotree = { enable = true; settings = { @@ -17,4 +18,5 @@ }; } ]; +}; } diff --git a/modules/editors/nixvim/plug/utils/whichkey.nix b/modules/editors/nixvim/plug/utils/whichkey.nix index f075fae..3841b71 100644 --- a/modules/editors/nixvim/plug/utils/whichkey.nix +++ b/modules/editors/nixvim/plug/utils/whichkey.nix @@ -1,5 +1,5 @@ { - plugins.which-key = { + programs.nixvim.plugins.which-key = { enable = true; }; } diff --git a/modules/gui/stylix.nix b/modules/gui/stylix.nix index 6973df1..1d5a039 100644 --- a/modules/gui/stylix.nix +++ b/modules/gui/stylix.nix @@ -36,7 +36,7 @@ in { applications = 0.9; popups = 0.9; desktop = 0.9; - terminal = 0.9; + terminal = 0.85; }; cursor = { package = pkgs.bibata-cursors;