fix:amd-pstate-epp

style:hy_animations_config remove:scx&&swayosd&&tsukimi feat:use_polkit_gnome add:embedded
2026-02-04 21:31:57 -05:00 · 2026-01-21 23:06:05 +08:00
parent a2485dca51
commit 0a7063ba13
14 changed files with 95 additions and 176 deletions
--- a/dotfiles/.config/hypr/hyprland/autostart.conf
+++ b/dotfiles/.config/hypr/hyprland/autostart.conf
@@ -1,6 +1,5 @@
 exec-once = fcitx5 -d -r
 exec-once = nm-applet
-exec-once = swayosd-server
 exec-once = swww-daemon
 exec-once = swww restore
 exec-once = xprop -root -f _XWAYLAND_GLOBAL_OUTPUT_SCALE 32c -set _XWAYLAND_GLOBAL_OUTPUT_SCALE $SCALE
--- a/dotfiles/.config/hypr/hyprland/basic.conf
+++ b/dotfiles/.config/hypr/hyprland/basic.conf
@@ -1,33 +1,15 @@
 source = ~/.config/hypr/theme.conf

-#animations {
-#    enabled = true
-#    bezier = liner, 1, 1, 1, 1
-#    bezier = overshot, 0.13, 0.99, 0.29, 1.1
-#    bezier = wind, 0.05, 0.9, 0.1, 1.05
-#    bezier = winIn, 0.1, 1.1, 0.1, 1.1
-#    animation = windows, 1, 6, wind, slide
-#    animation = windowsIn, 1, 7, winIn, slide
-#    animation = windowsOut, 1, 7, default, popin 80%
-#    animation = windowsMove, 1, 5, wind, slide
-#    animation = border, 1, 1, liner
-#    animation = fade, 1, 10, default
-#    animation = workspaces, 1, 8, default, slidefade 20%
-#    animation = specialWorkspaceIn, 1, 8, default, fade
-#    animation = specialWorkspaceOut, 1, 8, default, fade
-#}
-
 animations {
    enabled = yes
-    bezier = smooth, 0.1, 0.9, 0.2, 1.0
-    bezier = default, 0.25, 0.8, 0.5, 1
-    bezier = wind, 0.05, 0.9, 0.1, 1.05
-    animation = windowsIn, 1, 4, smooth, slide
-    animation = windowsOut, 1, 2, default, popin 80%
-    animation = windowsMove, 1, 4, wind, slide
-    animation = border, 1, 5, default
-    animation = workspacesIn, 1, 6, smooth, slide
-    animation = workspacesOut, 1, 6, smooth, slidefade 80%
+    bezier = niri, 0.2, 0.8, 0.2, 1.0
+    animation = windowsIn,   1, 3, niri, slide
+    animation = windowsOut,  1, 2, niri, popin 80%
+    animation = windowsMove, 1, 3, niri, slide
+    animation = workspacesIn,  1, 3, niri, slide
+    animation = workspacesOut, 1, 3, niri, slidefade 70%
+    animation = border, 1, 1, niri
+    animation = fade,   1, 1, niri
 }


@@ -37,20 +19,26 @@ debug {
 }


-decoration {
-    active_opacity = 1.0
-    blur {
-        enabled = false
+general {
+    border_size = 1
+    gaps_in = 2
+    gaps_out = 2
 }
-    dim_inactive = false
-    fullscreen_opacity = 1.0
+
+decoration {
+    rounding = 0
+    active_opacity = 1.0
    inactive_opacity = 1.0
-    rounding = 4
+
    shadow {
        enabled = false
    }
 }

+general {
+    col.active_border = rgba(313244ff)
+    col.inactive_border = rgba(1e1e2eff)
+}

 ecosystem {
    no_donation_nag = true
@@ -61,16 +49,6 @@ ecosystem {
 env = XDG_SESSION_DESKTOP, Hyprland


-general {
-    gaps_in = 1
-    gaps_out = 1
-    border_size = 2
-    col.active_border = $lavender
-    col.inactive_border = $base
-    layout = tile
-}
-
-
 gestures {
     workspace_swipe = true
     workspace_swipe_fingers = 3
@@ -114,36 +92,6 @@ misc {
 }


-#plugin {
-#    hy3 {
-#    no_gaps_when_only = 1
-#    node_collapse_policy = 1
-#    group_inset = 10
-#    tab_first_window = true
-#    tabs {
-#        col.active = rgb(b4befe)
-#        col.active.border = rgb(313244)
-#        col.active.text = rgb(181825)
-#        col.inactive = rgb(181825)
-#        col.inactive.border = rgb(313244)
-#        col.inactive.text = rgb(b4befe)
-#        col.urgent = rgb(f2cdcd)
-#        col.urgent.border = rgb(313244)
-#        col.urgent.text = rgb(181825)
-#        from_top = false
-#        height = 14
-#        padding = 2
-#        render_text = true
-#        rounding = 6
-#        text_center = true
-#        text_font = Sarasa Gothic SC
-#        text_height = 10
-#        text_padding = 0
-#        }
-#    }
-#}
-
-
 xwayland {
    force_zero_scaling = true
 }
--- a/dotfiles/.config/hypr/hyprland/bind.conf
+++ b/dotfiles/.config/hypr/hyprland/bind.conf
@@ -175,8 +175,8 @@ bind = SUPER, mouse:276, workspace, e-1


 ## Brightness control
-bindel = , XF86MonBrightnessUp, exec, swayosd-client --brightness +5
-bindel = , XF86MonBrightnessDown, exec, swayosd-client --brightness -5
+bindel = , XF86MonBrightnessUp, exec, brightnessctl -d amdgpu_bl1 s +5%
+bindel = , XF86MonBrightnessDown, exec, brightnessctl -d amdgpu_bl1 s 5%-


 ## Playback control
@@ -190,13 +190,13 @@ bindl = CONTROL_ALT, right, exec, playerctl next
 bindl = CONTROL_ALT, left, exec, playerctl previous


-## Volume control
-bindel = ,XF86AudioRaiseVolume, exec, swayosd-client --output-volume +2
-bindel = ,XF86AudioLowerVolume, exec, swayosd-client --output-volume -2
-bindl = ,XF86AudioMicMute, exec, swayosd-client --input-volume mute-toggle
-bindl = ,XF86AudioMute, exec, swayosd-client --output-volume mute-toggle
+## Volume control (stable, PipeWire)
+bindel = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
+bindel = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
+bindl  = , XF86AudioMute,        exec, wpctl set-mute   @DEFAULT_AUDIO_SINK@ toggle
+bindl  = , XF86AudioMicMute,     exec, wpctl set-mute   @DEFAULT_AUDIO_SOURCE@ toggle


 ## Volume control (bonus)
-bindel = CONTROL_ALT, up, exec, swayosd-client --output-volume +2
-bindel = CONTROL_ALT, down, exec, swayosd-client --output-volume -2
+bindel = CONTROL_ALT, up,   exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
+bindel = CONTROL_ALT, down, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
--- a/dotfiles/.config/niri/config.kdl
+++ b/dotfiles/.config/niri/config.kdl
@@ -165,17 +165,26 @@ binds {
    // Powers off the monitors. To turn them back on, do any input like
    // moving the mouse or pressing any other key.
    Super+Shift+P { power-off-monitors; }
+    // Volume control (stable)
+    XF86AudioRaiseVolume {
+        spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "5%+";
+    }
+    XF86AudioLowerVolume {
+        spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "5%-";
+    }
+    XF86AudioMute {
+        spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle";
+    }
+    XF86AudioMicMute {
+        spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle";
+    }
+    XF86MonBrightnessUp {
+        spawn "brightnessctl" "set" "+5%";
+    }

-    // Volume control
-    XF86AudioLowerVolume allow-when-locked=true { spawn "swayosd-client" "--output-volume" "-2"; }
-    XF86AudioMute allow-when-locked=true { spawn "swayosd-client" "--output-volume" "mute-toggle"; }
-    XF86AudioRaiseVolume allow-when-locked=true { spawn "swayosd-client" "--output-volume" "+2"; }
-    XF86MonBrightnessDown allow-when-locked=true { spawn "swayosd-client" "--brightness" "-5"; }
-    XF86MonBrightnessUp allow-when-locked=true { spawn "swayosd-client" "--brightness" "+5"; }
-
-    // Volume control (bonus)
-    Ctrl+Alt+Down allow-when-locked=true { spawn "swayosd-client" "--output-volume" "-2"; }
-    Ctrl+Alt+Up allow-when-locked=true { spawn "swayosd-client" "--output-volume" "+2"; }
+    XF86MonBrightnessDown {
+        spawn "brightnessctl" "set" "5%-";
+    }
 }


@@ -197,13 +206,10 @@ screenshot-path "~/Pictures/Screenshots/SCREENSHOT-%Y-%m-%d-%H:%M:%S.png"
 spawn-at-startup "fcitx5" "-d" "-r"
 spawn-at-startup "nm-applet"
 spawn-at-startup "blueman-applet"
-spawn-at-startup "sh" "-c" "dbus-update-activation-environment --systemd --all && systemctl --user stop niri-session.target && systemctl --user start niri-session.target"
-spawn-at-startup "swayosd-server"
 spawn-at-startup "swww-daemon"
 spawn-at-startup "swww" "img" "$HOME/Git/DCGOS/dotfiles/.local/share/wallpapers/yohoho.jpg"
 spawn-at-startup "swww" "restore"
 spawn-at-startup "waybar"
-spawn-at-startup "lxqt-policykit-agent"

 window-rule {
    block-out-from "screen-capture"
--- a/dotfiles/.config/waybar/config.jsonc
+++ b/dotfiles/.config/waybar/config.jsonc
@@ -39,7 +39,7 @@
  },

  "backlight": {
-    "device": "intel_backlight",
+    "device": "amdgpu_bl1",
    "format": "{icon} {percent}%",
    "format-icons": [""],
    "on-scroll-down": "brightnessctl s 2%-",
@@ -86,15 +86,7 @@
      "on-click": "activate",
      "on-click-middle": "close",
  },
-/*
-  "custom/screenshot": {
-    "format": " 󰨵 ",
-    "on-click": "sh ~/.config/waybar/scripts/Screenshot-Area.sh",
-    "on-click-right": "nemo ~/Pictures/Screenshots",
-    "on-click-middle": "sh ~/.config/waybar/scripts/Screenshot-Fullscreen.sh",
-    "tooltip": false,
-  },
-*/
+
  "tray": {
    "spacing": 8,
  },
@@ -108,6 +100,7 @@
      "on-scroll-down": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateBrightness d -0.02",
      "tooltip": false
  },
+
  "custom/wl-gammarelay-temperature": {
      "format": "{}K",
      "exec": "wl-gammarelay-rs watch {t}",
@@ -117,47 +110,21 @@
      "on-scroll-down": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateTemperature n -100",
      "tooltip": false
  },
-/*
-  "wireplumber": {
-    "on-click": "pwvucontrol",
-    "on-click-right": "easyeffects",
-    "on-click-middle": "swayosd-client --output-volume mute-toggle",
-    "on-scroll-down": "swayosd-client --output-volume -2",
-    "on-scroll-up": "swayosd-client --output-volume +2",
-    "format": "{icon} {volume}%",
-    "format-muted": "MUTE",
-    "format-source": "",
-    "format-source-muted": "",
-    "format-icons": {
-      "default": ["", "", ""],
-    },
-  },
-*/

  "wireplumber": {
-    "on-click": "pwvucontrol",
-    "on-click-right": "easyeffects",
-    "on-click-middle": "swayosd-client --output-volume mute-toggle",
-    "on-scroll-down": "swayosd-client --output-volume -2",
-    "on-scroll-up": "swayosd-client --output-volume +2",
    "format": "{icon} {volume}%",
    "format-muted": " MUTE",
    "format-source": "",
    "format-source-muted": "",
    "format-icons": {
-      "default": ["", "", ""],
+      "default": ["", "", ""]
    },
+    "on-scroll-up":   "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+",
+    "on-scroll-down": "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-",
+    "on-click": "pwvucontrol",
+    "on-click-right": "easyeffects"
  },
-/*
-  "clock": {
-    "interval": 60,
-    "align": 0,
-    "rotate": 0,
-    "tooltip-format": "<tt><big>{calendar}</big></tt>",
-    "format": " {:%d.%m.%Y}",
-    "format-alt": " {:%b%d %a,%G}",
-  },
-*/
+
  "clock": {
    "interval": 60,
    "align": 0,
--- a/home/gui/anime/tsukimi.nix
+++ b/home/gui/anime/tsukimi.nix
@@ -1,5 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    tsukimi
-  ];
-}
--- a/home/gui/file-sync/syncthing.nix
+++ b/home/gui/file-sync/syncthing.nix
@@ -1,5 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    syncthing
-  ];
-}
--- a/home/wayland/lxqt-policykit.nix
+++ b/home/wayland/lxqt-policykit.nix
@@ -1,5 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    lxqt.lxqt-policykit
-  ];
-}
--- a/home/wayland/polkit-agent.nix
+++ b/home/wayland/polkit-agent.nix
@@ -0,0 +1,21 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    polkit_gnome
+  ];
+
+  systemd.user.services.polkit-gnome-authentication-agent = {
+    Unit = {
+      Description = "PolicyKit GNOME Authentication Agent";
+      PartOf = ["graphical-session.target"];
+      After = ["graphical-session.target"];
+    };
+    Service = {
+      ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
+      Restart = "on-failure";
+      Slice = "session.slice";
+    };
+    Install = {
+      WantedBy = ["graphical-session.target"];
+    };
+  };
+}
--- a/home/wayland/swayosd.nix
+++ b/home/wayland/swayosd.nix
@@ -1,5 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    swayosd
-  ];
-}
--- a/hosts/dos/env.nix
+++ b/hosts/dos/env.nix
@@ -49,7 +49,6 @@
  # See: https://wiki.hyprland.org/Configuring/Monitors
  MonitorSettings = "
  monitor=eDP-1, 2560x1600@165, 0x0, 1.25
