Lock file maintenance

flake.lock

@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1704277720,
+        "lastModified": 1705452289,
-        "narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=",
+        "narHash": "sha256-i/WodLabBcmRr9hdSv5jzDigL1hRYuI8vNh+xTbGt+g=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4",
+        "rev": "74ab0227ee495e526f2dd57ea684b34f6396445a",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1704632650,
+        "lastModified": 1705312285,
-        "narHash": "sha256-83J/nd/NoLqo3vj0S0Ppqe8L+ijIFiGL6HNDfCCUD/Q=",
+        "narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "c478b3d56969006e015e55aaece4931f3600c1b2",
+        "rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0",
         "type": "github"
       },
       "original": {
@@ -59,11 +59,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1704498488,
+        "lastModified": 1705660020,
-        "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=",
+        "narHash": "sha256-1tOuNh+UbiZlaC8RrpQzzypgnLBC67eRlBunfkE4sbQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee",
+        "rev": "2064348e555b6aa963da6372a8f14e6acb80a176",
         "type": "github"
       },
       "original": {
@@ -83,11 +83,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1704649868,
+        "lastModified": 1705503680,
-        "narHash": "sha256-PKVOCPV5i8prioWway5PjRMsICtrVONV3y5W69gQLWw=",
+        "narHash": "sha256-e+ou1KvZeZp104yeCgvgTTp5G+DB380CUZuUkijZxAc=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "d7d333d162da2d3fc852b2c7a3faa2709440cefa",
+        "rev": "c4365f20ed8ff0dd480b7ed7cf1bfff1a0b6911a",
         "type": "github"
       },
       "original": {
@@ -123,7 +123,11 @@
     },
     "hyprlang": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "hyprland",
