some changes
This commit is contained in:
parent
7cdd07a9ae
commit
3ce1b14157
5 changed files with 116 additions and 126 deletions
17
flake.lock
generated
17
flake.lock
generated
|
|
@ -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",
|
||||||
|
|
|
||||||
|
|
@ -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 =
|
||||||
|
|
|
||||||
|
|
@ -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,
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,13 @@
|
||||||
{ 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; };
|
||||||
|
options.ragon.nvim.maximal = lib.mkOption { default = false; };
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
home.packages =
|
||||||
|
(with pkgs;[
|
||||||
# telescope
|
# telescope
|
||||||
ripgrep
|
ripgrep
|
||||||
# embedded terminal
|
# embedded terminal
|
||||||
|
|
@ -8,6 +15,10 @@
|
||||||
glab
|
glab
|
||||||
gh
|
gh
|
||||||
|
|
||||||
|
# other stuff
|
||||||
|
neovim-remote
|
||||||
|
]) ++
|
||||||
|
lib.optionals cfg.maximal (with pkgs;[
|
||||||
# language servers
|
# language servers
|
||||||
nil # nix
|
nil # nix
|
||||||
#inputs.rnix-lsp.packages."${pkgs.system}".rnix-lsp
|
#inputs.rnix-lsp.packages."${pkgs.system}".rnix-lsp
|
||||||
|
|
@ -23,6 +34,9 @@
|
||||||
nodePackages.vscode-langservers-extracted # eslint, ...
|
nodePackages.vscode-langservers-extracted # eslint, ...
|
||||||
texlab # latex
|
texlab # latex
|
||||||
tectonic
|
tectonic
|
||||||
|
kotlin
|
||||||
|
kotlin-language-server
|
||||||
|
ktlint
|
||||||
# rust completion
|
# rust completion
|
||||||
cargo
|
cargo
|
||||||
rustc
|
rustc
|
||||||
|
|
@ -31,9 +45,7 @@
|
||||||
# c# debugging
|
# c# debugging
|
||||||
(pkgs.writeShellScriptBin "netcoredbg" ''exec ${pkgs.unstable.netcoredbg}/bin/netcoredbg "$@"'') # don't fill $path with dlls
|
(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".source = ./config;
|
||||||
home.file.".config/nvim".recursive = true;
|
home.file.".config/nvim".recursive = true;
|
||||||
programs.neovim =
|
programs.neovim =
|
||||||
|
|
@ -108,4 +120,5 @@
|
||||||
))
|
))
|
||||||
]);
|
]);
|
||||||
};
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue