feat: cleanup & xwayland scaling fix

nekowinston · May 2, 2024 · 92bc2d7 · 92bc2d7
1 parent 138a9fc
commit 92bc2d7
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 51 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -89,18 +89,16 @@
 
   nixConfig = {
     extra-substituters = [
-      "https://cache.garnix.io"
-      "https://mic92.cachix.org"
-      "https://nekowinston.cachix.org"
       "https://nix-community.cachix.org"
       "https://pre-commit-hooks.cachix.org"
+      "https://nekowinston.cachix.org"
+      "https://mic92.cachix.org"
     ];
     extra-trusted-public-keys = [
-      "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
-      "mic92.cachix.org-1:gi8IhgiT3CYZnJsaW7fxznzTkMUOn1RY4GmXdT/nXYQ="
-      "nekowinston.cachix.org-1:lucpmaO+JwtoZj16HCO1p1fOv68s/RL1gumpVzRHRDs="
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       "pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc="
+      "nekowinston.cachix.org-1:lucpmaO+JwtoZj16HCO1p1fOv68s/RL1gumpVzRHRDs="
+      "mic92.cachix.org-1:gi8IhgiT3CYZnJsaW7fxznzTkMUOn1RY4GmXdT/nXYQ="
     ];
   };
 

diff --git a/home/apps/browsers.nix b/home/apps/browsers.nix
@@ -156,7 +156,6 @@ in {
     };
 
     home.packages = lib.mkIf isLinux [
-      pkgs.nur.repos.nekowinston.sizzy
       pkgs.mullvad-browser
     ];
 

diff --git a/home/apps/hyprland.nix b/home/apps/hyprland.nix
@@ -59,6 +59,7 @@
           "XDG_SESSION_TYPE, wayland"
           "_JAVA_AWT_WM_NONREPARENTING, 1"
         ];
+        xwayland.force_zero_scaling = true;
         general = {
           gaps_in = 2;
           gaps_out = 5;
@@ -134,7 +135,6 @@
           "${pkgs.swaybg}/bin/swaybg -o '*' -m fill -i ${../wallpapers/dhm_1610.png}"
         ];
         exec-once = [
-          "${pkgs.xorg.xprop}/bin/xprop -root -f _XWAYLAND_GLOBAL_OUTPUT_SCALE 32c -set _XWAYLAND_GLOBAL_OUTPUT_SCALE 2"
           "${config.programs.waybar.package}/bin/waybar -b hyprland"
         ];
         plugin.hy3.autotile.enable = true;

diff --git a/home/default.nix b/home/default.nix
@@ -35,7 +35,7 @@ in {
       ]
       ++ lib.optionals (config.isGraphical && isLinux) [
         _1password-gui
-        nur.repos.nekowinston.uhk-agent
+        uhk-agent
         neovide
       ]);
     sessionVariables = lib.mkIf isDarwin {

diff --git a/machines/common/linux/input.nix b/machines/common/linux/input.nix
@@ -1,5 +1,6 @@
-{
+{pkgs, ...}: {
   hardware.keyboard.qmk.enable = true;
+  services.udev.packages = [pkgs.uhk-udev-rules];
   services.kanata = {
     enable = true;
     keyboards.keychron-k6 = {

diff --git a/pkgs/overlays.nix b/pkgs/overlays.nix
@@ -21,17 +21,7 @@
       nurpkgs = prev;
       pkgs = prev;
       repoOverrides = {
-        nekowinston = import inputs.nekowinston-nur {inherit (prev) pkgs;};
-        caarlos0 = import inputs.caarlos0-nur {
-          inherit (prev) pkgs;
-          overlays = [
-            (final: prev: {
-              discord-applemusic-rich-presence = prev.discord-applemusic-rich-presence.overrideAttrs {
-                patches = [./patches/discord-applemusic-rich-presence.patch];
-              };
-            })
-          ];
-        };
+        nekowinston = inputs.nekowinston-nur.packages.${prev.stdenv.system};
       };
     };
   })
-Original file line number
+Diff line change
@@ Expand Up / @@ -156,7 +156,6 @@ in { @@
         };
         home.packages = lib.mkIf isLinux [
-          pkgs.nur.repos.nekowinston.sizzy
           pkgs.mullvad-browser
         ];
@@ Expand Down @@