diff --git a/configs/client.nix b/configs/client.nix index f5c3a36..8bb1007 100644 --- a/configs/client.nix +++ b/configs/client.nix @@ -4,7 +4,8 @@ environment.systemPackages = with pkgs; [ nil ffmpeg - fastfetch + yt-dlp + hyfetch ]; networking = { diff --git a/configs/desktop.nix b/configs/desktop.nix index 7ae7020..06992d6 100644 --- a/configs/desktop.nix +++ b/configs/desktop.nix @@ -14,6 +14,7 @@ ../programs/ghostty.nix ../programs/kde.nix + ../programs/games.nix # ../programs/vscode.nix # the world if hyprland @@ -85,12 +86,16 @@ obs-studio obsidian polkit_gnome + shotcut strawberry vscode (vesktop.override {withSystemVencord = false;}) ]; }; + + xdg.enable = true; + gtk.enable = true; }; i18n.extraLocaleSettings = { diff --git a/programs/fish.nix b/programs/fish.nix index e01b758..7b95912 100644 --- a/programs/fish.nix +++ b/programs/fish.nix @@ -11,6 +11,8 @@ 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 1d38686..fa41575 100644 --- a/programs/kde.nix +++ b/programs/kde.nix @@ -1,13 +1,11 @@ { - pkgs, camasca, + pkgs, ... }: { services.desktopManager.plasma6.enable = true; environment = { - variables.SSH_AUTH_SOCK = "/run/user/1000/ssh-agent"; - systemPackages = with pkgs; [ flameshot camasca.packages.${pkgs.system}.koi diff --git a/systems/fuji/default.nix b/systems/fuji/default.nix index c53c4bb..3599fb0 100644 --- a/systems/fuji/default.nix +++ b/systems/fuji/default.nix @@ -1,8 +1,5 @@ {pkgs, ...}: { - imports = [ - ./nvidia.nix - ../../programs/games.nix - ]; + imports = [./nvidia.nix]; services.xserver.videoDrivers = ["amdgpu"]; diff --git a/systems/kilimandjaro/default.nix b/systems/kilimandjaro/default.nix index 8dee4c4..75e1c9b 100644 --- a/systems/kilimandjaro/default.nix +++ b/systems/kilimandjaro/default.nix @@ -1,6 +1,4 @@ {pkgs, ...}: { - imports = [../../programs/games.nix]; - boot = { initrd.kernelModules = ["i915"]; kernelParams = ["i915.force_probe=9a49"];