hosts: small fixes on lifebook init config

remove sound config due to update
fix hydraJobs after adding lifebook

flake.lock

@@ -10,11 +10,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1720546205,
+        "lastModified": 1722339003,
-        "narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=",
+        "narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6",
+        "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7",
         "type": "github"
       },
       "original": {
@@ -31,11 +31,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718474113,
+        "lastModified": 1721842668,
-        "narHash": "sha256-UKrfy/46YF2TRnxTtKCYzqf2f5ZPRRWwKCCJb7O5X8U=",
+        "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "0095fd8ea00ae0a9e6014f39c375e40c2fbd3386",
+        "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf",
         "type": "github"
       },
       "original": {
@@ -66,6 +66,28 @@
         "type": "github"
       }
     },
+    "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "microvm",
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1722580276,
+        "narHash": "sha256-VaNcSh7n8OaFW/DJsR6Fm23V+EGpSei0DyF71RKB+90=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "286f371b3cfeaa5c856c8e6dfb893018e86cc947",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -90,11 +112,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717285511,
+        "lastModified": 1719994518,
-        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
+        "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
+        "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
         "type": "github"
       },
       "original": {
@@ -121,24 +143,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1705309234,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -189,11 +193,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720734513,
+        "lastModified": 1723015306,
-        "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=",
+        "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "90ae324e2c56af10f20549ab72014804a3064c7f",
+        "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e",
         "type": "github"
       },
       "original": {
@@ -246,11 +250,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720697445,
+        "lastModified": 1723211096,
-        "narHash": "sha256-IvFFc57vljkR1eP4VeNMuXJTS/POClq+ytFAadigSY0=",
+        "narHash": "sha256-zQaXLlVCLhT9gP31+wXDT3akOnazm26sVrCxCx4YQ/E=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "bba994424596df09228f5437bcf8ef7fde1fe56e",
+        "rev": "3b711ac1a2cf4d0bb4cb6630250e1af283227434",
         "type": "github"
       },
       "original": {
@@ -264,7 +268,6 @@
         "crane": "crane",
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
-        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -272,11 +275,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1719818887,
+        "lastModified": 1722329086,
-        "narHash": "sha256-Bogl1pJlgby7OpR16jp8zwOWV7FHRxCsnNxHcisyIq0=",
+        "narHash": "sha256-e/fSi0WER06N8WCvpht62fkGtWfe5ckDxr6zNYkwkFw=",
         "owner": "nix-community",
         "repo": "lanzaboote",
-        "rev": "0e6457c98547ec8866714d4222545e7e8c1ae429",
+        "rev": "f5a3a7dff44d131807fc1a89fbd8576cd870334a",
         "type": "github"
       },
       "original": {
@@ -288,18 +291,19 @@
     },
     "microvm": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "fenix": "fenix",
+        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ],
         "spectrum": "spectrum"
       },
       "locked": {
-        "lastModified": 1720034501,
+        "lastModified": 1723156493,
-        "narHash": "sha256-fzZpuVnhw5uOtA4OuXw3a+Otpy8C+QV0Uu5XfhGEPSg=",
+        "narHash": "sha256-ohQs9iCqkcGHWjKwe0P3X0INPjifb45PFH0ay9OnDdM=",
         "owner": "astro",
         "repo": "microvm.nix",
-        "rev": "a808af7775f508a2afedd1e4940a382fe1194f21",
+        "rev": "e2ca6955e34de2a8654defb159640e8f545c001b",
         "type": "github"
       },
       "original": {
@@ -332,11 +336,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1720737798,
+        "lastModified": 1723149858,
-        "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=",
+        "narHash": "sha256-3u51s7jdhavmEL1ggtd8wqrTH2clTy5yaZmhLvAXTqc=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751",
+        "rev": "107bb46eef1f05e86fc485ee8af9b637e5157988",
         "type": "github"
       },
       "original": {
@@ -348,11 +352,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1720823163,
+        "lastModified": 1722987190,
-        "narHash": "sha256-FZ5dnrvKkln9ESdoTR8R7GKW9rNpXNZrxGsOXsbsTpE=",
+        "narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f12ee5f64c6a09995e71c9626d88c4efa983b488",
+        "rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90",
         "type": "github"
       },
       "original": {
@@ -364,27 +368,27 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1710695816,
+        "lastModified": 1720386169,
-        "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
+        "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "614b4613980a522ba49f0d194531beddbb7220d3",
+        "rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1720768451,
+        "lastModified": 1722813957,
-        "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=",
+        "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9",
+        "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
         "type": "github"
       },
       "original": {
@@ -408,11 +412,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1717664902,
+        "lastModified": 1721042469,
-        "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=",
+        "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1",
+        "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
         "type": "github"
       },
       "original": {
@@ -435,23 +439,36 @@
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
     },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1722521768,
