diff --git a/flake.lock b/flake.lock index 1782fd8..8e4a57c 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1753461463, - "narHash": "sha256-kGc7pRH0diLzKmOHsEFA8sZ9NJpgT+tqxAMsuqNd5Po=", + "lastModified": 1756059815, + "narHash": "sha256-UALOxoXoFIHbwKzcqbqCAqw5cC0MJEehLaWSet5vxfE=", "owner": "Homebrew", "repo": "brew", - "rev": "4d14be89e99a45181c18e96a5f19a5b43343cc0f", + "rev": "02947ea4edbdef5fcce9ee57fa289547f4d096c9", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "4.5.13", + "ref": "4.6.7", "repo": "brew", "type": "github" } @@ -58,11 +58,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -133,11 +133,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1756261190, - "narHash": "sha256-eiy0klFK5EVJLNilutR7grsZN/7Itj9DyD75eyOf83k=", + "lastModified": 1756788591, + "narHash": "sha256-LOrOfPWpJU/ADWDyVwPv9XNuYPq5KJtmAmSzplpccmE=", "owner": "nix-community", "repo": "home-manager", - "rev": "77f348da3176dc68b20a73dab94852a417daf361", + "rev": "f3d3b4592a73fb64b5423234c01985ea73976596", "type": "github" }, "original": { @@ -165,11 +165,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1756273278, - "narHash": "sha256-zOAL3vd1V7ubbqBtsX+yy9QuxVNzrgYUwZTlwz7NiqU=", + "lastModified": 1756789235, + "narHash": "sha256-26jePwO2Yuc1BTIp5MBR42XNkPq5DXOmzVesPRwxsdM=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "e8654680d2da2aed3e370a93c3a09a90b19c932c", + "rev": "449700b4f81ff563b2c92b95aa7abea153c83e2a", "type": "github" }, "original": { @@ -181,11 +181,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1756274183, - "narHash": "sha256-2SE3iv6O7leGkQf09I6LI9pBqFLlC9LBi7ABtlQRtpE=", + "lastModified": 1756795236, + "narHash": "sha256-xkDwZSBnOhnCyvxy5UCGlCPAltWVQ//kX+QdBZUFc8A=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "b83323dad1849149ebc425b22d95322b66e23360", + "rev": "9d68afa39dc3233dc1a5a425b6159fa6e7f579db", "type": "github" }, "original": { @@ -227,11 +227,11 @@ "brew-src": "brew-src" }, "locked": { - "lastModified": 1754250993, - "narHash": "sha256-MEin+qoQKtFC1b0f4tnQ+Z82BQWSCgh6Ef7rpmH9gig=", + "lastModified": 1756398546, + "narHash": "sha256-n4GVDLhKu65XFraJuCzap2AaZji4xhPaZMTJ8aQdD3s=", "owner": "zhaofengli-wip", "repo": "nix-homebrew", - "rev": "314d057294e79bc2596972126b84c6f9f144499a", + "rev": "3aa475996cb3bc1ecefa88c99c466e6f0bc17431", "type": "github" }, "original": { @@ -242,11 +242,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1753579242, - "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=", + "lastModified": 1754788789, + "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e", + "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", "type": "github" }, "original": { @@ -273,11 +273,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756273791, - "narHash": "sha256-d8hIKtjQCWzKrLRf0X3QUsOcBaQidrKl3SAId1QY8CU=", + "lastModified": 1756797603, + "narHash": "sha256-ORpwrq8UE8gS3I9WEM5Xyzhxpk8E5RB3YeGpo12zq2k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6024b4aa94589b07b38bca7c3013b44ce38a41dd", + "rev": "2cc8d4237b7f9d9e3bb3aa0f4a23fafa10e41c11", "type": "github" }, "original": { @@ -327,11 +327,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1756261579, - "narHash": "sha256-U9U1FPnbPP8D7HRbctDzSDtiPE3Ud91sfOy6TWhLOEw=", + "lastModified": 1756727835, + "narHash": "sha256-767guSN146cmLD1lvjYzU4Bh7Ry3fzXzj+6hXEtF7rY=", "owner": "nix-community", "repo": "nixvim", - "rev": "6392a2f44f3a54e00c4095e8ba0dea378a52ca89", + "rev": "f5026663f68261a201cd0700ced14971945d8dd9", "type": "github" }, "original": { diff --git a/modules/home/default.nix b/modules/home/default.nix index f5fbc32..48ab7eb 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -6,6 +6,7 @@ imports = [ ./atuin.nix ./bash.nix + ./jujutsu.nix ./bat.nix ./direnv.nix ./eza.nix diff --git a/modules/home/jujutsu.nix b/modules/home/jujutsu.nix new file mode 100644 index 0000000..f816130 --- /dev/null +++ b/modules/home/jujutsu.nix @@ -0,0 +1,5 @@ +{ + programs.jujutsu = { + enable = true; + }; +} diff --git a/modules/home/neovim/options.nix b/modules/home/neovim/options.nix index 58c1b2c..5f8c5bc 100644 --- a/modules/home/neovim/options.nix +++ b/modules/home/neovim/options.nix @@ -1,10 +1,8 @@ { programs.nixvim = { globals = { - # clipboard = "osc52"; }; opts = { - clipboard = "unnamedplus"; expandtab = true; ignorecase = true; mouse = ""; diff --git a/modules/home/neovim/plugins/lsp.nix b/modules/home/neovim/plugins/lsp.nix index de4dd12..d287d0b 100644 --- a/modules/home/neovim/plugins/lsp.nix +++ b/modules/home/neovim/plugins/lsp.nix @@ -6,9 +6,10 @@ servers = { nil_ls.enable = true; # Nix ts_ls.enable = true; # TS/JS + volar.enable = true; # Vue cssls.enable = true; # CSS dockerls.enable = true; # Docker - # elixirls.enable = true; # Elixir + elixirls.enable = true; # Elixir }; }; }; diff --git a/modules/home/neovim/plugins/treesitter.nix b/modules/home/neovim/plugins/treesitter.nix index e73d172..31225ad 100644 --- a/modules/home/neovim/plugins/treesitter.nix +++ b/modules/home/neovim/plugins/treesitter.nix @@ -7,12 +7,14 @@ }; grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [ bash - fish elixir + fish heex json nix toml + typescript + vue yaml ]; }; diff --git a/modules/packages.nix b/modules/packages.nix index a5dea6f..75d3edd 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -2,6 +2,7 @@ with pkgs; [ (callPackage ./bin/open-project.nix {}) age + devenv lsof alejandra delta