From 7fdabbd351f97da91b289653c6b3b91e2cce0431 Mon Sep 17 00:00:00 2001 From: uku Date: Sat, 31 Aug 2024 11:28:54 +0200 Subject: [PATCH 1/4] fix(desktop): remove unused options --- configs/desktop.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/configs/desktop.nix b/configs/desktop.nix index 06992d6..5fce942 100644 --- a/configs/desktop.nix +++ b/configs/desktop.nix @@ -93,9 +93,6 @@ (vesktop.override {withSystemVencord = false;}) ]; }; - - xdg.enable = true; - gtk.enable = true; }; i18n.extraLocaleSettings = { From 5d39734c39610106b9fb4cffbb413f702378a208 Mon Sep 17 00:00:00 2001 From: uku Date: Sat, 31 Aug 2024 11:31:00 +0200 Subject: [PATCH 2/4] fix(kde): set ssh agent variable at system level --- programs/fish.nix | 2 -- programs/kde.nix | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/fish.nix b/programs/fish.nix index 7b95912..e01b758 100644 --- a/programs/fish.nix +++ b/programs/fish.nix @@ -11,8 +11,6 @@ enable = true; interactiveShellInit = with pkgs; '' - set -gx SSH_AUTH_SOCK /run/user/1000/ssh-agent - if test -f ~/.ssh/id_ed25519 ssh-add -l | grep -q (ssh-keygen -lf ~/.ssh/id_ed25519) || ssh-add ~/.ssh/id_ed25519 end diff --git a/programs/kde.nix b/programs/kde.nix index fa41575..1d38686 100644 --- a/programs/kde.nix +++ b/programs/kde.nix @@ -1,11 +1,13 @@ { - camasca, pkgs, + camasca, ... }: { services.desktopManager.plasma6.enable = true; environment = { + variables.SSH_AUTH_SOCK = "/run/user/1000/ssh-agent"; + systemPackages = with pkgs; [ flameshot camasca.packages.${pkgs.system}.koi From 3c61d41f5433d70aa0ca737de28617e074787201 Mon Sep 17 00:00:00 2001 From: uku Date: Sat, 31 Aug 2024 11:33:56 +0200 Subject: [PATCH 3/4] fix(desktop): move games to specific machines --- configs/desktop.nix | 2 -- systems/fuji/default.nix | 5 ++++- systems/kilimandjaro/default.nix | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configs/desktop.nix b/configs/desktop.nix index 5fce942..7ae7020 100644 --- a/configs/desktop.nix +++ b/configs/desktop.nix @@ -14,7 +14,6 @@ ../programs/ghostty.nix ../programs/kde.nix - ../programs/games.nix # ../programs/vscode.nix # the world if hyprland @@ -86,7 +85,6 @@ obs-studio obsidian polkit_gnome - shotcut strawberry vscode diff --git a/systems/fuji/default.nix b/systems/fuji/default.nix index 3599fb0..c53c4bb 100644 --- a/systems/fuji/default.nix +++ b/systems/fuji/default.nix @@ -1,5 +1,8 @@ {pkgs, ...}: { - imports = [./nvidia.nix]; + imports = [ + ./nvidia.nix + ../../programs/games.nix + ]; services.xserver.videoDrivers = ["amdgpu"]; diff --git a/systems/kilimandjaro/default.nix b/systems/kilimandjaro/default.nix index 75e1c9b..8dee4c4 100644 --- a/systems/kilimandjaro/default.nix +++ b/systems/kilimandjaro/default.nix @@ -1,4 +1,6 @@ {pkgs, ...}: { + imports = [../../programs/games.nix]; + boot = { initrd.kernelModules = ["i915"]; kernelParams = ["i915.force_probe=9a49"]; From 51bdf5d1918375b68ebf420017d398de43d148fd Mon Sep 17 00:00:00 2001 From: uku Date: Sat, 31 Aug 2024 11:34:35 +0200 Subject: [PATCH 4/4] chore(client): remove yt-dlp --- configs/client.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/client.nix b/configs/client.nix index 8bb1007..f5c3a36 100644 --- a/configs/client.nix +++ b/configs/client.nix @@ -4,8 +4,7 @@ environment.systemPackages = with pkgs; [ nil ffmpeg - yt-dlp - hyfetch + fastfetch ]; networking = {