+        "narHash": "sha256-FvJ4FaMy1kJbZ3Iw1RyvuiUAsbHJXoU2HwylzaFzj1o=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "f149dc5029d8406fae8b2c541603bcac06e30deb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
     "rust-overlay": {
       "inputs": {
-        "flake-utils": [
-          "lanzaboote",
-          "flake-utils"
-        ],
         "nixpkgs": [
           "lanzaboote",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1718504420,
+        "lastModified": 1722219664,
-        "narHash": "sha256-F2HT/abCfr0CDpkvXwYCscJyD66XDTLMVfdrIMRp2ck=",
+        "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "0043c3f92304823cc2c0a4354b0feaa61dfb4cd9",
+        "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4",
         "type": "github"
       },
       "original": {
@@ -463,11 +480,11 @@
     "spectrum": {
       "flake": false,
       "locked": {
-        "lastModified": 1708358594,
+        "lastModified": 1720264467,
-        "narHash": "sha256-e71YOotu2FYA67HoC/voJDTFsiPpZNRwmiQb4f94OxQ=",
+        "narHash": "sha256-xzM92n3Q9L90faJIJrkrTtTx+JqCGRHMkHWztkV4PuY=",
         "ref": "refs/heads/main",
-        "rev": "6d0e73864d28794cdbd26ab7b37259ab0e1e044c",
+        "rev": "fb59d42542049f586c84b0f8bb86ff3be338e9d3",
-        "revCount": 614,
+        "revCount": 674,
         "type": "git",
         "url": "https://spectrum-os.org/git/spectrum"
       },
@@ -505,21 +522,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -64,7 +64,8 @@
           "hades" = nixosConfigurations.hades.config.system.build.toplevel;
           "nasbak" = nixosConfigurations.nasbak.config.system.build.toplevel;
           "jupiter" = nixosConfigurations.jupiter.config.system.build.toplevel;
-          "laptop" = nixosConfigurations.laptop.config.system.build.toplevel;
+          "lifebook" = nixosConfigurations.lifebook.config.system.build.toplevel;
+          "nbf5" = nixosConfigurations.nbf5.config.system.build.toplevel;
           "kabtop" = nixosConfigurations.kabtop.config.system.build.toplevel;
           "dmz" = nixosConfigurations.dmz.config.system.build.toplevel;
         };

hosts/configuration_desktop.nix

@@ -58,12 +58,12 @@
     #  };
   };
 
-  sound = {                                 # ALSA sound enable
+  #sound = {                                 # ALSA sound enable
-    #enable = true;
+  #  #enable = true;
-    mediaKeys = {                           # Keyboard Media Keys (for minimal desktop) enable = true;
+  #  mediaKeys = {                           # Keyboard Media Keys (for minimal desktop) enable = true;
-      enable = true;
+  #    enable = true;
-    };
+  #  };
-  };
+  #};
 
   fonts.packages = with pkgs; [                # Fonts
     carlito                                 # NixOS

hosts/default.nix

@@ -63,6 +63,7 @@ in
     specialArgs = { inherit inputs user location nixos-hardware agenix lanzaboote; };
     modules = [
       agenix.nixosModules.default
+      lanzaboote.nixosModules.lanzaboote
       ./lifebook
       ./configuration_desktop.nix
       ../modules/hardware/hydraCache.nix

hosts/home.nix

@@ -95,6 +95,9 @@
 
           ];
       })
+
+      sdkmanager
+      android-tools
     ];
     file.".config/wall".source = ../modules/themes/wall.jpg;
     file.".config/lockwall".source = ../modules/themes/lockwall.jpg;

