Merge remote-tracking branch 'origin/main'

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716126753,
-        "narHash": "sha256-fdodsQ2AWreGj4arHk6cKcnqlWrNiLb64eRrHtMZ5cw=",
+        "lastModified": 1716291492,
+        "narHash": "sha256-Qvfoa99WdYIneGrrLFIKQCevLgB5vnxvwJe5aWbGYZY=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "601be8412d2ab72f752448766fe0fb2f00d5c40c",
+        "rev": "f1654e07728008d354c704d265fc710e3f5f42ee",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1716141623,
-        "narHash": "sha256-4NEvf7sULDyYoXIgeXHWGe7mXlr7+UL7TvgDkMqpbPY=",
+        "lastModified": 1716173274,
+        "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "f0cf56878046c42ec2096a2ade89203e7348917b",
+        "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191",
         "type": "github"
       },
       "original": {
@@ -57,11 +57,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1715961556,
-        "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=",
+        "lastModified": 1716137900,
+        "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64",
+        "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1",
         "type": "github"
       },
       "original": {
@@ -73,11 +73,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1716061101,
-        "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=",
+        "lastModified": 1716218643,
+        "narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2",
+        "rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee",
         "type": "github"
       },
       "original": {

hosts/Puenktchen/amd.nix

@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+  boot.initrd.kernelModules = [ "amdgpu" ];
+}

hosts/Puenktchen/default.nix

@@ -1,6 +1,7 @@
 { pkgs, ... }:
 {
   imports = [
+    ./amd.nix
     ./hardware-configuration.nix
     ./disko.nix
   ];

hosts/common/default.nix

@@ -7,6 +7,7 @@
     ./printers.nix
   ];
   
+  hardware.bluetooth.enable = true;
   networking.networkmanager.enable = true;
   console.keyMap = "de";
   nixpkgs.config.allowUnfree = true;

users/willifan/graphical/hyprland/Lenni/kanshi.nix

@@ -2,7 +2,7 @@
 {
   home-manager.users.willifan = {
     services.kanshi = {
-      enable = true;
+      enable = false;
 
       settings = [
         {
@@ -42,6 +42,9 @@
               scale = 1.0;
 	          	transform = "270";
             }
+            {
+              criteria = "*";
+            }
           ];
           profile.exec = "$XDG_CONFIG_HOME/eww/scripts/monitors.sh";
         }

users/willifan/graphical/hyprland/common/hyprland.nix

@@ -13,11 +13,12 @@
         monitor = [
           ", preffered, auto, 1"
           "eDP-1, preferred, 0x0, 1.6"
+          "desc:ViewSonic Corporation VX2705-2KP W6Z205100250, 2560x1440@144Hz, 0x384, 1.25"
+          "desc:ViewSonic Corporation VX2705-2KP W6Z210400766, 2560x1440@144Hz, 2048x384, 1.25"
+          "desc:BNQ BenQ BL2283 CAM01567019, 1920x1080@60Hz, 4096x0, 1.0, transform, 3"
         ];
         # Execute your favorite apps at launch
         exec-once = [
-          ''kanshi &''
-
           ''hyprctl dispatch exec "[workspace 1 silent] kitty"''
           ''hyprctl dispatch exec "[workspace 2 silent] firefox"''
           #''hyprctl dispatch exec "[workspace 3 silent] "''

users/willifan/graphical/steam.nix

@@ -3,4 +3,8 @@
   programs.steam.enable = true;
 
   hardware.steam-hardware.enable = true;
+
+  services.udev.extraRules = ''
+    SUBSYSTEM=="tty", ATTRS{idVendor}=="28de", ATTRS{idProduct}=="2102", MODE="0660", TAG+="uaccess"
+  '';
 }