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"
}
},
"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",

4
flake.nix
View file

@ -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 =

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.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,

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

@ -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
))
]);
};
};
}

5
hosts/daedalus/default.nix
View file

@ -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