From 6f4f395ca3c9342cda818f2fd7e981dca3a711d1 Mon Sep 17 00:00:00 2001
From: outfoxxed <outfoxxed@outfoxxed.me>
Date: Fri, 28 Feb 2025 17:42:21 -0800
Subject: [PATCH] update lock, related fixes
---
flake.lock | 233 ++++++++------------
modules/hyprland/default.nix | 2 +-
modules/hyprland/hyprland.conf | 10 +-
modules/polkit.nix | 2 +-
modules/theme/default.nix | 7 -
modules/user/general.nix | 2 +-
modules/user/modules/dolphin/default.nix | 2 +-
modules/user/modules/quickshell/default.nix | 6 +-
systems/msi/airvpn.nix | 39 ++++
9 files changed, 142 insertions(+), 161 deletions(-)
create mode 100644 systems/msi/airvpn.nix
diff --git a/flake.lock b/flake.lock
index 4008f22..0b6a21e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
]
},
"locked": {
- "lastModified": 1737636397,
- "narHash": "sha256-F5MbBj3QVorycVSFE9qjuOTLtIQBqt2VWbXa0uwzm98=",
+ "lastModified": 1739298463,
+ "narHash": "sha256-oAFv9jKwwA7d7384d2LeywDSgwhvb3ZnrwbfoWPhXsI=",
"owner": "hyprwm",
"repo": "aquamarine",
- "rev": "7fe006981fae53e931f513026fc754e322f13145",
+ "rev": "f239e5aadd6d23c48e085c2de3397e2058e54d16",
"type": "github"
},
"original": {
@@ -41,11 +41,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1737911494,
- "narHash": "sha256-XnQRqqRZZ5x28y4vy3yL25dMJk9s6wxnmwKQBfUlQCw=",
+ "lastModified": 1740763725,
+ "narHash": "sha256-KumD2s9L4YjSQu92w42dM0ZXNwen6lKykmjrfL7GS0o=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "b8e32860b5c94c75e9efb1779b9b5a4bd4a7d655",
+ "rev": "4a462936ca22eae70fd47fa3c9bef7f00153d2a1",
"type": "github"
},
"original": {
@@ -78,11 +78,11 @@
]
},
"locked": {
- "lastModified": 1736143030,
- "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
+ "lastModified": 1738453229,
+ "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
+ "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github"
},
"original": {
@@ -164,11 +164,11 @@
]
},
"locked": {
- "lastModified": 1736917206,
- "narHash": "sha256-JTBWmyGf8K1Rwb+gviHIUzRJk/sITtT+72HXFkTZUjo=",
+ "lastModified": 1739595404,
+ "narHash": "sha256-0CjCfbq0yHWexOrpO06e2WU1r5JAqR6ffy1zgM3NksI=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
- "rev": "afd0a42e8c61ebb56899315ee4084a8b2e4ff425",
+ "rev": "06519cec8fb32d219006da6eacd255504a9996af",
"type": "github"
},
"original": {
@@ -184,11 +184,11 @@
]
},
"locked": {
- "lastModified": 1737762889,
- "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=",
+ "lastModified": 1740699498,
+ "narHash": "sha256-r9hkKzX99CGiP1ZqH0e+SWKK4CMsRNRLyotuwrUjhTI=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "daf04c5950b676f47a794300657f1d3d14c1a120",
+ "rev": "b71edac7a3167026aabea82a54d08b1794088c21",
"type": "github"
},
"original": {
@@ -213,11 +213,11 @@
]
},
"locked": {
- "lastModified": 1737634937,
- "narHash": "sha256-Ffw4ujFpi++6pPHe+gCBOfDgAoNlzVPZN6MReC1beu8=",
+ "lastModified": 1738664950,
+ "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=",
"owner": "hyprwm",
"repo": "hyprcursor",
- "rev": "9c5dd1f7c825ee47f72727ad0a4e16ca46a2688e",
+ "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3",
"type": "github"
},
"original": {
@@ -242,11 +242,11 @@
]
},
"locked": {
- "lastModified": 1737634889,
- "narHash": "sha256-9JZE3KxcXOqZH9zs3UeadngDiK/yIACTiAR8HSA/TNI=",
+ "lastModified": 1739049071,
+ "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=",
"owner": "hyprwm",
"repo": "hyprgraphics",
- "rev": "0d77b4895ad5f1bb3b0ee43103a5246c58b65591",
+ "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73",
"type": "github"
},
"original": {
@@ -262,8 +262,8 @@
"hyprgraphics": "hyprgraphics",
"hyprland-protocols": "hyprland-protocols",
"hyprland-qtutils": "hyprland-qtutils",
- "hyprlang": "hyprlang_2",
- "hyprutils": "hyprutils_2",
+ "hyprlang": "hyprlang",
+ "hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": [
"nixpkgs"
@@ -273,11 +273,11 @@
"xdph": "xdph"
},
"locked": {
- "lastModified": 1737925585,
- "narHash": "sha256-+Y0fBW4G2KCmf9NY0bjgHM1W/mrTmm22uO/0aDVScNM=",
+ "lastModified": 1740707551,
+ "narHash": "sha256-khQu5pduq+KTid2lHYQpVkFPR3WigOdtE5/95PijxU4=",
"owner": "hyprwm",
"repo": "Hyprland",
- "rev": "2f55806d6f11a1e81e3e821cb0327779d5cc50e6",
+ "rev": "445337d03dce7c9aef10ff4d57fc516ac8c1b24d",
"type": "github"
},
"original": {
@@ -293,11 +293,11 @@
]
},
"locked": {
- "lastModified": 1737937753,
- "narHash": "sha256-qLP21Pp4++nMKdgb3bSpmHSzW412CEb99xAhZ2dzxE0=",
+ "lastModified": 1740038356,
+ "narHash": "sha256-V63ssPc9zja75PzL9PyOmOFWQL9PUkIEmJtDl8KZXUc=",
"owner": "outfoxxed",
"repo": "hy3",
- "rev": "021b746d11d5a16737f5c7c290e65e4aff229d73",
+ "rev": "0caaffd61445e9e82ba4cc6beb6eb81bbc3ae69a",
"type": "github"
},
"original": {
@@ -318,11 +318,11 @@
]
},
"locked": {
- "lastModified": 1737556638,
- "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=",
+ "lastModified": 1738422629,
+ "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
- "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5",
+ "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed",
"type": "github"
},
"original": {
@@ -358,7 +358,11 @@
},
"hyprland-qt-support": {
"inputs": {
- "hyprlang": "hyprlang",
+ "hyprlang": [
+ "hyprland",
+ "hyprland-qtutils",
+ "hyprlang"
+ ],
"nixpkgs": [
"hyprland",
"hyprland-qtutils",
@@ -387,8 +391,14 @@
"hyprland-qtutils": {
"inputs": {
"hyprland-qt-support": "hyprland-qt-support",
+ "hyprlang": [
+ "hyprland",
+ "hyprlang"
+ ],
"hyprutils": [
"hyprland",
+ "hyprland-qtutils",
+ "hyprlang",
"hyprutils"
],
"nixpkgs": [
@@ -401,11 +411,11 @@
]
},
"locked": {
- "lastModified": 1737811848,
- "narHash": "sha256-WZ7LeiKHk5Y94MU5gHIWn0r8asWxYOvie4LqfCjVIZU=",
+ "lastModified": 1739048983,
+ "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=",
"owner": "hyprwm",
"repo": "hyprland-qtutils",
- "rev": "9c0831ff98856c0f312fcb8b57553fbe3dd34d5b",
+ "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8",
"type": "github"
},
"original": {
@@ -415,36 +425,6 @@
}
},
"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",
@@ -460,11 +440,11 @@
]
},
"locked": {
- "lastModified": 1737634606,
- "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=",
+ "lastModified": 1739048914,
+ "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=",
"owner": "hyprwm",
"repo": "hyprlang",
- "rev": "f41271d35cc0f370d300413d756c2677f386af9d",
+ "rev": "a7334904d591f38757c46fbe2ab68651877d9099",
"type": "github"
},
"original": {
@@ -475,7 +455,7 @@
},
"hyprpicker": {
"inputs": {
- "hyprutils": "hyprutils_3",
+ "hyprutils": "hyprutils_2",
"hyprwayland-scanner": "hyprwayland-scanner_2",
"nixpkgs": [
"nixpkgs"
@@ -483,11 +463,11 @@
"systems": "systems_3"
},
"locked": {
- "lastModified": 1737635601,
- "narHash": "sha256-/Jb/9HqC5Ou5JtsLHY2MJtj/c0aDG3kaeh4RLvc2X2U=",
+ "lastModified": 1740169928,
+ "narHash": "sha256-TmCJ9oXar+CGw7Mnm/Y77C/Rb2J/HzHojpjnSgMOMxY=",
"ref": "refs/heads/main",
- "rev": "c3777320b358bb28a0f2112441377fe452d77ea8",
- "revCount": 96,
+ "rev": "b85b06577d8dcaa9ea4cd519b2b26dc575b06296",
+ "revCount": 98,
"type": "git",
"url": "https://github.com/hyprwm/hyprpicker"
},
@@ -499,7 +479,7 @@
"hyprsunset": {
"inputs": {
"hyprland-protocols": "hyprland-protocols_2",
- "hyprutils": "hyprutils_4",
+ "hyprutils": "hyprutils_3",
"hyprwayland-scanner": "hyprwayland-scanner_3",
"nixpkgs": [
"nixpkgs"
@@ -507,11 +487,11 @@
"systems": "systems_4"
},
"locked": {
- "lastModified": 1737635828,
- "narHash": "sha256-e3vsaQSB9F6p8KMRzrK4l+wCgMytw7ocUvxjgmJfjp8=",
+ "lastModified": 1739712272,
+ "narHash": "sha256-hWsYFTWgpZvKipKt1LCsG1DA+QpX3A0ccaYuHqwIzmg=",
"ref": "refs/heads/main",
- "rev": "cdcf145eec3e4bbb5e07ae16012c825b59efd44e",
- "revCount": 11,
+ "rev": "d1811e4b6b91e0de8aa29b8bde78ec1c44f3debb",
+ "revCount": 15,
"type": "git",
"url": "https://github.com/hyprwm/hyprsunset"
},
@@ -524,25 +504,19 @@
"inputs": {
"nixpkgs": [
"hyprland",
- "hyprland-qtutils",
- "hyprland-qt-support",
- "hyprlang",
"nixpkgs"
],
"systems": [
"hyprland",
- "hyprland-qtutils",
- "hyprland-qt-support",
- "hyprlang",
"systems"
]
},
"locked": {
- "lastModified": 1737632363,
- "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=",
+ "lastModified": 1739891528,
+ "narHash": "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=",
"owner": "hyprwm",
"repo": "hyprutils",
- "rev": "006620eb29d54ea9086538891404c78563d1bae1",
+ "rev": "61a5382f4b1ab578064d470b1b3d3f0df396b8ba",
"type": "github"
},
"original": {
@@ -552,31 +526,6 @@
}
},
"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",
@@ -601,7 +550,7 @@
"type": "github"
}
},
- "hyprutils_4": {
+ "hyprutils_3": {
"inputs": {
"nixpkgs": [
"hyprsunset",
@@ -638,11 +587,11 @@
]
},
"locked": {
- "lastModified": 1735493474,
- "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=",
+ "lastModified": 1739049028,
+ "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
- "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b",
+ "rev": "04146df74a8d5ec0b579657307be01f1e241125f",
"type": "github"
},
"original": {
@@ -723,11 +672,11 @@
]
},
"locked": {
- "lastModified": 1737861961,
- "narHash": "sha256-LIRtMvAwLGb8pBoamzgEF67oKlNPz4LuXiRPVZf+TpE=",
+ "lastModified": 1740281615,
+ "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=",
"owner": "Mic92",
"repo": "nix-index-database",
- "rev": "79b7b8eae3243fc5aa9aad34ba6b9bbb2266f523",
+ "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023",
"type": "github"
},
"original": {
@@ -765,11 +714,11 @@
]
},
"locked": {
- "lastModified": 1737599681,
- "narHash": "sha256-sFzfMxH7c9UWyrFsC2wsPRJqTCHchz7q2zd04+9/yvw=",
+ "lastModified": 1740623111,
+ "narHash": "sha256-gzy5AT6SWUlJm5N/l03/QZ9dyV3TIQ23m0Oqi/KEiy8=",
"owner": "nixpak",
"repo": "nixpak",
- "rev": "68beced51b937d506187431bec4847e78fd34911",
+ "rev": "94deaa9e812a0e206f01bff124c2df4d8efcda7d",
"type": "github"
},
"original": {
@@ -780,11 +729,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1737885589,
- "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
+ "lastModified": 1740560979,
+ "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
+ "rev": "5135c59491985879812717f4c9fea69604e7f26f",
"type": "github"
},
"original": {
@@ -795,11 +744,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1737672001,
- "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=",
+ "lastModified": 1740603184,
+ "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8",
+ "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49",
"type": "github"
},
"original": {
@@ -811,11 +760,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1737885589,
- "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
+ "lastModified": 1740560979,
+ "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
+ "rev": "5135c59491985879812717f4c9fea69604e7f26f",
"type": "github"
},
"original": {
@@ -832,11 +781,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1737928024,
- "narHash": "sha256-E3Y7NbbguVWz+J/xG20Grbns3v+y42QAxFuTxEiQN60=",
+ "lastModified": 1740776117,
+ "narHash": "sha256-zQuEScC1oP5q9Qtu+IthuD9AUeYx0f9dGCqHYxkVUDE=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "d8b236e8d1ecd476478d45d5fcad21af4a2c46ca",
+ "rev": "2efd087395c3c3a0778af4bfb79ea8955a5dbb17",
"type": "github"
},
"original": {
@@ -875,11 +824,11 @@
]
},
"locked": {
- "lastModified": 1737892627,
- "narHash": "sha256-Ax7XTB7rG6vKocFcfg2EE/RhB+iwnvQW2EYN1Aj7UL4=",
+ "lastModified": 1740134292,
+ "narHash": "sha256-fwPikeafRlou5yWgLArYDwY1VlJ3v/WFk3uRmYR3QCs=",
"ref": "refs/heads/master",
- "rev": "4f2610dece8b1b5f1d24b4d046a2bfbe2f2e2cc6",
- "revCount": 476,
+ "rev": "d1a172751d62af47c6b5bccd7545768ebd2cb2c4",
+ "revCount": 486,
"type": "git",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell"
},
@@ -915,11 +864,11 @@
]
},
"locked": {
- "lastModified": 1737858462,
- "narHash": "sha256-rohhmT/b8QNaIL3nY01jFtCyZu2dGTufef5YieECWZM=",
+ "lastModified": 1740709839,
+ "narHash": "sha256-4dF++MXIXna/AwlZWDKr7bgUmY4xoEwvkF1GewjNrt0=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "dd236609a6c272d00ceaa042b1a81a31968e7f4d",
+ "rev": "b4270835bf43c6f80285adac6f66a26d83f0f277",
"type": "github"
},
"original": {
diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix
index 4e81ee2..eab7aaa 100644
--- a/modules/hyprland/default.nix
+++ b/modules/hyprland/default.nix
@@ -44,7 +44,7 @@ in {
enable = true;
extraPortals = with pkgs; [
- xdg-desktop-portal-kde
+ kdePackages.xdg-desktop-portal-kde
];
config.common.default = [
diff --git a/modules/hyprland/hyprland.conf b/modules/hyprland/hyprland.conf
index 5c4349f..ca40607 100644
--- a/modules/hyprland/hyprland.conf
+++ b/modules/hyprland/hyprland.conf
@@ -83,10 +83,11 @@ plugin {
tabs {
border_width = 1
col.active = rgba(33ccff20)
- col.border.active = rgba(33ccffee)
- col.text.active = rgba(ffffffff)
+ col.active.border = rgba(33ccffee)
col.inactive = rgba(30303020)
- col.border.inactive = rgba(595959aa)
+ col.inactive.border = rgba(595959aa)
+ col.urgent = rgba(ff223340)
+ col.urgent.border = rgba(ff2233ee)
}
autotile {
@@ -146,6 +147,8 @@ 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)$
@@ -178,7 +181,6 @@ 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 88dbe6b..9fe5f37 100644
--- a/modules/polkit.nix
+++ b/modules/polkit.nix
@@ -10,7 +10,7 @@
after = [ "graphical-session.target" ];
serviceConfig = {
Type = "simple";
- ExecStart = "${pkgs.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1";
+ ExecStart = "${pkgs.kdePackages.polkit-kde-agent-1}/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 08bc8f6..0ef17de 100644
--- a/modules/theme/default.nix
+++ b/modules/theme/default.nix
@@ -20,13 +20,6 @@
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 b4f18f0..9b50908 100644
--- a/modules/user/general.nix
+++ b/modules/user/general.nix
@@ -49,7 +49,7 @@
serviceConfig = {
Type = "simple";
- ExecStart = "${pkgs.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1";
+ ExecStart = "${pkgs.kdePackages.polkit-kde-agent-1}/libexec/polkit-kde-authentication-agent-1";
Restart = "on-failure";
RestartSec = 1;
TimeoutStopSec = 10;
diff --git a/modules/user/modules/dolphin/default.nix b/modules/user/modules/dolphin/default.nix
index 79a6286..e6da67b 100644
--- a/modules/user/modules/dolphin/default.nix
+++ b/modules/user/modules/dolphin/default.nix
@@ -10,7 +10,7 @@
kdePackages.kde-cli-tools
# thumbnails
- ffmpegthumbs
+ kdePackages.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 2cbae77..0f5598c 100644
--- a/modules/user/modules/quickshell/default.nix
+++ b/modules/user/modules/quickshell/default.nix
@@ -6,6 +6,8 @@ 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: {
@@ -14,10 +16,6 @@ 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
new file mode 100644
index 0000000..eac96e4
--- /dev/null
+++ b/systems/msi/airvpn.nix
@@ -0,0 +1,39 @@
+{
+ /*
+ 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;
+ } ];
+ };
+ };
+}