qbit/xin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'main' into user-passwords

Browse Source
This commit is contained in:
Aaron Bieber 2024-03-19 07:54:18 -06:00
commit 4d2c3a2365
No known key found for this signature in database
11 changed files with 73 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configs/firefox.nix
View File

@ -99,6 +99,8 @@
MoreFromMozilla = false; MoreFromMozilla = false;
}; };
}; };
# NOTE: https://mozilla.github.io/policy-templates/
# Items can be found here ^
preferences = { preferences = {
# TODO: confirm no issues # TODO: confirm no issues
"dom.event.clipboardevents.enabled" = false; "dom.event.clipboardevents.enabled" = false;
@ -151,7 +153,6 @@
"security.ssl.errorReporting.enabled" = false; "security.ssl.errorReporting.enabled" = false;
# Not yet working: # Not yet working:
# https://github.com/mozilla/policy-templates/blob/master/README.md#preferences
"beacon.enabled" = false; "beacon.enabled" = false;
"privacy.resistFingerprinting" = true; "privacy.resistFingerprinting" = true;
"services.sync.prefs.sync-seen.browser.newtabpage.activity-stream.section.highlights.includePocket" = "services.sync.prefs.sync-seen.browser.newtabpage.activity-stream.section.highlights.includePocket" =

6
configs/neovim.lua
View File

@ -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'nvim-treesitter.configs'.setup({})
require('neogen').setup({}) require('neogen').setup({})

16
configs/neovim.nix
View File

@ -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; [ baseVimPackages = with vimPlugins; [
elm-vim elm-vim
fugitive fugitive
@ -69,7 +54,6 @@ let
zig-vim zig-vim
neogen neogen
obsidian
vacme vacme
nofrils nofrils
]; ];

30
flake.lock
View File

@ -43,11 +43,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709771483, "lastModified": 1710281379,
"narHash": "sha256-Hjzu9nCknHLQvhdaRFfCEprH0o15KcaNu1QDr3J88DI=", "narHash": "sha256-uFo9hxt982L3nFJeweW4Gip2esiGrIQlbvEGrNTh4AY=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "550340062c16d7ef8c2cc20a3d2b97bcd3c6b6f6", "rev": "d9ea313bc4851670dc99c5cc979cb79750e7d670",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -400,11 +400,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710195194, "lastModified": 1710433464,
"narHash": "sha256-KFxCJp0T6TJOz1IOKlpRdpsCr9xsvlVuWY/VCiAFnTE=", "narHash": "sha256-IXlPoWgIRovZ32mYvqqdBgOQln71LouE/HBhbKc1wcw=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "e52d8117b330f690382f1d16d81ae43daeb4b880", "rev": "6c32d3b9c7593f4b466ec5404e59fc09a803a090",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -415,11 +415,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1710197026, "lastModified": 1710542629,
"narHash": "sha256-0OdO4FsI7isTUKIGoFF6YRSp0H9oRAnb9ET1SlNu5G4=", "narHash": "sha256-FdP5ENwCiMt5G+E6fCTcnKASKz2cTW19A5gOFgdiajw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9c1dfe2db4be1095cc221e97a54323bc55d42696", "rev": "fc27eaa61bf866e03be1ea030fb1164fe4af02a3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -526,11 +526,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1710219226, "lastModified": 1710563645,
"narHash": "sha256-hdMP0Ja9Uy66Sqrekbv/kLQz8RrjgeY3+lDjcqXuUHE=", "narHash": "sha256-r2i935EhKAMoPgV2fn2gD5lHoPAARZoki5V00OQPlxI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6e72ac6e54d890e4e25116fece328f0b336c3416", "rev": "0edcd78e05a665633bd30e905988edb4cb3b5aca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -541,11 +541,11 @@
}, },
"unstableSmall": { "unstableSmall": {
"locked": { "locked": {
"lastModified": 1710213926, "lastModified": 1710513883,
"narHash": "sha256-D6wdwb289veivPoRV5/+IZaUG/XrdJPHpbR08cA5og0=", "narHash": "sha256-MKYur1pNCrk8bU7agCpMRi3dCCEbv3GwH3pS0XuM1Ps=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e4e2121b151e492fd15d4bdb034e793738fdc120", "rev": "bda93c2221bc4185056723795c62e1b4cc661c4b",
"type": "github" "type": "github"
}, },
"original": { "original": {

48
gui/kde.nix
View File

@ -3,12 +3,30 @@
, isUnstable , 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 = services.xserver =
lib.mkMerge [ mkMerge [
(if isUnstable then { (if isUnstable then {
desktopManager.plasma6.enable = true; desktopManager.plasma6.enable = true;
displayManager.sddm.wayland.enable = true; displayManager.sddm.wayland.enable = true;
@ -16,19 +34,25 @@
else { else {
desktopManager.plasma5.enable = true; desktopManager.plasma5.enable = true;
}) })
({ {
displayManager.sddm.enable = true; displayManager.sddm.enable = true;
}) }
]; ];
# Listen for KDE Connect connections on the tailnet # Listen for KDE Connect connections on the tailnet
networking.firewall.interfaces = { networking.firewall.interfaces = mkIf config.kdeConnect.enable {
"tailscale0" = { "${config.kdeConnect.interface}" =
allowedTCPPorts = lib.range 1714 1764; let
allowedUDPPorts = lib.range 1714 1764; range = {
}; from = 1714;
to = 1764;
};
in
{
allowedUDPPortRanges = [ range ];
allowedTCPPortRanges = [ range ];
};
}; };
programs.kdeconnect.enable = config.kdeConnect.enable;
programs.kdeconnect.enable = true;
}; };
} }

4
hosts/box/default.nix
View File

@ -213,7 +213,7 @@ in
apg apg
git git
signify signify
glowing-bear git-annex
rtl_433 rtl_433
]; ];
}; };
@ -787,7 +787,7 @@ in
gitea = { gitea = {
enable = true; enable = true;
stateDir = "/media/git"; stateDir = "/media/git/gitea";
appName = "Tape:neT"; appName = "Tape:neT";
#package = inputs.unstable.legacyPackages.${pkgs.system}.gitea; #package = inputs.unstable.legacyPackages.${pkgs.system}.gitea;

11
hosts/europa/default.nix
View File

@ -137,6 +137,7 @@ in
}; };
kde.enable = lib.mkDefault true; kde.enable = lib.mkDefault true;
kdeConnect.enable = true;
virtualisation.libvirtd.enable = lib.mkDefault true; virtualisation.libvirtd.enable = lib.mkDefault true;
@ -152,7 +153,12 @@ in
firewall = { firewall = {
enable = true; enable = true;
allowedTCPPorts = [ 22 ]; allowedTCPPorts = [ 22 ];
interfaces = { "tailscale0" = { allowedTCPPorts = [ 8384 ]; }; }; interfaces = {
"tailscale0" =
{
allowedTCPPorts = [ 8384 ];
};
};
}; };
}; };
@ -353,9 +359,12 @@ in
fossil fossil
gh gh
gimp gimp
git-annex
git-credential-1password git-credential-1password
gqrx gqrx
hackrf hackrf
inkscape
jujutsu
klavaro klavaro
minicom minicom
nheko nheko

