diff --git a/flake.lock b/flake.lock index 0b6a21e..4008f22 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1739298463, - "narHash": "sha256-oAFv9jKwwA7d7384d2LeywDSgwhvb3ZnrwbfoWPhXsI=", + "lastModified": 1737636397, + "narHash": "sha256-F5MbBj3QVorycVSFE9qjuOTLtIQBqt2VWbXa0uwzm98=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "f239e5aadd6d23c48e085c2de3397e2058e54d16", + "rev": "7fe006981fae53e931f513026fc754e322f13145", "type": "github" }, "original": { @@ -41,11 +41,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1740763725, - "narHash": "sha256-KumD2s9L4YjSQu92w42dM0ZXNwen6lKykmjrfL7GS0o=", + "lastModified": 1737911494, + "narHash": "sha256-XnQRqqRZZ5x28y4vy3yL25dMJk9s6wxnmwKQBfUlQCw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4a462936ca22eae70fd47fa3c9bef7f00153d2a1", + "rev": "b8e32860b5c94c75e9efb1779b9b5a4bd4a7d655", "type": "github" }, "original": { @@ -78,11 +78,11 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -164,11 +164,11 @@ ] }, "locked": { - "lastModified": 1739595404, - "narHash": "sha256-0CjCfbq0yHWexOrpO06e2WU1r5JAqR6ffy1zgM3NksI=", + "lastModified": 1736917206, + "narHash": "sha256-JTBWmyGf8K1Rwb+gviHIUzRJk/sITtT+72HXFkTZUjo=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "06519cec8fb32d219006da6eacd255504a9996af", + "rev": "afd0a42e8c61ebb56899315ee4084a8b2e4ff425", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1740699498, - "narHash": "sha256-r9hkKzX99CGiP1ZqH0e+SWKK4CMsRNRLyotuwrUjhTI=", + "lastModified": 1737762889, + "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", "owner": "nix-community", "repo": "home-manager", - "rev": "b71edac7a3167026aabea82a54d08b1794088c21", + "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", "type": "github" }, "original": { @@ -213,11 +213,11 @@ ] }, "locked": { - "lastModified": 1738664950, - "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", + "lastModified": 1737634937, + "narHash": "sha256-Ffw4ujFpi++6pPHe+gCBOfDgAoNlzVPZN6MReC1beu8=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", + "rev": "9c5dd1f7c825ee47f72727ad0a4e16ca46a2688e", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1739049071, - "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", + "lastModified": 1737634889, + "narHash": "sha256-9JZE3KxcXOqZH9zs3UeadngDiK/yIACTiAR8HSA/TNI=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", + "rev": "0d77b4895ad5f1bb3b0ee43103a5246c58b65591", "type": "github" }, "original": { @@ -262,8 +262,8 @@ "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", "hyprland-qtutils": "hyprland-qtutils", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", + "hyprlang": "hyprlang_2", + "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "nixpkgs" @@ -273,11 +273,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1740707551, - "narHash": "sha256-khQu5pduq+KTid2lHYQpVkFPR3WigOdtE5/95PijxU4=", + "lastModified": 1737925585, + "narHash": "sha256-+Y0fBW4G2KCmf9NY0bjgHM1W/mrTmm22uO/0aDVScNM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "445337d03dce7c9aef10ff4d57fc516ac8c1b24d", + "rev": "2f55806d6f11a1e81e3e821cb0327779d5cc50e6", "type": "github" }, "original": { @@ -293,11 +293,11 @@ ] }, "locked": { - "lastModified": 1740038356, - "narHash": "sha256-V63ssPc9zja75PzL9PyOmOFWQL9PUkIEmJtDl8KZXUc=", + "lastModified": 1737937753, + "narHash": "sha256-qLP21Pp4++nMKdgb3bSpmHSzW412CEb99xAhZ2dzxE0=", "owner": "outfoxxed", "repo": "hy3", - "rev": "0caaffd61445e9e82ba4cc6beb6eb81bbc3ae69a", + "rev": "021b746d11d5a16737f5c7c290e65e4aff229d73", "type": "github" }, "original": { @@ -318,11 +318,11 @@ ] }, "locked": { - "lastModified": 1738422629, - "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", + "lastModified": 1737556638, + "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", + "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", "type": "github" }, "original": { @@ -358,11 +358,7 @@ }, "hyprland-qt-support": { "inputs": { - "hyprlang": [ - "hyprland", - "hyprland-qtutils", - "hyprlang" - ], + "hyprlang": "hyprlang", "nixpkgs": [ "hyprland", "hyprland-qtutils", @@ -391,14 +387,8 @@ "hyprland-qtutils": { "inputs": { "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": [ - "hyprland", - "hyprlang" - ], "hyprutils": [ "hyprland", - "hyprland-qtutils", - "hyprlang", "hyprutils" ], "nixpkgs": [ @@ -411,11 +401,11 @@ ] }, "locked": { - "lastModified": 1739048983, - "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", + "lastModified": 1737811848, + "narHash": "sha256-WZ7LeiKHk5Y94MU5gHIWn0r8asWxYOvie4LqfCjVIZU=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", + "rev": "9c0831ff98856c0f312fcb8b57553fbe3dd34d5b", "type": "github" }, "original": { @@ -425,6 +415,36 @@ } }, "hyprlang": { + "inputs": { + "hyprutils": "hyprutils", + "nixpkgs": [ + "hyprland", + "hyprland-qtutils", + "hyprland-qt-support", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-qtutils", + "hyprland-qt-support", + "systems" + ] + }, + "locked": { + "lastModified": 1737634606, + "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_2": { "inputs": { "hyprutils": [ "hyprland", @@ -440,11 +460,11 @@ ] }, "locked": { - "lastModified": 1739048914, - "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", + "lastModified": 1737634606, + "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "a7334904d591f38757c46fbe2ab68651877d9099", + "rev": "f41271d35cc0f370d300413d756c2677f386af9d", "type": "github" }, "original": { @@ -455,7 +475,7 @@ }, "hyprpicker": { "inputs": { - "hyprutils": "hyprutils_2", + "hyprutils": "hyprutils_3", "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": [ "nixpkgs" @@ -463,11 +483,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1740169928, - "narHash": "sha256-TmCJ9oXar+CGw7Mnm/Y77C/Rb2J/HzHojpjnSgMOMxY=", + "lastModified": 1737635601, + "narHash": "sha256-/Jb/9HqC5Ou5JtsLHY2MJtj/c0aDG3kaeh4RLvc2X2U=", "ref": "refs/heads/main", - "rev": "b85b06577d8dcaa9ea4cd519b2b26dc575b06296", - "revCount": 98, + "rev": "c3777320b358bb28a0f2112441377fe452d77ea8", + "revCount": 96, "type": "git", "url": "https://github.com/hyprwm/hyprpicker" }, @@ -479,7 +499,7 @@ "hyprsunset": { "inputs": { "hyprland-protocols": "hyprland-protocols_2", - "hyprutils": "hyprutils_3", + "hyprutils": "hyprutils_4", "hyprwayland-scanner": "hyprwayland-scanner_3", "nixpkgs": [ "nixpkgs" @@ -487,11 +507,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1739712272, - "narHash": "sha256-hWsYFTWgpZvKipKt1LCsG1DA+QpX3A0ccaYuHqwIzmg=", + "lastModified": 1737635828, + "narHash": "sha256-e3vsaQSB9F6p8KMRzrK4l+wCgMytw7ocUvxjgmJfjp8=", "ref": "refs/heads/main", - "rev": "d1811e4b6b91e0de8aa29b8bde78ec1c44f3debb", - "revCount": 15, + "rev": "cdcf145eec3e4bbb5e07ae16012c825b59efd44e", + "revCount": 11, "type": "git", "url": "https://github.com/hyprwm/hyprsunset" }, @@ -504,19 +524,25 @@ "inputs": { "nixpkgs": [ "hyprland", + "hyprland-qtutils", + "hyprland-qt-support", + "hyprlang", "nixpkgs" ], "systems": [ "hyprland", + "hyprland-qtutils", + "hyprland-qt-support", + "hyprlang", "systems" ] }, "locked": { - "lastModified": 1739891528, - "narHash": "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=", + "lastModified": 1737632363, + "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "61a5382f4b1ab578064d470b1b3d3f0df396b8ba", + "rev": "006620eb29d54ea9086538891404c78563d1bae1", "type": "github" }, "original": { @@ -526,6 +552,31 @@ } }, "hyprutils_2": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1737725508, + "narHash": "sha256-jGmcPc6y/prg/4A8KGYqJ27nSPaProCMiFadaxNAKvA=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "fb0c2d1de3d1ef7396d19c18ac09e12bd956929e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_3": { "inputs": { "nixpkgs": [ "hyprpicker", @@ -550,7 +601,7 @@ "type": "github" } }, - "hyprutils_3": { + "hyprutils_4": { "inputs": { "nixpkgs": [ "hyprsunset", @@ -587,11 +638,11 @@ ] }, "locked": { - "lastModified": 1739049028, - "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=", + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "04146df74a8d5ec0b579657307be01f1e241125f", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", "type": "github" }, "original": { @@ -672,11 +723,11 @@ ] }, "locked": { - "lastModified": 1740281615, - "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=", + "lastModified": 1737861961, + "narHash": "sha256-LIRtMvAwLGb8pBoamzgEF67oKlNPz4LuXiRPVZf+TpE=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023", + "rev": "79b7b8eae3243fc5aa9aad34ba6b9bbb2266f523", "type": "github" }, "original": { @@ -714,11 +765,11 @@ ] }, "locked": { - "lastModified": 1740623111, - "narHash": "sha256-gzy5AT6SWUlJm5N/l03/QZ9dyV3TIQ23m0Oqi/KEiy8=", + "lastModified": 1737599681, + "narHash": "sha256-sFzfMxH7c9UWyrFsC2wsPRJqTCHchz7q2zd04+9/yvw=", "owner": "nixpak", "repo": "nixpak", - "rev": "94deaa9e812a0e206f01bff124c2df4d8efcda7d", + "rev": "68beced51b937d506187431bec4847e78fd34911", "type": "github" }, "original": { @@ -729,11 +780,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -744,11 +795,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1740603184, - "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=", + "lastModified": 1737672001, + "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49", + "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", "type": "github" }, "original": { @@ -760,11 +811,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -781,11 +832,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1740776117, - "narHash": "sha256-zQuEScC1oP5q9Qtu+IthuD9AUeYx0f9dGCqHYxkVUDE=", + "lastModified": 1737928024, + "narHash": "sha256-E3Y7NbbguVWz+J/xG20Grbns3v+y42QAxFuTxEiQN60=", "owner": "nix-community", "repo": "NUR", - "rev": "2efd087395c3c3a0778af4bfb79ea8955a5dbb17", + "rev": "d8b236e8d1ecd476478d45d5fcad21af4a2c46ca", "type": "github" }, "original": { @@ -824,11 +875,11 @@ ] }, "locked": { - "lastModified": 1740134292, - "narHash": "sha256-fwPikeafRlou5yWgLArYDwY1VlJ3v/WFk3uRmYR3QCs=", + "lastModified": 1737892627, + "narHash": "sha256-Ax7XTB7rG6vKocFcfg2EE/RhB+iwnvQW2EYN1Aj7UL4=", "ref": "refs/heads/master", - "rev": "d1a172751d62af47c6b5bccd7545768ebd2cb2c4", - "revCount": 486, + "rev": "4f2610dece8b1b5f1d24b4d046a2bfbe2f2e2cc6", + "revCount": 476, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -864,11 +915,11 @@ ] }, "locked": { - "lastModified": 1740709839, - "narHash": "sha256-4dF++MXIXna/AwlZWDKr7bgUmY4xoEwvkF1GewjNrt0=", + "lastModified": 1737858462, + "narHash": "sha256-rohhmT/b8QNaIL3nY01jFtCyZu2dGTufef5YieECWZM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b4270835bf43c6f80285adac6f66a26d83f0f277", + "rev": "dd236609a6c272d00ceaa042b1a81a31968e7f4d", "type": "github" }, "original": { diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix index eab7aaa..4e81ee2 100644 --- a/modules/hyprland/default.nix +++ b/modules/hyprland/default.nix @@ -44,7 +44,7 @@ in { enable = true; extraPortals = with pkgs; [ - kdePackages.xdg-desktop-portal-kde + xdg-desktop-portal-kde ]; config.common.default = [ diff --git a/modules/hyprland/hyprland.conf b/modules/hyprland/hyprland.conf index ca40607..5c4349f 100644 --- a/modules/hyprland/hyprland.conf +++ b/modules/hyprland/hyprland.conf @@ -83,11 +83,10 @@ plugin { tabs { border_width = 1 col.active = rgba(33ccff20) - col.active.border = rgba(33ccffee) + col.border.active = rgba(33ccffee) + col.text.active = rgba(ffffffff) col.inactive = rgba(30303020) - col.inactive.border = rgba(595959aa) - col.urgent = rgba(ff223340) - col.urgent.border = rgba(ff2233ee) + col.border.inactive = rgba(595959aa) } autotile { @@ -147,8 +146,6 @@ windowrulev2 = size 1000 700, class:^(org.freedesktop.impl.portal.desktop.kde)$ windowrulev2 = center, class:^(org.freedesktop.impl.portal.desktop.kde)$ windowrulev2 = dimaround, class:^(org.freedesktop.impl.portal.desktop.kde)$ windowrulev2 = float, title:^(OpenSSH Authentication Passphrase request)$ -windowrulev2 = float, title:^(KeePassXC - Access Request)$ -windowrulev2 = float, title:^(Unlock Database - KeePassXC)$ windowrulev2 = float, class:^(AlacrittyFloating)$ @@ -181,6 +178,7 @@ bind = $mod, r, hy3:changegroup, opposite bindm = $mod, mouse:272, movewindow bindm = $mod, mouse:273, resizewindow +bindn = , mouse:272, hy3:focustab, mouse bindn = , mouse_down, hy3:focustab, l, require_hovered bindn = , mouse_up, hy3:focustab, r, require_hovered bind = $mod, q, hy3:warpcursor diff --git a/modules/polkit.nix b/modules/polkit.nix index 9fe5f37..88dbe6b 100644 --- a/modules/polkit.nix +++ b/modules/polkit.nix @@ -10,7 +10,7 @@ after = [ "graphical-session.target" ]; serviceConfig = { Type = "simple"; - ExecStart = "${pkgs.kdePackages.polkit-kde-agent-1}/libexec/polkit-kde-authentication-agent-1"; + ExecStart = "${pkgs.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1"; Restart = "on-failure"; RestartSec = 1; TimeoutStopSec = 10; diff --git a/modules/theme/default.nix b/modules/theme/default.nix index 0ef17de..08bc8f6 100644 --- a/modules/theme/default.nix +++ b/modules/theme/default.nix @@ -20,6 +20,13 @@ nixpkgs.overlays = [(final: prev: { qt6Packages = prev.qt6Packages.overrideScope (qfinal: qprev: { qt6ct = qprev.qt6ct.overrideAttrs (ctprev: { + src = pkgs.fetchFromGitHub { + owner = "ilya-fedin"; + repo = "qt6ct"; + rev = "refs/heads/shenanigans"; + sha256 = "2RlzcjGx4vBs+r/kXd1kP3o5tQ5hWdlu4J/tWmd7FVk="; + }; + nativeBuildInputs = (builtins.filter (p: p != qfinal.qmake) ctprev.nativeBuildInputs) ++ [ final.cmake ]; buildInputs = ctprev.buildInputs ++ (with final.kdePackages; [ diff --git a/modules/user/general.nix b/modules/user/general.nix index 7478654..b4f18f0 100644 --- a/modules/user/general.nix +++ b/modules/user/general.nix @@ -49,7 +49,7 @@ serviceConfig = { Type = "simple"; - ExecStart = "${pkgs.kdePackages.polkit-kde-agent-1}/libexec/polkit-kde-authentication-agent-1"; + ExecStart = "${pkgs.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1"; Restart = "on-failure"; RestartSec = 1; TimeoutStopSec = 10; @@ -138,8 +138,6 @@ xdg-utils light - kicad - unrar # used by ark libnotify # test with it a lot ]; diff --git a/modules/user/modules/dolphin/default.nix b/modules/user/modules/dolphin/default.nix index e6da67b..79a6286 100644 --- a/modules/user/modules/dolphin/default.nix +++ b/modules/user/modules/dolphin/default.nix @@ -10,7 +10,7 @@ kdePackages.kde-cli-tools # thumbnails - kdePackages.ffmpegthumbs + ffmpegthumbs kdePackages.kio kdePackages.kio-extras kdePackages.kio-fuse diff --git a/modules/user/modules/quickshell/default.nix b/modules/user/modules/quickshell/default.nix index 0f5598c..2cbae77 100644 --- a/modules/user/modules/quickshell/default.nix +++ b/modules/user/modules/quickshell/default.nix @@ -6,8 +6,6 @@ in { home.packages = with pkgs; [ qt6.qtimageformats # amog qt6.qt5compat # shader fx - qt6.qtmultimedia # flicko shell - qt6.qtdeclarative # qtdecl types in path (quickshell.packages.${system}.default.override (prevqs: { debug = true; qt6 = prevqs.qt6.overrideScope (_: prevqt: { @@ -16,6 +14,10 @@ in { dontStrip = true; }); }); + + breakpad = prevqs.breakpad.override rec { + stdenv = pkgs.gcc13Stdenv; + }; })) grim imagemagick # screenshot ]; diff --git a/systems/msi/airvpn.nix b/systems/msi/airvpn.nix deleted file mode 100644 index eac96e4..0000000 --- a/systems/msi/airvpn.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - /* - networking.firewall.allowedUDPPorts = [ 51820 ]; - - networking.wireguard.interfaces = { - airvpn-america = { - listenPort = 51820; - - ips = [ "10.154.49.7/32" "fd7d:76ee:e68f:a993:be60:c90c:c237:479c/128" ]; - mtu = 1320; - privateKeyFile = "/root/wireguard-keys/airvpn-america.private_key"; - - peers = [ { - publicKey = "PyLCXAQT8KkM4T+dUsOQfn+Ub3pGxfGlxkIApuig+hk="; - presharedKeyFile = "/root/wireguard-keys/airvpn-america.preshared_key"; - allowedIPs = [ "0.0.0.0/0" "::/0" ]; - endpoint = "america.vpn.airdns.org:1637"; - persistentKeepalive = 15; - } ]; - }; - }; -*/ - networking.wg-quick.interfaces = { - airvpn-america = { - address = [ "10.154.49.7/32" "fd7d:76ee:e68f:a993:be60:c90c:c237:479c/128" ]; - dns = [ "10.128.0.1" "fd7d:76ee:e68f:a993::1" ]; - mtu = 1320; - privateKeyFile = "/root/wireguard-keys/airvpn-america.private_key"; - - peers = [ { - publicKey = "PyLCXAQT8KkM4T+dUsOQfn+Ub3pGxfGlxkIApuig+hk="; - presharedKeyFile = "/root/wireguard-keys/airvpn-america.preshared_key"; - allowedIPs = [ "0.0.0.0/0" "::/0" ]; - endpoint = "america.vpn.airdns.org:1637"; - persistentKeepalive = 15; - } ]; - }; - }; -}