Compare commits

..

No commits in common. "be802e3bf4dbbad81fa90846cd71f2af746fd5a9" and "481aa62efcfa7cef9f8d20afa46d712e6e7606d4" have entirely different histories.

3 changed files with 40 additions and 118 deletions

118
flake.lock generated
View file

@ -21,11 +21,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1756028045,
"narHash": "sha256-j6ehEdta7YnXtk42cdYQEElCKfnbe24yfeHJwszgyes=",
"lastModified": 1754418797,
"narHash": "sha256-8UP/nu75GyNcdKW3FD/mRxhs5zWlRIpAQo8wgm9rVQE=",
"owner": "catppuccin",
"repo": "nix",
"rev": "ad015344f592b6ebb82de853b747dd577926ec77",
"rev": "9bdf7f5fb308409495523ea21bec5484b75b2492",
"type": "github"
},
"original": {
@ -78,11 +78,11 @@
]
},
"locked": {
"lastModified": 1756115622,
"narHash": "sha256-iv8xVtmLMNLWFcDM/HcAPLRGONyTRpzL9NS09RnryRM=",
"lastModified": 1753140376,
"narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=",
"owner": "nix-community",
"repo": "disko",
"rev": "bafad29f89e83b2d861b493aa23034ea16595560",
"rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c",
"type": "github"
},
"original": {
@ -91,25 +91,6 @@
"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": {
@ -297,11 +278,11 @@
]
},
"locked": {
"lastModified": 1755699104,
"narHash": "sha256-BhpvSLQeDO2dvjGArG4KI1PQTv5+VcGY84n+s7Dc7ys=",
"lastModified": 1753803561,
"narHash": "sha256-diAHvnPHPvRdrgKwzt4h8AFewqLjATYFXhysYFBh4/w=",
"owner": "igor-ramazanov",
"repo": "headplane",
"rev": "7adacae9405453ed93af6d7823acded781167f39",
"rev": "65a14aefcfff006318ce1b13687cec903d72c12f",
"type": "github"
},
"original": {
@ -317,11 +298,11 @@
]
},
"locked": {
"lastModified": 1755928099,
"narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=",
"lastModified": 1753592768,
"narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "4a44fb9f7555da362af9d499817084f4288a957f",
"rev": "fc3add429f21450359369af74c2375cb34a2d204",
"type": "github"
},
"original": {
@ -372,11 +353,11 @@
"nixpkgs-25_05": "nixpkgs-25_05"
},
"locked": {
"lastModified": 1755110674,
"narHash": "sha256-PigqTAGkdBYXVFWsJnqcirrLeFqRFN4PFigLA8FzxeI=",
"lastModified": 1747965231,
"narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
"rev": "f5936247dbdb8501221978562ab0b302dd75456c",
"rev": "53007af63fade28853408370c4c600a63dd97f41",
"type": "gitlab"
},
"original": {
@ -388,11 +369,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1755615617,
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
"lastModified": 1753694789,
"narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "20075955deac2583bb12f07151c2df830ef346b4",
"rev": "dc9637876d0dcc8c9e5e22986b857632effeb727",
"type": "github"
},
"original": {
@ -433,45 +414,13 @@
"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=",
"lastModified": 1754292888,
"narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c",
"rev": "ce01daebf8489ba97bd1609d185ea276efdeb121",
"type": "github"
},
"original": {
@ -481,7 +430,7 @@
"type": "github"
}
},
"nixpkgs_4": {
"nixpkgs_3": {
"locked": {
"lastModified": 1741246872,
"narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
@ -497,7 +446,7 @@
"type": "github"
}
},
"nixpkgs_5": {
"nixpkgs_4": {
"locked": {
"lastModified": 1738797219,
"narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=",
@ -513,7 +462,7 @@
"type": "github"
}
},
"nixpkgs_6": {
"nixpkgs_5": {
"locked": {
"lastModified": 1730768919,
"narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=",
@ -529,7 +478,7 @@
"type": "github"
}
},
"nixpkgs_7": {
"nixpkgs_6": {
"locked": {
"lastModified": 1722813957,
"narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
@ -548,7 +497,7 @@
"nixvim": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_3",
"nixvim": "nixvim_2",
"pre-commit-hooks": "pre-commit-hooks"
},
@ -569,7 +518,7 @@
"nixvim_2": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_5",
"nixpkgs": "nixpkgs_4",
"nuschtosSearch": "nuschtosSearch"
},
"locked": {
@ -614,7 +563,7 @@
"inputs": {
"flake-compat": "flake-compat_2",
"gitignore": "gitignore_2",
"nixpkgs": "nixpkgs_6"
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1741350116,
@ -634,11 +583,10 @@
"inputs": {
"catppuccin": "catppuccin",
"disko": "disko",
"emacs-overlay": "emacs-overlay",
"headplane": "headplane",
"home-manager": "home-manager",
"nixos-mailserver": "nixos-mailserver",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_2",
"nixvim": "nixvim",
"sops-nix": "sops-nix",
"tidalcycles": "tidalcycles"
@ -651,11 +599,11 @@
]
},
"locked": {
"lastModified": 1754988908,
"narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
"lastModified": 1754328224,
"narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
"rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4",
"type": "github"
},
"original": {
@ -730,7 +678,7 @@
"tidalcycles": {
"inputs": {
"dirt-samples-src": "dirt-samples-src",
"nixpkgs": "nixpkgs_7",
"nixpkgs": "nixpkgs_6",
"superdirt-src": "superdirt-src",
"tidal-src": "tidal-src",
"vim-tidal-src": "vim-tidal-src",

View file

@ -39,11 +39,6 @@
inputs.nixpkgs.follows = "nixpkgs";
};
# emacs overlay
emacs-overlay = {
url = "github:nix-community/emacs-overlay";
};
# tidalcycles
tidalcycles = {
url = "github:mitchmindtree/tidalcycles.nix";
@ -54,7 +49,6 @@
{
self,
nixpkgs,
emacs-overlay,
tidalcycles,
...
}@inputs:
@ -67,12 +61,7 @@
wodan = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs outputs; };
modules = [
{
nixpkgs.overlays = [
emacs-overlay.overlays.default
tidalcycles.overlays.default
];
}
{ nixpkgs.overlays = [ tidalcycles.overlays.default ]; }
./hosts/wodan
];
};

View file

@ -78,21 +78,18 @@
nixpkgs.config.allowUnfree = true;
services.emacs = {
enable = true;
package = pkgs.emacs-unstable;
};
environment.systemPackages = with pkgs; [
(firefox.override { nativeMessagingHosts = [ passff-host ]; })
vim
wget
git
texliveFull
terraform
opentofu
tf-summarize
awscli2
libreoffice
packer
ansible
opensoundmeter
helvum
@ -107,23 +104,11 @@
superdirt-install
];
nix.settings = {
experimental-features = [
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 = {
enable = true;