From 1e1a9d6b5ae79a17880e22c10ba1ff2a9a167d85 Mon Sep 17 00:00:00 2001 From: Andre Date: Sat, 11 May 2024 20:29:29 -0400 Subject: [PATCH] Remove Telegram; tweak Gnome --- flake.lock | 14 +++++++------- hosts/Shura/default.nix | 2 +- modules/apps/gaming.nix | 8 ++++++++ modules/ui/gnome.nix | 9 +++++---- modules/users/aires/default.nix | 6 ------ 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index c05292e..dfd4e88 100644 --- a/flake.lock +++ b/flake.lock @@ -150,11 +150,11 @@ ] }, "locked": { - "lastModified": 1715348159, - "narHash": "sha256-nP0PJZ3dR0ols1V+w+sYBki7JlSRFvFJ8J8B00Oa7BM=", + "lastModified": 1715380449, + "narHash": "sha256-716+f9Rj3wjSyD1xitCv2FcYbgPz1WIVDj+ZBclH99Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "223743313bab8b0b44a57eaf9573de9f69082b4d", + "rev": "d7682620185f213df384c363288093b486b2883f", "type": "github" }, "original": { @@ -218,11 +218,11 @@ ] }, "locked": { - "lastModified": 1715278311, - "narHash": "sha256-Z787hdZuwBhQCQOeOmln5j9cCKxDWql7tbF1ukKDFZU=", + "lastModified": 1715442723, + "narHash": "sha256-pXMH7lqr5bT2FjH/3tEdTT/+1+hKx+15WkcGKycWWSM=", "ref": "refs/heads/main", - "rev": "c8ab1e79ba0140bc75731c75177242089506260b", - "revCount": 75, + "rev": "87b7b7e4bd936301b139e472589d1966b136f45f", + "revCount": 76, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, diff --git a/hosts/Shura/default.nix b/hosts/Shura/default.nix index b83b18d..dfb703a 100644 --- a/hosts/Shura/default.nix +++ b/hosts/Shura/default.nix @@ -34,7 +34,7 @@ in }; dj.enable = true; gaming.enable = true; - kdeconnect.enable = true; + kdeconnect.enable = false; media.enable = true; office.enable = true; recording.enable = true; diff --git a/modules/apps/gaming.nix b/modules/apps/gaming.nix index 3bbc392..2cbbf82 100644 --- a/modules/apps/gaming.nix +++ b/modules/apps/gaming.nix @@ -8,6 +8,11 @@ # Gaming-related settings let cfg = config.host.apps.gaming; + reset-controllers-script = pkgs.writeShellScriptBin "reset-controllers" '' + #!/usr/bin/env bash + sudo rmmod hid_xpadneo && sudo modprobe hid_xpadneo + sudo systemctl restart bluetooth.service + ''; in with lib; { @@ -28,5 +33,8 @@ with lib; extraModulePackages = with config.boot.kernelPackages; [ xpadneo ]; kernelModules = [ "hid_xpadneo" ]; }; + + # Add script to restart xpadneo in case of issues + environment.systemPackages = [ reset-controllers-script ]; }; } diff --git a/modules/ui/gnome.nix b/modules/ui/gnome.nix index e78ce6a..c80e899 100644 --- a/modules/ui/gnome.nix +++ b/modules/ui/gnome.nix @@ -100,10 +100,11 @@ with lib; # Gnome tweak tools gnome.gnome-tweaks # Gnome extensions - # FIXME: Disable temporarily due to broken version in Nixpkgs - #gnomeExtensions.appindicator - #gnomeExtensions.dash-to-panel - #gnomeExtensions.forge + gnomeExtensions.alphabetical-app-grid + gnomeExtensions.another-window-session-manager + gnomeExtensions.appindicator + gnomeExtensions.dash-to-panel + gnomeExtensions.forge # Themeing gnome.gnome-themes-extra papirus-icon-theme diff --git a/modules/users/aires/default.nix b/modules/users/aires/default.nix index be6b157..7d2a6ae 100644 --- a/modules/users/aires/default.nix +++ b/modules/users/aires/default.nix @@ -46,12 +46,6 @@ with lib; linger = true; }; - # Install aires-specific Flatpaks - services.flatpak.packages = mkIf config.services.flatpak.enable [ - "com.discordapp.Discord" - "org.telegram.desktop" - ]; - # Configure home-manager home-manager.users.aires = { imports = [