-  monitor=DP-1, 2560x1440@144, 2560x0, 1.25
  ";

  # -------------------- Software --------------------
--- a/modules/services/scx.nix
+++ b/modules/services/scx.nix
@@ -1,12 +0,0 @@
-{ lib, pkgs, username, ... }:
-
-{
-  services = {
-    gvfs.enable = true;
-    scx = {
-      enable = true;
-      scheduler = "scx_lavd";
-    };
-  };
-}
-
--- a/modules/system/bootstrap.nix
+++ b/modules/system/bootstrap.nix
@@ -45,7 +45,7 @@ in
      };
      kernelModules = ["v4l2loopback"]; # v4l2loopback is for OBS Virtual Cam Support
      kernelPackages = pkgs.${KernelPackages};
-      kernelParams = ["audit=0" "console=tty1" "erst_disable" "nmi_watchdog=0" "noatime" "nowatchdog"];
+      kernelParams = ["8250.nr_uarts=0" "8250.skip_txen_test=1" "i8042.nopnp" "amd_pstate=active" "audit=0" "console=tty1" "erst_disable" "nmi_watchdog=0" "noatime" "nowatchdog"];
      loader = {
        grub = mkIf (strings.hasInfix "grub" BootLoader) {
          configurationLimit = 50;
@@ -101,15 +101,13 @@ in
    };

    networking = {
-      dhcpcd.extraConfig = "nohook resolv.conf";
      firewall.enable = false;
      hostName = hostname;
-      nameservers = ["127.0.0.1" "::1"];
+      nameservers = ["8.8.8.8" "1.1.1.1"];
      networkmanager = {
        dns = "none";
        enable = true;
      };
-      resolvconf.enable = mkForce false;
    };

    security = {
--- a/modules/system/environment.nix
+++ b/modules/system/environment.nix
@@ -52,6 +52,7 @@ in {
      curl
      wget
      aria2
+      syncthing
      yt-dlp
      openssl

@@ -63,6 +64,14 @@ in {
      android-tools
      payload-dumper-go

+      # Embedded
+      scons
+      openocd
+      stlink
+      stlink-tool
+      gcc-arm-embedded
+      tio
+
      # Misc
      tree
      libnotify
@@ -100,6 +109,10 @@ in {
      # Agent
      opencode
      gemini-cli-bin
+
+      # Blog
+      zola
+      pagefind
    ];
  };