From 50d6d0447374a1c9fbfa4750b017dbbc466580e1 Mon Sep 17 00:00:00 2001 From: elwrcl Date: Wed, 15 Apr 2026 18:53:20 +0300 Subject: [PATCH] Refactor GTK settings and Steam dependencies --- home/default.nix | 41 ++++++++++-- home/hypr/default.nix | 2 +- home/hyprland.nix | 2 +- nixos/desktop/audio/pipewire.nix | 2 +- nixos/desktop/default.nix | 2 +- nixos/desktop/window-managers/hyprland.nix | 2 +- nixos/gaming/steam/default.nix | 66 ++++++++++++-------- nixos/hardware/bluetooth/default.nix | 2 +- nixos/hardware/graphics/intel.nix | 2 +- nixos/hardware/graphics/prime.nix | 2 +- nixos/hardware/keyboard/default.nix | 2 +- nixos/hardware/udev/default.nix | 2 +- nixos/networking/network-manager/default.nix | 2 +- nixos/networking/vpn/default.nix | 2 +- nixos/services/appimage/default.nix | 2 +- nixos/services/samba/default.nix | 9 ++- 16 files changed, 97 insertions(+), 45 deletions(-) diff --git a/home/default.nix b/home/default.nix index 8baf558..01cce8e 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,4 +1,9 @@ -{ config, pkgs, inputs, system, ... }: +{ + pkgs, + inputs, + system, + ... +}: { imports = [ ./hyprland.nix ]; @@ -80,13 +85,42 @@ "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; gtk-application-prefer-dark-theme = true; + icon-theme = "Papirus-Dark"; + cursor-theme = "Bibata-Modern-Classic"; + cursor-size = 24; }; "org/gnome/nautilus/preferences" = { default-folder-viewer = "icon-view"; + show-hidden-files = false; + }; + "org/gtk/settings/file-chooser" = { + sort-directories-first = true; }; }; - xdg.configFile."xdg-desktop-portal/portals/gtk.portal".source = - "${pkgs.xdg-desktop-portal-gtk}/share/xdg-desktop-portal/portals/gtk.portal"; + gtk = { + enable = true; + theme = { + name = "Adwaita-dark"; + package = pkgs.gnome-themes-extra; + }; + iconTheme = { + name = "Papirus-Dark"; + package = pkgs.papirus-icon-theme; + }; + cursorTheme = { + name = "Bibata-Modern-Classic"; + package = pkgs.bibata-cursors; + size = 24; + }; + gtk3.extraConfig = { + gtk-application-prefer-dark-theme = 1; + }; + gtk4.extraConfig = { + gtk-application-prefer-dark-theme = 1; + }; + gtk4.theme = null; + }; + qt = { enable = true; platformTheme.name = "gtk3"; @@ -96,4 +130,3 @@ }; }; } - diff --git a/home/hypr/default.nix b/home/hypr/default.nix index 41a1c50..efaebe3 100644 --- a/home/hypr/default.nix +++ b/home/hypr/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { imports = [ diff --git a/home/hyprland.nix b/home/hyprland.nix index 5a770b1..e976a99 100644 --- a/home/hyprland.nix +++ b/home/hyprland.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ ... }: { imports = [ diff --git a/nixos/desktop/audio/pipewire.nix b/nixos/desktop/audio/pipewire.nix index da7f21d..f77a079 100644 --- a/nixos/desktop/audio/pipewire.nix +++ b/nixos/desktop/audio/pipewire.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { services.pulseaudio.enable = false; diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 6e18af2..8f026f2 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { imports = [ diff --git a/nixos/desktop/window-managers/hyprland.nix b/nixos/desktop/window-managers/hyprland.nix index 6d54a1a..33a5e3c 100644 --- a/nixos/desktop/window-managers/hyprland.nix +++ b/nixos/desktop/window-managers/hyprland.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { programs.hyprland = { diff --git a/nixos/gaming/steam/default.nix b/nixos/gaming/steam/default.nix index 86ecab5..d44115f 100644 --- a/nixos/gaming/steam/default.nix +++ b/nixos/gaming/steam/default.nix @@ -9,35 +9,49 @@ package = pkgs.steam.override { extraEnv = { STEAM_USE_PORTAL = "1"; + GTK_USE_PORTAL = "1"; + PRESSURE_VESSEL_VERBOSE = "0"; }; - extraPkgs = p: with p; [ - xdg-desktop-portal - xdg-desktop-portal-gtk - liberation_ttf - wqy_zenhei - corefonts - vista-fonts - libXcursor - libXi - libXinerama - libXScrnSaver - libgpg-error - libkrb5 - keyutils - bash - coreutils - libpng - libpulseaudio - libvorbis - stdenv.cc.cc.lib - gamemode - zenity - pkgsi686Linux.libgcc - pkgsi686Linux.glibc - pkgsi686Linux.mesa - ]; + extraPkgs = + p: with p; [ + xdg-desktop-portal + xdg-desktop-portal-gtk + liberation_ttf + wqy_zenhei + corefonts + vista-fonts + libXcursor + libXi + libXinerama + libXScrnSaver + libgpg-error + libkrb5 + keyutils + bash + coreutils + libpng + libpulseaudio + libvorbis + stdenv.cc.cc.lib + gamemode + zenity + # pressure-vessel için gerekli + glib + dbus + at-spi2-atk + atk + pkgsi686Linux.libgcc + pkgsi686Linux.glibc + pkgsi686Linux.mesa + pkgsi686Linux.libGL + pkgsi686Linux.libpulseaudio + ]; }; gamescopeSession.enable = true; }; programs.bash.enable = true; + hardware.graphics.enable = true; + environment.systemPackages = with pkgs; [ + protontricks + ]; } diff --git a/nixos/hardware/bluetooth/default.nix b/nixos/hardware/bluetooth/default.nix index 820709f..fb6a06a 100644 --- a/nixos/hardware/bluetooth/default.nix +++ b/nixos/hardware/bluetooth/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { hardware.bluetooth.enable = true; diff --git a/nixos/hardware/graphics/intel.nix b/nixos/hardware/graphics/intel.nix index e4c9376..df26c3d 100644 --- a/nixos/hardware/graphics/intel.nix +++ b/nixos/hardware/graphics/intel.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ pkgs, ... }: let wayland-intel-vaapi-driver = pkgs.intel-vaapi-driver.overrideAttrs (oldAttrs: { diff --git a/nixos/hardware/graphics/prime.nix b/nixos/hardware/graphics/prime.nix index f9808ff..2c40942 100644 --- a/nixos/hardware/graphics/prime.nix +++ b/nixos/hardware/graphics/prime.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ ... }: { hardware.nvidia.prime = { diff --git a/nixos/hardware/keyboard/default.nix b/nixos/hardware/keyboard/default.nix index 4619fe0..7d7c8fc 100644 --- a/nixos/hardware/keyboard/default.nix +++ b/nixos/hardware/keyboard/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { hardware.keyboard.qmk.enable = true; diff --git a/nixos/hardware/udev/default.nix b/nixos/hardware/udev/default.nix index 6cec295..5331f16 100644 --- a/nixos/hardware/udev/default.nix +++ b/nixos/hardware/udev/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { services.udev.extraRules = '' diff --git a/nixos/networking/network-manager/default.nix b/nixos/networking/network-manager/default.nix index 389bf0b..c103a6c 100644 --- a/nixos/networking/network-manager/default.nix +++ b/nixos/networking/network-manager/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { networking.hostName = "copland"; diff --git a/nixos/networking/vpn/default.nix b/nixos/networking/vpn/default.nix index 19d98d6..048f970 100644 --- a/nixos/networking/vpn/default.nix +++ b/nixos/networking/vpn/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { services.cloudflare-warp.enable = false; diff --git a/nixos/services/appimage/default.nix b/nixos/services/appimage/default.nix index 677c26e..a890a25 100644 --- a/nixos/services/appimage/default.nix +++ b/nixos/services/appimage/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { programs.appimage = { enable = true; diff --git a/nixos/services/samba/default.nix b/nixos/services/samba/default.nix index a81eeb8..e0d86f0 100644 --- a/nixos/services/samba/default.nix +++ b/nixos/services/samba/default.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { systemd.tmpfiles.rules = [ @@ -36,7 +41,7 @@ }; "HDD" = { - path = "/mnt/hdd"; + path = "/mnt/HDD"; browseable = "yes"; public = "yes"; "read only" = "no";