Merge branch 'main' of src:greg/nixos-config
This commit is contained in:
@@ -17,7 +17,7 @@ def rebuild [] {
|
||||
sudo darwin-rebuild switch
|
||||
} else {
|
||||
let hostname = uname | get nodename
|
||||
let build = ^nom build $"/etc/nixos#nixosConfigurations.($hostname).config.system.build.toplevel"
|
||||
let build = ^nom build --keep-going $"/etc/nixos#nixosConfigurations.($hostname).config.system.build.toplevel"
|
||||
if $env.LAST_EXIT_CODE == 0 {
|
||||
nvd diff /run/current-system result
|
||||
run0 nixos-rebuild switch
|
||||
|
||||
@@ -115,7 +115,6 @@
|
||||
lsp = {
|
||||
enable = true;
|
||||
servers = {
|
||||
ansiblels.enable = true;
|
||||
cmake.enable = true;
|
||||
gopls.enable = true;
|
||||
html.enable = true;
|
||||
|
||||
@@ -59,7 +59,7 @@ local lspconfig = require('lspconfig')
|
||||
-- capabilities = capabilities
|
||||
--}
|
||||
--lspconfig.pyright.setup { capabilities = capabilities }
|
||||
lspconfig.ansiblels.setup { capabilities = capabilities }
|
||||
--lspconfig.ansiblels.setup { capabilities = capabilities }
|
||||
--lspconfig.jedi_language_server.setup { capabilities }
|
||||
|
||||
-- ======================================================================
|
||||
|
||||
@@ -88,7 +88,7 @@ lua <<EOF
|
||||
-- capabilities = capabilities
|
||||
--}
|
||||
--lspconfig.pyright.setup { capabilities = capabilities }
|
||||
lspconfig.ansiblels.setup { capabilities = capabilities }
|
||||
--lspconfig.ansiblels.setup { capabilities = capabilities }
|
||||
lspconfig.jedi_language_server.setup { capabilities = capabilities }
|
||||
EOF
|
||||
" Set filetype to the way I want it
|
||||
|
||||
@@ -40,4 +40,5 @@ in
|
||||
jeremiah = greg "jeremiah";
|
||||
linode = greg "linode";
|
||||
vm-gitlab = greg "vm-gitlab";
|
||||
vm-jellyfin = greg "vm-jellyfin";
|
||||
}
|
||||
|
||||
@@ -13,12 +13,14 @@
|
||||
cargo
|
||||
freeciv
|
||||
gimp
|
||||
gnucash
|
||||
k9s
|
||||
kdePackages.kdenlive
|
||||
kubernetes-helm
|
||||
kubectl
|
||||
kubectl-cnpg
|
||||
mumble
|
||||
pre-commit
|
||||
wineWowPackages.stable
|
||||
];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user