diff --git a/.envrc b/.envrc index 3550a30..5849ead 100644 --- a/.envrc +++ b/.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 diff --git a/flake.lock b/flake.lock index 2de6960..ce900c9 100644 --- a/flake.lock +++ b/flake.lock @@ -260,11 +260,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728067476, - "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=", + "lastModified": 1728500571, + "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030", + "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", "type": "github" }, "original": { @@ -292,11 +292,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728145679, - "narHash": "sha256-qd1nr2b+WUiyzJva650LBX/3hDBru0ZSVxKHSm1BE0w=", + "lastModified": 1728603032, + "narHash": "sha256-RAKCcBXqF/xOaf7fR11dnIZwZ8SDyNcK3MyVgD0l1xQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "6594472fd275f6dcf5a9fba4a83d2f7fa2cf2b8a", + "rev": "5cd8c9cf3104027b42ffe531fb68463ecb08ebc9", "type": "github" }, "original": { @@ -388,11 +388,11 @@ }, "unstable": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { diff --git a/nvim/plugins.nix b/nvim/plugins.nix index b8c7e47..3c2f67d 100644 --- a/nvim/plugins.nix +++ b/nvim/plugins.nix @@ -172,12 +172,7 @@ in lint = { enable = true; lintersByFt = { - rust = [ "typos" ]; - latex = [ - "chktex" - "typos" - ]; - markdown = [ "typos" ]; + latex = [ "chktex" ]; nix = [ "statix" ]; sh = [ "dash" ]; zsh = [ "zsh" ]; @@ -186,14 +181,16 @@ in lsp = { enable = true; servers = { - bashls.enable = true; - bashls.package = pkgs.unstable.bash-language-server; + bashls = { + enable = true; + package = pkgs.unstable.bash-language-server; + }; # clangd.enable = true; # Adds ~2GiB - html.enable = true; + # html.enable = true; # Not writing html jsonls.enable = true; marksman.enable = true; nixd.enable = true; - nil-ls = { + nil_ls = { enable = true; settings.nix.flake = { autoArchive = true; @@ -201,12 +198,11 @@ in }; }; pyright.enable = true; - # ruff-lsp.enable = true; ruff.enable = true; taplo.enable = true; # texlab.enable = true; # Not writing TeX rn - typos-lsp.enable = true; - typst-lsp.enable = true; + typos_lsp.enable = true; + # typst_lsp.enable = true; # Not using it either }; }; lspkind = { diff --git a/nvim/standalone.nix b/nvim/standalone.nix index fe2c191..b5f13e8 100644 --- a/nvim/standalone.nix +++ b/nvim/standalone.nix @@ -61,8 +61,8 @@ pkgs.unstable.taplo pkgs.unstable.typos pkgs.unstable.yamlfmt + (pkgs.unstable.python3.withPackages (p: [ p.jupytext ])) ]; - extraPython3Packages = p: [ p.jupytext ]; extraConfigLuaPre = # lua '' diff --git a/system/default.nix b/system/default.nix index 9d168a1..a3c2347 100644 --- a/system/default.nix +++ b/system/default.nix @@ -74,15 +74,17 @@ in }; environment.etc = keysFromGithub; - services.openssh.authorizedKeysFiles = builtins.map (path: "/etc/${path}") ( - builtins.attrNames keysFromGithub - ); - - # Enable printer autodiscovery if printing is enabled - services.avahi = { - inherit (config.services.printing) enable; - nssmdns4 = true; - openFirewall = true; + services = { + # Enable printer autodiscovery if printing is enabled + avahi = { + inherit (config.services.printing) enable; + nssmdns4 = true; + openFirewall = true; + }; + openssh.authorizedKeysFiles = builtins.map (path: "/etc/${path}") ( + builtins.attrNames keysFromGithub + ); + jupyter.enable = cfg.dev.enable; }; users.defaultUserShell = pkgs.zsh; # Open ports for spotifyd