From 0cfcd2e4143a41ea8816819f8ceeac962f58fbc8 Mon Sep 17 00:00:00 2001 From: pagedmov Date: Sun, 20 Oct 2024 15:48:30 -0400 Subject: [PATCH] moved gaming configuration to /sys module, added a bunch of neovim plugins --- modules/home/environment/gtk.nix | 10 +++--- modules/home/programs/gaming/gaming_pkgs.nix | 7 ---- modules/sys/software/default.nix | 2 +- .../software}/gaming/default.nix | 0 modules/sys/software/gaming/gaming_pkgs.nix | 7 ++++ .../software}/gaming/steam.nix | 0 modules/sys/software/nixvim/keymaps.nix | 5 +++ .../sys/software/nixvim/plugins/barbar.nix | 2 +- modules/sys/software/nixvim/plugins/cmp.nix | 3 ++ modules/sys/software/nixvim/plugins/coq.nix | 2 +- .../sys/software/nixvim/plugins/default.nix | 1 + .../sys/software/nixvim/plugins/haskell.nix | 18 ++++++++++ modules/sys/software/nixvim/plugins/lsp.nix | 4 +++ .../sys/software/nixvim/plugins/plugins.nix | 35 +++++++++++-------- modules/sys/software/packages.nix | 1 + 15 files changed, 67 insertions(+), 30 deletions(-) delete mode 100644 modules/home/programs/gaming/gaming_pkgs.nix rename modules/{home/programs => sys/software}/gaming/default.nix (100%) create mode 100644 modules/sys/software/gaming/gaming_pkgs.nix rename modules/{home/programs => sys/software}/gaming/steam.nix (100%) create mode 100644 modules/sys/software/nixvim/plugins/haskell.nix diff --git a/modules/home/environment/gtk.nix b/modules/home/environment/gtk.nix index cd4c7ca..2055b05 100644 --- a/modules/home/environment/gtk.nix +++ b/modules/home/environment/gtk.nix @@ -14,11 +14,11 @@ gtk = { enable = true; - cursorTheme = { - name = "Bibata-Modern-Ice"; - package = pkgs.bibata-cursors; - size = 16; - }; + #cursorTheme = { + # name = "Bibata-Modern-Ice"; + # package = pkgs.bibata-cursors; + # size = 16; + #}; #font = { # name = "Iosevka Nerd Font"; # package = pkgs.nerdfonts.override {fonts = ["Iosevka"];}; diff --git a/modules/home/programs/gaming/gaming_pkgs.nix b/modules/home/programs/gaming/gaming_pkgs.nix deleted file mode 100644 index b7689bb..0000000 --- a/modules/home/programs/gaming/gaming_pkgs.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: - -{ - home.packages = with pkgs; [ - snes9x-gtk - ]; -} diff --git a/modules/sys/software/default.nix b/modules/sys/software/default.nix index 744ea9b..3e3a2f1 100644 --- a/modules/sys/software/default.nix +++ b/modules/sys/software/default.nix @@ -10,7 +10,7 @@ }: let desktop_modules = if (host == "oganesson") then - [(import ./virtualization.nix)] + [(import ./virtualization.nix)] ++ [(import ./gaming)] else []; in { diff --git a/modules/home/programs/gaming/default.nix b/modules/sys/software/gaming/default.nix similarity index 100% rename from modules/home/programs/gaming/default.nix rename to modules/sys/software/gaming/default.nix diff --git a/modules/sys/software/gaming/gaming_pkgs.nix b/modules/sys/software/gaming/gaming_pkgs.nix new file mode 100644 index 0000000..29137c5 --- /dev/null +++ b/modules/sys/software/gaming/gaming_pkgs.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: + +{ + environment.systemPackages = with pkgs; [ + snes9x-gtk + ]; +} diff --git a/modules/home/programs/gaming/steam.nix b/modules/sys/software/gaming/steam.nix similarity index 100% rename from modules/home/programs/gaming/steam.nix rename to modules/sys/software/gaming/steam.nix diff --git a/modules/sys/software/nixvim/keymaps.nix b/modules/sys/software/nixvim/keymaps.nix index a7075de..7ad5ef4 100644 --- a/modules/sys/software/nixvim/keymaps.nix +++ b/modules/sys/software/nixvim/keymaps.nix @@ -26,6 +26,11 @@ key = ""; mode = "t"; } + { + action = "COQnow"; + key = "!cq"; + mode = "n"; + } ]; }; } diff --git a/modules/sys/software/nixvim/plugins/barbar.nix b/modules/sys/software/nixvim/plugins/barbar.nix index e77c725..215f6d6 100644 --- a/modules/sys/software/nixvim/plugins/barbar.nix +++ b/modules/sys/software/nixvim/plugins/barbar.nix @@ -1,7 +1,7 @@ { programs.nixvim = { plugins.barbar = { - enable = true; + enable = false; settings = { auto_hide = 1; }; diff --git a/modules/sys/software/nixvim/plugins/cmp.nix b/modules/sys/software/nixvim/plugins/cmp.nix index 3dfc9b8..d92b91f 100644 --- a/modules/sys/software/nixvim/plugins/cmp.nix +++ b/modules/sys/software/nixvim/plugins/cmp.nix @@ -8,5 +8,8 @@ {name = "buffer";} ]; }; + plugins.cmp-nvim-lsp.enable = true; + plugins.cmp-nvim-lsp-document-symbol.enable = true; + plugins.cmp-nvim-lsp-signature-help.enable = true; }; } diff --git a/modules/sys/software/nixvim/plugins/coq.nix b/modules/sys/software/nixvim/plugins/coq.nix index cadede4..64b8a8f 100644 --- a/modules/sys/software/nixvim/plugins/coq.nix +++ b/modules/sys/software/nixvim/plugins/coq.nix @@ -3,7 +3,7 @@ plugins.coq-nvim = { enable = true; settings = { - auto_start = true; + auto_start = false; }; }; }; diff --git a/modules/sys/software/nixvim/plugins/default.nix b/modules/sys/software/nixvim/plugins/default.nix index 9bad1ba..0514d52 100644 --- a/modules/sys/software/nixvim/plugins/default.nix +++ b/modules/sys/software/nixvim/plugins/default.nix @@ -1,6 +1,7 @@ { imports = [ ./alpha.nix + ./haskell.nix ./vim-matchup.nix ./coq.nix ./barbar.nix diff --git a/modules/sys/software/nixvim/plugins/haskell.nix b/modules/sys/software/nixvim/plugins/haskell.nix new file mode 100644 index 0000000..59f99af --- /dev/null +++ b/modules/sys/software/nixvim/plugins/haskell.nix @@ -0,0 +1,18 @@ +{ pkgs, ... }: { + programs.nixvim = { + extraPlugins = [ + (pkgs.vimUtils.buildVimPlugin { + name = "haskell-tools.nvim"; + src = pkgs.fetchFromGitHub { + owner = "mrcjkb"; + repo = "haskell-tools.nvim"; + rev = "39c4ced6f1bff1abc8d4df5027efd11ac38c6e6c"; + hash = "sha256-f+M35EwAlHwjJ2Xs2u9FLnyH0FJT22D0LLShDXCbEEs="; + }; + }) + ]; + plugins = { + haskell-scope-highlighting.enable = true; + }; + }; +} diff --git a/modules/sys/software/nixvim/plugins/lsp.nix b/modules/sys/software/nixvim/plugins/lsp.nix index 8238c2a..bd7e7d4 100644 --- a/modules/sys/software/nixvim/plugins/lsp.nix +++ b/modules/sys/software/nixvim/plugins/lsp.nix @@ -14,6 +14,10 @@ nil_ls.enable = true; pyright.enable = true; sqls.enable = true; + hls = { + enable = true; + installGhc = true; + }; }; }; }; diff --git a/modules/sys/software/nixvim/plugins/plugins.nix b/modules/sys/software/nixvim/plugins/plugins.nix index ec0a3a3..41dc2b1 100644 --- a/modules/sys/software/nixvim/plugins/plugins.nix +++ b/modules/sys/software/nixvim/plugins/plugins.nix @@ -1,24 +1,29 @@ { programs.nixvim = { plugins = { - nvim-surround.enable = true; - indent-blankline.enable = true; - treesitter.enable = true; - lastplace.enable = true; - markdown-preview.enable = true; - gitsigns.enable = true; - web-devicons.enable = true; - endwise.enable = true; - marks.enable = true; - trouble.enable = true; - floaterm.enable = true; - fugitive.enable = true; - rustaceanvim.enable = true; - firenvim.enable = true; - dap = { + dap = { enable = true; extensions.dap-ui.enable = true; }; + nix.enable = true; + neoscroll.enable = true; + endwise.enable = true; + firenvim.enable = true; + floaterm.enable = true; + fugitive.enable = true; + gitsigns.enable = true; + indent-blankline.enable = true; + lastplace.enable = true; + markdown-preview.enable = true; + marks.enable = true; + nvim-surround.enable = true; + rainbow-delimiters.enable = true; + render-markdown.enable = true; + rustaceanvim.enable = true; + treesitter.enable = true; + trim.enable = true; + trouble.enable = true; + web-devicons.enable = true; }; }; } diff --git a/modules/sys/software/packages.nix b/modules/sys/software/packages.nix index fa55ad7..14a7a13 100644 --- a/modules/sys/software/packages.nix +++ b/modules/sys/software/packages.nix @@ -9,6 +9,7 @@ alsa-utils bc cava + cabal-install clang clang-tools cmake