.envrc

@@ -1 +1 @@
-use flake
+use nix

flake.lock

@@ -3,9 +3,7 @@
     "agenix": {
       "inputs": {
         "agenix": "agenix_2",
-        "flake-utils": [
+        "flake-utils": "flake-utils",
-          "flake-utils"
-        ],
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -220,11 +218,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1678901627,
+        "lastModified": 1676283394,
-        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
+        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
+        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
         "type": "github"
       },
       "original": {
@@ -304,11 +302,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1679067095,
+        "lastModified": 1678729503,
-        "narHash": "sha256-G2dJQURL/CCi+8RP6jNJG8VqgtzEMCA+6mNodd3VR6E=",
+        "narHash": "sha256-j+h4Bdqbe+qjzhxdhkRmVgSx2lxJ8HnKeYcAhhnd1zM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3239e0b40f242f47bf6c0c37b2fd35ab3e76e370",
+        "rev": "24c1a6335e3da6a3ecf82f33ac50c2ad66aee346",
         "type": "github"
       },
       "original": {
@@ -350,11 +348,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1679081381,
+        "lastModified": 1678654296,
-        "narHash": "sha256-n4+SbrVohxbgbmOTkodfxc3d8W38OfKowD6YNA8j27o=",
+        "narHash": "sha256-aVfw3ThpY7vkUeF1rFy10NAkpKDS2imj3IakrzT0Occ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b573a7f69484a7d213680abb70b4f95bdc28eee5",
+        "rev": "5a1dc8acd977ff3dccd1328b7c4a6995429a656b",
         "type": "github"
       },
       "original": {
@@ -382,6 +380,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1670507980,
+        "narHash": "sha256-riNZa0xzM1it3pzxciwALeMs+0CsBMWIW2FqulzK8vM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2787fc7d1e51404678614bf0fe92fc296746eec0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "poetry2nix": {
       "flake": false,
       "locked": {
@@ -429,7 +443,6 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "webcord": "webcord"
@@ -495,9 +508,7 @@
     "webcord": {
       "inputs": {
         "dream2nix": "dream2nix",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_2",
-          "nixpkgs"
-        ],
         "webcord": "webcord_2"
       },
       "locked": {

flake.nix

@@ -3,12 +3,10 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
 
     agenix = {
       url = "github:yaxitech/ragenix";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
     };
 
     home-manager = {
@@ -16,69 +14,50 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    webcord = {
+    webcord.url = "github:fufexan/webcord-flake";
-      url = "github:fufexan/webcord-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
-  outputs = { nixpkgs, flake-utils, agenix, home-manager, webcord, ... }@inputs:
+  outputs = { nixpkgs, agenix, home-manager, webcord, ... }@inputs: {
-
+    # colmena
-    # Provide colmena
+    colmena = {
-    (flake-utils.lib.eachDefaultSystem (system:
+      meta = {
-      let pkgs = nixpkgs.legacyPackages.${system};
+        nixpkgs = import nixpkgs {
-      in {
+          system = "x86_64-linux";
-        devShells.default = pkgs.mkShell {
+          overlays = [ ];
-          packages = [
-            pkgs.colmena
-            pkgs.nixfmt
-            pkgs.git
-            inputs.agenix.packages.${system}.ragenix
-          ];
-        };
-      })) // {
-
-        # colmena
-        colmena = {
-          meta = {
-            nixpkgs = import nixpkgs {
-              system = "x86_64-linux";
-              overlays = [ ];
-            };
-          };
-
-          # default config
-          defaults = { name, ... }: {
-            imports = [
-              ./hosts/${name}/configuration.nix
-              home-manager.nixosModules.home-manager
-              agenix.nixosModules.default
-            ];
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-            };
-          };
-
-          # personnal laptop
-          neodymium = { ... }: {
-            home-manager.users.laurent = {
-              imports = [ webcord.homeManagerModules.default ];
-            };
-            deployment = {
-              allowLocalDeployment = true;
-              targetHost = null;
-            };
-          };
-
-          # ovh vps
-          hydrogen = { ... }: {
-            deployment = {
-              targetHost = "178.62.253.235";
-              targetUser = "root";
-            };
-          };
         };
       };
 
+      # default config
+      defaults = { name, ... }: {
+        imports = [
+          ./hosts/${name}/configuration.nix
+          home-manager.nixosModules.home-manager
+          agenix.nixosModules.default
+        ];
+        home-manager = {
+          useGlobalPkgs = true;
+          useUserPackages = true;
+        };
+      };
+
+      # personnal laptop
+      neodymium = { ... }: {
+        home-manager.users.laurent = {
+          imports = [ webcord.homeManagerModules.default ];
+        };
+        deployment = {
+          allowLocalDeployment = true;
+          targetHost = null;
+        };
+      };
+
+      # ovh vps
+      hydrogen = { ... }: {
+        deployment = {
+          targetHost = "178.62.253.235";
+          targetUser = "root";
+        };
+      };
+    };
+  };
 }

hosts/neodymium/configuration.nix

@@ -102,9 +102,6 @@ in {
     (nerdfonts.override { fonts = [ "FiraCode" ]; })
   ];
 
-  # udev
-  services.udev.packages = [ pkgs.android-udev-rules ];
-
   # audio
   services.pipewire = {
     enable = true;
@@ -127,7 +124,7 @@ in {
   users.users.laurent = {
     isNormalUser = true;
     initialPassword = "laurent";
-    extraGroups = [ "wheel" "video" "docker" "adbusers" ];
+    extraGroups = [ "wheel" "video" "docker" ];
     shell = pkgs.zsh;
   };
   home-manager.users.laurent = {

shell.nix

@@ -0,0 +1,3 @@
+{ pkgs ? import <nixpkgs> { } }:
+
+pkgs.mkShell { buildInputs = with pkgs; [ colmena nixfmt ]; }