From a4882d8057964fdc8e027cd538394066f96041c1 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Wed, 27 Nov 2024 20:34:52 +0530 Subject: [PATCH] feat: Remove some stuff --- flake.lock | 102 +++++++++++++++++++++++------------------------ nixos/device.nix | 52 ++++++++++-------------- 2 files changed, 72 insertions(+), 82 deletions(-) diff --git a/flake.lock b/flake.lock index 47e5aab9..c93c1a8b 100644 --- a/flake.lock +++ b/flake.lock @@ -270,11 +270,11 @@ "csshacks": { "flake": false, "locked": { - "lastModified": 1731735181, - "narHash": "sha256-TNmMIc+HjYxC55GQrRgRIc8iZQugtFhiQ2xmugvRKsE=", + "lastModified": 1732675953, + "narHash": "sha256-a+gVFYOIr2o9uDLhsRMWFZ/ffj27X8sxHGrv7sezo0w=", "owner": "MrOtherGuy", "repo": "firefox-csshacks", - "rev": "14f2c867e741668270df1b83fd7e4e89c2684186", + "rev": "e23b213d846b582817786f8e09ffc2807f733c37", "type": "github" }, "original": { @@ -1230,11 +1230,11 @@ ] }, "locked": { - "lastModified": 1732025103, - "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", + "lastModified": 1732482255, + "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "owner": "nix-community", "repo": "home-manager", - "rev": "a46e702093a5c46e192243edbd977d5749e7f294", + "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "type": "github" }, "original": { @@ -1273,11 +1273,11 @@ ] }, "locked": { - "lastModified": 1732025103, - "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", + "lastModified": 1732482255, + "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "owner": "nix-community", "repo": "home-manager", - "rev": "a46e702093a5c46e192243edbd977d5749e7f294", + "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "type": "github" }, "original": { @@ -1331,11 +1331,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1732100541, - "narHash": "sha256-ryxqTo2N5EOwHjrDXCoVFKuG1ZKpoMlRmCjqqUhjQPU=", + "lastModified": 1732629163, + "narHash": "sha256-IUNhY9+sf7zysRntzP2ZxbIipL3IuI6MgOb3gB33X6o=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "940f7aa990dbc99815bab8d355999d8277534b17", + "rev": "1fb720b62aeb474873ba43426ddc53afde1e6cdd", "type": "github" }, "original": { @@ -1535,11 +1535,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1732055037, - "narHash": "sha256-gTl7l/jJReaxhKn1HA6JJp1mfq/eu8XJbeK88NVeGnw=", + "lastModified": 1732533143, + "narHash": "sha256-m/dBgSxItXrWzTlNannj2loipflOgACfemE/imMICNo=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "230dd8b13b024eb039613c579f940802ea5857e5", + "rev": "a181d4e2571b369e619917d4dc592f64bd16ec1b", "type": "github" }, "original": { @@ -1662,11 +1662,11 @@ ] }, "locked": { - "lastModified": 1732139495, - "narHash": "sha256-bsL1CZWp5fMDXP6U0Ipwi/XA1YigK9ON+pC7Cxurgec=", + "lastModified": 1732661062, + "narHash": "sha256-E8mk/P0wUpHXy7tDQqUzbpa9IJoN/DmA1a6iFBuXqgI=", "owner": "musnix", "repo": "musnix", - "rev": "996b38613a282299c852eca204a10914c6b0074d", + "rev": "629dcc6010365cfd268702065c2f8149ae19ea02", "type": "github" }, "original": { @@ -1869,11 +1869,11 @@ ] }, "locked": { - "lastModified": 1732016537, - "narHash": "sha256-XwXUK+meYnlhdQz2TVE4Wv+tsx1CkdGbDPt1tRzCNH4=", + "lastModified": 1732603785, + "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "61cee20168a3ebb71a9efd70a55adebaadfbe4d4", + "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a", "type": "github" }, "original": { @@ -1890,11 +1890,11 @@ ] }, "locked": { - "lastModified": 1732016537, - "narHash": "sha256-XwXUK+meYnlhdQz2TVE4Wv+tsx1CkdGbDPt1tRzCNH4=", + "lastModified": 1732603785, + "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "61cee20168a3ebb71a9efd70a55adebaadfbe4d4", + "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a", "type": "github" }, "original": { @@ -1929,11 +1929,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1731814505, - "narHash": "sha256-l9ryrx1Twh08a+gxrMGM9O/aZKEimZfa6sZVyPCImgI=", + "lastModified": 1732519917, + "narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "bdba246946fb079b87b4cada4df9b1cdf1c06132", + "rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436", "type": "github" }, "original": { @@ -2050,11 +2050,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1732201103, - "narHash": "sha256-QYV9yMZ5xAdxjGLqjJ9baywQc0ekcwd7/QddsR2Zzj4=", + "lastModified": 1732715821, + "narHash": "sha256-GjpZXEeSlIwK8Qdl17SYga3B9Ti8gqA8lmYaBBddMW8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e17454c31dde901565b848326de097b06dd0892", + "rev": "c93e66162c3eba55cd4e81c51f49e8de71ddc569", "type": "github" }, "original": { @@ -2158,11 +2158,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -2174,11 +2174,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { @@ -2232,11 +2232,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1732143099, - "narHash": "sha256-lh2Qi8gd1SwJVGo7gJjoFvS/djS5Nimaw25j792PJjM=", + "lastModified": 1732661768, + "narHash": "sha256-3D1m2l/hMivhpVkmJoEM+4tQ9W5j6s4UESSnuVl/7LM=", "owner": "nix-community", "repo": "nixvim", - "rev": "2f71c4250bef7a52fe21bd00d1e58c119f62008c", + "rev": "7eb106ab690ff3f37ef5d517763e68a78a7923e3", "type": "github" }, "original": { @@ -2340,11 +2340,11 @@ }, "nur": { "locked": { - "lastModified": 1732200980, - "narHash": "sha256-I7iT9Pvfvwdn/HwduB0iypeZ0ZLe2S7ISeoOVu5MuWE=", + "lastModified": 1732712909, + "narHash": "sha256-itN6gokrJekkGJ1bBduDxqc0NeZVDEPwGM1eBk89268=", "owner": "nix-community", "repo": "nur", - "rev": "6b4e7eb30278bbf9fda14859347035fe3fc45eea", + "rev": "f2a9aa0e0cff734ea2ee8528aa97c2f367b92647", "type": "github" }, "original": { @@ -2683,11 +2683,11 @@ ] }, "locked": { - "lastModified": 1732156292, - "narHash": "sha256-XuTCME5ZausokOJ28AsIoayBVD1soscdoiKweT4VY50=", + "lastModified": 1732674798, + "narHash": "sha256-oM1gjCv9R4zxDFO3as9wqQ4FI3+pDA9MKZ72L7tTIII=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2d484c7a0db32f2700e253160bcd2aaa6cdca3ba", + "rev": "1d569430326b0a7807ccffdb2a188b814091976c", "type": "github" }, "original": { @@ -2724,11 +2724,11 @@ ] }, "locked": { - "lastModified": 1732186149, - "narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=", + "lastModified": 1732575825, + "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699", + "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa", "type": "github" }, "original": { @@ -3046,11 +3046,11 @@ ] }, "locked": { - "lastModified": 1732111664, - "narHash": "sha256-XWHuPWcP59QnHEewdZJXBX1TA2lAP78Vz4daG6tfIr4=", + "lastModified": 1732643199, + "narHash": "sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "62003fdad7a5ab7b6af3ea9bd7290e4c220277d0", + "rev": "84637a7ab04179bdc42aa8fd0af1909fba76ad0c", "type": "github" }, "original": { diff --git a/nixos/device.nix b/nixos/device.nix index e53577d6..fa5248ff 100644 --- a/nixos/device.nix +++ b/nixos/device.nix @@ -15,38 +15,28 @@ builtins.listToAttrs (builtins.map (device: { inherit device; lanzaboote = inputs.lanzaboote; }; - modules = - [ - nur.nixosModules.nur - inputs.sops-nix.nixosModules.sops - {nixpkgs.overlays = overlays;} - ./${device.name}/configuration.nix - home-manager.nixosModules.home-manager - inputs.lanzaboote.nixosModules.lanzaboote - inputs.musnix.nixosModules.musnix - { - nixpkgs.config.allowUnfree = true; - home-manager = { - backupFileExtension = "bak"; - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs = { - inherit inputs; - inherit device; - }; - users.${device.user}.imports = [../common/home.nix]; + modules = [ + nur.nixosModules.nur + inputs.sops-nix.nixosModules.sops + {nixpkgs.overlays = overlays;} + ./${device.name}/configuration.nix + home-manager.nixosModules.home-manager + inputs.lanzaboote.nixosModules.lanzaboote + inputs.musnix.nixosModules.musnix + { + nixpkgs.config.allowUnfree = true; + home-manager = { + backupFileExtension = "bak"; + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = { + inherit inputs; + inherit device; }; - } - ] - ++ nixpkgs.lib.optionals device.live [ - (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix") - ({pkgs, ...}: { - systemd.services.sshd.wantedBy = pkgs.lib.mkForce ["multi-user.target"]; - users.users.root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILdV/cFR8ENy4vCHnK/dL+Ud7jOJV7+iLeAe8y5nj3xF email@uttarayan.me" - ]; - }) - ]; + users.${device.user}.imports = [../common/home.nix]; + }; + } + ]; }; }) devices)