Compare commits
7 commits
d816faa25b
...
f30afe506b
Author | SHA1 | Date | |
---|---|---|---|
f30afe506b | |||
4f7479490e | |||
9765b6142a | |||
63b1e0e8cc | |||
4ae1433fce | |||
9f59290f50 | |||
63f6aa75be |
5 changed files with 39 additions and 32 deletions
9
.envrc
9
.envrc
|
@ -1 +1,10 @@
|
||||||
|
# update repo
|
||||||
|
if has jj; then
|
||||||
|
jj git fetch
|
||||||
|
elif has gix; then
|
||||||
|
gix fetch
|
||||||
|
elif has git; then
|
||||||
|
git fetch
|
||||||
|
fi
|
||||||
|
|
||||||
use flake
|
use flake
|
||||||
|
|
18
flake.lock
generated
18
flake.lock
generated
|
@ -260,11 +260,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728067476,
|
"lastModified": 1728500571,
|
||||||
"narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=",
|
"narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030",
|
"rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -292,11 +292,11 @@
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728145679,
|
"lastModified": 1728603032,
|
||||||
"narHash": "sha256-qd1nr2b+WUiyzJva650LBX/3hDBru0ZSVxKHSm1BE0w=",
|
"narHash": "sha256-RAKCcBXqF/xOaf7fR11dnIZwZ8SDyNcK3MyVgD0l1xQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "6594472fd275f6dcf5a9fba4a83d2f7fa2cf2b8a",
|
"rev": "5cd8c9cf3104027b42ffe531fb68463ecb08ebc9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -388,11 +388,11 @@
|
||||||
},
|
},
|
||||||
"unstable": {
|
"unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728018373,
|
"lastModified": 1728492678,
|
||||||
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
|
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
|
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -172,12 +172,7 @@ in
|
||||||
lint = {
|
lint = {
|
||||||
enable = true;
|
enable = true;
|
||||||
lintersByFt = {
|
lintersByFt = {
|
||||||
rust = [ "typos" ];
|
latex = [ "chktex" ];
|
||||||
latex = [
|
|
||||||
"chktex"
|
|
||||||
"typos"
|
|
||||||
];
|
|
||||||
markdown = [ "typos" ];
|
|
||||||
nix = [ "statix" ];
|
nix = [ "statix" ];
|
||||||
sh = [ "dash" ];
|
sh = [ "dash" ];
|
||||||
zsh = [ "zsh" ];
|
zsh = [ "zsh" ];
|
||||||
|
@ -186,14 +181,16 @@ in
|
||||||
lsp = {
|
lsp = {
|
||||||
enable = true;
|
enable = true;
|
||||||
servers = {
|
servers = {
|
||||||
bashls.enable = true;
|
bashls = {
|
||||||
bashls.package = pkgs.unstable.bash-language-server;
|
enable = true;
|
||||||
|
package = pkgs.unstable.bash-language-server;
|
||||||
|
};
|
||||||
# clangd.enable = true; # Adds ~2GiB
|
# clangd.enable = true; # Adds ~2GiB
|
||||||
html.enable = true;
|
# html.enable = true; # Not writing html
|
||||||
jsonls.enable = true;
|
jsonls.enable = true;
|
||||||
marksman.enable = true;
|
marksman.enable = true;
|
||||||
nixd.enable = true;
|
nixd.enable = true;
|
||||||
nil-ls = {
|
nil_ls = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.nix.flake = {
|
settings.nix.flake = {
|
||||||
autoArchive = true;
|
autoArchive = true;
|
||||||
|
@ -201,12 +198,11 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
pyright.enable = true;
|
pyright.enable = true;
|
||||||
# ruff-lsp.enable = true;
|
|
||||||
ruff.enable = true;
|
ruff.enable = true;
|
||||||
taplo.enable = true;
|
taplo.enable = true;
|
||||||
# texlab.enable = true; # Not writing TeX rn
|
# texlab.enable = true; # Not writing TeX rn
|
||||||
typos-lsp.enable = true;
|
typos_lsp.enable = true;
|
||||||
typst-lsp.enable = true;
|
# typst_lsp.enable = true; # Not using it either
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
lspkind = {
|
lspkind = {
|
||||||
|
|
|
@ -61,8 +61,8 @@
|
||||||
pkgs.unstable.taplo
|
pkgs.unstable.taplo
|
||||||
pkgs.unstable.typos
|
pkgs.unstable.typos
|
||||||
pkgs.unstable.yamlfmt
|
pkgs.unstable.yamlfmt
|
||||||
|
(pkgs.unstable.python3.withPackages (p: [ p.jupytext ]))
|
||||||
];
|
];
|
||||||
extraPython3Packages = p: [ p.jupytext ];
|
|
||||||
extraConfigLuaPre =
|
extraConfigLuaPre =
|
||||||
# lua
|
# lua
|
||||||
''
|
''
|
||||||
|
|
|
@ -74,15 +74,17 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.etc = keysFromGithub;
|
environment.etc = keysFromGithub;
|
||||||
services.openssh.authorizedKeysFiles = builtins.map (path: "/etc/${path}") (
|
services = {
|
||||||
builtins.attrNames keysFromGithub
|
# Enable printer autodiscovery if printing is enabled
|
||||||
);
|
avahi = {
|
||||||
|
inherit (config.services.printing) enable;
|
||||||
# Enable printer autodiscovery if printing is enabled
|
nssmdns4 = true;
|
||||||
services.avahi = {
|
openFirewall = true;
|
||||||
inherit (config.services.printing) enable;
|
};
|
||||||
nssmdns4 = true;
|
openssh.authorizedKeysFiles = builtins.map (path: "/etc/${path}") (
|
||||||
openFirewall = true;
|
builtins.attrNames keysFromGithub
|
||||||
|
);
|
||||||
|
jupyter.enable = cfg.dev.enable;
|
||||||
};
|
};
|
||||||
users.defaultUserShell = pkgs.zsh;
|
users.defaultUserShell = pkgs.zsh;
|
||||||
# Open ports for spotifyd
|
# Open ports for spotifyd
|
||||||
|
|
Loading…
Add table
Reference in a new issue