nixos

commit d31b083003db9f9bbbf08fe93750d6833cfca993
parent f6627431ce39452508c937e2247acea48e824a88
Author: MTRNord <mtrnord1@gmail.com>
Date:   Tue,  8 Aug 2023 21:38:02 +0200

Remove rust flake

Diffstat:
M
flake.lock
 | 
39
---------------------------------------
M
flake.nix
 | 
24
++----------------------
M
nixos/worker-1/configuration.nix
 | 
4
++++

3 files changed, 6 insertions(+), 61 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -1,26 +1,5 @@
 {
   "nodes": {
-    "fenix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-analyzer-src": "rust-analyzer-src"
-      },
-      "locked": {
-        "lastModified": 1691475627,
-        "narHash": "sha256-aOgYmNqXyCHw1vaNDv5GqUAURiPMVej4xQNE37bCF8g=",
-        "owner": "nix-community",
-        "repo": "fenix",
-        "rev": "72b64bd857cacd2733ce99fbf0603bbe335d357c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "fenix",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -176,7 +155,6 @@
     },
     "root": {
       "inputs": {
-        "fenix": "fenix",
         "hardware": "hardware",
         "home-manager": "home-manager",
         "kubenix": "kubenix",
@@ -185,23 +163,6 @@
         "sops-nix": "sops-nix"
       }
     },
-    "rust-analyzer-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1691410619,
-        "narHash": "sha256-npJ8zOZ/CQoZu+0kN5NU9iC5JbmbsucyK1DayPmHWPs=",
-        "owner": "rust-lang",
-        "repo": "rust-analyzer",
-        "rev": "d9e9ca29814e95bb40db2216ed0973d9ba54b6a2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rust-lang",
-        "ref": "nightly",
-        "repo": "rust-analyzer",
-        "type": "github"
-      }
-    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": "nixpkgs_3",
diff --git a/flake.nix b/flake.nix
@@ -21,14 +21,9 @@
     # nix-colors.url = "github:misterio77/nix-colors";
 
     kubenix.url = "github:hall/kubenix";
-
-    fenix = {
-      url = "github:nix-community/fenix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
-  outputs = { self, fenix, nixpkgs, home-manager, sops-nix, ... }@inputs:
+  outputs = { self, nixpkgs, home-manager, sops-nix, ... }@inputs:
     let
       inherit (self) outputs;
       forAllSystems = nixpkgs.lib.genAttrs [
@@ -42,8 +37,6 @@
       packages = forAllSystems (system:
         let
           pkgs = nixpkgs.legacyPackages.${system};
-          x86_64-linux.default = fenix.packages.x86_64-linux.stable.toolchain;
-          aarch64-linux.default = fenix.packages.aarch64-linux.stable.toolchain;
         in
         import ./pkgs { inherit pkgs; }
       );
@@ -74,21 +67,8 @@
           specialArgs = { inherit inputs outputs; };
           modules = [
             # > Our main nixos configuration file <
-            ./nixos/worker-1/configuration.nix
             sops-nix.nixosModules.sops
-            ({ pkgs, ... }: {
-              nixpkgs.overlays = [ fenix.overlays.default ];
-              environment.systemPackages = with pkgs; [
-                (fenix.complete.withComponents [
-                  "cargo"
-                  "clippy"
-                  "rust-src"
-                  "rustc"
-                  "rustfmt"
-                ])
-                rust-analyzer-nightly
-              ];
-            })
+            ./nixos/worker-1/configuration.nix
           ];
         };
       };
diff --git a/nixos/worker-1/configuration.nix b/nixos/worker-1/configuration.nix
@@ -100,6 +100,10 @@
     file
     go
     dos2unix
+    cargo
+    clippy
+    rustc
+    rustfmt
   ];
 
   boot.loader = {