From 6063d2b43815c5beef909f793521ac6bbe611b6a Mon Sep 17 00:00:00 2001 From: martyTF Date: Thu, 9 Jul 2026 20:10:45 +0200 Subject: [PATCH] i once again again again ened to sync --- flake.lock | 312 +--- flake.nix | 8 +- home/apps/internet/zen-browser.nix | 21 +- home/desktop/shell/noctalia.nix | 1994 ++++++++++----------- home/desktop/window-managers/hyprland.nix | 210 +-- home/desktop/window-managers/niri.nix | 3 +- hosts/marty-pc/custom.nix | 4 + hosts/marty-pc/options.nix | 1 - hosts/marty-server/custom.nix | 12 + modules/apps/gaming/default.nix | 14 +- modules/desktop/display-manager.nix | 22 +- modules/device/server.nix | 4 - modules/server/media/default.nix | 1 - modules/server/media/stump.nix | 20 - modules/server/misc/vaultwarden.nix | 2 +- modules/server/social/synapse.nix | 2 +- modules/system/boot.nix | 4 +- modules/system/networking.nix | 5 + 18 files changed, 1264 insertions(+), 1375 deletions(-) delete mode 100644 modules/server/media/stump.nix diff --git a/flake.lock b/flake.lock index 2b76e08..422d01b 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1776876344, - "narHash": "sha256-Ubqb/agkuMJK+k19gjQgHux/eOYRc1sRGoOZOho8+VY=", + "lastModified": 1782073106, + "narHash": "sha256-dnS5SaZlPqR1E0dPXaPc+lFkBwLUbAgbwsVMk7uA6dY=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "648a13d0ee1e03a843b3e145b8ece15393058701", + "rev": "6d6e2384f381def4ea4ea81543cba4bbdac72457", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1775706155, - "narHash": "sha256-h7Rw0vlb0n0Jsk21WJPm7H+1T1bG+PEuxE5cJ2TZl8A=", + "lastModified": 1781164160, + "narHash": "sha256-dxo3aPnfaQJt9K/3NhgKfu2Q9B42z4d4Or9Izoug+68=", "owner": "abenz1267", "repo": "elephant", - "rev": "376ee71c66db38683daabd57350bf3f6f086eaf8", + "rev": "3296842820d04d5ec774afc7528492fcbb3c01f2", "type": "github" }, "original": { @@ -132,11 +132,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -146,24 +146,6 @@ } }, "flake-utils": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "inputs": { "systems": [ "swayfx", @@ -234,11 +216,11 @@ ] }, "locked": { - "lastModified": 1777258755, - "narHash": "sha256-EC07KwADRE2LdIk7vEDyAaD3I0ZUq24T9jQF9L0iEPk=", + "lastModified": 1783134515, + "narHash": "sha256-qMoZazubXlXUD9k/syJ/aiWC4X4g73mwVmZ7Z4+rdpM=", "owner": "nix-community", "repo": "home-manager", - "rev": "7f8bbc93d63401e41368d6ddc46a4f631610fa90", + "rev": "b885baad531fa3d3beae2ba9a0712d22974d8016", "type": "github" }, "original": { @@ -292,11 +274,11 @@ ] }, "locked": { - "lastModified": 1776426399, - "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=", + "lastModified": 1782566056, + "narHash": "sha256-haEZcHzYrePnjFOYSWTbxm/Nrla0aPslJfmvdCvqtVc=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84", + "rev": "c6e7b9f673f4360bc813d3dc75028f75ee88d3f8", "type": "github" }, "original": { @@ -322,11 +304,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1777248628, - "narHash": "sha256-3RoogdcCOknnzMCNw4MxQBHlAL0qXZw/Jk1fN4Hm8jE=", + "lastModified": 1783110106, + "narHash": "sha256-PRnnFkTfQ+sQHSrcWw0512zEMNp5/1WHJeVuDf6FmxI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "80763b13ff9b8abb94654d9f5ca635003c0b5d84", + "rev": "14fa1fd0273973b7a40966b4fa9e081d6bf67dae", "type": "github" }, "original": { @@ -368,11 +350,11 @@ ] }, "locked": { - "lastModified": 1776426575, - "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=", + "lastModified": 1782563850, + "narHash": "sha256-rs/EzgrgPHbCtJjFZN4aR1HYldH/0NtGAempWVpWQTs=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "a968d211048e3ed538e47b84cb3649299578f19d", + "rev": "5ba080ee036c30cb2485f2647ff8a61f7aa08178", "type": "github" }, "original": { @@ -398,11 +380,11 @@ ] }, "locked": { - "lastModified": 1777220105, - "narHash": "sha256-M9JZK+8GVKAIVdQpcCG/49zBF3ylxO8zxW+hVjM5QpE=", + "lastModified": 1782769258, + "narHash": "sha256-HAhqQOoz4S0gzIOMnClL49B+rMT7zdp3UDWeqxtMs/k=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "dbe221941a5095e1b381ac460a152cf173b108b8", + "rev": "71b8953d7d92dbebe87a6ff9895bdd30e7495873", "type": "github" }, "original": { @@ -452,11 +434,11 @@ ] }, "locked": { - "lastModified": 1776426736, - "narHash": "sha256-rl7i4aY+9p8LysJp7o8uRWahCkpFznCgGHXszlTw7b0=", + "lastModified": 1777320127, + "narHash": "sha256-Qu+Wf2Bp5qUjyn2YpZNq8a7JyzTGowhT1knrwE38a9U=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "7833ff33b2e82d3406337b5dcf0d1cec595d83e9", + "rev": "090117506ddc3d7f26e650ff344d378c2ec329cc", "type": "github" }, "original": { @@ -504,11 +486,11 @@ ] }, "locked": { - "lastModified": 1772462885, - "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=", + "lastModified": 1782554491, + "narHash": "sha256-+p3MlyN/nqRefcf2IckPlGRUn9+hielqpS9XClbLleM=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998", + "rev": "bdba25ced39ea39ab004a8f31593ba0b0ff1ca35", "type": "github" }, "original": { @@ -529,11 +511,11 @@ ] }, "locked": { - "lastModified": 1777148223, - "narHash": "sha256-PTf7kRFFzCW6rIYxLH2fWfVJmj86FSYe3k6L8B+IM9o=", + "lastModified": 1783002634, + "narHash": "sha256-xGqHIUK0wIZoW7SiMalwvO6uGOO/VrlQwoRobpE7dDI=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "fa3992be2dfebe4ab06d753c6ca59bea298e798f", + "rev": "41fb809557abd29a57151b6e1aaeabd05f9437e1", "type": "github" }, "original": { @@ -554,11 +536,11 @@ ] }, "locked": { - "lastModified": 1777148232, - "narHash": "sha256-Uv0WZLhu89SafuSOmYDA7akrPt4wBRmsa1ucasO5aXg=", + "lastModified": 1777159683, + "narHash": "sha256-Jxixw6wZphUp+nHYxOKUYSckL17QMBx2d5Zp0rJHr1g=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "fec9cf1abcc1011e46f0a0986f46bf93c6bf8b92", + "rev": "b8632713a6beaf28b56f2a7b0ab2fb7088dbb404", "type": "github" }, "original": { @@ -583,11 +565,11 @@ ] }, "locked": { - "lastModified": 1776728575, - "narHash": "sha256-z9eGphrArEBpl1O/GCH0wlY6z4K9vA6yWh2gAS6qytU=", + "lastModified": 1778410714, + "narHash": "sha256-o6RzFj4nJXaPRY7EM01siuCQeT41RfwwmcmFQqwFJJg=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "f3a80888783702a39691b684d099e16b83ed4702", + "rev": "85148a8e612808cf5ddb25d0b3c5840f3498a7dc", "type": "github" }, "original": { @@ -604,11 +586,11 @@ "optnix": "optnix" }, "locked": { - "lastModified": 1777152325, - "narHash": "sha256-8z6TM8o91moN+rhgzErnhluIHaS5X9B2xvZnIwFA88I=", + "lastModified": 1780811447, + "narHash": "sha256-H2UAcXvmdpgZi4trdX1hoJIteXdoqod5Vbs9oB+O4VY=", "owner": "nix-community", "repo": "nixos-cli", - "rev": "ad72187c1628a409f8bb7a9256cca94c0362c5b9", + "rev": "fef2683f62b984a4c7b19eaf258f5dc387ec3447", "type": "github" }, "original": { @@ -635,11 +617,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1774748309, - "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "333c4e0545a6da976206c74db8773a1645b5870a", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "type": "github" }, "original": { @@ -666,11 +648,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1776877367, - "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", + "lastModified": 1782467914, + "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", + "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4", "type": "github" }, "original": { @@ -682,11 +664,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1775793324, - "narHash": "sha256-omax7atcZbol+6HJ2RLpP+ZCFcPa5bZ65Hn71RufeWQ=", + "lastModified": 1780336545, + "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d29d5f667d7467f98efc31881e824fa586c927e", + "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f", "type": "github" }, "original": { @@ -698,11 +680,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1776877367, - "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", + "lastModified": 1782959384, + "narHash": "sha256-xnJJk+ct+D2+wdRxj1wk36w5zV9RVESwRqcklPdt3fM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", + "rev": "65179426c83bb3f6bc14898b42ea1c6f01d374b0", "type": "github" }, "original": { @@ -713,22 +695,6 @@ } }, "nixpkgs_6": { - "locked": { - "lastModified": 1773375660, - "narHash": "sha256-SEzUWw2Rf5Ki3bcM26nSKgbeoqi2uYy8IHVBqOKjX3w=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3e20095fe3c6cbb1ddcef89b26969a69a1570776", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1775710090, "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", @@ -748,43 +714,19 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "noctalia-qs": "noctalia-qs" + ] }, "locked": { - "lastModified": 1777253304, - "narHash": "sha256-XqSHEKEW5pSAx9MoMo8mKPgkjoy4FEhZ4x0a6hGYrSI=", + "lastModified": 1783190788, + "narHash": "sha256-6eN7GU5caOyC2swgbDiFRh6VaiegqAHU62ooBhv/DYM=", "owner": "noctalia-dev", - "repo": "noctalia-shell", - "rev": "6773c4750a12c9e9af9c4ce2365e083f1d0d0ad8", + "repo": "noctalia", + "rev": "741a43539cc6ea8f728718c21dc11af680d21b0e", "type": "github" }, "original": { "owner": "noctalia-dev", - "repo": "noctalia-shell", - "type": "github" - } - }, - "noctalia-qs": { - "inputs": { - "nixpkgs": [ - "noctalia", - "nixpkgs" - ], - "systems": "systems_4", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1777167795, - "narHash": "sha256-VHdtmxVX7oF2+FxYQQPARQmtaHw23FoTBiTaH6ucOEg=", - "owner": "noctalia-dev", - "repo": "noctalia-qs", - "rev": "697db4c14e27d841956ff76887fc312443e6fb17", - "type": "github" - }, - "original": { - "owner": "noctalia-dev", - "repo": "noctalia-qs", + "repo": "noctalia", "type": "github" } }, @@ -800,11 +742,11 @@ ] }, "locked": { - "lastModified": 1774559664, - "narHash": "sha256-a8FWQZgqaS7o484iH7dFK+F9t7oMahKbcH2piIwUwFc=", + "lastModified": 1776468647, + "narHash": "sha256-zx5O1RyRl6Fq+mvMh+JdS18aXR8644bcN9MKh2fN19M=", "owner": "water-sucks", "repo": "optnix", - "rev": "853323ece22fb1ffed19cea4ae22804032034a8e", + "rev": "c320dc5494c0caaca9ee4341367618c06a957709", "type": "github" }, "original": { @@ -823,11 +765,11 @@ ] }, "locked": { - "lastModified": 1776796298, - "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=", + "lastModified": 1781733627, + "narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad", + "rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39", "type": "github" }, "original": { @@ -846,7 +788,6 @@ "nixos-cli": "nixos-cli", "nixpkgs": "nixpkgs_5", "noctalia": "noctalia", - "stump-nix": "stump-nix", "swayfx": "swayfx", "walker": "walker", "zen-browser": "zen-browser" @@ -862,14 +803,14 @@ "swayfx", "nixpkgs" ], - "systems": "systems_6" + "systems": "systems_4" }, "locked": { - "lastModified": 1771859266, - "narHash": "sha256-sUd6r/2cZ4slc6HB151LnEaf7b7g4bbYB36ADoYk564=", + "lastModified": 1775887016, + "narHash": "sha256-mNAj/ncpfMA7FWoM8bzlSZnBy/U7qwessoMB/7dffEg=", "owner": "wlrfx", "repo": "scenefx", - "rev": "bb223e3e94b4576f514df96d03ff0680384a4e20", + "rev": "ad987a32b9fe0e640fe1abf4092737699dec5a0f", "type": "github" }, "original": { @@ -878,40 +819,21 @@ "type": "github" } }, - "stump-nix": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1774882209, - "narHash": "sha256-H7NI8B3NsZRJEb8a4v2MK3UTc39oGT4XB1PtLoE7Af8=", - "owner": "bct", - "repo": "stump-nix", - "rev": "d9fa412abd927a45890460d371c25f22aa99feb5", - "type": "github" - }, - "original": { - "owner": "bct", - "repo": "stump-nix", - "type": "github" - } - }, "swayfx": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ], "scenefx": "scenefx", - "systems": "systems_7" + "systems": "systems_5" }, "locked": { - "lastModified": 1776138006, - "narHash": "sha256-hnfHAZ0y+PVAOs2pbHeeTTKJkFxhRnTl4ZoPqlpfyWw=", + "lastModified": 1779247265, + "narHash": "sha256-27enpY25y9h9WYigIgia6QOWEQrVpigPuFQDrtdqOG0=", "owner": "WillPower3309", "repo": "swayfx", - "rev": "1ccec2aef0e24a2c9ef0ec39a479dbcc21b9e5c9", + "rev": "a131cfb71665de7bad26030c2c02ef6279300551", "type": "github" }, "original": { @@ -982,16 +904,16 @@ }, "systems_5": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1010,72 +932,20 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_8": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "noctalia", - "noctalia-qs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1775636079, - "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "walker": { "inputs": { "elephant": [ "elephant" ], - "nixpkgs": "nixpkgs_7", - "systems": "systems_8" + "nixpkgs": "nixpkgs_6", + "systems": "systems_6" }, "locked": { - "lastModified": 1775815794, - "narHash": "sha256-4aYljsM+f09YLERdo+kQjg9lvxVc6yxc+rPRFdgeXxw=", + "lastModified": 1781164128, + "narHash": "sha256-xPcYrHdDXWykIi5/XXkLvliBArRnfzvs+atB9El1qhI=", "owner": "abenz1267", "repo": "walker", - "rev": "a0b5fa92e05c7d52936472c5027265b14e746bae", + "rev": "aa1e4b7d59237e8c43dde58636bae476f23d9bfb", "type": "github" }, "original": { @@ -1112,11 +982,11 @@ ] }, "locked": { - "lastModified": 1777035886, - "narHash": "sha256-m1TNuBoSXUBSKhD9UVMkU90M0wFTPTfvIOOltO8IM8A=", + "lastModified": 1782311043, + "narHash": "sha256-07zLc2M3/ax+JsjxGTft17/Joua41LHE9/9AC/F9zeU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "ecfcdcc781f48821d83e1e2a0e30d7beca0eeb5e", + "rev": "882ad01e195ce201b07c618bbee44a0cad8b9e5a", "type": "github" }, "original": { @@ -1132,11 +1002,11 @@ ] }, "locked": { - "lastModified": 1777092705, - "narHash": "sha256-qKMvM2+eKusg6H6lG2bwDdFjNi1XfEjdLD5xIt8ZgFs=", + "lastModified": 1783063092, + "narHash": "sha256-H6lM+h8+ZT25uWJwmYkER5yj5RJ9DP2++n5um/XH3J0=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "10f5c809db4f8e7badb6d505924ebbaaeefda4e4", + "rev": "36b24209358c82e0ea5404ba003ae8dc37334c86", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f66dce0..4a51b07 100644 --- a/flake.nix +++ b/flake.nix @@ -31,12 +31,9 @@ url = "github:ryantm/agenix"; }; noctalia = { - url = "github:noctalia-dev/noctalia-shell"; + url = "github:noctalia-dev/noctalia"; inputs.nixpkgs.follows = "nixpkgs"; }; - stump-nix = { - url = "github:bct/stump-nix"; - }; }; outputs = @@ -49,7 +46,6 @@ zen-browser, agenix, swayfx, - stump-nix, ... }: let @@ -78,7 +74,7 @@ nixos-cli.nixosModules.nixos-cli agenix.nixosModules.default ]; - }; + }; marty-pc = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; diff --git a/home/apps/internet/zen-browser.nix b/home/apps/internet/zen-browser.nix index b5ecfc0..2ec0fa7 100644 --- a/home/apps/internet/zen-browser.nix +++ b/home/apps/internet/zen-browser.nix @@ -90,13 +90,24 @@ in Name = "kagi"; URLTemplate = "https://kagi.com/search?q={searchTerms}"; IconURL = "https://kagi.com/asset/597c5c3/kagi_assets/logos/search.png"; - Alias = "@k"; } { - Name = "Wolfram|Alpha"; - URLTemplate = "https://www.wolframalpha.com/input?i={searchTerms}"; - IconURL = "https://upload.wikimedia.org/wikipedia/commons/2/20/Mathematica_Logo.svg"; - Alias = "@w"; + Name = "Paperless"; + URLTemplate = "http://marty-server:4050/documents?title_content={searchTerms}&sort=created&reverse=1&page=1"; + IconURL = "http://marty-server:4050/favicon.ico"; + Alias = "p"; + } + { + Name = "Immich"; + URLTemplate = "http://marty-server:2283/search?query={\"query\"%3A\"{searchTerms}\"}"; + IconURL = "http://marty-server:2283/favicon.ico"; + Alias = "i"; + } + { + Name = "NixOS"; + URLTemplate = "https://search.nixos.org/packages?channel=unstable&query={searchTerms}"; + IconURL = "https://search.nixos.org/favicon.png"; + Alias = "n"; } ]; }; diff --git a/home/desktop/shell/noctalia.nix b/home/desktop/shell/noctalia.nix index fa5fd51..6cfd0ef 100644 --- a/home/desktop/shell/noctalia.nix +++ b/home/desktop/shell/noctalia.nix @@ -13,1008 +13,1008 @@ ]; config = { - programs.noctalia-shell = + programs.noctalia = if osConfig.desktop.shell.noctalia.enable then { enable = true; package = (pkgs.noctalia-shell.override { calendarSupport = true; }); - settings = { - settingsVersion = 0; - bar = { - barType = "floating"; - position = "top"; - monitors = [ ]; - density = "comfortable"; - showOutline = true; - showCapsule = true; - capsuleOpacity = 1; - capsuleColorKey = "none"; - widgetSpacing = 6; - contentPadding = 6; - fontScale = 1; - enableExclusionZoneInset = true; - backgroundOpacity = 0; - useSeparateOpacity = true; - marginVertical = 6; - marginHorizontal = 6; - frameThickness = 8; - frameRadius = 30; - outerCorners = true; - hideOnOverview = false; - displayMode = "always_visible"; - autoHideDelay = 500; - autoShowDelay = 150; - showOnWorkspaceSwitch = true; - widgets = { - left = [ - { - colorizeSystemIcon = "none"; - customIconPath = ""; - enableColorization = false; - icon = "rocket"; - iconColor = "none"; - id = "Launcher"; - useDistroLogo = true; - } - { - compactMode = false; - hideMode = "hidden"; - hideWhenIdle = false; - id = "MediaMini"; - maxWidth = 145; - panelShowAlbumArt = true; - scrollingMode = "hover"; - showAlbumArt = true; - showArtistFirst = true; - showProgressRing = true; - showVisualizer = false; - textColor = "none"; - useFixedWidth = false; - visualizerType = "linear"; - } - { - defaultSettings = { - barWidgetMaxWidth = 300; - barWidgetSrollingMode = "hover"; - showVolumePercentage = false; - }; - id = "plugin:c4ed72:homeassistant"; - } - { - hideWhenZero = false; - hideWhenZeroUnread = false; - iconColor = "none"; - id = "NotificationHistory"; - showUnreadBadge = true; - unreadBadgeColor = "primary"; - } - { - compactMode = true; - diskPath = "/"; - iconColor = "none"; - id = "SystemMonitor"; - showCpuCores = false; - showCpuFreq = false; - showCpuTemp = true; - showCpuUsage = true; - showDiskAvailable = false; - showDiskUsage = true; - showDiskUsageAsPercent = false; - showGpuTemp = false; - showLoadAverage = false; - showMemoryAsPercent = false; - showMemoryUsage = true; - showNetworkStats = false; - showSwapUsage = true; - textColor = "none"; - useMonospaceFont = true; - usePadding = false; - } - ( - if (osConfig.device.type == "laptop") then - { - deviceNativePath = "__default__"; - displayMode = "icon-hover"; - hideIfIdle = false; - hideIfNotDetected = false; - id = "Battery"; - showNoctaliaPerformance = true; - showPowerProfiles = true; - } - else - { } - ) - { - displayMode = "alwaysHide"; - iconColor = "none"; - id = "Network"; - textColor = "none"; - } - { - displayMode = "alwaysHide"; - iconColor = "none"; - id = "Bluetooth"; - textColor = "none"; - } - { - defaultSettings = { - autoHeight = true; - cheatsheetData = [ ]; - columnCount = 3; - detectedCompositor = ""; - hyprlandConfigPath = "~/.config/hypr/hyprland.conf"; - modKeyVariable = "$mod"; - niriConfigPath = "~/.config/niri/config.kdl"; - windowHeight = 0; - windowWidth = 1400; - }; - id = "plugin:keybind-cheatsheet"; - } - { - defaultSettings = { - autoCloseManagedObs = true; - barLabelMode = "short-label"; - launchBehavior = "minimized-to-tray"; - leftClickAction = "panel"; - openVideosAfterStop = true; - pollIntervalMs = 2500; - showBarWhenReady = true; - showBarWhenRecording = true; - showBarWhenReplay = false; - showBarWhenStreaming = true; - showControlCenterWhenReady = false; - showControlCenterWhenRecording = true; - showControlCenterWhenReplay = true; - showControlCenterWhenStreaming = true; - showElapsedInBar = false; - videosOpener = "xdg-open"; - videosPath = ""; - }; - id = "plugin:obs-control"; - } - { - defaultSettings = { - activeColor = "primary"; - enableToast = true; - hideInactive = false; - iconSpacing = 4; - inactiveColor = "none"; - micFilterRegex = ""; - removeMargins = false; - }; - id = "plugin:privacy-indicator"; - } - { - defaultSettings = { - colorHistory = [ ]; - detectedCompositor = ""; - detectedRecorder = ""; - filenameFormat = ""; - installedLangs = [ - "eng" - ]; - paletteColors = [ ]; - screenshotPath = ""; - selectedOcrLang = "eng"; - transAvailable = false; - videoPath = ""; - }; - id = "plugin:screen-toolkit"; - } - ]; - center = [ - { - defaultSettings = { - hideBackground = false; - minimumThreshold = 10; - }; - id = "plugin:catwalk"; - } - { - clockColor = "none"; - customFont = ""; - formatHorizontal = "HH:mm ddd, dd. MMM"; - formatVertical = "HH mm - dd MM"; - id = "Clock"; - tooltipFormat = "HH:mm ddd, dd. MMM"; - useCustomFont = false; - } - { - id = "plugin:weekly-calendar"; - } - { - characterCount = 2; - colorizeIcons = false; - emptyColor = "none"; - enableScrollWheel = true; - focusedColor = "primary"; - followFocusedScreen = false; - fontWeight = "bold"; - groupedBorderOpacity = 1; - hideUnoccupied = false; - iconScale = 0.8; - id = "Workspace"; - labelMode = "index"; - occupiedColor = "none"; - pillSize = 0.6; - showApplications = false; - showApplicationsHover = false; - showBadge = true; - showLabelsOnlyWhenOccupied = true; - unfocusedIconsOpacity = 1; - } - { - defaultSettings = { - enableTodoIntegration = false; - notecardsEnabled = true; - pincardsEnabled = true; - showCloseButton = true; - }; - id = "plugin:clipper"; - } - ]; - right = [ - { - blacklist = [ - "*kdeconnect*" - "*syncthing*" - ]; - chevronColor = "none"; - colorizeIcons = false; - drawerEnabled = false; - hidePassive = false; - id = "Tray"; - pinned = [ ]; - } - { - defaultSettings = { }; - id = "plugin:kde-connect"; - } - { - defaultSettings = { - apiKey = ""; - apiUrl = ""; - configPath = ""; - enabled = true; - folderIds = [ ]; - pollIntervalMs = 10000; - verifyTls = false; - }; - id = "plugin:syncthing-status"; - } - { - defaultSettings = { - compactMode = false; - defaultPeerAction = "copy-ip"; - hideDisconnected = false; - hideMullvadExitNodes = true; - pingCount = 5; - refreshInterval = 5000; - showIpAddress = true; - showPeerCount = true; - sshUsername = ""; - taildropDownloadDir = "~/Downloads"; - taildropEnabled = true; - taildropReceiveMode = "operator"; - terminalCommand = ""; - }; - id = "plugin:tailscale"; - } + # settings = { + # settingsVersion = 0; + # bar = { + # barType = "floating"; + # position = "top"; + # monitors = [ ]; + # density = "comfortable"; + # showOutline = true; + # showCapsule = true; + # capsuleOpacity = 1; + # capsuleColorKey = "none"; + # widgetSpacing = 6; + # contentPadding = 6; + # fontScale = 1; + # enableExclusionZoneInset = true; + # backgroundOpacity = 0; + # useSeparateOpacity = true; + # marginVertical = 6; + # marginHorizontal = 6; + # frameThickness = 8; + # frameRadius = 30; + # outerCorners = true; + # hideOnOverview = false; + # displayMode = "always_visible"; + # autoHideDelay = 500; + # autoShowDelay = 150; + # showOnWorkspaceSwitch = true; + # widgets = { + # left = [ + # { + # colorizeSystemIcon = "none"; + # customIconPath = ""; + # enableColorization = false; + # icon = "rocket"; + # iconColor = "none"; + # id = "Launcher"; + # useDistroLogo = true; + # } + # { + # compactMode = false; + # hideMode = "hidden"; + # hideWhenIdle = false; + # id = "MediaMini"; + # maxWidth = 145; + # panelShowAlbumArt = true; + # scrollingMode = "hover"; + # showAlbumArt = true; + # showArtistFirst = true; + # showProgressRing = true; + # showVisualizer = false; + # textColor = "none"; + # useFixedWidth = false; + # visualizerType = "linear"; + # } + # { + # defaultSettings = { + # barWidgetMaxWidth = 300; + # barWidgetSrollingMode = "hover"; + # showVolumePercentage = false; + # }; + # id = "plugin:c4ed72:homeassistant"; + # } + # { + # hideWhenZero = false; + # hideWhenZeroUnread = false; + # iconColor = "none"; + # id = "NotificationHistory"; + # showUnreadBadge = true; + # unreadBadgeColor = "primary"; + # } + # { + # compactMode = true; + # diskPath = "/"; + # iconColor = "none"; + # id = "SystemMonitor"; + # showCpuCores = false; + # showCpuFreq = false; + # showCpuTemp = true; + # showCpuUsage = true; + # showDiskAvailable = false; + # showDiskUsage = true; + # showDiskUsageAsPercent = false; + # showGpuTemp = false; + # showLoadAverage = false; + # showMemoryAsPercent = false; + # showMemoryUsage = true; + # showNetworkStats = false; + # showSwapUsage = true; + # textColor = "none"; + # useMonospaceFont = true; + # usePadding = false; + # } + # ( + # if (osConfig.device.type == "laptop") then + # { + # deviceNativePath = "__default__"; + # displayMode = "icon-hover"; + # hideIfIdle = false; + # hideIfNotDetected = false; + # id = "Battery"; + # showNoctaliaPerformance = true; + # showPowerProfiles = true; + # } + # else + # { } + # ) + # { + # displayMode = "alwaysHide"; + # iconColor = "none"; + # id = "Network"; + # textColor = "none"; + # } + # { + # displayMode = "alwaysHide"; + # iconColor = "none"; + # id = "Bluetooth"; + # textColor = "none"; + # } + # { + # defaultSettings = { + # autoHeight = true; + # cheatsheetData = [ ]; + # columnCount = 3; + # detectedCompositor = ""; + # hyprlandConfigPath = "~/.config/hypr/hyprland.conf"; + # modKeyVariable = "$mod"; + # niriConfigPath = "~/.config/niri/config.kdl"; + # windowHeight = 0; + # windowWidth = 1400; + # }; + # id = "plugin:keybind-cheatsheet"; + # } + # { + # defaultSettings = { + # autoCloseManagedObs = true; + # barLabelMode = "short-label"; + # launchBehavior = "minimized-to-tray"; + # leftClickAction = "panel"; + # openVideosAfterStop = true; + # pollIntervalMs = 2500; + # showBarWhenReady = true; + # showBarWhenRecording = true; + # showBarWhenReplay = false; + # showBarWhenStreaming = true; + # showControlCenterWhenReady = false; + # showControlCenterWhenRecording = true; + # showControlCenterWhenReplay = true; + # showControlCenterWhenStreaming = true; + # showElapsedInBar = false; + # videosOpener = "xdg-open"; + # videosPath = ""; + # }; + # id = "plugin:obs-control"; + # } + # { + # defaultSettings = { + # activeColor = "primary"; + # enableToast = true; + # hideInactive = false; + # iconSpacing = 4; + # inactiveColor = "none"; + # micFilterRegex = ""; + # removeMargins = false; + # }; + # id = "plugin:privacy-indicator"; + # } + # { + # defaultSettings = { + # colorHistory = [ ]; + # detectedCompositor = ""; + # detectedRecorder = ""; + # filenameFormat = ""; + # installedLangs = [ + # "eng" + # ]; + # paletteColors = [ ]; + # screenshotPath = ""; + # selectedOcrLang = "eng"; + # transAvailable = false; + # videoPath = ""; + # }; + # id = "plugin:screen-toolkit"; + # } + # ]; + # center = [ + # { + # defaultSettings = { + # hideBackground = false; + # minimumThreshold = 10; + # }; + # id = "plugin:catwalk"; + # } + # { + # clockColor = "none"; + # customFont = ""; + # formatHorizontal = "HH:mm ddd, dd. MMM"; + # formatVertical = "HH mm - dd MM"; + # id = "Clock"; + # tooltipFormat = "HH:mm ddd, dd. MMM"; + # useCustomFont = false; + # } + # { + # id = "plugin:weekly-calendar"; + # } + # { + # characterCount = 2; + # colorizeIcons = false; + # emptyColor = "none"; + # enableScrollWheel = true; + # focusedColor = "primary"; + # followFocusedScreen = false; + # fontWeight = "bold"; + # groupedBorderOpacity = 1; + # hideUnoccupied = false; + # iconScale = 0.8; + # id = "Workspace"; + # labelMode = "index"; + # occupiedColor = "none"; + # pillSize = 0.6; + # showApplications = false; + # showApplicationsHover = false; + # showBadge = true; + # showLabelsOnlyWhenOccupied = true; + # unfocusedIconsOpacity = 1; + # } + # { + # defaultSettings = { + # enableTodoIntegration = false; + # notecardsEnabled = true; + # pincardsEnabled = true; + # showCloseButton = true; + # }; + # id = "plugin:clipper"; + # } + # ]; + # right = [ + # { + # blacklist = [ + # "*kdeconnect*" + # "*syncthing*" + # ]; + # chevronColor = "none"; + # colorizeIcons = false; + # drawerEnabled = false; + # hidePassive = false; + # id = "Tray"; + # pinned = [ ]; + # } + # { + # defaultSettings = { }; + # id = "plugin:kde-connect"; + # } + # { + # defaultSettings = { + # apiKey = ""; + # apiUrl = ""; + # configPath = ""; + # enabled = true; + # folderIds = [ ]; + # pollIntervalMs = 10000; + # verifyTls = false; + # }; + # id = "plugin:syncthing-status"; + # } + # { + # defaultSettings = { + # compactMode = false; + # defaultPeerAction = "copy-ip"; + # hideDisconnected = false; + # hideMullvadExitNodes = true; + # pingCount = 5; + # refreshInterval = 5000; + # showIpAddress = true; + # showPeerCount = true; + # sshUsername = ""; + # taildropDownloadDir = "~/Downloads"; + # taildropEnabled = true; + # taildropReceiveMode = "operator"; + # terminalCommand = ""; + # }; + # id = "plugin:tailscale"; + # } - ( - if (osConfig.device.type == "laptop") then - { - applyToAllMonitors = false; - displayMode = "onhover"; - iconColor = "none"; - id = "Brightness"; - textColor = "none"; - } - else - { } - ) - { - displayMode = "onhover"; - iconColor = "none"; - id = "Volume"; - middleClickCommand = "pwvucontrol || pavucontrol"; - textColor = "none"; - } - { - displayMode = "onhover"; - iconColor = "none"; - id = "Microphone"; - middleClickCommand = "pwvucontrol || pavucontrol"; - textColor = "none"; - } - { - iconColor = "none"; - id = "WallpaperSelector"; - } - ]; - }; - mouseWheelAction = "workspace"; - reverseScroll = false; - mouseWheelWrap = true; - middleClickAction = "settings"; - middleClickFollowMouse = true; - middleClickCommand = ""; - rightClickAction = "controlCenter"; - rightClickFollowMouse = true; - rightClickCommand = ""; - screenOverrides = [ ]; - }; - general = { - avatarImage = ""; - dimmerOpacity = 0.1; - showScreenCorners = false; - forceBlackScreenCorners = false; - scaleRatio = 1; - radiusRatio = 2; - iRadiusRatio = 2; - boxRadiusRatio = 1; - screenRadiusRatio = 1; - animationSpeed = 1; - animationDisabled = false; - compactLockScreen = false; - lockScreenAnimations = true; - lockOnSuspend = true; - showSessionButtonsOnLockScreen = true; - showHibernateOnLockScreen = false; - enableLockScreenMediaControls = true; - enableShadows = true; - enableBlurBehind = true; - shadowDirection = "bottom_right"; - shadowOffsetX = 2; - shadowOffsetY = 3; - language = ""; - allowPanelsOnScreenWithoutBar = true; - showChangelogOnStartup = true; - telemetryEnabled = false; - enableLockScreenCountdown = true; - lockScreenCountdownDuration = 5000; - autoStartAuth = true; - allowPasswordWithFprintd = true; - clockStyle = "custom"; - clockFormat = "HH:mm - dd.MM.yyyy"; - passwordChars = true; - lockScreenMonitors = [ ]; - lockScreenBlur = 0.05; - lockScreenTint = 0; - keybinds = { - keyUp = [ - "Up" - ]; - keyDown = [ - "Down" - ]; - keyLeft = [ - "Left" - ]; - keyRight = [ - "Right" - ]; - keyEnter = [ - "Return" - "Enter" - ]; - keyEscape = [ - "Esc" - ]; - keyRemove = [ - "Del" - ]; - }; - reverseScroll = false; - smoothScrollEnabled = true; - }; - ui = { - fontDefault = "FiraCode Nerd Font"; - fontFixed = "FiraCode Nerd Font"; - fontDefaultScale = 1; - fontFixedScale = 1; - tooltipsEnabled = true; - scrollbarAlwaysVisible = true; - boxBorderEnabled = true; - panelBackgroundOpacity = 1; - translucentWidgets = false; - panelsAttachedToBar = false; - settingsPanelMode = "centered"; - settingsPanelSideBarCardStyle = true; - }; - location = { - name = ""; - weatherEnabled = true; - weatherShowEffects = true; - useFahrenheit = false; - use12hourFormat = false; - showWeekNumberInCalendar = true; - showCalendarEvents = true; - showCalendarWeather = true; - analogClockInCalendar = false; - firstDayOfWeek = 1; - hideWeatherTimezone = false; - hideWeatherCityName = true; - autoLocate = true; - }; - calendar = { - cards = [ - { - enabled = true; - id = "calendar-header-card"; - } - { - enabled = true; - id = "calendar-month-card"; - } - { - enabled = true; - id = "weather-card"; - } - ]; - }; - wallpaper = { - enabled = true; - overviewEnabled = true; - directory = "/home/${osConfig.user.userName}/.local/share/wallpapers"; - monitorDirectories = [ ]; - enableMultiMonitorDirectories = false; - showHiddenFiles = false; - viewMode = "recursive"; - setWallpaperOnAllMonitors = true; - linkLightAndDarkWallpapers = true; - fillMode = "crop"; - fillColor = "#000000"; - useSolidColor = false; - solidColor = "#1a1a2e"; - automationEnabled = true; - wallpaperChangeMode = "random"; - randomIntervalSec = 900; - transitionDuration = 1500; - transitionType = [ - "fade" - "disc" - "stripes" - "wipe" - "pixelate" - "honeycomb" - ]; - skipStartupTransition = false; - transitionEdgeSmoothness = 0.05; - panelPosition = "follow_bar"; - hideWallpaperFilenames = false; - useOriginalImages = false; - overviewBlur = 0.4; - overviewTint = 0.6; - useWallhaven = false; - wallhavenQuery = ""; - wallhavenSorting = "relevance"; - wallhavenOrder = "desc"; - wallhavenCategories = "111"; - wallhavenPurity = "100"; - wallhavenRatios = ""; - wallhavenApiKey = ""; - wallhavenResolutionMode = "atleast"; - wallhavenResolutionWidth = ""; - wallhavenResolutionHeight = ""; - sortOrder = "name"; - favorites = [ ]; - }; - appLauncher = { - enableClipboardHistory = true; - autoPasteClipboard = false; - enableClipPreview = true; - clipboardWrapText = true; - enableClipboardSmartIcons = true; - enableClipboardChips = true; - clipboardWatchTextCommand = "wl-paste --type text --watch cliphist store"; - clipboardWatchImageCommand = "wl-paste --type image --watch cliphist store"; - position = "top_center"; - pinnedApps = [ ]; - sortByMostUsed = true; - terminalCommand = "kitty -e"; - customLaunchPrefixEnabled = false; - customLaunchPrefix = ""; - viewMode = "grid"; - showCategories = true; - iconMode = "native"; - showIconBackground = true; - enableSettingsSearch = true; - enableWindowsSearch = true; - enableSessionSearch = true; - ignoreMouseInput = false; - screenshotAnnotationTool = "gradia"; - overviewLayer = true; - density = "default"; - }; - controlCenter = { - position = "close_to_bar_button"; - diskPath = "/"; - shortcuts = { - left = [ - { - id = "Network"; - } - { - id = "Bluetooth"; - } - { - id = "WallpaperSelector"; - } - { - id = "NoctaliaPerformance"; - } - ]; - right = [ - { - id = "Notifications"; - } - { - id = "PowerProfile"; - } - { - id = "NightLight"; - } - ]; - }; - cards = [ - { - enabled = true; - id = "profile-card"; - } - { - enabled = true; - id = "shortcuts-card"; - } - { - enabled = true; - id = "audio-card"; - } - { - enabled = false; - id = "brightness-card"; - } - { - enabled = true; - id = "weather-card"; - } - { - enabled = true; - id = "media-sysmon-card"; - } - ]; - }; - systemMonitor = { - cpuWarningThreshold = 80; - cpuCriticalThreshold = 90; - tempWarningThreshold = 80; - tempCriticalThreshold = 90; - gpuWarningThreshold = 80; - gpuCriticalThreshold = 90; - memWarningThreshold = 80; - memCriticalThreshold = 90; - swapWarningThreshold = 80; - swapCriticalThreshold = 90; - diskWarningThreshold = 80; - diskCriticalThreshold = 90; - diskAvailWarningThreshold = 20; - diskAvailCriticalThreshold = 10; - batteryWarningThreshold = 20; - batteryCriticalThreshold = 5; - enableDgpuMonitoring = false; - useCustomColors = false; - warningColor = ""; - criticalColor = ""; - externalMonitor = "resources || missioncenter || jdsystemmonitor || corestats || system-monitoring-center || gnome-system-monitor || plasma-systemmonitor || mate-system-monitor || ukui-system-monitor || deepin-system-monitor || pantheon-system-monitor"; - }; - noctaliaPerformance = { - disableWallpaper = true; - disableDesktopWidgets = true; - }; - dock = { - enabled = false; - position = "bottom"; - displayMode = "auto_hide"; - dockType = "floating"; - backgroundOpacity = 1; - floatingRatio = 1; - size = 1; - onlySameOutput = true; - monitors = [ ]; - pinnedApps = [ ]; - colorizeIcons = false; - showLauncherIcon = false; - launcherPosition = "end"; - launcherUseDistroLogo = false; - launcherIcon = ""; - launcherIconColor = "none"; - pinnedStatic = false; - inactiveIndicators = false; - groupApps = false; - groupContextMenuMode = "extended"; - groupClickAction = "cycle"; - groupIndicatorStyle = "dots"; - deadOpacity = 0.6; - animationSpeed = 1; - sitOnFrame = false; - showDockIndicator = false; - indicatorThickness = 3; - indicatorColor = "primary"; - indicatorOpacity = 0.6; - }; - network = { - bluetoothRssiPollingEnabled = false; - bluetoothRssiPollIntervalMs = 60000; - networkPanelView = "wifi"; - wifiDetailsViewMode = "grid"; - bluetoothDetailsViewMode = "grid"; - bluetoothHideUnnamedDevices = false; - disableDiscoverability = false; - bluetoothAutoConnect = true; - }; - sessionMenu = { - enableCountdown = true; - countdownDuration = 5000; - position = "center"; - showHeader = true; - showKeybinds = true; - largeButtonsStyle = true; - largeButtonsLayout = "single-row"; - powerOptions = [ - { - action = "lock"; - enabled = true; - keybind = "1"; - } - { - action = "suspend"; - enabled = true; - keybind = "2"; - } - { - action = "hibernate"; - enabled = true; - keybind = "3"; - } - { - action = "reboot"; - enabled = true; - keybind = "4"; - } - { - action = "logout"; - enabled = true; - keybind = "5"; - } - { - action = "shutdown"; - enabled = true; - keybind = "6"; - } - { - action = "rebootToUefi"; - enabled = true; - keybind = "7"; - } - ]; - }; - notifications = { - enabled = true; - enableMarkdown = true; - density = "compact"; - monitors = [ ]; - location = "top"; - overlayLayer = true; - backgroundOpacity = 1; - respectExpireTimeout = true; - lowUrgencyDuration = 3; - normalUrgencyDuration = 8; - criticalUrgencyDuration = 15; - clearDismissed = true; - saveToHistory = { - low = true; - normal = true; - critical = true; - }; - sounds = { - enabled = false; - volume = 0.5; - separateSounds = false; - criticalSoundFile = ""; - normalSoundFile = ""; - lowSoundFile = ""; - excludedApps = "discord,firefox,chrome,chromium,edge"; - }; - enableMediaToast = false; - enableKeyboardLayoutToast = true; - enableBatteryToast = true; - }; - osd = { - enabled = true; - location = "top_right"; - autoHideMs = 2000; - overlayLayer = true; - backgroundOpacity = 1; - enabledTypes = [ - 0 - 1 - 2 - ]; - monitors = [ ]; - }; - audio = { - volumeStep = 5; - volumeOverdrive = false; - spectrumFrameRate = 30; - visualizerType = "linear"; - spectrumMirrored = true; - mprisBlacklist = [ ]; - preferredPlayer = ""; - volumeFeedback = false; - volumeFeedbackSoundFile = ""; - }; - brightness = { - brightnessStep = 5; - enforceMinimum = true; - enableDdcSupport = false; - backlightDeviceMappings = [ ]; - }; - colorSchemes = { - useWallpaperColors = true; - predefinedScheme = "Noctalia (default)"; - darkMode = true; - schedulingMode = "off"; - manualSunrise = "06:30"; - manualSunset = "18:30"; - generationMethod = "tonal-spot"; - monitorForColors = ""; - syncGsettings = true; - }; - templates = { - activeTemplates = [ - { - id = "alacritty"; - active = true; - enable = true; - } - { - id = "btop"; - active = true; - enable = true; - } - { - id = "cava"; - active = true; - enable = true; - } - { - id = "emacs"; - active = true; - enable = true; - } - { - id = "gtk"; - active = true; - enable = true; - } - { - id = "hyprland"; - active = true; - enable = true; - } - { - id = "hyprtoolkit"; - active = true; - enable = true; - } - { - id = "kcolorscheme"; - active = true; - enable = true; - } - { - id = "kitty"; - active = true; - enable = true; - } - { - id = "mango"; - active = true; - enable = true; - } - { - id = "niri"; - active = true; - enable = true; - } - { - id = "qt"; - active = true; - enable = true; - } - { - id = "steam"; - active = true; - enable = true; - } - { - id = "sway"; - active = true; - enable = true; - } - { - id = "code"; - active = true; - enable = true; - } - { - id = "walker"; - active = true; - enable = true; - } - { - id = "zed"; - active = true; - enable = true; - } - { - id = "zenBrowser"; - active = true; - enable = true; - } - ]; - enableUserTheming = false; - }; - nightLight = { - enabled = false; - forced = false; - autoSchedule = true; - nightTemp = "4000"; - dayTemp = "6500"; - manualSunrise = "06:30"; - manualSunset = "18:30"; - }; - hooks = { - enabled = false; - wallpaperChange = ""; - darkModeChange = ""; - screenLock = ""; - screenUnlock = ""; - performanceModeEnabled = ""; - performanceModeDisabled = ""; - startup = ""; - session = ""; - colorGeneration = ""; - }; - plugins = { - autoUpdate = false; - notifyUpdates = true; - sources = [ - { - enabled = true; - name = "Official Noctalia Plugins"; - url = "https://github.com/noctalia-dev/noctalia-plugins"; - } - { - enabled = true; - name = "Mic92"; - url = "https://github.com/Mic92/noctalia-plugins"; - } - { - enabled = true; - name = "anthonyhab"; - url = "https://github.com/anthonyhab/noctalia-plugins"; - } - ]; - states = { - catwalk = { - enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; - }; - clipper = { - enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; - }; - file-search = { - enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; - }; - giphy-search = { - enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; - }; - kagi-quick-search = { - enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; - }; - kaomoji-provider = { - enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; - }; - kde-connect = { - enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; - }; - keybind-cheatsheet = { - enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; - }; - obs-control = { - enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; - }; - parallax-wallpaper = { - enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; - }; - polkit-agent = { - enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; - }; - privacy-indicator = { - enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; - }; - rss-feed = { - enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; - }; - screen-toolkit = { - enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; - }; - syncthing-status = { - enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; - }; - tailscale = { - enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; - }; - vscode-provider = { - enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; - }; - weekly-calendar = { - enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; - }; - homeassistant = { - enabled = true; - sourceUrl = "https://github.com/anthonyhab/noctalia-plugins"; - }; - rbw-provider = { - enabled = true; - sourceUrl = "https://github.com/Mic92/noctalia-plugins"; - }; - fprint-notify = { - enabled = true; - sourceUrl = "https://github.com/Mic92/noctalia-plugins"; - }; - }; - }; - idle = { - enabled = false; - screenOffTimeout = 600; - lockTimeout = 660; - suspendTimeout = 1800; - fadeDuration = 5; - screenOffCommand = ""; - lockCommand = ""; - suspendCommand = ""; - resumeScreenOffCommand = ""; - resumeLockCommand = ""; - resumeSuspendCommand = ""; - customCommands = "[]"; - }; - desktopWidgets = { - enabled = false; - overviewEnabled = true; - gridSnap = false; - gridSnapScale = false; - monitorWidgets = [ ]; - }; - }; + # ( + # if (osConfig.device.type == "laptop") then + # { + # applyToAllMonitors = false; + # displayMode = "onhover"; + # iconColor = "none"; + # id = "Brightness"; + # textColor = "none"; + # } + # else + # { } + # ) + # { + # displayMode = "onhover"; + # iconColor = "none"; + # id = "Volume"; + # middleClickCommand = "pwvucontrol || pavucontrol"; + # textColor = "none"; + # } + # { + # displayMode = "onhover"; + # iconColor = "none"; + # id = "Microphone"; + # middleClickCommand = "pwvucontrol || pavucontrol"; + # textColor = "none"; + # } + # { + # iconColor = "none"; + # id = "WallpaperSelector"; + # } + # ]; + # }; + # mouseWheelAction = "workspace"; + # reverseScroll = false; + # mouseWheelWrap = true; + # middleClickAction = "settings"; + # middleClickFollowMouse = true; + # middleClickCommand = ""; + # rightClickAction = "controlCenter"; + # rightClickFollowMouse = true; + # rightClickCommand = ""; + # screenOverrides = [ ]; + # }; + # general = { + # avatarImage = ""; + # dimmerOpacity = 0.1; + # showScreenCorners = false; + # forceBlackScreenCorners = false; + # scaleRatio = 1; + # radiusRatio = 2; + # iRadiusRatio = 2; + # boxRadiusRatio = 1; + # screenRadiusRatio = 1; + # animationSpeed = 1; + # animationDisabled = false; + # compactLockScreen = false; + # lockScreenAnimations = true; + # lockOnSuspend = true; + # showSessionButtonsOnLockScreen = true; + # showHibernateOnLockScreen = false; + # enableLockScreenMediaControls = true; + # enableShadows = true; + # enableBlurBehind = true; + # shadowDirection = "bottom_right"; + # shadowOffsetX = 2; + # shadowOffsetY = 3; + # language = ""; + # allowPanelsOnScreenWithoutBar = true; + # showChangelogOnStartup = true; + # telemetryEnabled = false; + # enableLockScreenCountdown = true; + # lockScreenCountdownDuration = 5000; + # autoStartAuth = true; + # allowPasswordWithFprintd = true; + # clockStyle = "custom"; + # clockFormat = "HH:mm - dd.MM.yyyy"; + # passwordChars = true; + # lockScreenMonitors = [ ]; + # lockScreenBlur = 0.05; + # lockScreenTint = 0; + # keybinds = { + # keyUp = [ + # "Up" + # ]; + # keyDown = [ + # "Down" + # ]; + # keyLeft = [ + # "Left" + # ]; + # keyRight = [ + # "Right" + # ]; + # keyEnter = [ + # "Return" + # "Enter" + # ]; + # keyEscape = [ + # "Esc" + # ]; + # keyRemove = [ + # "Del" + # ]; + # }; + # reverseScroll = false; + # smoothScrollEnabled = true; + # }; + # ui = { + # fontDefault = "FiraCode Nerd Font"; + # fontFixed = "FiraCode Nerd Font"; + # fontDefaultScale = 1; + # fontFixedScale = 1; + # tooltipsEnabled = true; + # scrollbarAlwaysVisible = true; + # boxBorderEnabled = true; + # panelBackgroundOpacity = 1; + # translucentWidgets = false; + # panelsAttachedToBar = false; + # settingsPanelMode = "centered"; + # settingsPanelSideBarCardStyle = true; + # }; + # location = { + # name = ""; + # weatherEnabled = true; + # weatherShowEffects = true; + # useFahrenheit = false; + # use12hourFormat = false; + # showWeekNumberInCalendar = true; + # showCalendarEvents = true; + # showCalendarWeather = true; + # analogClockInCalendar = false; + # firstDayOfWeek = 1; + # hideWeatherTimezone = false; + # hideWeatherCityName = true; + # autoLocate = true; + # }; + # calendar = { + # cards = [ + # { + # enabled = true; + # id = "calendar-header-card"; + # } + # { + # enabled = true; + # id = "calendar-month-card"; + # } + # { + # enabled = true; + # id = "weather-card"; + # } + # ]; + # }; + # wallpaper = { + # enabled = true; + # overviewEnabled = true; + # directory = "/home/${osConfig.user.userName}/.local/share/wallpapers"; + # monitorDirectories = [ ]; + # enableMultiMonitorDirectories = false; + # showHiddenFiles = false; + # viewMode = "recursive"; + # setWallpaperOnAllMonitors = true; + # linkLightAndDarkWallpapers = true; + # fillMode = "crop"; + # fillColor = "#000000"; + # useSolidColor = false; + # solidColor = "#1a1a2e"; + # automationEnabled = true; + # wallpaperChangeMode = "random"; + # randomIntervalSec = 900; + # transitionDuration = 1500; + # transitionType = [ + # "fade" + # "disc" + # "stripes" + # "wipe" + # "pixelate" + # "honeycomb" + # ]; + # skipStartupTransition = false; + # transitionEdgeSmoothness = 0.05; + # panelPosition = "follow_bar"; + # hideWallpaperFilenames = false; + # useOriginalImages = false; + # overviewBlur = 0.4; + # overviewTint = 0.6; + # useWallhaven = false; + # wallhavenQuery = ""; + # wallhavenSorting = "relevance"; + # wallhavenOrder = "desc"; + # wallhavenCategories = "111"; + # wallhavenPurity = "100"; + # wallhavenRatios = ""; + # wallhavenApiKey = ""; + # wallhavenResolutionMode = "atleast"; + # wallhavenResolutionWidth = ""; + # wallhavenResolutionHeight = ""; + # sortOrder = "name"; + # favorites = [ ]; + # }; + # appLauncher = { + # enableClipboardHistory = true; + # autoPasteClipboard = false; + # enableClipPreview = true; + # clipboardWrapText = true; + # enableClipboardSmartIcons = true; + # enableClipboardChips = true; + # clipboardWatchTextCommand = "wl-paste --type text --watch cliphist store"; + # clipboardWatchImageCommand = "wl-paste --type image --watch cliphist store"; + # position = "top_center"; + # pinnedApps = [ ]; + # sortByMostUsed = true; + # terminalCommand = "kitty -e"; + # customLaunchPrefixEnabled = false; + # customLaunchPrefix = ""; + # viewMode = "grid"; + # showCategories = true; + # iconMode = "native"; + # showIconBackground = true; + # enableSettingsSearch = true; + # enableWindowsSearch = true; + # enableSessionSearch = true; + # ignoreMouseInput = false; + # screenshotAnnotationTool = "gradia"; + # overviewLayer = true; + # density = "default"; + # }; + # controlCenter = { + # position = "close_to_bar_button"; + # diskPath = "/"; + # shortcuts = { + # left = [ + # { + # id = "Network"; + # } + # { + # id = "Bluetooth"; + # } + # { + # id = "WallpaperSelector"; + # } + # { + # id = "NoctaliaPerformance"; + # } + # ]; + # right = [ + # { + # id = "Notifications"; + # } + # { + # id = "PowerProfile"; + # } + # { + # id = "NightLight"; + # } + # ]; + # }; + # cards = [ + # { + # enabled = true; + # id = "profile-card"; + # } + # { + # enabled = true; + # id = "shortcuts-card"; + # } + # { + # enabled = true; + # id = "audio-card"; + # } + # { + # enabled = false; + # id = "brightness-card"; + # } + # { + # enabled = true; + # id = "weather-card"; + # } + # { + # enabled = true; + # id = "media-sysmon-card"; + # } + # ]; + # }; + # systemMonitor = { + # cpuWarningThreshold = 80; + # cpuCriticalThreshold = 90; + # tempWarningThreshold = 80; + # tempCriticalThreshold = 90; + # gpuWarningThreshold = 80; + # gpuCriticalThreshold = 90; + # memWarningThreshold = 80; + # memCriticalThreshold = 90; + # swapWarningThreshold = 80; + # swapCriticalThreshold = 90; + # diskWarningThreshold = 80; + # diskCriticalThreshold = 90; + # diskAvailWarningThreshold = 20; + # diskAvailCriticalThreshold = 10; + # batteryWarningThreshold = 20; + # batteryCriticalThreshold = 5; + # enableDgpuMonitoring = false; + # useCustomColors = false; + # warningColor = ""; + # criticalColor = ""; + # externalMonitor = "resources || missioncenter || jdsystemmonitor || corestats || system-monitoring-center || gnome-system-monitor || plasma-systemmonitor || mate-system-monitor || ukui-system-monitor || deepin-system-monitor || pantheon-system-monitor"; + # }; + # noctaliaPerformance = { + # disableWallpaper = true; + # disableDesktopWidgets = true; + # }; + # dock = { + # enabled = false; + # position = "bottom"; + # displayMode = "auto_hide"; + # dockType = "floating"; + # backgroundOpacity = 1; + # floatingRatio = 1; + # size = 1; + # onlySameOutput = true; + # monitors = [ ]; + # pinnedApps = [ ]; + # colorizeIcons = false; + # showLauncherIcon = false; + # launcherPosition = "end"; + # launcherUseDistroLogo = false; + # launcherIcon = ""; + # launcherIconColor = "none"; + # pinnedStatic = false; + # inactiveIndicators = false; + # groupApps = false; + # groupContextMenuMode = "extended"; + # groupClickAction = "cycle"; + # groupIndicatorStyle = "dots"; + # deadOpacity = 0.6; + # animationSpeed = 1; + # sitOnFrame = false; + # showDockIndicator = false; + # indicatorThickness = 3; + # indicatorColor = "primary"; + # indicatorOpacity = 0.6; + # }; + # network = { + # bluetoothRssiPollingEnabled = false; + # bluetoothRssiPollIntervalMs = 60000; + # networkPanelView = "wifi"; + # wifiDetailsViewMode = "grid"; + # bluetoothDetailsViewMode = "grid"; + # bluetoothHideUnnamedDevices = false; + # disableDiscoverability = false; + # bluetoothAutoConnect = true; + # }; + # sessionMenu = { + # enableCountdown = true; + # countdownDuration = 5000; + # position = "center"; + # showHeader = true; + # showKeybinds = true; + # largeButtonsStyle = true; + # largeButtonsLayout = "single-row"; + # powerOptions = [ + # { + # action = "lock"; + # enabled = true; + # keybind = "1"; + # } + # { + # action = "suspend"; + # enabled = true; + # keybind = "2"; + # } + # { + # action = "hibernate"; + # enabled = true; + # keybind = "3"; + # } + # { + # action = "reboot"; + # enabled = true; + # keybind = "4"; + # } + # { + # action = "logout"; + # enabled = true; + # keybind = "5"; + # } + # { + # action = "shutdown"; + # enabled = true; + # keybind = "6"; + # } + # { + # action = "rebootToUefi"; + # enabled = true; + # keybind = "7"; + # } + # ]; + # }; + # notifications = { + # enabled = true; + # enableMarkdown = true; + # density = "compact"; + # monitors = [ ]; + # location = "top"; + # overlayLayer = true; + # backgroundOpacity = 1; + # respectExpireTimeout = true; + # lowUrgencyDuration = 3; + # normalUrgencyDuration = 8; + # criticalUrgencyDuration = 15; + # clearDismissed = true; + # saveToHistory = { + # low = true; + # normal = true; + # critical = true; + # }; + # sounds = { + # enabled = false; + # volume = 0.5; + # separateSounds = false; + # criticalSoundFile = ""; + # normalSoundFile = ""; + # lowSoundFile = ""; + # excludedApps = "discord,firefox,chrome,chromium,edge"; + # }; + # enableMediaToast = false; + # enableKeyboardLayoutToast = true; + # enableBatteryToast = true; + # }; + # osd = { + # enabled = true; + # location = "top_right"; + # autoHideMs = 2000; + # overlayLayer = true; + # backgroundOpacity = 1; + # enabledTypes = [ + # 0 + # 1 + # 2 + # ]; + # monitors = [ ]; + # }; + # audio = { + # volumeStep = 5; + # volumeOverdrive = false; + # spectrumFrameRate = 30; + # visualizerType = "linear"; + # spectrumMirrored = true; + # mprisBlacklist = [ ]; + # preferredPlayer = ""; + # volumeFeedback = false; + # volumeFeedbackSoundFile = ""; + # }; + # brightness = { + # brightnessStep = 5; + # enforceMinimum = true; + # enableDdcSupport = false; + # backlightDeviceMappings = [ ]; + # }; + # colorSchemes = { + # useWallpaperColors = true; + # predefinedScheme = "Noctalia (default)"; + # darkMode = true; + # schedulingMode = "off"; + # manualSunrise = "06:30"; + # manualSunset = "18:30"; + # generationMethod = "tonal-spot"; + # monitorForColors = ""; + # syncGsettings = true; + # }; + # templates = { + # activeTemplates = [ + # { + # id = "alacritty"; + # active = true; + # enable = true; + # } + # { + # id = "btop"; + # active = true; + # enable = true; + # } + # { + # id = "cava"; + # active = true; + # enable = true; + # } + # { + # id = "emacs"; + # active = true; + # enable = true; + # } + # { + # id = "gtk"; + # active = true; + # enable = true; + # } + # { + # id = "hyprland"; + # active = true; + # enable = true; + # } + # { + # id = "hyprtoolkit"; + # active = true; + # enable = true; + # } + # { + # id = "kcolorscheme"; + # active = true; + # enable = true; + # } + # { + # id = "kitty"; + # active = true; + # enable = true; + # } + # { + # id = "mango"; + # active = true; + # enable = true; + # } + # { + # id = "niri"; + # active = true; + # enable = true; + # } + # { + # id = "qt"; + # active = true; + # enable = true; + # } + # { + # id = "steam"; + # active = true; + # enable = true; + # } + # { + # id = "sway"; + # active = true; + # enable = true; + # } + # { + # id = "code"; + # active = true; + # enable = true; + # } + # { + # id = "walker"; + # active = true; + # enable = true; + # } + # { + # id = "zed"; + # active = true; + # enable = true; + # } + # { + # id = "zenBrowser"; + # active = true; + # enable = true; + # } + # ]; + # enableUserTheming = false; + # }; + # nightLight = { + # enabled = false; + # forced = false; + # autoSchedule = true; + # nightTemp = "4000"; + # dayTemp = "6500"; + # manualSunrise = "06:30"; + # manualSunset = "18:30"; + # }; + # hooks = { + # enabled = false; + # wallpaperChange = ""; + # darkModeChange = ""; + # screenLock = ""; + # screenUnlock = ""; + # performanceModeEnabled = ""; + # performanceModeDisabled = ""; + # startup = ""; + # session = ""; + # colorGeneration = ""; + # }; + # plugins = { + # autoUpdate = false; + # notifyUpdates = true; + # sources = [ + # { + # enabled = true; + # name = "Official Noctalia Plugins"; + # url = "https://github.com/noctalia-dev/noctalia-plugins"; + # } + # { + # enabled = true; + # name = "Mic92"; + # url = "https://github.com/Mic92/noctalia-plugins"; + # } + # { + # enabled = true; + # name = "anthonyhab"; + # url = "https://github.com/anthonyhab/noctalia-plugins"; + # } + # ]; + # states = { + # catwalk = { + # enabled = true; + # sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; + # }; + # clipper = { + # enabled = true; + # sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; + # }; + # file-search = { + # enabled = true; + # sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; + # }; + # giphy-search = { + # enabled = true; + # sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; + # }; + # kagi-quick-search = { + # enabled = true; + # sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; + # }; + # kaomoji-provider = { + # enabled = true; + # sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; + # }; + # kde-connect = { + # enabled = true; + # sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; + # }; + # keybind-cheatsheet = { + # enabled = true; + # sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; + # }; + # obs-control = { + # enabled = true; + # sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; + # }; + # parallax-wallpaper = { + # enabled = true; + # sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; + # }; + # polkit-agent = { + # enabled = true; + # sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; + # }; + # privacy-indicator = { + # enabled = true; + # sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; + # }; + # rss-feed = { + # enabled = true; + # sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; + # }; + # screen-toolkit = { + # enabled = true; + # sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; + # }; + # syncthing-status = { + # enabled = true; + # sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; + # }; + # tailscale = { + # enabled = true; + # sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; + # }; + # vscode-provider = { + # enabled = true; + # sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; + # }; + # weekly-calendar = { + # enabled = true; + # sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; + # }; + # homeassistant = { + # enabled = true; + # sourceUrl = "https://github.com/anthonyhab/noctalia-plugins"; + # }; + # rbw-provider = { + # enabled = true; + # sourceUrl = "https://github.com/Mic92/noctalia-plugins"; + # }; + # fprint-notify = { + # enabled = true; + # sourceUrl = "https://github.com/Mic92/noctalia-plugins"; + # }; + # }; + # }; + # idle = { + # enabled = false; + # screenOffTimeout = 600; + # lockTimeout = 660; + # suspendTimeout = 1800; + # fadeDuration = 5; + # screenOffCommand = ""; + # lockCommand = ""; + # suspendCommand = ""; + # resumeScreenOffCommand = ""; + # resumeLockCommand = ""; + # resumeSuspendCommand = ""; + # customCommands = "[]"; + # }; + # desktopWidgets = { + # enabled = false; + # overviewEnabled = true; + # gridSnap = false; + # gridSnapScale = false; + # monitorWidgets = [ ]; + # }; + # }; } else { }; diff --git a/home/desktop/window-managers/hyprland.nix b/home/desktop/window-managers/hyprland.nix index 3137f41..c0b24cd 100644 --- a/home/desktop/window-managers/hyprland.nix +++ b/home/desktop/window-managers/hyprland.nix @@ -66,114 +66,118 @@ wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; - systemd.enable = false; + configType = "lua"; + systemd = { + enable = false; + variables = [ "--all" ]; + }; package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; - settings = { - monitor = config.desktop.hyprland.monitors; - workspace = config.desktop.hyprland.workspaces.workspaces; - env = [ - "XDG_CURRENT_DESKTOP,Hyprland" - "XDG_SESSION_TYPE,wayland" - "XDG_SESSION_DESKTOP,Hyprland" - ]; - exec-once = [ - (lib.mkIf (osConfig.desktop.shell.walker.enable) "elephant") - (lib.mkIf (osConfig.desktop.shell.walker.enable) "walker --gapplication-service") - (lib.mkIf (osConfig.desktop.shell.waybar.enable) "waybar") - (lib.mkIf (osConfig.desktop.shell.noctalia.enable) "noctalia-shell") - (lib.mkIf (osConfig.desktop.shell.noctalia.enable) "noctalia-shell ipc call wallpaper random") - (lib.mkIf (osConfig.desktop.shell.swww.enable) "waypaper --restore --random") - (lib.mkIf (osConfig.apps.gaming.steam.enable) "adwaita-steam-gtk -u; steam -silent") - (lib.mkIf (osConfig.apps.internet.mail.providers.protonmail.enable) "protonmail-bridge -n") - "echo $HYPRLAND_INSTANCE_SIGNATURE > ~/.config/hypr/instance_signature" - ]; - "$mod" = "SUPER"; - bind = [ + # settings = { + # monitor = config.desktop.hyprland.monitors; + # workspace = config.desktop.hyprland.workspaces.workspaces; + # env = [ + # "XDG_CURRENT_DESKTOP,Hyprland" + # "XDG_SESSION_TYPE,wayland" + # "XDG_SESSION_DESKTOP,Hyprland" + # ]; + # exec-once = [ + # (lib.mkIf (osConfig.desktop.shell.walker.enable) "elephant") + # (lib.mkIf (osConfig.desktop.shell.walker.enable) "walker --gapplication-service") + # (lib.mkIf (osConfig.desktop.shell.waybar.enable) "waybar") + # (lib.mkIf (osConfig.desktop.shell.noctalia.enable) "noctalia-shell") + # (lib.mkIf (osConfig.desktop.shell.noctalia.enable) "noctalia-shell ipc call wallpaper random") + # (lib.mkIf (osConfig.desktop.shell.swww.enable) "waypaper --restore --random") + # (lib.mkIf (osConfig.apps.gaming.steam.enable) "adwaita-steam-gtk -u; steam -silent") + # (lib.mkIf (osConfig.apps.internet.mail.providers.protonmail.enable) "protonmail-bridge -n") + # "echo $HYPRLAND_INSTANCE_SIGNATURE > ~/.config/hypr/instance_signature" + # ]; + # "$mod" = "SUPER"; + # bind = [ - (lib.mkIf (osConfig.desktop.shell.walker.enable) "$mod, D, exec, noctalia-shell ipc call launcher toggle || walker") - (lib.mkIf (osConfig.desktop.shell.rofi.enable) "$mod, D, exec, noctalia-shell ipc call launcher toggle || rofi -show drun") - "$mod, return, exec, ${osConfig.apps.terminal.binary}" - (lib.mkIf (osConfig.desktop.utilities.grimblast.enable) ", print, exec, GRIMBLAST_EDITOR=gradia grimblast edit area") - (lib.mkIf (osConfig.desktop.shell.walker.enable && osConfig.apps.misc.bitwarden.enable) - "$mod, B, exec, rbw unlocked || kitty --class kitty-floating -e rbw unlock; selected=$(rbw list | walker -d); wl-copy $(rbw get \"$selected\"); sleep 30; rbw lock" - ) - "$mod, F, fullscreen, 1" - "$mod SHIFT, F, fullscreen, 0" - "$mod SHIFT, Q, killactive," - "$mod, S, togglespecialworkspace, magic" - "$mod, O, exec, zen" - "$mod SHIFT, S, movetoworkspace, special:magic" - "$mod CTRL, right, workspace, m+1" - "$mod CTRL, left, workspace, m-1" - "$mod, mouse_down, workspace, m-1" - "$mod, mouse_up, workspace, m+1" - "$mod, left, movefocus, l" - "$mod, right, movefocus, r" - "$mod, up, movefocus, u" - "$mod, down, movefocus, d" - "$mod, J, exec, playerctl previous" - "$mod, K, exec, playerctl play-pause" - "$mod, L, exec, playerctl next" - "$mod, G, togglefloating," - "$mod, F1, exec, hyprlock" - "$mod SHIFT, E, exec, codium" - "$mod CTRL, up, exec, light -A 10" - "$mod CTRL, down, exec, light -U 10" - "$mod CTRL, Q, exec, hyprctl kill" + # (lib.mkIf (osConfig.desktop.shell.walker.enable) "$mod, D, exec, noctalia-shell ipc call launcher toggle || walker") + # (lib.mkIf (osConfig.desktop.shell.rofi.enable) "$mod, D, exec, noctalia-shell ipc call launcher toggle || rofi -show drun") + # "$mod, return, exec, ${osConfig.apps.terminal.binary}" + # (lib.mkIf (osConfig.desktop.utilities.grimblast.enable) ", print, exec, GRIMBLAST_EDITOR=gradia grimblast edit area") + # (lib.mkIf (osConfig.desktop.shell.walker.enable && osConfig.apps.misc.bitwarden.enable) + # "$mod, B, exec, rbw unlocked || kitty --class kitty-floating -e rbw unlock; selected=$(rbw list | walker -d); wl-copy $(rbw get \"$selected\"); sleep 30; rbw lock" + # ) + # "$mod, F, fullscreen, 1" + # "$mod SHIFT, F, fullscreen, 0" + # "$mod SHIFT, Q, killactive," + # "$mod, S, togglespecialworkspace, magic" + # "$mod, O, exec, zen" + # "$mod SHIFT, S, movetoworkspace, special:magic" + # "$mod CTRL, right, workspace, m+1" + # "$mod CTRL, left, workspace, m-1" + # "$mod, mouse_down, workspace, m-1" + # "$mod, mouse_up, workspace, m+1" + # "$mod, left, movefocus, l" + # "$mod, right, movefocus, r" + # "$mod, up, movefocus, u" + # "$mod, down, movefocus, d" + # "$mod, J, exec, playerctl previous" + # "$mod, K, exec, playerctl play-pause" + # "$mod, L, exec, playerctl next" + # "$mod, G, togglefloating," + # "$mod, F1, exec, hyprlock" + # "$mod SHIFT, E, exec, codium" + # "$mod CTRL, up, exec, light -A 10" + # "$mod CTRL, down, exec, light -U 10" + # "$mod CTRL, Q, exec, hyprctl kill" - ] - ++ (builtins.concatLists ( - builtins.genList ( - i: - let - ws = i + 1; - in - [ - "$mod, code:1${toString i}, workspace, ${toString ws}" - "$mod SHIFT, code:1${toString i}, movetoworkspacesilent, ${toString ws}" - ] - ) config.desktop.hyprland.workspaces.amount - )); - bindm = [ - "$mod, mouse:272, movewindow" - "$mod, mouse:273, resizewindow" - ]; - bindel = [ - ",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+" - ",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" - ]; - input = { - kb_layout = "de"; - numlock_by_default = config.desktop.hyprland.numlock; - follow_mouse = 2; - mouse_refocus = false; - accel_profile = "flat"; - sensitivity = 0.2; - touchpad = { - natural_scroll = "no"; - disable_while_typing = true; - }; - }; - cursor = { - inactive_timeout = 0; - no_warps = true; - }; - decoration = { - rounding = 20; - blur = { - enabled = true; - size = 3; - passes = 1; - }; - shadow = { - range = 4; - render_power = 3; - color = "rgba(1a1a1aee)"; - }; - }; - }; + # ] + # ++ (builtins.concatLists ( + # builtins.genList ( + # i: + # let + # ws = i + 1; + # in + # [ + # "$mod, code:1${toString i}, workspace, ${toString ws}" + # "$mod SHIFT, code:1${toString i}, movetoworkspacesilent, ${toString ws}" + # ] + # ) config.desktop.hyprland.workspaces.amount + # )); + # bindm = [ + # "$mod, mouse:272, movewindow" + # "$mod, mouse:273, resizewindow" + # ]; + # bindel = [ + # ",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+" + # ",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" + # ]; + # input = { + # kb_layout = "de"; + # numlock_by_default = config.desktop.hyprland.numlock; + # follow_mouse = 2; + # mouse_refocus = false; + # accel_profile = "flat"; + # sensitivity = 0.2; + # touchpad = { + # natural_scroll = "no"; + # disable_while_typing = true; + # }; + # }; + # cursor = { + # inactive_timeout = 0; + # no_warps = true; + # }; + # decoration = { + # rounding = 20; + # blur = { + # enabled = true; + # size = 3; + # passes = 1; + # }; + # shadow = { + # range = 4; + # render_power = 3; + # color = "rgba(1a1a1aee)"; + # }; + # }; + # }; }; home.sessionVariables.NIXOS_OZONE_WL = "1"; }; diff --git a/home/desktop/window-managers/niri.nix b/home/desktop/window-managers/niri.nix index c1dc698..d195f61 100644 --- a/home/desktop/window-managers/niri.nix +++ b/home/desktop/window-managers/niri.nix @@ -128,7 +128,8 @@ in spawn-at-startup "elephant" spawn-at-startup "noctalia-shell" - spawn-at-startup "walker --gapplication-service" + spawn-at-startup "walker" "--gapplication-service" + spawn-at-startup "echo" "$NIRI_SOCKET" ">.config/niri/niri_socket" gestures { diff --git a/hosts/marty-pc/custom.nix b/hosts/marty-pc/custom.nix index a5e39dc..c3b0f16 100644 --- a/hosts/marty-pc/custom.nix +++ b/hosts/marty-pc/custom.nix @@ -6,6 +6,10 @@ }: { + programs.appimage = { + enable = true; + binfmt = true; + }; networking = { interfaces = { enp42s0 = { diff --git a/hosts/marty-pc/options.nix b/hosts/marty-pc/options.nix index 6ed88d2..9eb7252 100644 --- a/hosts/marty-pc/options.nix +++ b/hosts/marty-pc/options.nix @@ -20,7 +20,6 @@ locale = "de_DE.UTF-8"; hostname = "marty-pc"; }; - server.media.stump.enable = true; apps = { audio = { base.enable = true; diff --git a/hosts/marty-server/custom.nix b/hosts/marty-server/custom.nix index 0520a60..c4ea6bb 100644 --- a/hosts/marty-server/custom.nix +++ b/hosts/marty-server/custom.nix @@ -25,6 +25,18 @@ in ipv6local = [ netname ]; }; }; + services.nginx.virtualHosts = { + "${config.networking.domain}" = { + enableACME = true; + forceSSL = true; + root = "/var/www/marty.tf/"; + }; + "share.marty.tf" = { + enableACME = true; + forceSSL = true; + root = "/var/www/ShadowCat/"; + }; + }; containers.tamatas-upcycling = { autoStart = true; diff --git a/modules/apps/gaming/default.nix b/modules/apps/gaming/default.nix index 946fd02..d56e591 100644 --- a/modules/apps/gaming/default.nix +++ b/modules/apps/gaming/default.nix @@ -45,6 +45,13 @@ } ); }) + (pkgs.heroic.override { + extraPkgs = + pkgs': with pkgs'; [ + gamescope + gamemode + ]; + }) ] else [ ] @@ -62,7 +69,11 @@ ++ ( if (config.apps.gaming.steam.enable) then - [ adwsteamgtk ] + [ + adwsteamgtk + protontricks + winetricks + ] else [ ] ); @@ -89,6 +100,7 @@ enable = true; capSysNice = true; }; + gamemode.enable = true; }; }; diff --git a/modules/desktop/display-manager.nix b/modules/desktop/display-manager.nix index 19e0364..ba3759f 100644 --- a/modules/desktop/display-manager.nix +++ b/modules/desktop/display-manager.nix @@ -22,7 +22,7 @@ }; displayManager = { gdm = { - enable = true; + enable = false; autoSuspend = false; }; }; @@ -31,7 +31,16 @@ uwsm = { enable = true; waylandCompositors = - if config.desktop.window-managers.hyprland.enable then + if config.desktop.window-managers.niri.enable then + + { + niri = { + prettyName = "Niri"; + comment = "Niri"; + binPath = "${config.programs.niri.package}/bin/niri-session"; + }; + } + else if config.desktop.window-managers.hyprland.enable then { hyprland = { prettyName = "Hyprland"; @@ -47,15 +56,6 @@ binPath = "${config.programs.sway.package}/bin/sway --session"; }; } - else if config.desktop.window-managers.niri.enable then - - { - niri = { - prettyName = "Niri"; - comment = "Niri"; - binPath = "${config.programs.niri.package}/bin/niri-session"; - }; - } else { }; }; diff --git a/modules/device/server.nix b/modules/device/server.nix index d870498..018e5f3 100644 --- a/modules/device/server.nix +++ b/modules/device/server.nix @@ -30,10 +30,6 @@ enable = true; public = false; }; - stump = { - enable = true; - public = false; - }; navidrome = { enable = true; public = false; diff --git a/modules/server/media/default.nix b/modules/server/media/default.nix index ba13018..876a42d 100644 --- a/modules/server/media/default.nix +++ b/modules/server/media/default.nix @@ -8,7 +8,6 @@ { imports = [ ./jellyfin.nix - ./stump.nix ./navidrome.nix ]; } diff --git a/modules/server/media/stump.nix b/modules/server/media/stump.nix deleted file mode 100644 index eca02cf..0000000 --- a/modules/server/media/stump.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ inputs, ... }: -{ - options = { - server.media.stump = { - enable = lib.mkEnableOption "enable stump"; - public = lib.mkEnableOption "make stump public"; - }; - }; - - imports = [ inputs.stump-nix.nixosModules.stump ]; - - config = { - services.stump = { - enable = true; - environment = { - STUMP_PORT = "10801"; - }; - }; - }; -} diff --git a/modules/server/misc/vaultwarden.nix b/modules/server/misc/vaultwarden.nix index c05d4c3..86e84b8 100644 --- a/modules/server/misc/vaultwarden.nix +++ b/modules/server/misc/vaultwarden.nix @@ -23,7 +23,7 @@ config = { services = { vaultwarden = { - enable = true; + enable = config.server.misc.vaultwarden.enable; config = { DOMAIN = "https://${config.server.misc.vaultwarden.subdomain}.${config.networking.domain}"; SIGNUPS_ALLOWED = false; diff --git a/modules/server/social/synapse.nix b/modules/server/social/synapse.nix index a5a9721..4f0cc30 100644 --- a/modules/server/social/synapse.nix +++ b/modules/server/social/synapse.nix @@ -61,7 +61,7 @@ in generic = { enabled = true; outbound = true; - urlPrefix = "https://https://yap.marty.tf/webhooks/"; + urlPrefix = "https://https://${config.server.social.synapse.subdomain}.${config.networking.domain}/webhooks/"; allowJsTransformationFunctions = false; waitForComplete = false; enableHttpGet = false; diff --git a/modules/system/boot.nix b/modules/system/boot.nix index b2db4d6..44d9c05 100644 --- a/modules/system/boot.nix +++ b/modules/system/boot.nix @@ -20,9 +20,9 @@ editor = false; }; timeout = 3; - efi.canTouchEfiVariables = true; + efi.canTouchEfiVariables = false; }; - kernelPackages = pkgs.linuxPackages_zen; + # kernelPackages = pkgs.linuxPackages_zen; kernel = { sysctl = { "vm.swappiness" = 10; diff --git a/modules/system/networking.nix b/modules/system/networking.nix index f93a3b1..8c66a02 100644 --- a/modules/system/networking.nix +++ b/modules/system/networking.nix @@ -24,11 +24,16 @@ 53317 16261 16262 + 25565 + 27015 ]; allowedTCPPorts = [ 53317 16261 16262 + 3400 + 25565 + 27015 ]; trustedInterfaces = [ "tailscale0" ]; };