From 99d4fa1a27d847e8edef36cacf06402521994ee6 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Thu, 2 May 2024 17:24:32 -0300 Subject: [PATCH 01/13] scripts: move the steam game launch script to 'games' This is because the script does not have anything specific to Proton anymore or Wine for that matter, so we can use this as a handy tool to open any games. --- scripts/{steam/launch_native.sh => games/launch.sh} | 0 scripts/steam/launch.sh | 11 ----------- 2 files changed, 11 deletions(-) rename scripts/{steam/launch_native.sh => games/launch.sh} (100%) delete mode 100755 scripts/steam/launch.sh diff --git a/scripts/steam/launch_native.sh b/scripts/games/launch.sh similarity index 100% rename from scripts/steam/launch_native.sh rename to scripts/games/launch.sh diff --git a/scripts/steam/launch.sh b/scripts/steam/launch.sh deleted file mode 100755 index 722fb47..0000000 --- a/scripts/steam/launch.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -export MANGOHUD=1 - -# https://docs.mesa3d.org/envvars.html -export MESA_NO_DITHER=1 # Disables dither -export MESA_BACK_BUFFER=pixmap # For X only - -export DXVK_ASYNC=1 - -gamemoderun "$@" From a4043760288cb5eb88c03ac1da97d92b306b4f1e Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Thu, 2 May 2024 17:25:59 -0300 Subject: [PATCH 02/13] nixos: remove adguardhome service --- nixos.nix | 1 - services/adguardhome.nix | 5 ----- 2 files changed, 6 deletions(-) delete mode 100644 services/adguardhome.nix diff --git a/nixos.nix b/nixos.nix index d27fb0c..db895bf 100644 --- a/nixos.nix +++ b/nixos.nix @@ -13,7 +13,6 @@ # Include the results of the hardware scan. ./hardware-configuration.nix # Include service configuration - ./services/adguardhome.nix ./services/archi.nix ./services/caddy.nix ./services/jellyfin.nix diff --git a/services/adguardhome.nix b/services/adguardhome.nix deleted file mode 100644 index 4cf7564..0000000 --- a/services/adguardhome.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: - -{ - services.adguardhome = { enable = true; }; -} From 2c0abb3eeb596e732a2e118ff09c4fca38799c23 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Thu, 2 May 2024 17:26:37 -0300 Subject: [PATCH 03/13] hm: correct gtk theme and iconTheme names --- home-manager.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager.nix b/home-manager.nix index e14b407..d6aec4f 100644 --- a/home-manager.nix +++ b/home-manager.nix @@ -294,7 +294,7 @@ enable = true; theme = { - name = "Catppuccin-Frappe-Lavender"; + name = "Catppuccin-Frappe-Standard-Lavender-Dark"; package = pkgs.catppuccin-gtk.override { accents = [ "lavender" ]; tweaks = [ "rimless" ]; @@ -303,7 +303,7 @@ }; iconTheme = { - name = "Papirus"; + name = "Papirus-Dark"; package = pkgs.catppuccin-papirus-folders.override { accent = "lavender"; flavor = "frappe"; @@ -314,7 +314,7 @@ # Configure QT qt = { enable = true; - platformTheme = "qtct"; + platformTheme.name = "qtct"; }; # Configure XDG From ead61b3406e1d0f6c90d31a5cfb034e35de78d2b Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Thu, 2 May 2024 17:26:59 -0300 Subject: [PATCH 04/13] hm: use wine-staging instead of stable with wayland patches --- home-manager.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager.nix b/home-manager.nix index d6aec4f..a229cfe 100644 --- a/home-manager.nix +++ b/home-manager.nix @@ -137,7 +137,7 @@ dolphin-emu protontricks r2modman - wineWowPackages.waylandFull + wineWowPackages.stagingFull winetricks xonotic From c8a78d92272dfe6bff053f53f2f2f50bc75aa160 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Mon, 13 May 2024 11:56:50 -0300 Subject: [PATCH 05/13] nixos: disable wireless and enable WoL for ethernet adapter --- nixos.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/nixos.nix b/nixos.nix index db895bf..968154e 100644 --- a/nixos.nix +++ b/nixos.nix @@ -66,15 +66,13 @@ }; networking.hostName = "nixos"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # Enable networking networking.networkmanager.enable = true; + # Enable WOL on my ethernet interface. + networking.interfaces.enp5s0.wakeOnLan.enable = true; + # Open ports in the firewall. networking.firewall = { allowedTCPPorts = [ From dd7130c31e4c213517db0b7d06ca9aa1c5511fc3 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Mon, 13 May 2024 11:58:21 -0300 Subject: [PATCH 06/13] nixos: add my user to the openrazer group --- nixos.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos.nix b/nixos.nix index 968154e..13e81a5 100644 --- a/nixos.nix +++ b/nixos.nix @@ -114,7 +114,7 @@ users.users.wizardlink = { createHome = true; description = "Alexandre Cavalheiro"; - extraGroups = [ "networkmanager" "wheel" "postgresql" "docker" ]; + extraGroups = [ "networkmanager" "wheel" "postgresql" "docker" "openrazer" ]; initialPassword = "wizardlink"; isNormalUser = true; @@ -314,7 +314,7 @@ ## Hardware specific openrazer-daemon # Razor products back-end - polychromatic # and it's Front-end + polychromatic # and it's front-end ]; # Some programs need SUID wrappers, can be configured further or are From ff8b5f40619f53ef66ebe0f8fe68278d0ff2ac20 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Mon, 13 May 2024 11:58:36 -0300 Subject: [PATCH 07/13] nixos: add qmk/via support nixos: via udev --- nixos.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/nixos.nix b/nixos.nix index 13e81a5..fb1d343 100644 --- a/nixos.nix +++ b/nixos.nix @@ -185,6 +185,9 @@ users = [ "wizardlink" ]; }; + # Enable QMK support. + hardware.keyboard.qmk.enable = true; + # Enable xpadneo support. hardware.xpadneo.enable = true; @@ -199,6 +202,7 @@ services.displayManager.sddm = { enable = true; wayland.enable = true; + theme = "${import ./theming/sddm.nix { inherit pkgs; }}"; }; @@ -315,6 +319,7 @@ ## Hardware specific openrazer-daemon # Razor products back-end polychromatic # and it's front-end + via ]; # Some programs need SUID wrappers, can be configured further or are @@ -329,14 +334,12 @@ ## SERVICES # ## - services.udev.extraRules = '' - # Monsgeek M1 - KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="fffe", ATTRS{idProduct}=="0005", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl" - ''; - # Enable flatpak services.flatpak.enable = true; + # Enables VIA + services.udev.packages = [ pkgs.via ]; + # Enable and configure PostgreSQL. services.postgresql = { enable = true; From 777b66637d27a686b5c96568acef982bd0fda419 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Mon, 13 May 2024 11:59:43 -0300 Subject: [PATCH 08/13] hm: use nixpkgs vesktop package --- home-manager.nix | 41 +---------------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/home-manager.nix b/home-manager.nix index a229cfe..1dd1b97 100644 --- a/home-manager.nix +++ b/home-manager.nix @@ -78,46 +78,7 @@ pulseaudio qbittorrent tigervnc - (vesktop.overrideAttrs (prev: { - src = pkgs.fetchFromGitHub { - owner = "wizardlink"; - repo = "Vesktop"; - rev = "93c9cc24f88c1dbc50c3ee0569ddbdbaec76d9b3"; - hash = "sha256-tJyiZ/gAh+mA/UoJq5rzjJxit8lZpkJC74lf1Z5eqFc="; - }; - - installPhase = - let - # this is mainly required for venmic - libPath = lib.makeLibraryPath (with pkgs; [ - libpulseaudio - libnotify - pipewire - stdenv.cc.cc.lib - libva - ]); - in - '' - runHook preInstall - - mkdir -p $out/opt/Vesktop/resources - cp dist/linux-*unpacked/resources/app.asar $out/opt/Vesktop/resources - - pushd build - ${pkgs.libicns}/bin/icns2png -x icon.icns - for file in icon_*x32.png; do - file_suffix=''${file//icon_} - install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/vesktop.png - done - - makeWrapper ${pkgs.electron}/bin/electron $out/bin/vesktop \ - --prefix LD_LIBRARY_PATH : ${libPath} \ - --add-flags $out/opt/Vesktop/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - - runHook postInstall - ''; - })) + vesktop vlc yt-dlp zathura From 4eccdb8770c82a22ffb7211f743a1f7f81cc226d Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Mon, 13 May 2024 12:00:02 -0300 Subject: [PATCH 09/13] flake: update and pin hyprland v0.40 --- flake.lock | 31 ++++++++++++++++--------------- flake.nix | 2 +- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index d5c36b4..4118a33 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1713818326, - "narHash": "sha256-aw3xbVPJauLk/bbrlakIYxKpeuMWzA2feGrkIpIuXd8=", + "lastModified": 1715077503, + "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", "owner": "nix-community", "repo": "home-manager", - "rev": "67de98ae6eed5ad6f91b1142356d71a87ba97f21", + "rev": "6e277d9566de9976f47228dd8c580b97488734d4", "type": "github" }, "original": { @@ -63,15 +63,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1713819507, - "narHash": "sha256-mG0kD8HmkCsHRkTBmqGb/QvM1vAvkAmB5p2H5XQ0zLo=", + "lastModified": 1714837352, + "narHash": "sha256-QzzJTb+0CBqgAT0wKZsOt1rky5+u2zMUlNxbZcGj2VM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "da839f20f1b1a57ec78d6b041f8d1369150d253e", + "rev": "cba1ade848feac44b2eda677503900639581c3f4", "type": "github" }, "original": { "owner": "hyprwm", + "ref": "v0.40.0", "repo": "Hyprland", "type": "github" } @@ -138,11 +139,11 @@ ] }, "locked": { - "lastModified": 1713730424, - "narHash": "sha256-MqYjTvQCxwuDIuAaqIEuyqserm5PYr0auiHHPuYFN/k=", + "lastModified": 1714755542, + "narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "7c9c8adfe7e424faa0c5ce6e8be90157fda53c06", + "rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828", "type": "github" }, "original": { @@ -153,11 +154,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713714899, - "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", + "lastModified": 1715087517, + "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", + "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29", "type": "github" }, "original": { @@ -226,11 +227,11 @@ ] }, "locked": { - "lastModified": 1713724432, - "narHash": "sha256-dtU1y4oj/0Y42oauzm93ucFg1AoqETnQ21bmXTIUng0=", + "lastModified": 1714060055, + "narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "9ace6f969ce495185df34cc6254fb9d297765478", + "rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e1008b1..18b0a3a 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ }; hyprland = { - url = "github:hyprwm/Hyprland"; + url = "github:hyprwm/Hyprland/v0.40.0"; inputs.nixpkgs.follows = "nixpkgs"; }; }; From d7417c2b11c4feee489e26973c0e9e7f6f65e472 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Mon, 13 May 2024 12:00:49 -0300 Subject: [PATCH 10/13] hm(hyprland): add binds for volume up, down and mute --- programs/hyprland/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/hyprland/default.nix b/programs/hyprland/default.nix index 6bd1fcb..e92c887 100644 --- a/programs/hyprland/default.nix +++ b/programs/hyprland/default.nix @@ -251,6 +251,11 @@ bind = $mainMod SHIFT, J, movewindow, d bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow + + # Volume changes + binde = , XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+ + binde = , XF86AudioLowerVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%- + bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle # Window rules windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$ From a4d2fa7de08b3bef9e0ef051fe82456fc46e919a Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Fri, 17 May 2024 15:18:31 -0300 Subject: [PATCH 11/13] flake: update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 4118a33..6fed0ef 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1715077503, - "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", + "lastModified": 1715486357, + "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e277d9566de9976f47228dd8c580b97488734d4", + "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", "type": "github" }, "original": { @@ -154,11 +154,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715087517, - "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=", + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", "type": "github" }, "original": { From 34fb317bbcbec6964d6f98a87cd94b979d18b63d Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Fri, 17 May 2024 15:19:55 -0300 Subject: [PATCH 12/13] hm(hyprland): change volume binds to adjust by 1% not 5% --- programs/hyprland/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/hyprland/default.nix b/programs/hyprland/default.nix index e92c887..b83a171 100644 --- a/programs/hyprland/default.nix +++ b/programs/hyprland/default.nix @@ -253,8 +253,8 @@ bindm = $mainMod, mouse:273, resizewindow # Volume changes - binde = , XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+ - binde = , XF86AudioLowerVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%- + binde = , XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 1%+ + binde = , XF86AudioLowerVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 1%- bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle # Window rules From ee8a8a6215e8a181e89f2bda81a15047d6d163c9 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Fri, 17 May 2024 15:20:10 -0300 Subject: [PATCH 13/13] nixos(archisteamfarm): add new bot --- services/archi.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/services/archi.nix b/services/archi.nix index f026a2e..85a11d0 100644 --- a/services/archi.nix +++ b/services/archi.nix @@ -15,5 +15,11 @@ CustomGamePlayedWhileIdle = "Out from the fields"; }; }; + + bots.zak = { + enabled = true; + passwordFile = /var/lib/archisteamfarm/bots/zak.password; + username = "matheuszak"; + }; }; }