diff --git a/flake.lock b/flake.lock index a668d557..fc9977b0 100644 --- a/flake.lock +++ b/flake.lock @@ -440,22 +440,6 @@ "type": "github" } }, - "private": { - "flake": false, - "locked": { - "lastModified": 1667531394, - "narHash": "sha256-eo5s09w9DjRTqk4y+ULpYHQw5RNjNi+n9tEyvpbL84g=", - "owner": "thexyno", - "repo": "nixos-config-private-dummy", - "rev": "b38da5d5dd120e7dcc61b2ed3536be69fac649da", - "type": "github" - }, - "original": { - "owner": "thexyno", - "repo": "nixos-config-private-dummy", - "type": "github" - } - }, "rnix-lsp": { "inputs": { "naersk": "naersk", @@ -498,7 +482,6 @@ "octoprint-spoolmanager": "octoprint-spoolmanager", "octoprint-telegram": "octoprint-telegram", "pandoc-latex-template": "pandoc-latex-template", - "private": "private", "rnix-lsp": "rnix-lsp", "spoons": "spoons", "utils": "utils_2", diff --git a/flake.nix b/flake.nix index 9a366ef7..3f0c05c1 100644 --- a/flake.nix +++ b/flake.nix @@ -65,10 +65,6 @@ octoprint-spoolmanager.url = "github:OllisGit/OctoPrint-SpoolManager"; octoprint-spoolmanager.flake = false; - ## mail - private.url = "github:thexyno/nixos-config-private-dummy"; - private.flake = false; - }; outputs = diff --git a/hm-imports/nvim/config/lua/plugin/lsp.lua b/hm-imports/nvim/config/lua/plugin/lsp.lua index 6bb32c3f..ce6930bc 100644 --- a/hm-imports/nvim/config/lua/plugin/lsp.lua +++ b/hm-imports/nvim/config/lua/plugin/lsp.lua @@ -31,6 +31,7 @@ lspconfig.pyright.setup { capabilities = capabilities, on_attach = on_lsp_attach lspconfig.nil_ls.setup { capabilities = capabilities, on_attach = on_lsp_attach } -- nix -- lspconfig.rnix.setup { capabilities = capabilities, on_attach = on_lsp_attach } -- nix lspconfig.terraformls.setup { capabilities = capabilities, on_attach = on_lsp_attach } +lspconfig.kotlin_language_server.setup { capabilities = capabilities, on_attach = on_lsp_attach } lspconfig.tsserver.setup { capabilities = capabilities, on_attach = on_lsp_attach } lspconfig.vimls.setup { capabilities = capabilities, diff --git a/hm-imports/nvim/default.nix b/hm-imports/nvim/default.nix index c08b3254..a09e0f0a 100644 --- a/hm-imports/nvim/default.nix +++ b/hm-imports/nvim/default.nix @@ -1,111 +1,124 @@ { pkgs, config, lib, inputs, ... }: +let + cfg = config.ragon.nvim; +in { - home.packages = with pkgs;[ - # telescope - ripgrep - # embedded terminal - lazygit - glab - gh + options.ragon.nvim.enable = lib.mkOption { default = true; }; + options.ragon.nvim.maximal = lib.mkOption { default = false; }; + config = lib.mkIf cfg.enable { + home.packages = + (with pkgs;[ + # telescope + ripgrep + # embedded terminal + lazygit + glab + gh - # language servers - nil # nix - #inputs.rnix-lsp.packages."${pkgs.system}".rnix-lsp - gopls # go - pyright # python3 - terraform-ls - terraform - nodePackages.typescript - nodePackages.typescript-language-server - haskell-language-server - sumneko-lua-language-server - ltex-ls # languageTool - nodePackages.vscode-langservers-extracted # eslint, ... - texlab # latex - tectonic - # rust completion - cargo - rustc - rustfmt - unstable.rust-analyzer - # c# debugging - (pkgs.writeShellScriptBin "netcoredbg" ''exec ${pkgs.unstable.netcoredbg}/bin/netcoredbg "$@"'') # don't fill $path with dlls + # other stuff + neovim-remote + ]) ++ + lib.optionals cfg.maximal (with pkgs;[ + # language servers + nil # nix + #inputs.rnix-lsp.packages."${pkgs.system}".rnix-lsp + gopls # go + pyright # python3 + terraform-ls + terraform + nodePackages.typescript + nodePackages.typescript-language-server + haskell-language-server + sumneko-lua-language-server + ltex-ls # languageTool + nodePackages.vscode-langservers-extracted # eslint, ... + texlab # latex + tectonic + kotlin + kotlin-language-server + ktlint + # rust completion + cargo + rustc + rustfmt + unstable.rust-analyzer + # c# debugging + (pkgs.writeShellScriptBin "netcoredbg" ''exec ${pkgs.unstable.netcoredbg}/bin/netcoredbg "$@"'') # don't fill $path with dlls - # other stuff - neovim-remote - ]; - home.file.".config/nvim".source = ./config; - home.file.".config/nvim".recursive = true; - programs.neovim = - { - enable = true; - package = pkgs.neovim-nightly; - extraConfig = '' - set runtimepath^=~/.config/nvim - lua dofile('${./config/nvim.lua}') - ''; - vimAlias = true; - viAlias = true; - plugins = - let - nnn-nvim = pkgs.vimUtils.buildVimPlugin { - pname = "nnn-nvim"; - version = "1.0.0"; - src = inputs.nnn-nvim; - }; - notify-nvim = pkgs.vimUtils.buildVimPlugin { - pname = "notify-nvim"; - version = "1.0.0"; - src = inputs.notify-nvim; - }; - noice-nvim = pkgs.vimUtils.buildVimPlugin { - pname = "noice-nvim"; - version = "1.0.0"; - src = inputs.noice-nvim; - }; - in - map (x: { plugin = x; }) (with pkgs.vimPlugins; [ - vim-tmux-navigator # tmux - nnn-nvim # nnn as filebrowser - gruvbox-nvim # theme - # complete ui overhaul - notify-nvim - nui-nvim - noice-nvim - telescope-nvim - telescope-ui-select-nvim - # line - lualine-nvim + ]); + home.file.".config/nvim".source = ./config; + home.file.".config/nvim".recursive = true; + programs.neovim = + { + enable = true; + package = pkgs.neovim-nightly; + extraConfig = '' + set runtimepath^=~/.config/nvim + lua dofile('${./config/nvim.lua}') + ''; + vimAlias = true; + viAlias = true; + plugins = + let + nnn-nvim = pkgs.vimUtils.buildVimPlugin { + pname = "nnn-nvim"; + version = "1.0.0"; + src = inputs.nnn-nvim; + }; + notify-nvim = pkgs.vimUtils.buildVimPlugin { + pname = "notify-nvim"; + version = "1.0.0"; + src = inputs.notify-nvim; + }; + noice-nvim = pkgs.vimUtils.buildVimPlugin { + pname = "noice-nvim"; + version = "1.0.0"; + src = inputs.noice-nvim; + }; + in + map (x: { plugin = x; }) (with pkgs.vimPlugins; [ + vim-tmux-navigator # tmux + nnn-nvim # nnn as filebrowser + gruvbox-nvim # theme + # complete ui overhaul + notify-nvim + nui-nvim + noice-nvim + telescope-nvim + telescope-ui-select-nvim + # line + lualine-nvim - # vcs integration - gitsigns-nvim + # vcs integration + gitsigns-nvim - # completion - nvim-lspconfig # lsp - nvim-dap # dap - nvim-dap-ui # dap stuffzies - nvim-dap-go - pkgs.unstable.vimPlugins.rust-tools-nvim # rust special sauce - pkgs.unstable.vimPlugins.flutter-tools-nvim - # completion - nvim-cmp - cmp-nvim-lsp - cmp-buffer - cmp-path - cmp-cmdline - nvim-cmp # completion ui - lspkind-nvim # icons for completion - # completion-snippets - luasnip - cmp_luasnip - friendly-snippets # some premade snippets + # completion + nvim-lspconfig # lsp + nvim-dap # dap + nvim-dap-ui # dap stuffzies + nvim-dap-go + pkgs.unstable.vimPlugins.rust-tools-nvim # rust special sauce + pkgs.unstable.vimPlugins.flutter-tools-nvim + # completion - nvim-cmp + cmp-nvim-lsp + cmp-buffer + cmp-path + cmp-cmdline + nvim-cmp # completion ui + lspkind-nvim # icons for completion + # completion-snippets + luasnip + cmp_luasnip + friendly-snippets # some premade snippets - toggleterm-nvim # embed terminals (for lazygit,...) + toggleterm-nvim # embed terminals (for lazygit,...) - # treesitter - (nvim-treesitter.withPlugins ( - plugins: pkgs.tree-sitter.allGrammars - )) - ]); - }; + # treesitter + (nvim-treesitter.withPlugins ( + plugins: pkgs.tree-sitter.allGrammars + )) + ]); + }; + }; } diff --git a/hosts/daedalus/default.nix b/hosts/daedalus/default.nix index 4e2bc384..c07cd92d 100644 --- a/hosts/daedalus/default.nix +++ b/hosts/daedalus/default.nix @@ -48,10 +48,7 @@ with lib.my; programs.gnupg.agent.enable = true; home-manager.users.ragon = { pkgs, lib, inputs, config, ... }: { - - imports = [ - "${inputs.private}/mail.nix" - ]; + ragon.nvim.maximal = true; home.file.".hammerspoon/init.lua".source = let