From a8fbff057663149c4713c4cbaf83998a8d50de37 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Thu, 9 Jan 2025 18:37:46 +0100 Subject: [PATCH] fixup old config --- hosts/toaster/amd.nix | 2 ++ hosts/toaster/network/default.nix | 4 +--- modules/gnupg.nix | 1 - modules/sway.nix | 40 ++++++++++++++----------------- 4 files changed, 21 insertions(+), 26 deletions(-) diff --git a/hosts/toaster/amd.nix b/hosts/toaster/amd.nix index 54872a0..81f74c4 100644 --- a/hosts/toaster/amd.nix +++ b/hosts/toaster/amd.nix @@ -6,6 +6,8 @@ "amd_pstate=active" # try to fix weird flickering "amdgpu.sg_display=0" + # some weird amd PSR shit... + "amdgpu.dcdebugmask=0x10" ]; # hardware.graphics = { diff --git a/hosts/toaster/network/default.nix b/hosts/toaster/network/default.nix index 24b3854..028648f 100644 --- a/hosts/toaster/network/default.nix +++ b/hosts/toaster/network/default.nix @@ -5,8 +5,6 @@ ./zw.nix ]; - environment.systemPackages = with pkgs; [ iwgtk ]; - # kick out networkmanager networking.networkmanager.enable = lib.mkForce false; networking.useNetworkd = true; @@ -21,7 +19,7 @@ services.resolved = { enable = true; - dnssec = "allow-downgrade"; + dnssec = "false"; fallbackDns = [ "9.9.9.9" "2620:fe::fe" diff --git a/modules/gnupg.nix b/modules/gnupg.nix index 6d52e66..b093bda 100644 --- a/modules/gnupg.nix +++ b/modules/gnupg.nix @@ -13,6 +13,5 @@ hardware.gpgSmartcards.enable = true; programs.gnupg.agent = { enable = true; - enableSSHSupport = true; }; } diff --git a/modules/sway.nix b/modules/sway.nix index df68e9b..9330959 100644 --- a/modules/sway.nix +++ b/modules/sway.nix @@ -18,7 +18,6 @@ termusic gsettings-desktop-schemas xdg-utils - nextcloud-client foot qt5.qtwayland bashmount @@ -53,6 +52,7 @@ twemoji-color-font twitter-color-emoji iosevka + nerd-fonts.hack ]; fonts.enableDefaultPackages = true; @@ -69,11 +69,6 @@ # Enable sound. security.rtkit.enable = true; - services.avahi = { - enable = true; - nssmdns4 = true; - }; - services.pipewire = { enable = true; alsa.enable = true; @@ -92,8 +87,6 @@ services.acpid.enable = true; programs.light.enable = true; - services.blueman.enable = true; - programs.xwayland.enable = true; programs.sway = { enable = true; @@ -104,24 +97,27 @@ export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" export QT_QPA_PLATFORMTHEME="gnome" export QT_STYLE_OVERRIDE="adwaita-dark" + # export WLR_DRM_NO_ATOMIC=1 ''; extraPackages = with pkgs; [ - alacritty - pamixer - swaylock - graphicsmagick - swayidle - wl-clipboard - mako - foot - rofi-wayland - grim - slurp adwaita-icon-theme - i3status-rust - kanshi - wl-mirror + alacritty + bluetui + foot gammastep + graphicsmagick + grim + i3status-rust + impala + kanshi + mako + pamixer + rofi-wayland + slurp + swayidle + swaylock + wl-clipboard + wl-mirror ]; }; environment.sessionVariables = { GTK_THEME = "Adwaita:dark"; };