From cfbcad4fedd185f10af99ae9703e16993aedc946 Mon Sep 17 00:00:00 2001 From: willifan Date: Mon, 20 May 2024 19:42:52 +0200 Subject: [PATCH 01/11] fixed amd gpu at boot --- hosts/Puenktchen/amd.nix | 4 ++++ hosts/Puenktchen/default.nix | 1 + 2 files changed, 5 insertions(+) create mode 100644 hosts/Puenktchen/amd.nix diff --git a/hosts/Puenktchen/amd.nix b/hosts/Puenktchen/amd.nix new file mode 100644 index 0000000..508a2d5 --- /dev/null +++ b/hosts/Puenktchen/amd.nix @@ -0,0 +1,4 @@ +{ pkgs, ... }: +{ + boot.initrd.kernelModules = [ "amdgpu" ]; +} \ No newline at end of file diff --git a/hosts/Puenktchen/default.nix b/hosts/Puenktchen/default.nix index 36963cd..8a8195f 100644 --- a/hosts/Puenktchen/default.nix +++ b/hosts/Puenktchen/default.nix @@ -1,6 +1,7 @@ { pkgs, ... }: { imports = [ + ./amd.nix ./hardware-configuration.nix ./disko.nix ]; From 4ffcddf5df33d8cd3ecc9e993a4b7ccc99c958eb Mon Sep 17 00:00:00 2001 From: willifan Date: Tue, 21 May 2024 01:11:45 +0200 Subject: [PATCH 02/11] fix kanshi with VR Headset --- users/willifan/graphical/hyprland/kanshi.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/users/willifan/graphical/hyprland/kanshi.nix b/users/willifan/graphical/hyprland/kanshi.nix index b5c8616..5d2e81c 100644 --- a/users/willifan/graphical/hyprland/kanshi.nix +++ b/users/willifan/graphical/hyprland/kanshi.nix @@ -42,6 +42,9 @@ scale = 1.0; transform = "270"; } + { + criteria = "*"; + } ]; profile.exec = "$XDG_CONFIG_HOME/eww/scripts/monitors.sh"; } From 78c5ed0981145d5873dc258451f7d80195a71b02 Mon Sep 17 00:00:00 2001 From: willifan Date: Tue, 21 May 2024 01:27:32 +0200 Subject: [PATCH 03/11] enabled bluetooth --- hosts/common/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/common/default.nix b/hosts/common/default.nix index 59b31d0..a3b2f61 100644 --- a/hosts/common/default.nix +++ b/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; From c9fce0a4be7be38f7a2104658ddaad23431e0362 Mon Sep 17 00:00:00 2001 From: willifan Date: Tue, 21 May 2024 01:46:37 +0200 Subject: [PATCH 04/11] vr headset fullscreen --- users/willifan/graphical/hyprland/hyprland.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/willifan/graphical/hyprland/hyprland.nix b/users/willifan/graphical/hyprland/hyprland.nix index e3f6a11..8675e7c 100644 --- a/users/willifan/graphical/hyprland/hyprland.nix +++ b/users/willifan/graphical/hyprland/hyprland.nix @@ -135,6 +135,7 @@ "move 20% 5%, ^(org.gnome.Calendar)$" "size 60% 60%, ^(org.gnome.Calendar)$" "float, ^(org.gnome.Calculator)$" + "fullscreen, title:^(vrmonitor)$" ]; windowrulev2 = [ From b72e93cb70946050a2ea820e0f6b1afde697bffa Mon Sep 17 00:00:00 2001 From: willifan Date: Tue, 21 May 2024 01:56:23 +0200 Subject: [PATCH 05/11] Hard coded desktop monitors --- users/willifan/graphical/hyprland/hyprland.nix | 5 +++-- users/willifan/graphical/hyprland/kanshi.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/users/willifan/graphical/hyprland/hyprland.nix b/users/willifan/graphical/hyprland/hyprland.nix index 8675e7c..23310cd 100644 --- a/users/willifan/graphical/hyprland/hyprland.nix +++ b/users/willifan/graphical/hyprland/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] "'' diff --git a/users/willifan/graphical/hyprland/kanshi.nix b/users/willifan/graphical/hyprland/kanshi.nix index 5d2e81c..4b0baca 100644 --- a/users/willifan/graphical/hyprland/kanshi.nix +++ b/users/willifan/graphical/hyprland/kanshi.nix @@ -2,7 +2,7 @@ { home-manager.users.willifan = { services.kanshi = { - enable = true; + enable = false; settings = [ { From 781f7f1cb7574d5a4b59ed824f00c091f1009d2f Mon Sep 17 00:00:00 2001 From: willifan Date: Tue, 21 May 2024 19:53:59 +0200 Subject: [PATCH 06/11] Revert "vr headset fullscreen" This reverts commit c9fce0a4be7be38f7a2104658ddaad23431e0362. --- users/willifan/graphical/hyprland/hyprland.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/users/willifan/graphical/hyprland/hyprland.nix b/users/willifan/graphical/hyprland/hyprland.nix index 23310cd..b403af2 100644 --- a/users/willifan/graphical/hyprland/hyprland.nix +++ b/users/willifan/graphical/hyprland/hyprland.nix @@ -136,7 +136,6 @@ "move 20% 5%, ^(org.gnome.Calendar)$" "size 60% 60%, ^(org.gnome.Calendar)$" "float, ^(org.gnome.Calculator)$" - "fullscreen, title:^(vrmonitor)$" ]; windowrulev2 = [ From 54b9a5264f8ea7247bbb685a9ae7ae3256cd1cc3 Mon Sep 17 00:00:00 2001 From: willifan Date: Tue, 21 May 2024 21:23:07 +0200 Subject: [PATCH 07/11] added udev rule for valve index bluetooth --- users/willifan/graphical/steam.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/users/willifan/graphical/steam.nix b/users/willifan/graphical/steam.nix index d7e6a9d..c025bcd 100644 --- a/users/willifan/graphical/steam.nix +++ b/users/willifan/graphical/steam.nix @@ -3,4 +3,9 @@ programs.steam.enable = true; hardware.steam-hardware.enable = true; + + services.udev.extraRules = '' + SUBSYSTEM=="tty", ATTRS{idVendor}=="28de", ATTRS{idProduct}=="2102", MODE="0660", TAG+="uaccess" + KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="28de", ATTRS{idProduct}=="2613", MODE="0660", TAG+="uaccess" + ''; } \ No newline at end of file From 3af97a76d472219b6c846af55d440c53bdea4442 Mon Sep 17 00:00:00 2001 From: willifan Date: Tue, 21 May 2024 22:47:11 +0200 Subject: [PATCH 08/11] fix index audio --- users/willifan/graphical/hyprland/pipewire.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/willifan/graphical/hyprland/pipewire.nix b/users/willifan/graphical/hyprland/pipewire.nix index 5995cd8..d759a0f 100644 --- a/users/willifan/graphical/hyprland/pipewire.nix +++ b/users/willifan/graphical/hyprland/pipewire.nix @@ -3,6 +3,7 @@ security.rtkit.enable = true; services.pipewire = { enable = true; + audio.enable = true; alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; From 71225a85376bbb53cb912a305328d510e594d4d9 Mon Sep 17 00:00:00 2001 From: willifan Date: Tue, 21 May 2024 23:40:23 +0200 Subject: [PATCH 09/11] Revert "fix index audio" This reverts commit 3af97a76d472219b6c846af55d440c53bdea4442. --- users/willifan/graphical/hyprland/pipewire.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/users/willifan/graphical/hyprland/pipewire.nix b/users/willifan/graphical/hyprland/pipewire.nix index d759a0f..5995cd8 100644 --- a/users/willifan/graphical/hyprland/pipewire.nix +++ b/users/willifan/graphical/hyprland/pipewire.nix @@ -3,7 +3,6 @@ security.rtkit.enable = true; services.pipewire = { enable = true; - audio.enable = true; alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; From 2a85a707657cb53cd9e9d5fb4cbe72b8e78650eb Mon Sep 17 00:00:00 2001 From: willifan Date: Tue, 21 May 2024 23:40:51 +0200 Subject: [PATCH 10/11] removed unused udev rule --- users/willifan/graphical/steam.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/users/willifan/graphical/steam.nix b/users/willifan/graphical/steam.nix index c025bcd..7317792 100644 --- a/users/willifan/graphical/steam.nix +++ b/users/willifan/graphical/steam.nix @@ -6,6 +6,5 @@ services.udev.extraRules = '' SUBSYSTEM=="tty", ATTRS{idVendor}=="28de", ATTRS{idProduct}=="2102", MODE="0660", TAG+="uaccess" - KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="28de", ATTRS{idProduct}=="2613", MODE="0660", TAG+="uaccess" ''; } \ No newline at end of file From ee7b1168f39bfc7c48f88565e56c3f0612f0d662 Mon Sep 17 00:00:00 2001 From: willifan Date: Tue, 21 May 2024 23:45:31 +0200 Subject: [PATCH 11/11] updated flake --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 2973c3f..cda621c 100644 --- a/flake.lock +++ b/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": {