diff --git a/flake.lock b/flake.lock --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "nixpkgs" ] }, "locked": { - "lastModified": 1747365160, - "narHash": "sha256-4ZVr0x+ry6ybym/VhVYACj0HlJo44YxAaPGOxiS88Hg=", + "lastModified": 1751270151, + "narHash": "sha256-xL7UKUPnJwqmlQKiqeVX+LDbLKIP8fcBcc55ocnhy64=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "8817b00b0011750381d0d44bb94d61087349b6ba", + "rev": "425c929e209a05f8790ce83106942e94258adbc8", "type": "github" }, "original": { @@ -43,11 +43,11 @@ } }, "darwin-stable": { "locked": { - "lastModified": 1747257696, - "narHash": "sha256-bKD2zezDqJBwrPgP5a05areWFTE3wHpEmo+9feEWCAY=", + "lastModified": 1751125036, + "narHash": "sha256-e0SC5qMG1bj0Sm+2/rRFHRDM6aoRmFIhMrwpQKHmA3c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2589c813e138db4ecab0912798c0b65512dba1e8", + "rev": "92f27305bedaa335cca6da8d183c67b16c26752e", "type": "github" }, "original": { @@ -94,11 +94,11 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -228,11 +228,11 @@ "nixpkgs" ] }, "locked": { - "lastModified": 1745809923, - "narHash": "sha256-zqhf+yq+6XaYGT4qU9/0Fu1HsYBDmQ7v/2fVMgSwnbg=", + "lastModified": 1750368836, + "narHash": "sha256-2t9DAFkvpqRdj3oMyagWG6N9hEUk05DrU9WwlQnul5A=", "owner": "arxanas", "repo": "git-branchless", - "rev": "245d9033ddcf568aa572e018ce4943c92de16fee", + "rev": "4a760400fa846193173044222d36f09495b04694", "type": "github" }, "original": { @@ -248,11 +248,11 @@ "nixpkgs" ] }, "locked": { - "lastModified": 1747427366, - "narHash": "sha256-c3UfEsnT94bt6ta1VELYQhAWkQWFGlB+7DmBmthlGGg=", + "lastModified": 1751296747, + "narHash": "sha256-/nHOfmB0C972nYX0xVF0zWmbt8ooA9TCczfeKHNvwqI=", "owner": "nix-community", "repo": "home-manager", - "rev": "74d31e1165341bf510ee2017841a599f5cfc1608", + "rev": "0f21ed5182a158d2f84e9136f6bf8539fd9a6890", "type": "github" }, "original": { @@ -284,15 +284,15 @@ }, "lix": { "flake": false, "locked": { - "lastModified": 1746827285, - "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=", - "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a", + "lastModified": 1751235704, + "narHash": "sha256-J4ycLoXHPsoBoQtEXFCelL4xlq5pT8U9tNWNKm43+YI=", + "rev": "1d7368585eebaa2c4bdbcb88fe600cfb2239b2c6", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1d7368585eebaa2c4bdbcb88fe600cfb2239b2c6.tar.gz?rev=1d7368585eebaa2c4bdbcb88fe600cfb2239b2c6" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz" } }, "lix-module": { @@ -305,25 +305,25 @@ "nixpkgs" ] }, "locked": { - "lastModified": 1746838955, - "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=", - "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc", + "lastModified": 1751240025, + "narHash": "sha256-SXUAlxpjPRkArRMHy5+Hdi+PiC+ND9yzzIjiaHmTvQU=", + "rev": "8b1094356f4723d6e89d3f8a95b333ee16d9ab02", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/8b1094356f4723d6e89d3f8a95b333ee16d9ab02.tar.gz?rev=8b1094356f4723d6e89d3f8a95b333ee16d9ab02" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz" } }, "neorg": { "flake": false, "locked": { - "lastModified": 1746047774, - "narHash": "sha256-xm2+uqmQB8tP5/zIwbOicEBNLSEftmgu96squLRSY3c=", + "lastModified": 1749805422, + "narHash": "sha256-q3wIdHnAgCUczum+1WhrcxO2Nf6chN/IeRHjB1v2tI4=", "owner": "nvim-neorg", "repo": "neorg", - "rev": "8fdd9b2986acfb4ce310bebfc338111793862f00", + "rev": "9d75ae8e2625db240636870dd7f029c9a82ab9ef", "type": "github" }, "original": { @@ -344,11 +344,11 @@ "norg": "norg", "norg-meta": "norg-meta" }, "locked": { - "lastModified": 1747333524, - "narHash": "sha256-k/xwAPNxJ7coTAQn8TGfwMNIpqLXgik8zXEbU+S8sTk=", + "lastModified": 1751235419, + "narHash": "sha256-3NH+mhwx2Fvq+QmNRgBZD3JFv1tRycu6Zz/nwUKHqxw=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "bf427c0ed58df58cf33beed182270f70a4f29b28", + "rev": "360356ceed94b66e2ba9edbf8c22c8e6b8995a58", "type": "github" }, "original": { @@ -389,11 +389,11 @@ } }, "nixpkgs-lib": { "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "lastModified": 1748740939, + "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "rev": "656a64127e9d791a334452c6b6606d17539476e2", "type": "github" }, "original": { @@ -448,11 +448,11 @@ } }, "nixpkgs_4": { "locked": { - "lastModified": 1747312588, - "narHash": "sha256-MmJvj6mlWzeRwKGLcwmZpKaOPZ5nJb/6al5CXqJsgjo=", + "lastModified": 1751180975, + "narHash": "sha256-BKk4yDiXr4LdF80OTVqYJ53Q74rOcA/82EClXug8xsY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b1bebd0fe266bbd1820019612ead889e96a8fa2d", + "rev": "a48741b083d4f36dd79abd9f760c84da6b4dc0e5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/darwin.nix b/modules/darwin.nix --- a/modules/darwin.nix +++ b/modules/darwin.nix @@ -29,6 +29,8 @@ # Enable TouchID PAM on macOS security.pam.services.sudo_local.touchIdAuth = true; system = { + primaryUser = "hauleth"; + defaults.dock.autohide = true; keyboard = { diff --git a/modules/jj.nix b/modules/jj.nix --- a/modules/jj.nix +++ b/modules/jj.nix @@ -22,6 +22,8 @@ }; git.write-change-id-header = true; + colors."diff token".underline = false; + signing = { behavior = "own"; backend = "ssh"; diff --git a/modules/nvim.nix b/modules/nvim.nix --- a/modules/nvim.nix +++ b/modules/nvim.nix @@ -14,6 +14,7 @@ set runtimepath+=${./nvim}/after set runtimepath^=${./nvim} lua << EOF vim.g.lsp_paths = { + ['rust_analyzer'] = "${pkgs.rust-analyzer}/bin/rust-analyzer", ['lexical'] = "${inputs.lexical.packages.${pkgs.stdenv.hostPlatform.system}.lexical}/bin/lexical", ['typos_lsp'] = "${pkgs.typos-lsp}/bin/typos-lsp" } @@ -80,7 +81,7 @@ meson nginx nickel nix - norg + # norg po printf prolog diff --git a/modules/nvim/fnl/langclient.fnl b/modules/nvim/fnl/langclient.fnl --- a/modules/nvim/fnl/langclient.fnl +++ b/modules/nvim/fnl/langclient.fnl @@ -46,10 +46,12 @@ {:autostart false})) (fn setup [name opts] - ((. (. lspconfig name) :setup) opts)) + (vim.lsp.enable name) + (vim.lsp.config name opts)) -(setup :rust_analyzer - {:settings {:rust-analyzer {:files {:excludeDirs [".direnv"]}}}}) +(setup :rust_analyzer { + :cmd [vim.g.lsp_paths.rust_analyzer] + :settings {:rust-analyzer {:files {:excludeDirs [".direnv"]}}}}) (setup :lexical { :cmd [vim.g.lsp_paths.lexical :start] diff --git a/pkgs/prr.nix b/pkgs/prr.nix --- a/pkgs/prr.nix +++ b/pkgs/prr.nix @@ -20,11 +20,7 @@ buildInputs = [ openssl zlib - ] - ++ lib.optional stdenv.isDarwin (with darwin.apple_sdk; [ - frameworks.Security - frameworks.SystemConfiguration - ]); + ]; src = fetchFromGitHub { owner = "danobi";