diff --git a/flake.lock b/flake.lock index 0f7841c..128653d 100644 --- a/flake.lock +++ b/flake.lock @@ -16,21 +16,6 @@ "type": "github" } }, - "flake-utils": { - "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -38,11 +23,11 @@ ] }, "locked": { - "lastModified": 1682347289, - "narHash": "sha256-BQHY4lzS3Tkx4XLmZPR5FSjKWMP+cKNtUM8pTC4L9Ek=", + "lastModified": 1682535786, + "narHash": "sha256-NH2a8yB8V25cglvcHDrvaTLvohzMgGLLZ4vnXQn4vOw=", "owner": "nix-community", "repo": "home-manager", - "rev": "0263da497eae3246ea15ed6f0f7875bc15592cef", + "rev": "d82c9af8175878a461a0fdf914e67cc446664570", "type": "github" }, "original": { @@ -61,11 +46,11 @@ ] }, "locked": { - "lastModified": 1682374992, - "narHash": "sha256-kUKN01bcoVOs5R4PoN8vZKCBvbgffuF09DiXKsgwmCs=", + "lastModified": 1682548480, + "narHash": "sha256-aycGKS+Vv/lQQFaYJNpK054leLKIapfUobgzt8fohFA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "e195a51cd4dd1cb15a04d9b67e3aec67199c5bea", + "rev": "72d2f33b34951b7f5be6cdbc302b1c6a33cbf60f", "type": "github" }, "original": { @@ -123,11 +108,11 @@ ] }, "locked": { - "lastModified": 1681650457, - "narHash": "sha256-IGXRZrFGFqUeM5iDgP/ojbrd+gKL40PaFFAITxbkfZ0=", + "lastModified": 1682542538, + "narHash": "sha256-752hHXEGsvKdw1Hm2LoFfi6sj2zVxu2AuKi4sRA7HN0=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "3bfaac09f58ce31c33e1a56e7eaa606a87fe4c32", + "rev": "b4fdc0be52d7c3e48e932698bafc3f69dbd45b3b", "type": "github" }, "original": { @@ -136,27 +121,6 @@ "type": "github" } }, - "language-servers": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1673891911, - "narHash": "sha256-ayBHJQpJItWrUsTy/uFDFRkDuaGTkGn4Y7Xka35rFY0=", - "ref": "refs/heads/master", - "rev": "be9c9b24c0fce29baaaf6b0f5cb4dd3cacad83ad", - "revCount": 9, - "type": "git", - "url": "https://git.sr.ht/~bwolf/language-servers.nix" - }, - "original": { - "type": "git", - "url": "https://git.sr.ht/~bwolf/language-servers.nix" - } - }, "nix-colors": { "inputs": { "base16-schemes": "base16-schemes", @@ -183,11 +147,11 @@ ] }, "locked": { - "lastModified": 1681591833, - "narHash": "sha256-lW+xOELafAs29yw56FG4MzNOFkh8VHC/X/tRs1wsGn8=", + "lastModified": 1682417654, + "narHash": "sha256-XtUhq1GTRzV7QebHkxjd7Z58E6lVEk6Iv1/pF/GnBB4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "68ec961c51f48768f72d2bbdb396ce65a316677e", + "rev": "e3e320b19c192f40a5b98e8776e3870df62dee8a", "type": "github" }, "original": { @@ -213,11 +177,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1681920287, - "narHash": "sha256-+/d6XQQfhhXVfqfLROJoqj3TuG38CAeoT6jO1g9r1k0=", + "lastModified": 1682453498, + "narHash": "sha256-WoWiAd7KZt5Eh6n+qojcivaVpnXKqBsVgpixpV2L9CE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "645bc49f34fa8eff95479f0345ff57e55b53437e", + "rev": "c8018361fa1d1650ee8d4b96294783cf564e8a7f", "type": "github" }, "original": { @@ -274,22 +238,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1680945546, - "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "purge": { "inputs": { "nixpkgs": [ @@ -315,7 +263,6 @@ "home-manager": "home-manager", "hyprland": "hyprland", "hyprpaper": "hyprpaper", - "language-servers": "language-servers", "nix-colors": "nix-colors", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", @@ -334,11 +281,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1682338428, - "narHash": "sha256-T7AL/Us6ecxowjMAlO77GETTQO2SO+1XX2+Y/OSfHk8=", + "lastModified": 1682539132, + "narHash": "sha256-djX/Vp1snR1XHyk400HKCfwWVoLBE8uiQalTXMH7Kj0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "7c8e9727a2ecf9994d4a63d577ad5327e933b6a4", + "rev": "4a330ead6a990365c9bb48f30523ac048fb6d8ae", "type": "github" }, "original": { @@ -371,11 +318,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1681806570, - "narHash": "sha256-Q3En42poeOlVJz4K1rg7p7hrlNCpC0dQy91R4Ucoapc=", + "lastModified": 1682436395, + "narHash": "sha256-GGEjkQO9m7YLYIXIXM76HWdhjg4Ye+oafOtyaFAYKI4=", "owner": "wlroots", "repo": "wlroots", - "rev": "00489b11a0d926058d23584e2ad0e2b64f5b7406", + "rev": "6830bfc17fd94709e2cdd4da0af989f102a26e59", "type": "gitlab" }, "original": { @@ -388,14 +335,16 @@ "xdph": { "inputs": { "hyprland-protocols": "hyprland-protocols_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1682345099, - "narHash": "sha256-UmVuGvrOrL2iSZOf3sqzJAtbI9Y1BVAOHOdCBCI6W10=", + "lastModified": 1682439384, + "narHash": "sha256-zHDa8LCZs05TZHQSIZ3ucwyMPglBGHcqTBzfkLjYXTM=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "f9f08c802e96ede147f25f724977a156324a4cf4", + "rev": "c0e233955568fbea4e859336f6d3d14d51294d7c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7ed5c99..32327c6 100644 --- a/flake.nix +++ b/flake.nix @@ -32,6 +32,9 @@ xdph = { url = "github:hyprwm/xdg-desktop-portal-hyprland"; + inputs = { + nixpkgs.follows = "nixpkgs"; + }; }; hyprland = { @@ -46,9 +49,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - language-servers.url = "git+https://git.sr.ht/~bwolf/language-servers.nix"; - language-servers.inputs.nixpkgs.follows = "nixpkgs"; - purge = { url = "github:therealr5/purge"; inputs.nixpkgs.follows = "nixpkgs"; @@ -69,7 +69,6 @@ , nixos-hardware , purge , trucksimulatorbot-images - , language-servers , ... }@attrs: { formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt; diff --git a/users/rouven/modules/helix/default.nix b/users/rouven/modules/helix/default.nix index 063191e..8029e03 100644 --- a/users/rouven/modules/helix/default.nix +++ b/users/rouven/modules/helix/default.nix @@ -1,4 +1,4 @@ -{ pkgs, language-servers, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ lldb @@ -20,7 +20,6 @@ pylint ])) clang-tools - language-servers.packages.x86_64-linux.jdt-language-server ]; programs.helix = { enable = true; @@ -39,7 +38,6 @@ display-inlay-hints = true; }; }; - }; }; }