From 765d149fdb6d57e7689954efd41fbd46ab569485 Mon Sep 17 00:00:00 2001 From: Lander Van den Bulcke Date: Tue, 26 Aug 2025 00:28:45 +0200 Subject: [PATCH 1/4] chore: nix flake update Signed-off-by: Lander Van den Bulcke --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 6809a78..271191c 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1754418797, - "narHash": "sha256-8UP/nu75GyNcdKW3FD/mRxhs5zWlRIpAQo8wgm9rVQE=", + "lastModified": 1756028045, + "narHash": "sha256-j6ehEdta7YnXtk42cdYQEElCKfnbe24yfeHJwszgyes=", "owner": "catppuccin", "repo": "nix", - "rev": "9bdf7f5fb308409495523ea21bec5484b75b2492", + "rev": "ad015344f592b6ebb82de853b747dd577926ec77", "type": "github" }, "original": { @@ -78,11 +78,11 @@ ] }, "locked": { - "lastModified": 1753140376, - "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", + "lastModified": 1756115622, + "narHash": "sha256-iv8xVtmLMNLWFcDM/HcAPLRGONyTRpzL9NS09RnryRM=", "owner": "nix-community", "repo": "disko", - "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", + "rev": "bafad29f89e83b2d861b493aa23034ea16595560", "type": "github" }, "original": { @@ -278,11 +278,11 @@ ] }, "locked": { - "lastModified": 1753803561, - "narHash": "sha256-diAHvnPHPvRdrgKwzt4h8AFewqLjATYFXhysYFBh4/w=", + "lastModified": 1755699104, + "narHash": "sha256-BhpvSLQeDO2dvjGArG4KI1PQTv5+VcGY84n+s7Dc7ys=", "owner": "igor-ramazanov", "repo": "headplane", - "rev": "65a14aefcfff006318ce1b13687cec903d72c12f", + "rev": "7adacae9405453ed93af6d7823acded781167f39", "type": "github" }, "original": { @@ -298,11 +298,11 @@ ] }, "locked": { - "lastModified": 1753592768, - "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", + "lastModified": 1755928099, + "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc3add429f21450359369af74c2375cb34a2d204", + "rev": "4a44fb9f7555da362af9d499817084f4288a957f", "type": "github" }, "original": { @@ -353,11 +353,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1747965231, - "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=", + "lastModified": 1755110674, + "narHash": "sha256-PigqTAGkdBYXVFWsJnqcirrLeFqRFN4PFigLA8FzxeI=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "53007af63fade28853408370c4c600a63dd97f41", + "rev": "f5936247dbdb8501221978562ab0b302dd75456c", "type": "gitlab" }, "original": { @@ -369,11 +369,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753694789, - "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { @@ -416,11 +416,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1754292888, - "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=", + "lastModified": 1755922037, + "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121", + "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", "type": "github" }, "original": { @@ -599,11 +599,11 @@ ] }, "locked": { - "lastModified": 1754328224, - "narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=", + "lastModified": 1754988908, + "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4", + "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", "type": "github" }, "original": { From 368eeb9356d5ded5efa6b66657ee6169725b9988 Mon Sep 17 00:00:00 2001 From: Lander Van den Bulcke Date: Tue, 26 Aug 2025 00:50:10 +0200 Subject: [PATCH 2/4] chore: remove hashicorp stuff Signed-off-by: Lander Van den Bulcke --- hosts/wodan/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/wodan/default.nix b/hosts/wodan/default.nix index 4d20936..3328e1c 100644 --- a/hosts/wodan/default.nix +++ b/hosts/wodan/default.nix @@ -84,12 +84,10 @@ wget git texliveFull - terraform opentofu tf-summarize awscli2 libreoffice - packer ansible opensoundmeter helvum From d3432ab240b3d68e114a77975a71052d84361df0 Mon Sep 17 00:00:00 2001 From: Lander Van den Bulcke Date: Tue, 26 Aug 2025 00:58:41 +0200 Subject: [PATCH 3/4] feat: add nix-community cache Signed-off-by: Lander Van den Bulcke --- hosts/wodan/default.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/hosts/wodan/default.nix b/hosts/wodan/default.nix index 3328e1c..ca5991a 100644 --- a/hosts/wodan/default.nix +++ b/hosts/wodan/default.nix @@ -102,10 +102,22 @@ superdirt-install ]; - nix.settings.experimental-features = [ - "nix-command" - "flakes" - ]; + nix.settings = { + experimental-features = [ + "nix-command" + "flakes" + ]; + + substituters = [ + "https://cache.nixos.org/" + "https://nix-community.cachix.org" + ]; + + trusted-public-keys = [ + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ]; + }; services.tailscale.enable = true; services.mullvad-vpn = { From be802e3bf4dbbad81fa90846cd71f2af746fd5a9 Mon Sep 17 00:00:00 2001 From: Lander Van den Bulcke Date: Tue, 26 Aug 2025 01:04:49 +0200 Subject: [PATCH 4/4] feat: add emacs-overlay Signed-off-by: Lander Van den Bulcke --- flake.lock | 70 +++++++++++++++++++++++++++++++++++------ flake.nix | 13 +++++++- hosts/wodan/default.nix | 5 +++ 3 files changed, 78 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 271191c..e7c4d4e 100644 --- a/flake.lock +++ b/flake.lock @@ -91,6 +91,25 @@ "type": "github" } }, + "emacs-overlay": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1756141823, + "narHash": "sha256-Fakm5F02Z7pO2+RwPG8SXN/WIqUvqZERrwT76ISXfjo=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "6e64ccc5fe49ef8bbda0cecb3e281afdb53b3af7", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -414,7 +433,39 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1751274312, + "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { + "locked": { + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1755922037, "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", @@ -430,7 +481,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1741246872, "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", @@ -446,7 +497,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1738797219, "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", @@ -462,7 +513,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1730768919, "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", @@ -478,7 +529,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1722813957, "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", @@ -497,7 +548,7 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixvim": "nixvim_2", "pre-commit-hooks": "pre-commit-hooks" }, @@ -518,7 +569,7 @@ "nixvim_2": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nuschtosSearch": "nuschtosSearch" }, "locked": { @@ -563,7 +614,7 @@ "inputs": { "flake-compat": "flake-compat_2", "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1741350116, @@ -583,10 +634,11 @@ "inputs": { "catppuccin": "catppuccin", "disko": "disko", + "emacs-overlay": "emacs-overlay", "headplane": "headplane", "home-manager": "home-manager", "nixos-mailserver": "nixos-mailserver", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixvim": "nixvim", "sops-nix": "sops-nix", "tidalcycles": "tidalcycles" @@ -678,7 +730,7 @@ "tidalcycles": { "inputs": { "dirt-samples-src": "dirt-samples-src", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "superdirt-src": "superdirt-src", "tidal-src": "tidal-src", "vim-tidal-src": "vim-tidal-src", diff --git a/flake.nix b/flake.nix index af8f1a5..3984512 100644 --- a/flake.nix +++ b/flake.nix @@ -39,6 +39,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + # emacs overlay + emacs-overlay = { + url = "github:nix-community/emacs-overlay"; + }; + # tidalcycles tidalcycles = { url = "github:mitchmindtree/tidalcycles.nix"; @@ -49,6 +54,7 @@ { self, nixpkgs, + emacs-overlay, tidalcycles, ... }@inputs: @@ -61,7 +67,12 @@ wodan = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs; }; modules = [ - { nixpkgs.overlays = [ tidalcycles.overlays.default ]; } + { + nixpkgs.overlays = [ + emacs-overlay.overlays.default + tidalcycles.overlays.default + ]; + } ./hosts/wodan ]; }; diff --git a/hosts/wodan/default.nix b/hosts/wodan/default.nix index ca5991a..1e15352 100644 --- a/hosts/wodan/default.nix +++ b/hosts/wodan/default.nix @@ -78,6 +78,11 @@ nixpkgs.config.allowUnfree = true; + services.emacs = { + enable = true; + package = pkgs.emacs-unstable; + }; + environment.systemPackages = with pkgs; [ (firefox.override { nativeMessagingHosts = [ passff-host ]; }) vim