+          "xdph",
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1704287638,
@@ -160,15 +164,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1702645756,
+        "lastModified": 1705496572,
-        "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=",
+        "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0",
+        "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -189,29 +193,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1704194953,
-        "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nur": {
       "locked": {
-        "lastModified": 1704656673,
+        "lastModified": 1705674901,
-        "narHash": "sha256-AdwWgssYf88cgxU6OvXuLY2QIs/OhUAyM3UckeLxR2I=",
+        "narHash": "sha256-sXJAurZAOfIZgs5x+CuBCopWKLRn5XY+jAeYqzNpHCM=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "50c8484371ff46d77678e88c1f78cc5495d7190d",
+        "rev": "750734b35cbc48450a8bfa04586fbe3610e2f2c3",
         "type": "github"
       },
       "original": {
@@ -227,7 +215,7 @@
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "nix-colors": "nix-colors",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nur": "nur",
         "sops-nix": "sops-nix"
       }
@@ -242,11 +230,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1704596510,
+        "lastModified": 1705356877,
-        "narHash": "sha256-tupdwwg1WeX2hNMOQrvtyafTaTVty0QC/gQp7yaYJic=",
+        "narHash": "sha256-274jL1cH64DcXUXebVMZBRUsTs3FvFlPIPkCN/yhSnI=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "f5fbcc0f50e7fc60c4f806fa7a09abccf0826d8a",
+        "rev": "87755331580fdf23df7e39b46d63ac88236bf42c",
         "type": "github"
       },
       "original": {
@@ -306,11 +294,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1704400467,
+        "lastModified": 1704659450,
-        "narHash": "sha256-IsEAKBCorRlN53FwFAMbyGLRsPVu/ZrWEJtCwykPds8=",
+        "narHash": "sha256-3lyoUVtUWz1LuxbltAtkJSK2IlVXmKhxCRU2/0PYCms=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "1c802128f6cc3db29a8ef01552b1a22f894eeefd",
+        "rev": "6a5de92769d5b7038134044053f90e7458f6a197",
         "type": "github"
       },
       "original": {

modules/home/gui/apps/develop/default.nix

@@ -1,12 +1,7 @@
 { lib, config, pkgs, ... }: {
-
+  imports = [ ./vscodium ];
-    imports = [ ./vscodium ];
 
   config = lib.mkIf (config.homecfg.make.develop) {
-
+    home.packages = with pkgs; [ blender godot_4 ];
-    home.packages = with pkgs; [
-        blender
-        godot_4
-    ];
   };
 }

modules/nixos/hostcfg/default.nix

@@ -24,6 +24,10 @@ with lib; {
         type = types.bool;
         default = false;
       };
+      develop = mkOption {
+        type = types.bool;
+        default = false;
+      };
     };
     net = {
       wlp = {

modules/nixos/system/hw/udev/default.nix

@@ -1,13 +1,16 @@
 { ... }: {
   systemd.services.systemd-udevd.restartIfChanged = false;
 
-  services.udev.extraRules = ''
+  services.udev = {
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0127", GROUP="plugdev", TAG+="uaccess"
+    packages = [ ];
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0118", GROUP="plugdev", TAG+="uaccess"
+    extraRules = ''
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0106", GROUP="plugdev", TAG+="uaccess"
+      SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0127", GROUP="plugdev", TAG+="uaccess"
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0128", GROUP="plugdev", TAG+="uaccess"
+      SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0118", GROUP="plugdev", TAG+="uaccess"
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="010a", GROUP="plugdev", TAG+="uaccess"
+      SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0106", GROUP="plugdev", TAG+="uaccess"
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0102", GROUP="plugdev", TAG+="uaccess"
+      SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0128", GROUP="plugdev", TAG+="uaccess"
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0313", GROUP="plugdev", TAG+="uaccess"
+      SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="010a", GROUP="plugdev", TAG+="uaccess"
-  '';
+      SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0102", GROUP="plugdev", TAG+="uaccess"
+      SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0313", GROUP="plugdev", TAG+="uaccess"
+    '';
+  };
 }

modules/nixos/system/hw/virt/default.nix

@@ -1,9 +1,11 @@
-{ lib, config, ... }:
+{ lib, config, pkgs, ... }:
 let cfg = config.hostcfg.make.virt;
 in {
   config = lib.mkIf cfg {
+
+    environment.systemPackages = [ pkgs.qemu ];
     virtualisation = {
-      # libvirtd.enable = true;
+      libvirtd.enable = true;
       # waydroid.enable = true;
       # lxd.enable = true;
       docker = {

modules/nixos/system/nix/default.nix

@@ -2,6 +2,7 @@
   nixpkgs.config = {
     permittedInsecurePackages = [ ];
     allowUnfree = true;
+    android_sdk.accept_license = true;
     packageOverrides = pkgs: rec {
       custom = import ../../../../packages { inherit pkgs; };
     };

modules/nixos/tools/debug/default.nix

@@ -1,6 +1,6 @@
-{ pkgs, ... }: {
+{ pkgs, config, ... }: {
   programs.adb.enable = true;
   programs.wireshark.enable = true;
 
-  environment.systemPackages = with pkgs; [ wget dconf ];
+  environment.systemPackages = with pkgs; [ wget dconf wireshark ];
 }

modules/nixos/tools/default.nix

@@ -1 +1 @@
-{ ... }: { imports = [ ./debug ./devel ]; }
+{ ... }: { imports = [ ./debug ./develop ]; }

modules/nixos/tools/devel/default.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-
-}

modules/nixos/tools/develop/default.nix

@@ -0,0 +1,15 @@
+{ lib, config, pkgs, ... }:
+let
+  android_env = pkgs.androidenv.composeAndroidPackages {
+    platformVersions = [ "34" ];
+    abiVersions = [ "x86" "x86_64" ];
+    includeEmulator = false;
+  };
+in {
+  config = lib.mkIf (config.hostcfg.make.develop) {
+    environment.systemPackages = with pkgs; [
+      android-tools
+      androidStudioPackages.canary
+    ];
+  };
+}

modules/nixos/users/default.nix

@@ -10,6 +10,8 @@
         "wheel"
         "vboxsf"
         "adbusers"
+        "libvirtd"
+        "kvm"
         "lp"
         "audio"
         "video"

systems/iriy/default.nix

@@ -14,6 +14,7 @@
       virt = true;
       power = false;
       game = true;
+      develop = true;
     };
     net = {
       wlp = {

systems/valinor/default.nix

@@ -14,6 +14,7 @@
       virt = true;
       power = true;
       game = true;
+      develop = true;
     };
     net = {
       wlp = {