From e04491f9dddcea7c90a79ffe12b8f325da66f04b Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Tue, 23 May 2023 20:51:02 +0200
Subject: [PATCH] don't enable fwupd in the iso

---
 flake.lock                        | 18 +++++++++---------
 flake.nix                         |  2 +-
 hosts/iso/default.nix             |  1 -
 hosts/thinkpad/default.nix        |  2 ++
 users/rouven/fixes.nix            |  4 ----
 users/rouven/modules/packages.nix |  2 +-
 6 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0d92cae..d63744b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1684741999,
-        "narHash": "sha256-KZLKsFZ6cLjCdCNKZoT8bc1y+rYBuFgKatmIB38zqy4=",
+        "lastModified": 1684824189,
+        "narHash": "sha256-k3nCkn5Qy67rCguuw6YkGuL6hOUNRKxQoKOjnapk5sU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ba006d7cca2cb871c6a31bdbc130c05cde5ca8e8",
+        "rev": "58eb968c21d309a6c2b020ea8d64e25c38ceebba",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1684750687,
-        "narHash": "sha256-lqFY4fLfx17l4lFBCe0nQdNAexxkqut90Y2cBOc2gbo=",
+        "lastModified": 1684844798,
+        "narHash": "sha256-ZrMXFoEA535jOZ+eDA3s+URZ5MkVRksBgL5qGnb6Ciw=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "ad244190e001de3eded047a5a387ea47fa0b3eea",
+        "rev": "eb1f832fcec5838053c6b031b656e4f949ada57b",
         "type": "github"
       },
       "original": {
@@ -194,11 +194,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1684662198,
-        "narHash": "sha256-lmGDGuFONWSoGBKDDhU/6fOhhmFoZQ8rPf+kS7/e/Gs=",
+        "lastModified": 1684754342,
+        "narHash": "sha256-plGnjnbnPLoZCTdQX21oT7xliQhFtgcWlkuDHgtEb1o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "50a183182d7ae39133555414d48d5d609a28a57d",
+        "rev": "7084250df3d7f9735087d3234407f3c1fc2400e3",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 8467525..f0f7e67 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,7 +49,7 @@
     }@attrs: {
       packages.x86_64-linux.iso = self.nixosConfigurations.iso.config.system.build.isoImage;
       packages.x86_64-linux.jmri = nixpkgs.legacyPackages.x86_64-linux.callPackage ./pkgs/jmri { };
-      # packages.x86_64-linux.circuitjs = nixpkgs.legacyPackages.x86_64-linux.callPackage ./pkgs/circuitjs { };
+      packages.x86_64-linux.circuitjs = nixpkgs.legacyPackages.x86_64-linux.callPackage ./pkgs/circuitjs { };
       hydraJobs = self.packages;
       formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
       nixosConfigurations = {
diff --git a/hosts/iso/default.nix b/hosts/iso/default.nix
index c72eb30..f9f406c 100644
--- a/hosts/iso/default.nix
+++ b/hosts/iso/default.nix
@@ -10,7 +10,6 @@
     keyMap = "dvorak";
   };
   programs.git.enable = true;
-  services.fwupd.enable = true;
 
   # in case we need to rescue a zfs machine
   boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index dd0c7aa..76bd46d 100755
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -169,6 +169,8 @@
     killall
     zip
     unzip
+
+    virt-viewer # multi monitor for vms
   ];
   programs.java.enable = true;
 
diff --git a/users/rouven/fixes.nix b/users/rouven/fixes.nix
index b347f1a..a23b16f 100644
--- a/users/rouven/fixes.nix
+++ b/users/rouven/fixes.nix
@@ -1,9 +1,5 @@
 { pkgs, ... }:
 {
-  # nodejs 16 is EOL but bitwarden depends on it
-  nixpkgs.config.permittedInsecurePackages = [
-    "nodejs-16.20.0"
-  ];
   # fixes pam entries for swaylock
   security.pam.services.swaylock.text = ''
     # Account management.
diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix
index 0784533..e46f218 100644
--- a/users/rouven/modules/packages.nix
+++ b/users/rouven/modules/packages.nix
@@ -31,7 +31,7 @@
     gomuks # alternative matrix client
 
     # games
-    # prismlauncher # minecraft, but it actually works # not anymore lol
+    prismlauncher # minecraft, but it actually works # not anymore lol
     superTuxKart
 
     # yubikey and password stuff