diff --git a/common/home.nix b/common/home.nix index 2dfde9a0..f2e8fab4 100644 --- a/common/home.nix +++ b/common/home.nix @@ -232,7 +232,7 @@ in { extraConfig = '' ${pkgs.pfetch-rs}/bin/pfetch ''; - package = pkgs.nushellFull; + package = pkgs.nushell; configFile.text = '' $env.config = { show_banner: false, diff --git a/flake.lock b/flake.lock index ca032ab6..a5770d91 100644 --- a/flake.lock +++ b/flake.lock @@ -203,11 +203,11 @@ ] }, "locked": { - "lastModified": 1713979152, - "narHash": "sha256-apdecPuh8SOQnkEET/kW/UcfjCRb8JbV5BKjoH+DcP4=", + "lastModified": 1717025063, + "narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=", "owner": "ipetkov", "repo": "crane", - "rev": "a5eca68a2cf11adb32787fc141cddd29ac8eb79c", + "rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e", "type": "github" }, "original": { @@ -269,11 +269,11 @@ ] }, "locked": { - "lastModified": 1716680724, - "narHash": "sha256-THm0mm4aKHQhh3pXCj5ms5t0sVPP9xzVsIU9byMjbtI=", + "lastModified": 1717290123, + "narHash": "sha256-K8O2KQEbA+NIAc8BDsWV6QKqU3i9M+YTUi4zzmLRy1s=", "owner": "ipetkov", "repo": "crane", - "rev": "701dbc191ca003a118ce885db38fae9598908294", + "rev": "ae1453ffd0f8f684e863685c317a953317db2b79", "type": "github" }, "original": { @@ -367,11 +367,11 @@ ] }, "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", "owner": "numtide", "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", "type": "github" }, "original": { @@ -761,11 +761,11 @@ ] }, "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -789,21 +789,6 @@ "type": "github" } }, - "flake-root_2": { - "locked": { - "lastModified": 1713493429, - "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", - "owner": "srid", - "repo": "flake-root", - "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -1128,11 +1113,11 @@ ] }, "locked": { - "lastModified": 1716213921, - "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { @@ -1293,11 +1278,11 @@ ] }, "locked": { - "lastModified": 1716847642, - "narHash": "sha256-rjEswRV0o23eBBils8lJXyIGha+l/VjV73IPg+ztxgk=", + "lastModified": 1717525419, + "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", "owner": "nix-community", "repo": "home-manager", - "rev": "10c7c219b7dae5795fb67f465a0d86cbe29f25fa", + "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", "type": "github" }, "original": { @@ -1336,11 +1321,11 @@ ] }, "locked": { - "lastModified": 1716457508, - "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", + "lastModified": 1717525419, + "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", "owner": "nix-community", "repo": "home-manager", - "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", + "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", "type": "github" }, "original": { @@ -1380,11 +1365,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1716742013, - "narHash": "sha256-seOWIKi6jXE1BIQ6FLXUMe0h54cLwAxCCiL8bXFx60Q=", + "lastModified": 1716987277, + "narHash": "sha256-l8aa+XPDbM3Mf3W4ukC/tBBHVZE8A3att4KLXrnyKSI=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "768cd3ea525bbd1ed2dde5928b0843129274b50d", + "rev": "e07d4110dc0b9d1786403aa760232564ad28b6fa", "type": "github" }, "original": { @@ -1403,11 +1388,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1716498188, - "narHash": "sha256-tHE2jWpRUrGk0mCCeVmfL3tHa7S5RRXj/Ec3bPNZNxg=", + "lastModified": 1717448400, + "narHash": "sha256-9Kc0M0DWe9Yr80Ph4ZJHEsnnaHRniSX1SA3PfIxH0i8=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "a47ef0c763cc61811a5fb21c03669e1bf2445f98", + "rev": "b0132bdb2b78359e01ec8c790b63047b331e4a28", "type": "github" }, "original": { @@ -1429,11 +1414,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1716805126, - "narHash": "sha256-yqJWx74e16Gk4pwW5DWfI4orTKeWezKFNbW7eaojpLw=", + "lastModified": 1717686691, + "narHash": "sha256-LF4zVaSsJ83wq6j+4lm/olK2V71KAJHNJbD42mF+fr8=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "2eb19b872bc0a5f336b9b934ba96ea029e4da8c2", + "rev": "990e300ef9abe0eb8c86388683f8d7465e335626", "type": "github" }, "original": { @@ -1471,11 +1456,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1713520724, - "narHash": "sha256-CO8MmVDmqZX2FovL75pu5BvwhW+Vugc7Q6ze7Hj8heI=", + "lastModified": 1717067539, + "narHash": "sha256-oIs5EF+6VpHJRvvpVWuqCYJMMVW/6h59aYUv9lABLtY=", "owner": "nix-community", "repo": "naersk", - "rev": "c5037590290c6c7dae2e42e7da1e247e54ed2d49", + "rev": "fa19d8c135e776dc97f4dcca08656a0eeb28d5c0", "type": "github" }, "original": { @@ -1606,7 +1591,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-9gbJnltqIKmcgjHXhd8DZb/EDwtqBw4l82qn7UI9b/E=", + "narHash": "sha256-HCoaOTwKbS5LmQTW+mJXY4fd2KGQgGvfvxoPWvOtnmo=", "path": "./neovim", "type": "path" }, @@ -1660,11 +1645,11 @@ ] }, "locked": { - "lastModified": 1716511055, - "narHash": "sha256-5Fe/DGgvMhPEMl9VdVxv3zvwRcwNDmW5eRJ0gk72w7U=", + "lastModified": 1716993688, + "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "0bea8222f6e83247dd13b055d83e64bce02ee532", + "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", "type": "github" }, "original": { @@ -1681,11 +1666,11 @@ ] }, "locked": { - "lastModified": 1716511055, - "narHash": "sha256-5Fe/DGgvMhPEMl9VdVxv3zvwRcwNDmW5eRJ0gk72w7U=", + "lastModified": 1716993688, + "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "0bea8222f6e83247dd13b055d83e64bce02ee532", + "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", "type": "github" }, "original": { @@ -1699,11 +1684,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1716772633, - "narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=", + "lastModified": 1717297675, + "narHash": "sha256-43UmlS1Ifx17y93/Vc258U7bOlAAIZbu8dsGDHOIIr0=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac", + "rev": "972a52bee3991ae1f1899e6452e0d7c01ee566d9", "type": "github" }, "original": { @@ -1865,11 +1850,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1714314149, - "narHash": "sha256-yNAevSKF4krRWacmLUsLK7D7PlfuY3zF0lYnGYNi9vQ=", + "lastModified": 1717112898, + "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf8cc1201be8bc71b7cbbbdaf349b22f4f99c7ae", + "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", "type": "github" }, "original": { @@ -1911,11 +1896,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "type": "github" }, "original": { @@ -1927,11 +1912,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1717602782, + "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", "type": "github" }, "original": { @@ -1975,7 +1960,6 @@ "devshell": "devshell_2", "flake-compat": "flake-compat_9", "flake-parts": "flake-parts_8", - "flake-root": "flake-root_2", "git-hooks": "git-hooks_2", "home-manager": "home-manager_3", "nix-darwin": "nix-darwin_3", @@ -1985,11 +1969,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1716833970, - "narHash": "sha256-K3tVrTna4EN86GW9IeOQJkbj57zT2xNGJg1hh26xy5c=", + "lastModified": 1717681257, + "narHash": "sha256-0PhFvfc4wDjba1cus2ALsfn0wVizeKkcuF+aqvDJivg=", "owner": "nix-community", "repo": "nixvim", - "rev": "a2afa5634495ee739e682e5ccb743c5c6dd90ec1", + "rev": "36f2e51b28ee3389a67ed5e9ed5c4bd388b06918", "type": "github" }, "original": { @@ -2093,11 +2077,11 @@ }, "nur": { "locked": { - "lastModified": 1716903916, - "narHash": "sha256-kjodJgHDprBBwQ7WHRPaTtJ4cgxHKycquhwO9tlWcjI=", + "lastModified": 1717698941, + "narHash": "sha256-aG4df7MrR4jVrKS63/1LchlByihg0e96tBne08tpzI8=", "owner": "nix-community", "repo": "nur", - "rev": "f90c0edd68fd388dfbaa310789a13bccfd06b005", + "rev": "437476d779b35425091b2061b736b7dc54b71b15", "type": "github" }, "original": { @@ -2303,11 +2287,11 @@ ] }, "locked": { - "lastModified": 1714443211, - "narHash": "sha256-lKTA3XqRo4aVgkyTSCtpcALpGXdmkilHTtN00eRg0QU=", + "lastModified": 1717121863, + "narHash": "sha256-/3sxIe7MZqF/jw1RTQCSmgTjwVod43mmrk84m50MJQ4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ce35c36f58f82cee6ec959e0d44c587d64281b6f", + "rev": "2a7b53172ed08f856b8382d7dcfd36a4e0cbd866", "type": "github" }, "original": { @@ -2376,11 +2360,11 @@ ] }, "locked": { - "lastModified": 1716862669, - "narHash": "sha256-7oTPM9lcdwiI1cpRC313B+lHawocgpY5F07N+Rbm5Uk=", + "lastModified": 1717640276, + "narHash": "sha256-xtWJuHl0Zq1/pibvU7V8+qad4fcNLP4yerO54nr4Hec=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "47b2d15658b37716393b2463a019000dbd6ce4bc", + "rev": "96161e19677e2ae639c41147e422da4d6ec48240", "type": "github" }, "original": { @@ -2401,11 +2385,11 @@ ] }, "locked": { - "lastModified": 1716689906, - "narHash": "sha256-tQYQM9zT4P1fFf739/AIZuTIGPxtEIpV7K7VieU60Io=", + "lastModified": 1717294752, + "narHash": "sha256-QhlS52cEQyx+iVcgrEoCnEEpWUA6uLdmeLRxk935inI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3b6e1e221b04965427f3eee11fd6b6ea7b5f579b", + "rev": "b46857a406d207a1de74e792ef3b83e800c30e08", "type": "github" }, "original": { @@ -2772,11 +2756,11 @@ ] }, "locked": { - "lastModified": 1715940852, - "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "lastModified": 1717278143, + "narHash": "sha256-u10aDdYrpiGOLoxzY/mJ9llST9yO8Q7K/UlROoNxzDw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", + "rev": "3eb96ca1ae9edf792a8e0963cc92fddfa5a87706", "type": "github" }, "original": { @@ -2795,11 +2779,11 @@ "rust-overlay": "rust-overlay_7" }, "locked": { - "lastModified": 1716790530, - "narHash": "sha256-DfVi60QPmspU1g7BwSs80AObTL57W5uiKvDrTB7Yv1E=", + "lastModified": 1717324343, + "narHash": "sha256-0X7htQ46i4DbJxz4lSpx8RL7/B+7bUQNtkSr4ZOX9xc=", "owner": "dj95", "repo": "zjstatus", - "rev": "d4ed9932b0473dbcdfb87408eed94bd99d32fc6d", + "rev": "d669610cae0051b60dfb9564a52582611968dfad", "type": "github" }, "original": { diff --git a/neovim/nvim.nix b/neovim/nvim.nix index 7479ee84..0d72f6bf 100644 --- a/neovim/nvim.nix +++ b/neovim/nvim.nix @@ -223,7 +223,7 @@ in rec { enable = true; servers = { gopls.enable = true; - nil_ls = { + nil-ls = { enable = true; settings.formatting.command = [ "${pkgs.alejandra}/bin/alejandra" diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 2703b8f5..34193c4c 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -212,7 +212,7 @@ foot git fish - nushellFull + nushell (pkgs.wrapFirefox (pkgs.firefox-unwrapped.override {pipewireSupport = true;}) {})