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" = 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 ]; diff --git a/flake.lock b/flake.lock index 60b80d5..a275ac8 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": { @@ -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": { @@ -415,11 +415,11 @@ }, "stable": { "locked": { - "lastModified": 1710197026, - "narHash": "sha256-0OdO4FsI7isTUKIGoFF6YRSp0H9oRAnb9ET1SlNu5G4=", + "lastModified": 1710542629, + "narHash": "sha256-FdP5ENwCiMt5G+E6fCTcnKASKz2cTW19A5gOFgdiajw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9c1dfe2db4be1095cc221e97a54323bc55d42696", + "rev": "fc27eaa61bf866e03be1ea030fb1164fe4af02a3", "type": "github" }, "original": { @@ -526,11 +526,11 @@ }, "unstable": { "locked": { - "lastModified": 1710219226, - "narHash": "sha256-hdMP0Ja9Uy66Sqrekbv/kLQz8RrjgeY3+lDjcqXuUHE=", + "lastModified": 1710563645, + "narHash": "sha256-r2i935EhKAMoPgV2fn2gD5lHoPAARZoki5V00OQPlxI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e72ac6e54d890e4e25116fece328f0b336c3416", + "rev": "0edcd78e05a665633bd30e905988edb4cb3b5aca", "type": "github" }, "original": { @@ -541,11 +541,11 @@ }, "unstableSmall": { "locked": { - "lastModified": 1710213926, - "narHash": "sha256-D6wdwb289veivPoRV5/+IZaUG/XrdJPHpbR08cA5og0=", + "lastModified": 1710513883, + "narHash": "sha256-MKYur1pNCrk8bU7agCpMRi3dCCEbv3GwH3pS0XuM1Ps=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4e2121b151e492fd15d4bdb034e793738fdc120", + "rev": "bda93c2221bc4185056723795c62e1b4cc661c4b", "type": "github" }, "original": { diff --git a/gui/kde.nix b/gui/kde.nix index 6f1ec45..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; @@ -16,19 +34,25 @@ else { desktopManager.plasma5.enable = true; }) - ({ + { displayManager.sddm.enable = true; - }) + } ]; # 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/box/default.nix b/hosts/box/default.nix index dd5348f..86c24f7 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 ]; }; @@ -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; diff --git a/hosts/europa/default.nix b/hosts/europa/default.nix index 9a5d42f..929fcf5 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 ]; + }; + }; }; }; @@ -353,9 +359,12 @@ in fossil gh gimp + git-annex git-credential-1password gqrx hackrf + inkscape + jujutsu klavaro minicom nheko 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 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 { 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 ]; 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}"