pull in latest fix for trucksim

flake.lock

@@ -180,11 +180,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705169127,
-        "narHash": "sha256-j9OEtNxOIPWZWjbECVMkI1TO17SzlpHMm0LnVWKOR/g=",
+        "lastModified": 1705879479,
+        "narHash": "sha256-ZIohbyly1KOe+8I3gdyNKgVN/oifKdmeI0DzMfytbtg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f2942f3385f1b35cc8a1abb03a45e29c9cb4d3c8",
+        "rev": "2d47379ad591bcb14ca95a90b6964b8305f6c913",
         "type": "github"
       },
       "original": {
@@ -281,11 +281,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705201750,
-        "narHash": "sha256-0umjkDiAoXDsIhaFlIIhKFTX/q7sMhfzvhNuY6wFdZo=",
+        "lastModified": 1705806513,
+        "narHash": "sha256-FcOmNjhHFfPz2udZbRpZ1sfyhVMr+C2O8kOxPj+HDDk=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "274a40dbf8be212697f3988471a4473987f8a886",
+        "rev": "f8e04fbcebcc24cebc91989981bd45f69b963ed7",
         "type": "github"
       },
       "original": {
@@ -296,11 +296,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1705133751,
-        "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=",
+        "lastModified": 1705677747,
+        "narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d",
+        "rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261",
         "type": "github"
       },
       "original": {
@@ -398,11 +398,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1704138480,
-        "narHash": "sha256-KSWmE3C/nnU6gJ2KIYaTPB4Yk58BhqFdOhaIuhCCFfg=",
+        "lastModified": 1705881825,
+        "narHash": "sha256-tFmDS9lSuDKx6voMK4HlLAI0/IR5x319Ng8LvhsfL1U=",
         "owner": "therealr5",
         "repo": "purge",
-        "rev": "3ae163c8fa9a64ecf1d06f390c6072948a57905f",
+        "rev": "364bc2c5522dda77947f003d3ab03d023a7318e1",
         "type": "github"
       },
       "original": {
@@ -488,11 +488,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1704138497,
-        "narHash": "sha256-+bDxq8eeLpPO/4fZm4ikAbW064T4+n8CIY4kv+sd41U=",
+        "lastModified": 1705882164,
+        "narHash": "sha256-HAjEar8nN4HtOTEeA6LRjq40SPS84YWrfXMBBh7jCF8=",
         "owner": "therealr5",
         "repo": "TruckSimulatorBot",
-        "rev": "1053bcb5419c18fb7f700e7b2a0cde9c0467f79c",
+        "rev": "b59e230bdec747dbff7e15447cf68791a31c323f",
         "type": "github"
       },
       "original": {

hosts/falkenstein/default.nix

@@ -55,7 +55,7 @@
     enable = true;
     settings.PasswordAuthentication = false;
   };
-  services.journald.enableHttpGateway = true;
+  services.journald.gateway.enable = true;
   programs.mosh.enable = true;
   users.users.root.openssh.authorizedKeys.keyFiles = [
     ../../keys/ssh/rouven-thinkpad

hosts/nuc/default.nix

@@ -64,7 +64,7 @@
 
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
-  services.journald.enableHttpGateway = true;
+  services.journald.gateway.enable = true;
   programs.mosh.enable = true;
 
 

hosts/nuc/modules/networks/default.nix

@@ -14,7 +14,7 @@
   };
   services.resolved = {
     enable = true;
-    # dnssec = "true";
+    dnssec = "true";
     fallbackDns = [
       "9.9.9.9"
       "149.112.112.112"

hosts/thinkpad/default.nix

@@ -66,7 +66,14 @@
     fwupd.enable = true; # firmware updates
     zfs.autoScrub.enable = true;
   };
-  hardware.bluetooth.enable = true;
+  hardware.bluetooth = {
+    enable = true;
+    settings = {
+      General = {
+        Experimental = true;
+      };
+    };
+  };
 
   services.logind = {
     lidSwitch = "suspend-then-hibernate";

overlays/default.nix

@@ -18,15 +18,6 @@ in
   pww = callPackage ../pkgs/pww { };
   ianny = callPackage ../pkgs/ianny { };
 
-  river = prev.river.overrideAttrs (_: {
-    patches = [
-      (fetchpatch {
-        url = "https://patch-diff.githubusercontent.com/raw/riverwm/river/pull/735.patch";
-        hash = "sha256-7pwQfXurgJej0NZ+kD2qBQdrqD6pYA1PbHxzG+5rGac=";
-      })
-    ];
-  });
-
   tpm2-pkcs11 = prev.tpm2-pkcs11.override { fapiSupport = false; };
 
   gnome-break-timer = callPackage ../pkgs/gnome-break-timer { };

users/rouven/default.nix

@@ -5,7 +5,7 @@
   users.users.rouven = {
     description = "Rouven Seifert";
     isNormalUser = true;
-    extraGroups = [ "wheel" "video" "libvirtd" "tss" "input" "wireshark" "etherape" ];
+    extraGroups = [ "wheel" "video" "dialout" "libvirtd" "tss" "input" "wireshark" "etherape" ];
     initialHashedPassword = "$6$X3XERQv28Nt1UUT5$MjdMBDuXyEwexkuKqmNFweez69q4enY5cjMXSbBxOc6Bq7Fhhp7OqmCm02k3OGjoZFXzPV9ZHuMSGKZOtwYIk1";
   };
   home-manager.useUserPackages = true;

users/rouven/fixes.nix

@@ -18,11 +18,15 @@
     enable = true;
     extraPortals = [
       pkgs.xdg-desktop-portal-wlr
+      pkgs.xdg-desktop-portal-gtk
     ];
     config = {
       common = {
         default = [ "wlr" ];
       };
+      "org.freedesktop.impl.portal.FileChooser" = {
+        default = [ "gtk" ];
+      };
       "org.freedesktop.impl.portal.Secret" = {
         default = [ "gnome-keyring" ];
       };

users/rouven/modules/packages.nix

@@ -52,6 +52,7 @@
     libreoffice
     mosh
     ansible
+    plover.dev
 
     # programming languages
     cargo

users/rouven/modules/wayland/waybar.nix

@@ -10,7 +10,7 @@
         layer = "top";
         position = "top";
         height = 26;
-        modules-left = [ "river/tags" "custom/spotifytitle" "river/window" ];
+        modules-left = [ "sway/workspaces" "river/tags" "custom/spotifytitle" "river/window" ];
         modules-right = [ "network" "cpu" "pulseaudio" "battery" "tray" "custom/notification" "clock" ];
         network = {
           format-wifi = "  {essid} ({signalStrength}%)";
@@ -24,6 +24,10 @@
           format = "{icon}";
           on-click = "activate";
         };
+        "sway/workspaces" = {
+          format = "{icon}";
+          on-click = "activate";
+        };
         "river/window" = {
           format = "   {}";
           # separate-outputs = true;
@@ -113,12 +117,14 @@
       background-color: transparent;
     }
 
+    #workspaces button,
     #tags button {
         padding: 0 5px;
         background-color: transparent;
         color: #${config.colorScheme.colors.base05};
     }
 
+    #workspaces button.focused,
     #tags button.focused {
         background-color: #${config.colorScheme.colors.base04};
         box-shadow: inset 0 -3px #${config.colorScheme.colors.base05};
@@ -128,6 +134,7 @@
         box-shadow: inset 0 -3px #${config.colorScheme.colors.base05};
     }
     
+    #workspaces button.urgent,
     #tags button.urgent {
         background-color: #eb4d4b;
     }