From 92bc2d77a85c53e243e0d303d001e8a150bcb37f Mon Sep 17 00:00:00 2001 From: winston Date: Thu, 2 May 2024 17:50:03 +0200 Subject: [PATCH] feat: cleanup & xwayland scaling fix --- flake.lock | 60 ++++++++++++++++----------------- flake.nix | 10 +++--- home/apps/browsers.nix | 1 - home/apps/hyprland.nix | 2 +- home/default.nix | 2 +- machines/common/linux/input.nix | 3 +- pkgs/overlays.nix | 12 +------ 7 files changed, 39 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index 844b35c..911ff2d 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ ] }, "locked": { - "lastModified": 1713283909, - "narHash": "sha256-2kcINN2FM9Pqo4ipoInCf+wU3rCJcvAc+mFSaM/KQe8=", + "lastModified": 1714216681, + "narHash": "sha256-DAr4pB6ztv3vJtfGEf9EMV81zZ8GVt/GM16VjnqjBiQ=", "owner": "catppuccin", "repo": "toolbox", - "rev": "6148435e940b82f3edfa65c02cb9e20a48cb7de5", + "rev": "7303828d5afe39457541ba9ef161d527bfed89c3", "type": "github" }, "original": { @@ -200,11 +200,11 @@ ] }, "locked": { - "lastModified": 1714042918, - "narHash": "sha256-4AItZA3EQIiSNAxliuYEJumw/LaVfrMv84gYyrs0r3U=", + "lastModified": 1714515075, + "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=", "owner": "nix-community", "repo": "home-manager", - "rev": "0c5704eceefcb7bb238a958f532a86e3b59d76db", + "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef", "type": "github" }, "original": { @@ -219,11 +219,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1714118177, - "narHash": "sha256-7OkL9iZeJAHuHqGA0efWalYvdyQA5jCzE0g8R8wqm6M=", + "lastModified": 1714434500, + "narHash": "sha256-SmmC9p8uvxRjnuDMm/8kRW0K2cWgdHozst/u0OOFKSY=", "owner": "nekowinston", "repo": "nur", - "rev": "01c681d41bb4e3d0c483586c5b0ab0d23dd83dbd", + "rev": "4efb75611200530626aa08fa4302b0c994bfc85f", "type": "github" }, "original": { @@ -239,11 +239,11 @@ ] }, "locked": { - "lastModified": 1713869268, - "narHash": "sha256-o3CMQeu/S8/4zU0pMtYg51rd1FWdJsI2Xohzng1Ysdg=", + "lastModified": 1714273701, + "narHash": "sha256-bmoeZ5zMSSO/e8P51yjrzaxA9uzA3SZAEFvih6S3LFo=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "dcb6ac44922858ce3a5b46f77a36d6030181460c", + "rev": "941c4973c824509e0356be455d89613611f76c8a", "type": "github" }, "original": { @@ -263,11 +263,11 @@ ] }, "locked": { - "lastModified": 1714094499, - "narHash": "sha256-SC6tm901h2tzRxd6hfzn5/bgLJ8R4ng39R7SIkg6wlo=", + "lastModified": 1714526701, + "narHash": "sha256-SO5QvTx6gEbEDqRJVzQGhwftmJICJM+h0cvql9z4kTg=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "e05ff96b9f710d57d7cd60641f0273176debf222", + "rev": "24c85bf514f34dc679f0cfd35c66065975cb635e", "type": "github" }, "original": { @@ -294,11 +294,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1714076141, - "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -326,11 +326,11 @@ }, "nur": { "locked": { - "lastModified": 1714170749, - "narHash": "sha256-ISFPLQfdYvIJjGfsBop5TuB13JcGU2IDME3C4g70FDE=", + "lastModified": 1714596740, + "narHash": "sha256-V3ZR38xu3JSUrg04wMTp0fzDSP+ogNJOOU5ckreCzLQ=", "owner": "nix-community", "repo": "nur", - "rev": "d8399969cca6025f5cbbfc4aa1e721877dd6d583", + "rev": "c8456769a0904ac761020a76bf0bb72a92c27c7c", "type": "github" }, "original": { @@ -354,11 +354,11 @@ ] }, "locked": { - "lastModified": 1713954846, - "narHash": "sha256-RWFafuSb5nkWGu8dDbW7gVb8FOQOPqmX/9MlxUUDguw=", + "lastModified": 1714478972, + "narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "6fb82e44254d6a0ece014ec423cb62d92435336f", + "rev": "2849da033884f54822af194400f8dff435ada242", "type": "github" }, "original": { @@ -414,11 +414,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1713822111, - "narHash": "sha256-aQVHGi6oqceTlyzzzZnErVHYDJbDfG0sdWe+ItuH8a4=", + "lastModified": 1714534729, + "narHash": "sha256-kwztZUS7roNMya4z/hgZ1gDxUuCQNRMKL0mvxR3CCi4=", "owner": "willpower3309", "repo": "swayfx", - "rev": "a5a69d4d4e9a8fe306e27ca46cde3a8b9d312ae3", + "rev": "e45b420ccc888f4d14782f233cf037941a2425db", "type": "github" }, "original": { @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1714134704, - "narHash": "sha256-jgTn20s3qzar/IqhjQcEO+dIQbT4hBFIloVntiCURkA=", + "lastModified": 1714355896, + "narHash": "sha256-rtv+nJJ12V7w68j8vIcGacfS1yuK1/dBgglSKWzYMTM=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "4fb773cffed9bf1efdabcc01b25637eaeb4e8e9c", + "rev": "acb893461a4bee4e77b1a27b1410d4995b52174c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9072517..289190c 100644 --- 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 index 6ceae9d..ea46a40 100644 --- 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 index 2e76052..8cadceb 100644 --- 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 index 4918714..b093367 100644 --- 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 index 40536c2..31cff5f 100644 --- 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 index ab33dbe..fc35e21 100644 --- 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}; }; }; })