From dc67ac08b4327f78e1e6df07f51d8f6fcb2cbcdd Mon Sep 17 00:00:00 2001 From: uku Date: Mon, 6 Jan 2025 09:27:09 +0100 Subject: [PATCH 1/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'camasca': 'git+https://git.uku3lig.net/uku/camasca?ref=refs/heads/main&rev=bbcfc7babd9fc854e961e6422e61ea5ab7f09423' (2024-12-30) → 'git+https://git.uku3lig.net/uku/camasca?ref=refs/heads/main&rev=fd017eee2fdbce44cbe57f3d72a34276ffad55d7' (2025-01-06) • Updated input 'crane': 'github:ipetkov/crane/72e2d02dbac80c8c86bf6bf3e785536acf8ee926?narHash=sha256-3aH/0Y6ajIlfy7j52FGZ%2Bs4icVX0oHhqBzRdlOeztqg%3D' (2024-12-21) → 'github:ipetkov/crane/61ba163d85e5adeddc7b3a69bb174034965965b2?narHash=sha256-iKOPq86AOWCohuzxwFy/MtC8PcSVGnrxBOvxpjpzrAY%3D' (2025-01-05) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/f2f7418ce0ab4a5309a4596161d154cfc877af66?narHash=sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq%2BraipRI%3D' (2025-01-01) → 'github:hercules-ci/flake-parts/b905f6fc23a9051a6e1b741e1438dbfc0634c6de?narHash=sha256-%2Bhu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU%3D' (2025-01-06) • Updated input 'home-manager': 'github:nix-community/home-manager/ef64efdbaca99f9960f75efab991e4c49e79a5f1?narHash=sha256-/NptDI4njO5hH0ZVQ2yzbvTXmBOabZaGYkjhnMJ37TY%3D' (2025-01-03) → 'github:nix-community/home-manager/172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196?narHash=sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4%3D' (2025-01-05) • Updated input 'mystia': 'github:soopyc/mystia/87fcf4041dcb362f3074f7675b5b5f9f2bcdc1fd?narHash=sha256-YCV7J8mo7OXgUSMhNJwvq7u2Ka8LRo7sLaQQi5RHV30%3D' (2024-12-30) → 'github:soopyc/mystia/7380f249aa50a9676ac9b5ca8342262a2a097f5a?narHash=sha256-BX3bAAPLKwpIl/1jvCWUKOl4q8ri9BGcRwN%2BXI8bTf8%3D' (2025-01-06) • Updated input 'nixos-wsl': 'github:nix-community/NixOS-WSL/dee4425dcee3149475ead0cb6a616b8a028c5888?narHash=sha256-K9qGHniYBbjqVcEiwXyiofj/IFf78L5F0/FCf%2BCKyr0%3D' (2024-12-10) → 'github:nix-community/NixOS-WSL/63c3b4ed1712a3a0621002cd59bfdc80875ecbb0?narHash=sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM%3D' (2025-01-05) • Removed input 'nixos-wsl/flake-utils' • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/6df24922a1400241dae323af55f30e4318a6ca65?narHash=sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk%3D' (2025-01-02) → 'github:NixOS/nixpkgs/8f3e1f807051e32d8c95cd12b9b421623850a34d?narHash=sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs%2BrI%3D' (2025-01-04) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/29806abab803e498df96d82dd6f34b32eb8dd2c8?narHash=sha256-1hKMRIT%2BQZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o%3D' (2025-01-03) → 'github:numtide/treefmt-nix/1788ca5acd4b542b923d4757d4cfe4183cc6a92d?narHash=sha256-FBG9d7e0BTFfxVdw4b5EmNll2Mv7hfRc54hbB4LrKko%3D' (2025-01-05) • Updated input 'vscode-extensions': 'github:nix-community/nix-vscode-extensions/b0f7a59cee0ca77c157ab4e0c60d4a9df6bccb86?narHash=sha256-U4Oy2o/CmBg6gexAHamH%2B%2B52oAgvvEwcq9fkEmcvjyw%3D' (2025-01-03) → 'github:nix-community/nix-vscode-extensions/ba2fa846fba43fb9c8cd71b1435d227a7925fae0?narHash=sha256-wSVfnO8Hixn767LsdAE/FIHO5IemkfbTEZZ03%2BHUowM%3D' (2025-01-06) --- flake.lock | 59 ++++++++++++++++++++++++++---------------------------- flake.nix | 1 - 2 files changed, 28 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index c9b7b46..016c9c3 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ ] }, "locked": { - "lastModified": 1735555697, - "narHash": "sha256-vAVPDhNSX0vnIshjkdSBgnWZLXnTAQ+xd1W6qHqJ4GM=", + "lastModified": 1736151979, + "narHash": "sha256-PdQGjLkOtjkFGFOI2OW4bKszIX8/Ig6jPR6kXKBaYRU=", "ref": "refs/heads/main", - "rev": "bbcfc7babd9fc854e961e6422e61ea5ab7f09423", - "revCount": 38, + "rev": "fd017eee2fdbce44cbe57f3d72a34276ffad55d7", + "revCount": 40, "type": "git", "url": "https://git.uku3lig.net/uku/camasca" }, @@ -72,11 +72,11 @@ }, "crane": { "locked": { - "lastModified": 1734808813, - "narHash": "sha256-3aH/0Y6ajIlfy7j52FGZ+s4icVX0oHhqBzRdlOeztqg=", + "lastModified": 1736101677, + "narHash": "sha256-iKOPq86AOWCohuzxwFy/MtC8PcSVGnrxBOvxpjpzrAY=", "owner": "ipetkov", "repo": "crane", - "rev": "72e2d02dbac80c8c86bf6bf3e785536acf8ee926", + "rev": "61ba163d85e5adeddc7b3a69bb174034965965b2", "type": "github" }, "original": { @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1735774679, - "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1735925111, - "narHash": "sha256-/NptDI4njO5hH0ZVQ2yzbvTXmBOabZaGYkjhnMJ37TY=", + "lastModified": 1736089250, + "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", "owner": "nix-community", "repo": "home-manager", - "rev": "ef64efdbaca99f9960f75efab991e4c49e79a5f1", + "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", "type": "github" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1735545722, - "narHash": "sha256-YCV7J8mo7OXgUSMhNJwvq7u2Ka8LRo7sLaQQi5RHV30=", + "lastModified": 1736150521, + "narHash": "sha256-BX3bAAPLKwpIl/1jvCWUKOl4q8ri9BGcRwN+XI8bTf8=", "owner": "soopyc", "repo": "mystia", - "rev": "87fcf4041dcb362f3074f7675b5b5f9f2bcdc1fd", + "rev": "7380f249aa50a9676ac9b5ca8342262a2a097f5a", "type": "github" }, "original": { @@ -199,19 +199,16 @@ "nixos-wsl": { "inputs": { "flake-compat": [], - "flake-utils": [ - "flake-utils" - ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1733854371, - "narHash": "sha256-K9qGHniYBbjqVcEiwXyiofj/IFf78L5F0/FCf+CKyr0=", + "lastModified": 1736095716, + "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "dee4425dcee3149475ead0cb6a616b8a028c5888", + "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0", "type": "github" }, "original": { @@ -222,11 +219,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -298,11 +295,11 @@ ] }, "locked": { - "lastModified": 1735905407, - "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=", + "lastModified": 1736115332, + "narHash": "sha256-FBG9d7e0BTFfxVdw4b5EmNll2Mv7hfRc54hbB4LrKko=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8", + "rev": "1788ca5acd4b542b923d4757d4cfe4183cc6a92d", "type": "github" }, "original": { @@ -361,11 +358,11 @@ ] }, "locked": { - "lastModified": 1735868868, - "narHash": "sha256-U4Oy2o/CmBg6gexAHamH++52oAgvvEwcq9fkEmcvjyw=", + "lastModified": 1736128196, + "narHash": "sha256-wSVfnO8Hixn767LsdAE/FIHO5IemkfbTEZZ03+HUowM=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "b0f7a59cee0ca77c157ab4e0c60d4a9df6bccb86", + "rev": "ba2fa846fba43fb9c8cd71b1435d227a7925fae0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3289325..14f1133 100644 --- a/flake.nix +++ b/flake.nix @@ -109,7 +109,6 @@ nixos-wsl = { url = "github:nix-community/NixOS-WSL"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; inputs.flake-compat.follows = ""; }; From dcc3276dd7c97c5ab56aa7a73a38e529b0d2c5f4 Mon Sep 17 00:00:00 2001 From: uku Date: Mon, 6 Jan 2025 10:10:35 +0100 Subject: [PATCH 2/4] fix(client): set priority manually for ssh-askpass --- configs/client.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/client.nix b/configs/client.nix index 730791d..77a7939 100644 --- a/configs/client.nix +++ b/configs/client.nix @@ -32,7 +32,7 @@ ssh = { startAgent = true; enableAskPassword = true; - askPassword = lib.mkDefault "${pkgs.curses-ssh-askpass}"; # see exprs/curses-ssh-askpass.nix + askPassword = lib.mkOverride 1200 "${pkgs.curses-ssh-askpass}"; # see exprs/curses-ssh-askpass.nix }; }; From deaa98d41a9d712b20bb427ff6d0ea5119f185a1 Mon Sep 17 00:00:00 2001 From: uku Date: Mon, 6 Jan 2025 10:10:47 +0100 Subject: [PATCH 3/4] fix(desktop): change renamed options --- configs/desktop.nix | 11 ++++------- programs/kde.nix | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/configs/desktop.nix b/configs/desktop.nix index b84e037..fa23ee2 100644 --- a/configs/desktop.nix +++ b/configs/desktop.nix @@ -59,13 +59,9 @@ }; }; - hardware = { - graphics = { - enable = true; - enable32Bit = true; - }; - - pulseaudio.enable = false; + hardware.graphics = { + enable = true; + enable32Bit = true; }; hm = { @@ -127,6 +123,7 @@ printing.enable = true; + pulseaudio.enable = false; pipewire = { enable = true; alsa.enable = true; diff --git a/programs/kde.nix b/programs/kde.nix index 468a3c1..32212a5 100644 --- a/programs/kde.nix +++ b/programs/kde.nix @@ -17,7 +17,7 @@ environment = { systemPackages = with pkgs; [ gnome-calculator - camasca.packages.${pkgs.system}.koi + koi ]; plasma6.excludePackages = with pkgs.kdePackages; [ From 373fe4528fe26ebd247e16662bd4dfa7b4d469c3 Mon Sep 17 00:00:00 2001 From: uku Date: Sat, 4 Jan 2025 00:04:54 +0100 Subject: [PATCH 4/4] WIP MADDY --- systems/vesuvio/mail.nix | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 systems/vesuvio/mail.nix diff --git a/systems/vesuvio/mail.nix b/systems/vesuvio/mail.nix new file mode 100644 index 0000000..7d40abd --- /dev/null +++ b/systems/vesuvio/mail.nix @@ -0,0 +1,35 @@ +{ config, ... }: +let + certName = "mail.c.uku3lig.net"; + certLocation = config.security.acme.certs.${certName}.directory; +in +{ + security.acme.certs.${certName} = { + group = config.services.maddy.group; + extraLegoRenewFlags = [ "--reuse-key" ]; # soopyc said its more secure + }; + + services.maddy = { + enable = true; + hostname = "mx1.uku3lig.net"; + primaryDomain = "uku3lig.net"; + localDomains = [ + "$(primary_domain)" + "uku.moe" + ]; + + tls = { + loader = "file"; + certificates = [ + { + certPath = "${certLocation}/fullchain.pem"; + keyPath = "${certLocation}/key.pem"; + } + ]; + }; + + config = '' + + ''; + }; +}