From da6bd2a2e0e577ec6e6ed5d8d67d489f33cf25ac Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Tue, 12 Mar 2024 11:19:09 -0600 Subject: [PATCH 01/25] fmt --- gui/kde.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/kde.nix b/gui/kde.nix index 6f1ec45..af93350 100644 --- a/gui/kde.nix +++ b/gui/kde.nix @@ -16,9 +16,9 @@ else { desktopManager.plasma5.enable = true; }) - ({ + { displayManager.sddm.enable = true; - }) + } ]; # Listen for KDE Connect connections on the tailnet From 9b46741c9612a2dd89c6a72d3eab92f2b362487b Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Tue, 12 Mar 2024 11:19:30 -0600 Subject: [PATCH 02/25] pkgs/openssh: disable dsa keys --- pkgs/openssh.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/openssh.nix b/pkgs/openssh.nix index 4db2bb3..78a8a52 100644 --- a/pkgs/openssh.nix +++ b/pkgs/openssh.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation { "--with-mantype=man" "--with-libedit=yes" "--disable-strip" + "--disable-dsa-keys" (lib.withFeature withPAM "pam") ] ++ lib.optional (etcDir != null) "--sysconfdir=${etcDir}" From 5119a8fe125caf9ad013933d1009ce0161789b59 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Tue, 12 Mar 2024 18:37:09 -0600 Subject: [PATCH 03/25] pkgs/gitu: update to 0.6.2 --- pkgs/gitu.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/gitu.nix b/pkgs/gitu.nix index 09c7ac6..b8d8ac7 100644 --- a/pkgs/gitu.nix +++ b/pkgs/gitu.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage rec { pname = "gitu"; - version = "0.5.4"; + version = "0.6.2"; src = fetchFromGitHub { owner = "altsem"; repo = pname; rev = "v${version}"; - hash = "sha256-a4hNgEizxanYE3XuHSCmbV6CkOqhXkznP3Sp0KLFFQs="; + hash = "sha256-ymAggfyLPpXp4aQPHp1R+olKeCZwrcwu1GldM8yJVtQ="; }; - cargoHash = "sha256-+CA3UG32oZedzRbt7b0wOlhH/subuym4BCL5SMNzrr8="; + cargoHash = "sha256-pIA9AnJoauT5nLxSgzR2Lk3wSo30fXAepAJlMahSuCA="; buildInputs = [ git openssl ]; nativeBuildInputs = [ pkg-config ]; From 09d392febb2180d089b49d5d2eb320554a0e0fab Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Tue, 12 Mar 2024 23:00:20 -0600 Subject: [PATCH 04/25] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'darwin': 'github:lnl7/nix-darwin/550340062c16d7ef8c2cc20a3d2b97bcd3c6b6f6' (2024-03-07) → 'github:lnl7/nix-darwin/d9ea313bc4851670dc99c5cc979cb79750e7d670' (2024-03-12) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 60b80d5..fab2fb4 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1709771483, - "narHash": "sha256-Hjzu9nCknHLQvhdaRFfCEprH0o15KcaNu1QDr3J88DI=", + "lastModified": 1710281379, + "narHash": "sha256-uFo9hxt982L3nFJeweW4Gip2esiGrIQlbvEGrNTh4AY=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "550340062c16d7ef8c2cc20a3d2b97bcd3c6b6f6", + "rev": "d9ea313bc4851670dc99c5cc979cb79750e7d670", "type": "github" }, "original": { From b3d386e984de0299177aa80a3df42766dfc3b1bd Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Tue, 12 Mar 2024 23:03:42 -0600 Subject: [PATCH 05/25] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'stable': 'github:NixOS/nixpkgs/9c1dfe2db4be1095cc221e97a54323bc55d42696' (2024-03-11) → 'github:NixOS/nixpkgs/efbb274f364c918b9937574de879b5874b5833cc' (2024-03-12) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index fab2fb4..489ceea 100644 --- a/flake.lock +++ b/flake.lock @@ -415,11 +415,11 @@ }, "stable": { "locked": { - "lastModified": 1710197026, - "narHash": "sha256-0OdO4FsI7isTUKIGoFF6YRSp0H9oRAnb9ET1SlNu5G4=", + "lastModified": 1710248792, + "narHash": "sha256-yFyWw4na+nJgtXwhHs2SJSy5Lcw94/FcMbBOorlGdfI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9c1dfe2db4be1095cc221e97a54323bc55d42696", + "rev": "efbb274f364c918b9937574de879b5874b5833cc", "type": "github" }, "original": { From f0f167aca8c06f5dfa19be4b53a611eaca56eb4d Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Tue, 12 Mar 2024 23:09:03 -0600 Subject: [PATCH 06/25] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'unstable': 'github:NixOS/nixpkgs/6e72ac6e54d890e4e25116fece328f0b336c3416' (2024-03-12) → 'github:NixOS/nixpkgs/91003d1a62d400231ff42236a379b58460a947da' (2024-03-13) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 489ceea..c7a9648 100644 --- a/flake.lock +++ b/flake.lock @@ -526,11 +526,11 @@ }, "unstable": { "locked": { - "lastModified": 1710219226, - "narHash": "sha256-hdMP0Ja9Uy66Sqrekbv/kLQz8RrjgeY3+lDjcqXuUHE=", + "lastModified": 1710304788, + "narHash": "sha256-BpjfgTKrDuxYMHq62QUl4jiveX+EsWKkx2cxbnZGNB0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e72ac6e54d890e4e25116fece328f0b336c3416", + "rev": "91003d1a62d400231ff42236a379b58460a947da", "type": "github" }, "original": { From db0ff4f7ee35fb5c303d834186c96b1fb1947daa Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Tue, 12 Mar 2024 23:16:24 -0600 Subject: [PATCH 07/25] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'unstableSmall': 'github:NixOS/nixpkgs/e4e2121b151e492fd15d4bdb034e793738fdc120' (2024-03-12) → 'github:NixOS/nixpkgs/21adc4f16a8ab151fec83b9d9368cd62d9de86bc' (2024-03-12) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index c7a9648..7036b01 100644 --- a/flake.lock +++ b/flake.lock @@ -541,11 +541,11 @@ }, "unstableSmall": { "locked": { - "lastModified": 1710213926, - "narHash": "sha256-D6wdwb289veivPoRV5/+IZaUG/XrdJPHpbR08cA5og0=", + "lastModified": 1710247538, + "narHash": "sha256-Mm3aCwfAdYgG2zKf5SLRBktPH0swXN1yEetAMn05KAA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4e2121b151e492fd15d4bdb034e793738fdc120", + "rev": "21adc4f16a8ab151fec83b9d9368cd62d9de86bc", "type": "github" }, "original": { From fbe6383b2d77592b82dedb7676a4074f0674e20e Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Wed, 13 Mar 2024 23:00:38 -0600 Subject: [PATCH 08/25] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'stable': 'github:NixOS/nixpkgs/efbb274f364c918b9937574de879b5874b5833cc' (2024-03-12) → 'github:NixOS/nixpkgs/1f128eff583a8230220eb4db2d831abdbc7b6596' (2024-03-13) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 7036b01..f709b67 100644 --- a/flake.lock +++ b/flake.lock @@ -415,11 +415,11 @@ }, "stable": { "locked": { - "lastModified": 1710248792, - "narHash": "sha256-yFyWw4na+nJgtXwhHs2SJSy5Lcw94/FcMbBOorlGdfI=", + "lastModified": 1710360263, + "narHash": "sha256-l8IDlSIUFEp6PvhNZL7AZtcHB09LHR6QstiqJ6M4qC4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "efbb274f364c918b9937574de879b5874b5833cc", + "rev": "1f128eff583a8230220eb4db2d831abdbc7b6596", "type": "github" }, "original": { From 050ff44b6223b041aa5769c53f82a18a6845c4a5 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Wed, 13 Mar 2024 23:03:53 -0600 Subject: [PATCH 09/25] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'unstable': 'github:NixOS/nixpkgs/91003d1a62d400231ff42236a379b58460a947da' (2024-03-13) → 'github:NixOS/nixpkgs/21e9ea433b001fc2d4aff1abdb9afe409cd94920' (2024-03-14) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index f709b67..a764ae9 100644 --- a/flake.lock +++ b/flake.lock @@ -526,11 +526,11 @@ }, "unstable": { "locked": { - "lastModified": 1710304788, - "narHash": "sha256-BpjfgTKrDuxYMHq62QUl4jiveX+EsWKkx2cxbnZGNB0=", + "lastModified": 1710392569, + "narHash": "sha256-v1Rn+jdIDBXTmTwVlOd4sMVYXNY+Hktt6IS34mSVoL4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "91003d1a62d400231ff42236a379b58460a947da", + "rev": "21e9ea433b001fc2d4aff1abdb9afe409cd94920", "type": "github" }, "original": { From 1645a0047b6e4fa03645116654c91bdfbfc72714 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Wed, 13 Mar 2024 23:09:28 -0600 Subject: [PATCH 10/25] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'unstableSmall': 'github:NixOS/nixpkgs/21adc4f16a8ab151fec83b9d9368cd62d9de86bc' (2024-03-12) → 'github:NixOS/nixpkgs/2dbc8f62d8af7a1ab962e4b20d12b25ddcb86ced' (2024-03-13) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a764ae9..86a9f68 100644 --- a/flake.lock +++ b/flake.lock @@ -541,11 +541,11 @@ }, "unstableSmall": { "locked": { - "lastModified": 1710247538, - "narHash": "sha256-Mm3aCwfAdYgG2zKf5SLRBktPH0swXN1yEetAMn05KAA=", + "lastModified": 1710339354, + "narHash": "sha256-+P5ccUPiLouHexb8aJrUOVOIja9qm+fG57pgAu7uIRs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "21adc4f16a8ab151fec83b9d9368cd62d9de86bc", + "rev": "2dbc8f62d8af7a1ab962e4b20d12b25ddcb86ced", "type": "github" }, "original": { From 8433017a8a3f645b0a0d14a484443196691e3d25 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Thu, 14 Mar 2024 06:07:11 -0600 Subject: [PATCH 11/25] configs/neovim: remove obsidian plugin --- configs/neovim.lua | 6 ------ configs/neovim.nix | 16 ---------------- 2 files changed, 22 deletions(-) diff --git a/configs/neovim.lua b/configs/neovim.lua index 523ee80..67c3758 100644 --- a/configs/neovim.lua +++ b/configs/neovim.lua @@ -43,12 +43,6 @@ require("nvim-tree").setup({ } }) -require('obsidian').setup({ - dir = "~/Brain", - daily_notes = {folder = "Daily"}, - completion = {nvim_cmp = false} -}) - require'nvim-treesitter.configs'.setup({}) require('neogen').setup({}) diff --git a/configs/neovim.nix b/configs/neovim.nix index f30a874..7109bc2 100644 --- a/configs/neovim.nix +++ b/configs/neovim.nix @@ -26,21 +26,6 @@ let }; }; - - obsidian = vimBuildTool rec { - pname = "obsidian-nvim"; - # https://github.com/epwalsh/obsidian.nvim/tags - version = "3.2.0"; - src = pkgs.fetchFromGitHub { - owner = "epwalsh"; - repo = "obsidian.nvim"; - rev = "v${version}"; - hash = "sha256-VIc5qgzqJjSv2A0v8tM25pWh+smX9DYXVsyFNTGMPbQ="; - fetchSubmodules = true; - }; - dependencies = with vimPlugins; [ nvim-cmp tabular plenary-nvim ]; - }; - baseVimPackages = with vimPlugins; [ elm-vim fugitive @@ -69,7 +54,6 @@ let zig-vim neogen - obsidian vacme nofrils ]; From ad6672e0fd6be6c8ea36eb09bfae3bed048a4acc Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Thu, 14 Mar 2024 06:08:39 -0600 Subject: [PATCH 12/25] box/europa: install gitannex --- hosts/box/default.nix | 2 +- hosts/europa/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/box/default.nix b/hosts/box/default.nix index dd5348f..261f8d3 100644 --- a/hosts/box/default.nix +++ b/hosts/box/default.nix @@ -213,7 +213,7 @@ in apg git signify - glowing-bear + git-annex rtl_433 ]; }; diff --git a/hosts/europa/default.nix b/hosts/europa/default.nix index 9a5d42f..db0a9b9 100644 --- a/hosts/europa/default.nix +++ b/hosts/europa/default.nix @@ -353,6 +353,7 @@ in fossil gh gimp + git-annex git-credential-1password gqrx hackrf From 9ba45e5741e1cb52d8e588430ff66ec6201c1c4d Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Thu, 14 Mar 2024 06:09:00 -0600 Subject: [PATCH 13/25] box: move gitea dir into its own dir --- hosts/box/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/box/default.nix b/hosts/box/default.nix index 261f8d3..86c24f7 100644 --- a/hosts/box/default.nix +++ b/hosts/box/default.nix @@ -787,7 +787,7 @@ in gitea = { enable = true; - stateDir = "/media/git"; + stateDir = "/media/git/gitea"; appName = "Tape:neT"; #package = inputs.unstable.legacyPackages.${pkgs.system}.gitea; From f4ee6ef6c5e43a384febc1812de748c7ed09fc2a Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Thu, 14 Mar 2024 23:00:13 -0600 Subject: [PATCH 14/25] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'sops-nix': 'github:Mic92/sops-nix/e52d8117b330f690382f1d16d81ae43daeb4b880' (2024-03-11) → 'github:Mic92/sops-nix/6c32d3b9c7593f4b466ec5404e59fc09a803a090' (2024-03-14) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 86a9f68..d6a233e 100644 --- a/flake.lock +++ b/flake.lock @@ -400,11 +400,11 @@ ] }, "locked": { - "lastModified": 1710195194, - "narHash": "sha256-KFxCJp0T6TJOz1IOKlpRdpsCr9xsvlVuWY/VCiAFnTE=", + "lastModified": 1710433464, + "narHash": "sha256-IXlPoWgIRovZ32mYvqqdBgOQln71LouE/HBhbKc1wcw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e52d8117b330f690382f1d16d81ae43daeb4b880", + "rev": "6c32d3b9c7593f4b466ec5404e59fc09a803a090", "type": "github" }, "original": { From f81f53ce2d9257e102af6c53149502fe619cb045 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Thu, 14 Mar 2024 23:03:25 -0600 Subject: [PATCH 15/25] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'stable': 'github:NixOS/nixpkgs/1f128eff583a8230220eb4db2d831abdbc7b6596' (2024-03-13) → 'github:NixOS/nixpkgs/d3eeab67779382692725ac423b023edecbd8547e' (2024-03-14) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d6a233e..8e565b4 100644 --- a/flake.lock +++ b/flake.lock @@ -415,11 +415,11 @@ }, "stable": { "locked": { - "lastModified": 1710360263, - "narHash": "sha256-l8IDlSIUFEp6PvhNZL7AZtcHB09LHR6QstiqJ6M4qC4=", + "lastModified": 1710399145, + "narHash": "sha256-yhGlmdqxfstngEs3qikYyqU93iqi39GLOiJ7XDWFdPQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1f128eff583a8230220eb4db2d831abdbc7b6596", + "rev": "d3eeab67779382692725ac423b023edecbd8547e", "type": "github" }, "original": { From 44731cc8767e767c14744ebf8e599645dde81010 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Thu, 14 Mar 2024 23:06:36 -0600 Subject: [PATCH 16/25] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'unstable': 'github:NixOS/nixpkgs/21e9ea433b001fc2d4aff1abdb9afe409cd94920' (2024-03-14) → 'github:NixOS/nixpkgs/2bcf18c64c66b95e17d9c8755104d33bc5103c63' (2024-03-15) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8e565b4..069fee3 100644 --- a/flake.lock +++ b/flake.lock @@ -526,11 +526,11 @@ }, "unstable": { "locked": { - "lastModified": 1710392569, - "narHash": "sha256-v1Rn+jdIDBXTmTwVlOd4sMVYXNY+Hktt6IS34mSVoL4=", + "lastModified": 1710474764, + "narHash": "sha256-M43DDaPLL04HBLfh7XBZ8ROiujeL9IvnWsEKUnG2/yU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "21e9ea433b001fc2d4aff1abdb9afe409cd94920", + "rev": "2bcf18c64c66b95e17d9c8755104d33bc5103c63", "type": "github" }, "original": { From 9e80fa691730654d299c5b2d90329498ef14f91d Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Thu, 14 Mar 2024 23:11:46 -0600 Subject: [PATCH 17/25] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'unstableSmall': 'github:NixOS/nixpkgs/2dbc8f62d8af7a1ab962e4b20d12b25ddcb86ced' (2024-03-13) → 'github:NixOS/nixpkgs/f7156e005c93248d684c09bc4cf8b66a4d2ffcbf' (2024-03-14) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 069fee3..ebea94e 100644 --- a/flake.lock +++ b/flake.lock @@ -541,11 +541,11 @@ }, "unstableSmall": { "locked": { - "lastModified": 1710339354, - "narHash": "sha256-+P5ccUPiLouHexb8aJrUOVOIja9qm+fG57pgAu7uIRs=", + "lastModified": 1710433391, + "narHash": "sha256-w0tmRGIUl7EWWDteJ19qXPIvmeKUQKptAfojNRvpIDU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2dbc8f62d8af7a1ab962e4b20d12b25ddcb86ced", + "rev": "f7156e005c93248d684c09bc4cf8b66a4d2ffcbf", "type": "github" }, "original": { From 12de1420cb32da638079694142bc3c3b10281424 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Fri, 15 Mar 2024 08:03:56 -0600 Subject: [PATCH 18/25] gui/kde: add a kdeConnect option and enable it in europa --- gui/kde.nix | 44 +++++++++++++++++++++++++++++++--------- hosts/europa/default.nix | 8 +++++++- 2 files changed, 41 insertions(+), 11 deletions(-) diff --git a/gui/kde.nix b/gui/kde.nix index af93350..b5cd871 100644 --- a/gui/kde.nix +++ b/gui/kde.nix @@ -3,12 +3,30 @@ , isUnstable , ... }: +let + inherit (lib) mkIf mkEnableOption mkMerge mkOption types; +in { - options = { kde = { enable = lib.mkEnableOption "Enable KDE desktop."; }; }; + options = { + kde = { enable = mkEnableOption "Enable KDE desktop."; }; + kdeConnect = { + enable = mkEnableOption { + description = "Enable PipeWire"; + default = false; + example = true; + }; - config = lib.mkIf config.kde.enable { + interface = mkOption { + description = "listen interface for kde connect"; + default = "tailscale0"; + type = types.str; + }; + }; + }; + + config = mkIf config.kde.enable { services.xserver = - lib.mkMerge [ + mkMerge [ (if isUnstable then { desktopManager.plasma6.enable = true; displayManager.sddm.wayland.enable = true; @@ -22,13 +40,19 @@ ]; # Listen for KDE Connect connections on the tailnet - networking.firewall.interfaces = { - "tailscale0" = { - allowedTCPPorts = lib.range 1714 1764; - allowedUDPPorts = lib.range 1714 1764; - }; + networking.firewall.interfaces = mkIf config.kdeConnect.enable { + "${config.kdeConnect.interface}" = + let + range = { + from = 1714; + to = 1764; + }; + in + { + allowedUDPPortRanges = [ range ]; + allowedTCPPortRanges = [ range ]; + }; }; - - programs.kdeconnect.enable = true; + programs.kdeconnect.enable = config.kdeConnect.enable; }; } diff --git a/hosts/europa/default.nix b/hosts/europa/default.nix index db0a9b9..45622b6 100644 --- a/hosts/europa/default.nix +++ b/hosts/europa/default.nix @@ -137,6 +137,7 @@ in }; kde.enable = lib.mkDefault true; + kdeConnect.enable = true; virtualisation.libvirtd.enable = lib.mkDefault true; @@ -152,7 +153,12 @@ in firewall = { enable = true; allowedTCPPorts = [ 22 ]; - interfaces = { "tailscale0" = { allowedTCPPorts = [ 8384 ]; }; }; + interfaces = { + "tailscale0" = + { + allowedTCPPorts = [ 8384 ]; + }; + }; }; }; From d66c10bafdfb3d49c70a9ff5d23d2a3a9c951866 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Fri, 15 Mar 2024 23:00:36 -0600 Subject: [PATCH 19/25] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'stable': 'github:NixOS/nixpkgs/d3eeab67779382692725ac423b023edecbd8547e' (2024-03-14) → 'github:NixOS/nixpkgs/fc27eaa61bf866e03be1ea030fb1164fe4af02a3' (2024-03-15) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index ebea94e..d07ef18 100644 --- a/flake.lock +++ b/flake.lock @@ -415,11 +415,11 @@ }, "stable": { "locked": { - "lastModified": 1710399145, - "narHash": "sha256-yhGlmdqxfstngEs3qikYyqU93iqi39GLOiJ7XDWFdPQ=", + "lastModified": 1710542629, + "narHash": "sha256-FdP5ENwCiMt5G+E6fCTcnKASKz2cTW19A5gOFgdiajw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3eeab67779382692725ac423b023edecbd8547e", + "rev": "fc27eaa61bf866e03be1ea030fb1164fe4af02a3", "type": "github" }, "original": { From eff3ac8ce48c18795d2902001aac5b41ada6cb57 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Fri, 15 Mar 2024 23:03:46 -0600 Subject: [PATCH 20/25] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'unstable': 'github:NixOS/nixpkgs/2bcf18c64c66b95e17d9c8755104d33bc5103c63' (2024-03-15) → 'github:NixOS/nixpkgs/0edcd78e05a665633bd30e905988edb4cb3b5aca' (2024-03-16) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d07ef18..1d84a7e 100644 --- a/flake.lock +++ b/flake.lock @@ -526,11 +526,11 @@ }, "unstable": { "locked": { - "lastModified": 1710474764, - "narHash": "sha256-M43DDaPLL04HBLfh7XBZ8ROiujeL9IvnWsEKUnG2/yU=", + "lastModified": 1710563645, + "narHash": "sha256-r2i935EhKAMoPgV2fn2gD5lHoPAARZoki5V00OQPlxI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2bcf18c64c66b95e17d9c8755104d33bc5103c63", + "rev": "0edcd78e05a665633bd30e905988edb4cb3b5aca", "type": "github" }, "original": { From 78b14e93f77f7ed3db744e25d27fc0aff39c18da Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Sat, 16 Mar 2024 01:26:47 -0600 Subject: [PATCH 21/25] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'unstableSmall': 'github:NixOS/nixpkgs/f7156e005c93248d684c09bc4cf8b66a4d2ffcbf' (2024-03-14) → 'github:NixOS/nixpkgs/bda93c2221bc4185056723795c62e1b4cc661c4b' (2024-03-15) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 1d84a7e..a275ac8 100644 --- a/flake.lock +++ b/flake.lock @@ -541,11 +541,11 @@ }, "unstableSmall": { "locked": { - "lastModified": 1710433391, - "narHash": "sha256-w0tmRGIUl7EWWDteJ19qXPIvmeKUQKptAfojNRvpIDU=", + "lastModified": 1710513883, + "narHash": "sha256-MKYur1pNCrk8bU7agCpMRi3dCCEbv3GwH3pS0XuM1Ps=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f7156e005c93248d684c09bc4cf8b66a4d2ffcbf", + "rev": "bda93c2221bc4185056723795c62e1b4cc661c4b", "type": "github" }, "original": { From 345c63b1afd3df15fb0c4341c51a1c6038001daa Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Sat, 16 Mar 2024 06:21:54 -0600 Subject: [PATCH 22/25] h: +irssi --- hosts/h/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/h/default.nix b/hosts/h/default.nix index 0a326bd..3a267ba 100644 --- a/hosts/h/default.nix +++ b/hosts/h/default.nix @@ -234,6 +234,7 @@ in aspell aspellDicts.en icbirc + irssi # matrix things matrix-synapse-tools.synadm From d84be00aabbf392b1963d3958b7bf50583a92289 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Mon, 18 Mar 2024 13:35:11 -0600 Subject: [PATCH 23/25] europa: +inkscape, +jj --- hosts/europa/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/europa/default.nix b/hosts/europa/default.nix index 45622b6..929fcf5 100644 --- a/hosts/europa/default.nix +++ b/hosts/europa/default.nix @@ -363,6 +363,8 @@ in git-credential-1password gqrx hackrf + inkscape + jujutsu klavaro minicom nheko From 67423f6e13fa80386b2943f8cf9ce07161ecbf20 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Tue, 19 Mar 2024 06:29:05 -0600 Subject: [PATCH 24/25] configs/firefox: update link to policy stuff --- configs/firefox.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/firefox.nix b/configs/firefox.nix index f2d3532..752729e 100644 --- a/configs/firefox.nix +++ b/configs/firefox.nix @@ -99,6 +99,8 @@ MoreFromMozilla = false; }; }; + # NOTE: https://mozilla.github.io/policy-templates/ + # Items can be found here ^ preferences = { # TODO: confirm no issues "dom.event.clipboardevents.enabled" = false; @@ -151,7 +153,6 @@ "security.ssl.errorReporting.enabled" = false; # Not yet working: - # https://github.com/mozilla/policy-templates/blob/master/README.md#preferences "beacon.enabled" = false; "privacy.resistFingerprinting" = true; "services.sync.prefs.sync-seen.browser.newtabpage.activity-stream.section.highlights.includePocket" = From 1b47bfad9bad431db71ef5ebc9f9910dc2b77c73 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Tue, 19 Mar 2024 07:25:14 -0600 Subject: [PATCH 25/25] overlays/matrix-synapse: bumb to 1.103.0 --- overlays/matrix-synapse.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/overlays/matrix-synapse.nix b/overlays/matrix-synapse.nix index 125d4bb..8c7d015 100644 --- a/overlays/matrix-synapse.nix +++ b/overlays/matrix-synapse.nix @@ -1,9 +1,9 @@ let - hash = "sha256-RJsuvNqqUiiVw6uKkG81rqo1ZoszUHK4UIJh8MReFqo="; - sha256 = "sha256-PoPJnSZ9QpcpVbqDMlqwgAqu0K8oornpihErLHXb6Gc="; + hash = "sha256-NwHX4pOM2PUf2MldaPTOzP9gOcTmILxM1Sx2HPkLBcw="; + sha256 = "sha256-AyV0JPPJkJ4jdaw0FUXPqGF3Qkce1+RK70FkXAw+bLA="; matrix-synapse-unwrapped = _: super: { matrix-synapse-unwrapped = super.matrix-synapse-unwrapped.overrideAttrs (_: rec { - version = "1.102.0"; + version = "1.103.0"; pname = "matrix-synapse"; src = super.fetchFromGitHub {