1
hosts/h/default.nix
View File

@ -234,6 +234,7 @@ in
aspell aspell
aspellDicts.en aspellDicts.en
icbirc icbirc
irssi
# matrix things # matrix things
matrix-synapse-tools.synadm matrix-synapse-tools.synadm

6
overlays/matrix-synapse.nix
View File

@ -1,9 +1,9 @@
let let
hash = "sha256-RJsuvNqqUiiVw6uKkG81rqo1ZoszUHK4UIJh8MReFqo="; hash = "sha256-NwHX4pOM2PUf2MldaPTOzP9gOcTmILxM1Sx2HPkLBcw=";
sha256 = "sha256-PoPJnSZ9QpcpVbqDMlqwgAqu0K8oornpihErLHXb6Gc="; sha256 = "sha256-AyV0JPPJkJ4jdaw0FUXPqGF3Qkce1+RK70FkXAw+bLA=";
matrix-synapse-unwrapped = _: super: { matrix-synapse-unwrapped = _: super: {
matrix-synapse-unwrapped = super.matrix-synapse-unwrapped.overrideAttrs (_: rec { matrix-synapse-unwrapped = super.matrix-synapse-unwrapped.overrideAttrs (_: rec {
version = "1.102.0"; version = "1.103.0";
pname = "matrix-synapse"; pname = "matrix-synapse";
src = super.fetchFromGitHub { src = super.fetchFromGitHub {

6
pkgs/gitu.nix
View File

@ -8,16 +8,16 @@
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "gitu"; pname = "gitu";
version = "0.5.4"; version = "0.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "altsem"; owner = "altsem";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-a4hNgEizxanYE3XuHSCmbV6CkOqhXkznP3Sp0KLFFQs="; hash = "sha256-ymAggfyLPpXp4aQPHp1R+olKeCZwrcwu1GldM8yJVtQ=";
}; };
cargoHash = "sha256-+CA3UG32oZedzRbt7b0wOlhH/subuym4BCL5SMNzrr8="; cargoHash = "sha256-pIA9AnJoauT5nLxSgzR2Lk3wSo30fXAepAJlMahSuCA=";
buildInputs = [ git openssl ]; buildInputs = [ git openssl ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

1
pkgs/openssh.nix
View File

@ -83,6 +83,7 @@ stdenv.mkDerivation {
"--with-mantype=man" "--with-mantype=man"
"--with-libedit=yes" "--with-libedit=yes"
"--disable-strip" "--disable-strip"
"--disable-dsa-keys"
(lib.withFeature withPAM "pam") (lib.withFeature withPAM "pam")
] ]
++ lib.optional (etcDir != null) "--sysconfdir=${etcDir}" ++ lib.optional (etcDir != null) "--sysconfdir=${etcDir}"