hosts/lifebook/default.nix

@@ -17,7 +17,7 @@
 #           └─ default.nix
 #
 
-{ config, pkgs, user, ... }:
+{ lib, config, pkgs, user, ... }:
 
 {
   imports =                                                         # For now, if applying to other system, swap files
@@ -32,13 +32,18 @@
     kernelPackages = pkgs.linuxPackages_latest;
 
     loader = {                              # EFI Boot
-      systemd-boot.enable = true;
+      systemd-boot.enable = lib.mkForce false;
       efi = {
         canTouchEfiVariables = true;
         efiSysMountPoint = "/boot";
       };
       timeout = 1;                          # Grub auto select time
     };
+
+    lanzaboote = {
+        enable = true;
+        pkiBundle = "/etc/secureboot";
+    };
   };
 
 #  hardware.sane = {                           # Used for scanning with Xsane
@@ -51,9 +56,8 @@
 
   environment = {
     systemPackages = with pkgs; [
-#      simple-scan
+       linux-firmware
        intel-media-driver
-#       alacritty
     ];
   };
 
@@ -62,14 +66,7 @@
   };
 
   services = {
-    tlp = {
+    logind.lidSwitch = "hibernate";            # Laptop does not go to sleep when lid is closed
-      enable = true;                      # TLP and auto-cpufreq for power management
-      settings = {
-        USB_DENYLIST="fc32:1287 1e7d:2e4a 1d5c:5500 1d5c:5510";
-      };
-    };
-
-    logind.lidSwitch = "suspend-then-hibernate";            # Laptop does not go to sleep when lid is closed
     #auto-cpufreq.enable = true;
     blueman.enable = true;
     printing = {                            # Printing and drivers for TS5300

hosts/lifebook/hardware-configuration.nix

@@ -32,10 +32,10 @@
 	  };
 
 	  kernelModules = [ "kvm-intel" ];
-	  kernelParams = [ "luks.options=fido2-device=auto" ];
+	  kernelParams = [ "luks.options=fido2-device=auto" "sysrq_always_enabled=1" ];
-#	  extraModprobeConfig = ''
+	  extraModprobeConfig = ''
-#		  options i915 enable_guc=3 enable_fbc=1 fastboot=1
+		  options i915 enable_guc=3
-#		  '';
+		  '';
 	  tmp.useTmpfs = false;
 	  tmp.cleanOnBoot = true;
   };
@@ -174,16 +174,15 @@
     #defaultGateway = "192.168.0.1";
     #nameservers = [ "192.168.0.4" ];
     firewall = {
-      checkReversePath = "loose";
+      checkReversePath = false;
       enable = true;
-      allowedUDPPorts = [ 24727 ];
+      allowedUDPPorts = [ 24727 51820 ];
       allowedTCPPorts = [ 24727 ];
     };
   };
 
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   powerManagement = {
-    #cpuFreqGovernor = lib.mkDefault "schedutil";
+    powertop.enable = true;    
-    #powertop.enable = true;    
   };
 }

modules/wm/sway/home.nix

@@ -31,8 +31,9 @@
         
         input = {
             "type:keyboard" = { 
-                xkb_layout = "us";
+                xkb_layout = "us,de";
-                xkb_variant = "altgr-intl";
+                xkb_variant = "altgr-intl,";
+                xkb_options = "grp:win_space_toggle";
             };
             "type:touchpad" = {
                 tap = "enabled";