summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chaski/configuration.nix1
-rw-r--r--chaski/services/headscale.nix40
-rw-r--r--home/home-minimal.nix25
-rw-r--r--home/home.nix5
-rw-r--r--home/newsboat-public.nix8
-rw-r--r--home/packages-minimal.nix2
-rw-r--r--npins/sources.json46
-rw-r--r--pkgs/default.nix2
-rw-r--r--pkgs/overlay.nix33
-rw-r--r--surltesh-echer/configuration.scm7
-rw-r--r--surltesh-echer/home/home-configuration.scm2
11 files changed, 140 insertions, 31 deletions
diff --git a/chaski/configuration.nix b/chaski/configuration.nix
index da8fdaf..6339d32 100644
--- a/chaski/configuration.nix
+++ b/chaski/configuration.nix
@@ -12,6 +12,7 @@
./services/chat.nix
./services/bahnhof-name.nix
./services/conduit.nix
+ ./services/headscale.nix
];
sops.defaultSopsFile = ../secrets/chaski.yaml;
diff --git a/chaski/services/headscale.nix b/chaski/services/headscale.nix
new file mode 100644
index 0000000..8240d93
--- /dev/null
+++ b/chaski/services/headscale.nix
@@ -0,0 +1,40 @@
+{ config, lib, pkgs, ... }:
+
+{
+ services.headscale = {
+ enable = true;
+ settings = {
+ server_url = "https://headscale.noms.ing";
+ listen_addr = "127.0.0.1:8323";
+
+ # oidc = {
+ # only_start_if_oidc_is_available = true;
+ # issuer = "https://idm.cuties.network/oauth2/openid/headscale";
+ # client_id = "headscale";
+ # client_secret_path = "/run/secrets/headscale_oidc_secret";
+ # strip_email_domain = true;
+ # };
+
+ dns_config.magic_dns = true;
+ dns_config.domains = [ "nodes.headscale.noms.ing" ];
+ # dns_config.base_domain = "ts.cuties.network";
+ };
+ };
+
+ users.users.headscale.extraGroups = [ config.users.groups.keys.name ];
+ # sops.secrets.headscale_oidc_secret = {
+ # owner = config.users.users.headscale.name;
+ # sopsFile = ./headscale.sops.yaml;
+ # };
+
+ services.nginx.virtualHosts."headscale.noms.ing" = {
+ forceSSL = true;
+ enableACME = true;
+ locations."/" = {
+ proxyPass = "http://localhost:8323";
+ proxyWebsockets = true;
+ };
+ };
+
+ services.tailscale.enable = true;
+}
diff --git a/home/home-minimal.nix b/home/home-minimal.nix
index 42f358d..78d6014 100644
--- a/home/home-minimal.nix
+++ b/home/home-minimal.nix
@@ -138,8 +138,33 @@
commit.verbose = true;
rerere.enabled = true;
branch.sort = "-authordate";
+
+ merge.mergiraf = {
+ name = "mergiraf";
+ driver = "merigraf merge --git %O %A %B -s %S -x %X -y %Y -p %P";
+ };
};
+ attributes = [
+ "*.java merge=mergiraf"
+ "*.rs merge=mergiraf"
+ "*.go merge=mergiraf"
+ "*.js merge=mergiraf"
+ "*.jsx merge=mergiraf"
+ "*.json merge=mergiraf"
+ "*.yml merge=mergiraf"
+ "*.yaml merge=mergiraf"
+ "*.html merge=mergiraf"
+ "*.htm merge=mergiraf"
+ "*.xhtml merge=mergiraf"
+ "*.xml merge=mergiraf"
+ "*.c merge=mergiraf"
+ "*.h merge=mergiraf"
+ "*.cpp merge=mergiraf"
+ "*.hpp merge=mergiraf"
+ "*.cs merge=mergiraf"
+ ];
+
# diff-so-fancy.enable = true;
# difftastic.enable = true;
delta = {
diff --git a/home/home.nix b/home/home.nix
index 22640b9..0452e0f 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -316,6 +316,11 @@
user = "git";
identityFile = keydir + "/id_surltesh-echer";
};
+ "encoder* mixer* atem* minion*" = {
+ # hostname = "%h.lan.c3voc.de";
+ user = "voc";
+ extraOptions.StrictHostKeyChecking = "no";
+ };
"nobelium" = {
hostname = "no.colorspace.club";
user = "root";
diff --git a/home/newsboat-public.nix b/home/newsboat-public.nix
index 1bd5bcb..8216b14 100644
--- a/home/newsboat-public.nix
+++ b/home/newsboat-public.nix
@@ -29,6 +29,7 @@ with import ./newsboat-lib.nix;
(ntag "https://www.gdl.de/feed.rss" "trains")
(ntag "https://www.transformativeworks.org/feed" "fandom")
(ntag "https://haskell.github.io/security-advisories/atom.xml" "comp")
+ (ntag "https://blog.haskell.org/atom.xml" "comp")
# blogs
(btag "https://scilogs.spektrum.de/klimalounge/feed/" "climate")
@@ -205,6 +206,9 @@ with import ./newsboat-lib.nix;
(btag "https://blog.poisson.chat/rss.xml" "comp")
(btag "https://blog.nadja.top/feed.rss" "hardware")
(btag "https://matttproud.com/blog/index.xml" "comp")
+ (btag "https://www.rntz.net/blog/atom.xml" "comp")
+ (btag "https://realdougwilson.com/feed.xml" "fonts")
+ (btag "https://feeds.feedburner.com/balpha" "fonts")
# paper
(btag "http://arxiv.org/rss/cs.PL" "paper")
@@ -269,6 +273,10 @@ with import ./newsboat-lib.nix;
(ytag "UC6IxnFzHofFJ5X2PycSMsww" "stuff") # xkcd's What If?
(ytag "UClgXF_jwWAwPRu8nT1g90xQ" "stuff") # Matt Gray
(ytag "UCqqJQ_cXSat0KIAVfIfKkVA" "food") # Kenji
+ (ytag "UCK48_8v5k90EXEYRD5mATlw" "plants") # techplant
+ (ytag "UChIwaIJ8nxk8nskUZJD2yyg" "plants") # plants in jars
+ (ytag "UCWYSiz0rqNEJ0mX4a45Lhrw" "plants") # nick alexander
+ (ytag "UC9_p50tH3WmMslWRWKnM7dQ" "food") # Adam Ragusea
(blender 2737) # blender developers
(blender 10) # reels
(blender 9) # open movies
diff --git a/home/packages-minimal.nix b/home/packages-minimal.nix
index fe09bc3..f2294ec 100644
--- a/home/packages-minimal.nix
+++ b/home/packages-minimal.nix
@@ -21,7 +21,7 @@
# nix tools
nixpkgs-review nix-top nix-diff nix-tree
# git
- gitAndTools.gitAnnex git-bug git-appraise
+ gitAndTools.gitAnnex git-bug git-appraise mergiraf
# other things
gauche
# html, js & co
diff --git a/npins/sources.json b/npins/sources.json
index faedff1..260317b 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -29,9 +29,9 @@
"url": "ssh://cgit/~/blog"
},
"branch": "main",
- "revision": "58e380da3f6cc57bc8673067973d880c209c011c",
+ "revision": "8ab8e7f9580b1144baf511d206188dece7b13bc8",
"url": null,
- "hash": "129v5q9ayf63v616rjy88v07i2brl8s7hw6s2yxsxvknyrnykbj7"
+ "hash": "1n78xgl5vfnfvjd2q7zycpy295y0qi2s028yjwgk3pb0zlk43wvs"
},
"deploy-rs": {
"type": "Git",
@@ -78,9 +78,9 @@
"repo": "home-manager"
},
"branch": "release-24.05",
- "revision": "208df2e558b73b6a1f0faec98493cb59a25f62ba",
- "url": "https://github.com/nix-community/home-manager/archive/208df2e558b73b6a1f0faec98493cb59a25f62ba.tar.gz",
- "hash": "13jlfifjw6pirk700p61anijv8q66mn0f356fw3ssb16vzhhqf5l"
+ "revision": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+ "url": "https://github.com/nix-community/home-manager/archive/2f23fa308a7c067e52dfcc30a0758f47043ec176.tar.gz",
+ "hash": "00wp0s9b5nm5rsbwpc1wzfrkyxxmqjwsc1kcibjdbfkh69arcpsn"
},
"isabelle-utils": {
"type": "Git",
@@ -100,9 +100,9 @@
"url": "git+ssh://git@git.lix.systems/lix-project/lix"
},
"branch": "main",
- "revision": "c14486ae8d3bbc862c625d948a6b2f4dc0927d5b",
+ "revision": "6b7076f81c25941559f7d132a5ebc2fcfcedcc4d",
"url": null,
- "hash": "17j4hmn2q43vrmkpsa3i49760samszkx010ns7f575g5fcxwkp7j"
+ "hash": "1kv0yxaw1mfi9c99g940m0w8aqfnpwnwrxpd43920xqnd928jxli"
},
"lix-nixos-module": {
"type": "Git",
@@ -111,9 +111,9 @@
"url": "git+ssh://git@git.lix.systems/lix-project/nixos-module"
},
"branch": "main",
- "revision": "353b25f0b6da5ede15206d416345a2ec4195b5c8",
+ "revision": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d",
"url": null,
- "hash": "0aq9l1qhz01wm232gskq2mywik98zv2r8qn42bjw3kdb185wf9kl"
+ "hash": "0jxpqaz12lqibg03iv36sa0shfvamn2yhg937llv3kl4csijd34f"
},
"nixpkgs": {
"type": "Git",
@@ -123,9 +123,9 @@
"repo": "nixpkgs"
},
"branch": "nixos-24.05",
- "revision": "68e7dce0a6532e876980764167ad158174402c6f",
- "url": "https://github.com/NixOS/nixpkgs/archive/68e7dce0a6532e876980764167ad158174402c6f.tar.gz",
- "hash": "024vd8hqdakvhyzxw6zpm6awkxm9bx0xg5hmrpsfl16nnrwy3z34"
+ "revision": "080166c15633801df010977d9d7474b4a6c549d7",
+ "url": "https://github.com/NixOS/nixpkgs/archive/080166c15633801df010977d9d7474b4a6c549d7.tar.gz",
+ "hash": "17sls93qjqr0dsh31xph33m1f1x67gs22s3cr8qv20bm8zkab9y4"
},
"nixpkgs-unstable": {
"type": "Git",
@@ -135,9 +135,9 @@
"repo": "nixpkgs"
},
"branch": "nixpkgs-unstable",
- "revision": "add0443ee587a0c44f22793b8c8649a0dbc3bb00",
- "url": "https://github.com/NixOS/nixpkgs/archive/add0443ee587a0c44f22793b8c8649a0dbc3bb00.tar.gz",
- "hash": "09ci84bqd0yb1p667wha2lj42285h4jgz28mmvshbc9z8hrbdanh"
+ "revision": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53",
+ "url": "https://github.com/NixOS/nixpkgs/archive/2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53.tar.gz",
+ "hash": "1v6gpivg8mj4qapdp0y5grapnlvlw8xyh5bjahq9i50iidjr3587"
},
"ntfy-matrix-bot": {
"type": "Git",
@@ -169,9 +169,9 @@
"repo": "rust-overlay"
},
"branch": "master",
- "revision": "2ef910a6276a2f34513d18f2f826a8dea72c3b3f",
- "url": "https://github.com/oxalica/rust-overlay/archive/2ef910a6276a2f34513d18f2f826a8dea72c3b3f.tar.gz",
- "hash": "0pjgvqi1l0y2chzjs9lh6qvx962k71ny8c1c2rn6h4afxfpl52dv"
+ "revision": "41814763a2c597755b0755dbe3e721367a5e420f",
+ "url": "https://github.com/oxalica/rust-overlay/archive/41814763a2c597755b0755dbe3e721367a5e420f.tar.gz",
+ "hash": "0pphdgma7dm0mhknnmg41ga4779cg47f9v8h2znhy15f79v5l1f5"
},
"showrt": {
"type": "Git",
@@ -204,9 +204,9 @@
"repo": "sops-nix"
},
"branch": "master",
- "revision": "b68757cd2c3fa66d6ccaa0d046ce42a9324e0070",
- "url": "https://github.com/Mic92/sops-nix/archive/b68757cd2c3fa66d6ccaa0d046ce42a9324e0070.tar.gz",
- "hash": "0l5a0qshh5ygfhxya3cq2r2a6661gjcwnn5lx5422mg2irrpdxxd"
+ "revision": "e9b5eef9b51cdf966c76143e13a9476725b2f760",
+ "url": "https://github.com/Mic92/sops-nix/archive/e9b5eef9b51cdf966c76143e13a9476725b2f760.tar.gz",
+ "hash": "1irwfigc3fcxdm5pc3p9cddv57drjp208sa0hd7bq78b0csdxnyl"
},
"traveltext": {
"type": "Git",
@@ -215,9 +215,9 @@
"url": "https://stuebinm.eu/git/traveltext"
},
"branch": "main",
- "revision": "b6080abc5661f9323593944f5701d7dd7597afb9",
+ "revision": "d876202506621eb76012c12cbb0e91fd2bb0ada0",
"url": null,
- "hash": "0rwfkkq46j7yjbkv3ylpsifzlhq7qlc2svzpbwjyqm65d53dyalm"
+ "hash": "0886l3r4fnnd6pc699n9l7kzh1y00y6bbdalab90gjqccviwv9cd"
},
"uplcg": {
"type": "Git",
diff --git a/pkgs/default.nix b/pkgs/default.nix
index f9d50c0..3f8dda3 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -7,7 +7,7 @@
travelynx crs-tracker crs-php bahnhof-name matrix-to
hikari_unstable heartwood radicle-interface radicle-tui
inweb nomsring bookwyrm mollysocket git-annex-remote-remarkable2
- ntfy-matrix-bot transport_validator;
+ ntfy-matrix-bot transport_validator mergiraf;
pkgs = nixpkgs;
}
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index 3a37b8f..c7e929e 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -50,6 +50,39 @@ in
cargoLock.lockFile = "${src}/Cargo.lock";
};
+ mergiraf = self.rustPlatform.buildRustPackage rec {
+ pname = "mergiraf";
+ version = "git";
+ src = self.fetchgit {
+ url = "https://codeberg.org/mergiraf/mergiraf";
+ rev = "v0.2.0";
+ hash = "sha256-egtX2daCbPXi5rX2OxbEZA/VI9R4HMj5LRKbUEBFo+E=";
+ };
+ # TODO: probably unnecessary once we are on nixpkgs 24.11; earlier version
+ # hardcode --frozen here, but cargo wants --offline.
+ # the postBuild hook is necessary to set up things for the install hook
+ buildPhase = ''
+ cargo build -j $NIX_BUILD_CORES \
+ --target x86_64-unknown-linux-gnu \
+ --release \
+ --offline
+
+ runHook postBuild
+ '';
+ # no idea why this didn't work with either test or build inputs ..
+ preCheck = ''
+ export PATH=$PATH:${self.gitMinimal}/bin
+ '';
+ cargoLock = {
+ lockFile = "${src}/Cargo.lock";
+ outputHashes = {
+ "tree-sitter-go-0.23.1" = "sha256-elPqkvVYs0vADOuN/umDteWP5hqcXhQAoSkqYDtTxaU=";
+ "tree-sitter-xml-0.7.0" = "sha256-RTWvOUAs3Uql9DKsP1jf9FZZHaZORE40GXd+6g6RQZw=";
+ "tree-sitter-yaml-0.6.1" = "sha256-gS+SjOnGl/86U9VV/y1ca7naYIe7DAOvOv++jCRLTKo=";
+ };
+ };
+ };
+
rustex = rustPlatform.buildRustPackage rec {
pname = "rustex";
version = "git";
diff --git a/surltesh-echer/configuration.scm b/surltesh-echer/configuration.scm
index e97a9f3..7c679c8 100644
--- a/surltesh-echer/configuration.scm
+++ b/surltesh-echer/configuration.scm
@@ -11,8 +11,7 @@
emacs
terminals
wm xdisorg shells admin
- version-control
- nss)
+ version-control)
(use-service-modules desktop
base)
@@ -52,9 +51,7 @@
;; window managers
hikari
emacs kitty fuzzel git
- fish
- ;; for HTTPS access
- nss-certs)
+ fish)
%base-packages))
;; Use the "desktop" services, which include the X11
diff --git a/surltesh-echer/home/home-configuration.scm b/surltesh-echer/home/home-configuration.scm
index 9e87bac..728cfba 100644
--- a/surltesh-echer/home/home-configuration.scm
+++ b/surltesh-echer/home/home-configuration.scm
@@ -71,7 +71,7 @@
(url "https://git.savannah.gnu.org/git/guix.git")
(branch "master")
(commit
- "5a95cf76e1d0f9fdff5b232b42337c657b76d1d4")
+ "7a89bbffd081129da8c2c5b58b4e12133bf210c5")
(introduction
(make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 21:33:01 +0000