xyno/nix-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some changes

Browse source
This commit is contained in:
Philipp Hochkamp 2023-04-30 22:57:59 +02:00
parent 7cdd07a9ae
commit 3ce1b14157
5 changed files with 116 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

17
flake.lock generated
View file

@ -440,22 +440,6 @@
"type": "github" "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": { "rnix-lsp": {
"inputs": { "inputs": {
"naersk": "naersk", "naersk": "naersk",
@ -498,7 +482,6 @@
"octoprint-spoolmanager": "octoprint-spoolmanager", "octoprint-spoolmanager": "octoprint-spoolmanager",
"octoprint-telegram": "octoprint-telegram", "octoprint-telegram": "octoprint-telegram",
"pandoc-latex-template": "pandoc-latex-template", "pandoc-latex-template": "pandoc-latex-template",
"private": "private",
"rnix-lsp": "rnix-lsp", "rnix-lsp": "rnix-lsp",
"spoons": "spoons", "spoons": "spoons",
"utils": "utils_2", "utils": "utils_2",

4
flake.nix
View file

@ -65,10 +65,6 @@
octoprint-spoolmanager.url = "github:OllisGit/OctoPrint-SpoolManager"; octoprint-spoolmanager.url = "github:OllisGit/OctoPrint-SpoolManager";
octoprint-spoolmanager.flake = false; octoprint-spoolmanager.flake = false;
## mail
private.url = "github:thexyno/nixos-config-private-dummy";
private.flake = false;
}; };
outputs = outputs =

1
hm-imports/nvim/config/lua/plugin/lsp.lua
View file

@ -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.nil_ls.setup { capabilities = capabilities, on_attach = on_lsp_attach } -- nix
-- lspconfig.rnix.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.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.tsserver.setup { capabilities = capabilities, on_attach = on_lsp_attach }
lspconfig.vimls.setup { lspconfig.vimls.setup {
capabilities = capabilities, capabilities = capabilities,

215
hm-imports/nvim/default.nix
View file

@ -1,111 +1,124 @@
{ pkgs, config, lib, inputs, ... }: { pkgs, config, lib, inputs, ... }:
let
cfg = config.ragon.nvim;
in
{ {
home.packages = with pkgs;[ options.ragon.nvim.enable = lib.mkOption { default = true; };
# telescope options.ragon.nvim.maximal = lib.mkOption { default = false; };
ripgrep config = lib.mkIf cfg.enable {
# embedded terminal home.packages =
lazygit (with pkgs;[
glab # telescope
gh ripgrep
# embedded terminal
lazygit
glab
gh
# language servers # other stuff
nil # nix neovim-remote
#inputs.rnix-lsp.packages."${pkgs.system}".rnix-lsp ]) ++
gopls # go lib.optionals cfg.maximal (with pkgs;[
pyright # python3 # language servers
terraform-ls nil # nix
terraform #inputs.rnix-lsp.packages."${pkgs.system}".rnix-lsp
nodePackages.typescript gopls # go
nodePackages.typescript-language-server pyright # python3
haskell-language-server terraform-ls
sumneko-lua-language-server terraform
ltex-ls # languageTool nodePackages.typescript
nodePackages.vscode-langservers-extracted # eslint, ... nodePackages.typescript-language-server
texlab # latex haskell-language-server
tectonic sumneko-lua-language-server
# rust completion ltex-ls # languageTool
cargo nodePackages.vscode-langservers-extracted # eslint, ...
rustc texlab # latex
rustfmt tectonic
unstable.rust-analyzer kotlin
# c# debugging kotlin-language-server
(pkgs.writeShellScriptBin "netcoredbg" ''exec ${pkgs.unstable.netcoredbg}/bin/netcoredbg "$@"'') # don't fill $path with dlls 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;
home.file.".config/nvim".source = ./config; programs.neovim =
home.file.".config/nvim".recursive = true; {
programs.neovim = enable = true;
{ package = pkgs.neovim-nightly;
enable = true; extraConfig = ''
package = pkgs.neovim-nightly; set runtimepath^=~/.config/nvim
extraConfig = '' lua dofile('${./config/nvim.lua}')
set runtimepath^=~/.config/nvim '';
lua dofile('${./config/nvim.lua}') vimAlias = true;
''; viAlias = true;
vimAlias = true; plugins =
viAlias = true; let
plugins = nnn-nvim = pkgs.vimUtils.buildVimPlugin {
let pname = "nnn-nvim";
nnn-nvim = pkgs.vimUtils.buildVimPlugin { version = "1.0.0";
pname = "nnn-nvim"; src = inputs.nnn-nvim;
version = "1.0.0"; };
src = inputs.nnn-nvim; notify-nvim = pkgs.vimUtils.buildVimPlugin {
}; pname = "notify-nvim";
notify-nvim = pkgs.vimUtils.buildVimPlugin { version = "1.0.0";
pname = "notify-nvim"; src = inputs.notify-nvim;
version = "1.0.0"; };
src = inputs.notify-nvim; noice-nvim = pkgs.vimUtils.buildVimPlugin {
}; pname = "noice-nvim";
noice-nvim = pkgs.vimUtils.buildVimPlugin { version = "1.0.0";
pname = "noice-nvim"; src = inputs.noice-nvim;
version = "1.0.0"; };
src = inputs.noice-nvim; in
}; map (x: { plugin = x; }) (with pkgs.vimPlugins; [
in vim-tmux-navigator # tmux
map (x: { plugin = x; }) (with pkgs.vimPlugins; [ nnn-nvim # nnn as filebrowser
vim-tmux-navigator # tmux gruvbox-nvim # theme
nnn-nvim # nnn as filebrowser # complete ui overhaul
gruvbox-nvim # theme notify-nvim
# complete ui overhaul nui-nvim
notify-nvim noice-nvim
nui-nvim telescope-nvim
noice-nvim telescope-ui-select-nvim
telescope-nvim # line
telescope-ui-select-nvim lualine-nvim
# line
lualine-nvim
# vcs integration # vcs integration
gitsigns-nvim gitsigns-nvim
# completion # completion
nvim-lspconfig # lsp nvim-lspconfig # lsp
nvim-dap # dap nvim-dap # dap
nvim-dap-ui # dap stuffzies nvim-dap-ui # dap stuffzies
nvim-dap-go nvim-dap-go
pkgs.unstable.vimPlugins.rust-tools-nvim # rust special sauce pkgs.unstable.vimPlugins.rust-tools-nvim # rust special sauce
pkgs.unstable.vimPlugins.flutter-tools-nvim pkgs.unstable.vimPlugins.flutter-tools-nvim
# completion - nvim-cmp # completion - nvim-cmp
cmp-nvim-lsp cmp-nvim-lsp
cmp-buffer cmp-buffer
cmp-path cmp-path
cmp-cmdline cmp-cmdline
nvim-cmp # completion ui nvim-cmp # completion ui
lspkind-nvim # icons for completion lspkind-nvim # icons for completion
# completion-snippets # completion-snippets
luasnip luasnip
cmp_luasnip cmp_luasnip
friendly-snippets # some premade snippets friendly-snippets # some premade snippets
toggleterm-nvim # embed terminals (for lazygit,...) toggleterm-nvim # embed terminals (for lazygit,...)
# treesitter # treesitter
(nvim-treesitter.withPlugins ( (nvim-treesitter.withPlugins (
plugins: pkgs.tree-sitter.allGrammars plugins: pkgs.tree-sitter.allGrammars
)) ))
]); ]);
}; };
};
} }

5
hosts/daedalus/default.nix
View file

@ -48,10 +48,7 @@ with lib.my;
programs.gnupg.agent.enable = true; programs.gnupg.agent.enable = true;
home-manager.users.ragon = { pkgs, lib, inputs, config, ... }: home-manager.users.ragon = { pkgs, lib, inputs, config, ... }:
{ {
ragon.nvim.maximal = true;
imports = [
"${inputs.private}/mail.nix"
];
home.file.".hammerspoon/init.lua".source = home.file.".hammerspoon/init.lua".source =
let let