update

flake.lock

@@ -96,11 +96,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1731236720,
-        "narHash": "sha256-XyfDLPyOH+8+3uCxRPzhmbo2f14w2uYQDQ7EXAEdqt8=",
+        "lastModified": 1731297786,
+        "narHash": "sha256-YC+FPREQqPF2HNSu1PkvVps5mBzexxvCV6NXfTf/kQI=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "bc3b536455de8d36e582679a2a5ba02cb4ce5e8a",
+        "rev": "85c8db7e7e901f656072b01f89c8fffcab26bfa6",
         "type": "gitlab"
       },
       "original": {
@@ -311,11 +311,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1730785428,
-        "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
+        "lastModified": 1731139594,
+        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
+        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
         "type": "github"
       },
       "original": {

flake.nix

@@ -13,7 +13,8 @@
     domain = "joygnu.org";
     mail = "contact@joygnu.org";
     nixpath = "nix/";
-    systemConfig = {modules}:
+
+    nixosconf = {modules}:
       nixpkgs.lib.nixosSystem {
         specialArgs = {
           inherit inputs;
@@ -30,16 +31,16 @@
       modules = [./hosts/phone];
     };
     nixosConfigurations = {
-      desktop = systemConfig {
+      desktop = nixosconf {
         modules = [./hosts/desktop];
       };
-      laptop = systemConfig {
+      laptop = nixosconf {
         modules = [./hosts/laptop];
       };
-      server = systemConfig {
+      server = nixosconf {
         modules = [./hosts/server];
       };
-      iso = systemConfig {
+      iso = nixosconf {
         modules = [./hosts/iso];
       };
     };

hosts/iso/default.nix

@@ -1,7 +1,8 @@
 {modulesPath, ...}: {
   imports = [
     "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
-    ../../modules
+    ../../modules/system
+    ../../modules/programs
   ];
 
   nixpkgs.hostPlatform = "x86_64-linux";

modules/games/emulator/default.nix

@@ -20,8 +20,8 @@
     };
 in {
   config = lib.mkIf config.games.enable {
-    environment.systemPackages = [
-      # pkgs.cemu
+    environment.systemPackages = with pkgs; [
+      cemu
       customPkgs.suyu
     ];
 

modules/hardware/default.nix

@@ -4,6 +4,7 @@
     ./bluetooth
     ./openrgb
     ./sound
+    ./lact
     ./boot
     ./led
   ];

modules/programs/zsh/default.nix

@@ -24,7 +24,7 @@
       hs = "z ~ && ssh ${username}@${domain}";
       su = "z ~ && su";
       ip = "sh ~/${nixpath}modules/programs/zsh/scripts/ip.sh";
-      rb = "sh ~/${nixpath}modules/programs/zsh/scripts/ip.sh";
+      rb = "sh ~/${nixpath}modules/programs/zsh/scripts/rebuild.sh";
       fr = "doas systemctl reboot --firmware";
       up = "nix flake update --flake ~/${nixpath}";
       del = "doas nix-collect-garbage -d";

modules/system/default.nix

@@ -3,7 +3,6 @@
     ./user
     ./homemanger
     ./networking
-    ./lact
     ./doas
     ./misc
   ];

modules/system/misc/default.nix

@@ -6,4 +6,5 @@
   users.defaultUserShell = pkgs.zsh;
   services.xserver.excludePackages = [pkgs.xterm];
   programs.nano.enable = false;
+  programs.java.enable = true;
 }