Compare commits
38 Commits
9374735e0b
...
426d004020
| Author | SHA1 | Date | |
|---|---|---|---|
| 426d004020 | |||
966bb50149
|
|||
|
a5a305e907
|
|||
|
7056667392
|
|||
|
27f5e3e350
|
|||
|
4f0ab8b741
|
|||
|
bdadda5249
|
|||
|
12112b319b
|
|||
|
1f2ab17d6b
|
|||
|
b9a06eb264
|
|||
|
dfe7f043f1
|
|||
|
367d899455
|
|||
|
4c641d82c9
|
|||
|
0cc8d9b467
|
|||
|
00d77b7cad
|
|||
|
7d4def613a
|
|||
|
33dfef43c8
|
|||
|
472cf6518c
|
|||
|
90939f3311
|
|||
|
b9df372c6c
|
|||
|
a87db6c9e8
|
|||
|
682a8ddfee
|
|||
|
ab8898fcd1
|
|||
|
0c0748b223
|
|||
|
ab9ce09885
|
|||
|
3febac0eab
|
|||
|
3970c118cf
|
|||
|
236e037b9d
|
|||
|
13a8582ab9
|
|||
|
bfbdbe40b2
|
|||
|
471a2a05de
|
|||
|
7645afa79d
|
|||
|
7820c4a07d
|
|||
|
4661b91508
|
|||
|
7d4fd51dcf
|
|||
|
361314584e
|
|||
|
7552a752a9
|
|||
|
3a13160741
|
@ -11,8 +11,10 @@ with pkgs;
|
||||
{
|
||||
# Kernel configuration
|
||||
boot = {
|
||||
kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
|
||||
blacklistedKernelModules = [ "btusb" "bluetooth" ];
|
||||
blacklistedKernelModules = [
|
||||
"btusb"
|
||||
"bluetooth"
|
||||
];
|
||||
kernelParams = [
|
||||
"zfs.zfs_arc_max=8589934592"
|
||||
"zfs.zfs_arc_min=1073741824"
|
||||
@ -107,7 +109,6 @@ with pkgs;
|
||||
group = "systemd-network";
|
||||
};
|
||||
secrets.syncthing.file = secrets/syncthing.age;
|
||||
secrets.samba-ugent.file = secrets/samba-ugent.age;
|
||||
secrets.msmtp.file = secrets/msmtp.age;
|
||||
identityPaths = [ "/etc/ssh/id_ed25519" ];
|
||||
};
|
||||
@ -181,6 +182,7 @@ with pkgs;
|
||||
./modules/periodic.nix
|
||||
./modules/power.nix
|
||||
./modules/monitoring.nix
|
||||
./modules/latest-zfs-kernel.nix
|
||||
];
|
||||
|
||||
}
|
||||
|
||||
287
flake.lock
generated
287
flake.lock
generated
@ -25,29 +25,14 @@
|
||||
},
|
||||
"crane": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
"lanzaboote",
|
||||
"flake-compat"
|
||||
],
|
||||
"flake-utils": [
|
||||
"lanzaboote",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"lanzaboote",
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-overlay": [
|
||||
"lanzaboote",
|
||||
"rust-overlay"
|
||||
]
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681177078,
|
||||
"narHash": "sha256-ZNIjBDou2GOabcpctiQykEQVkI8BDwk7TyvlWlI4myE=",
|
||||
"lastModified": 1717535930,
|
||||
"narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "0c9f468ff00576577d83f5019a66c557ede5acf6",
|
||||
"rev": "55e7754ec31dac78980c8be45f8a28e80e370946",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -97,11 +82,11 @@
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1673956053,
|
||||
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -118,11 +103,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1680392223,
|
||||
"narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=",
|
||||
"lastModified": 1717285511,
|
||||
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5",
|
||||
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -136,32 +121,11 @@
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681202837,
|
||||
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": [
|
||||
"openconnect-sso",
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -179,11 +143,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1660459072,
|
||||
"narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
|
||||
"lastModified": 1709087332,
|
||||
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
|
||||
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -218,7 +182,6 @@
|
||||
"crane": "crane",
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
@ -226,16 +189,16 @@
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1682802423,
|
||||
"narHash": "sha256-Fb5TeRTdvUlo/5Yi2d+FC8a6KoRLk2h1VE0/peMhWPs=",
|
||||
"lastModified": 1737639419,
|
||||
"narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "lanzaboote",
|
||||
"rev": "64b903ca87d18cef2752c19c098af275c6e51d63",
|
||||
"rev": "a65905a09e2c43ff63be8c0e86a93712361f871e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "v0.3.0",
|
||||
"ref": "v0.4.2",
|
||||
"repo": "lanzaboote",
|
||||
"type": "github"
|
||||
}
|
||||
@ -253,27 +216,6 @@
|
||||
"type": "path"
|
||||
}
|
||||
},
|
||||
"nix-github-actions": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"openconnect-sso",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1720066371,
|
||||
"narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-github-actions",
|
||||
"rev": "622f829f5fe69310a866c8a6cd07e747c44ef820",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-github-actions",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-index-database": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@ -281,11 +223,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728263287,
|
||||
"narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=",
|
||||
"lastModified": 1733629314,
|
||||
"narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=",
|
||||
"owner": "Mic92",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259",
|
||||
"rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -296,11 +238,11 @@
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1728269138,
|
||||
"narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=",
|
||||
"lastModified": 1733861262,
|
||||
"narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b",
|
||||
"rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -311,11 +253,43 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1730785428,
|
||||
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
|
||||
"lastModified": 1740396192,
|
||||
"narHash": "sha256-ATMHHrg3sG1KgpQA5x8I+zcYpp5Sf17FaFj/fN+8OoQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
|
||||
"rev": "d9b69c3ec2a2e2e971c534065bdd53374bd68b97",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1710695816,
|
||||
"narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "614b4613980a522ba49f0d194531beddbb7220d3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-23.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1740560979,
|
||||
"narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5135c59491985879812717f4c9fea69604e7f26f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -324,95 +298,12 @@
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1678872516,
|
||||
"narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-22.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"openconnect-sso": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nix-github-actions": "nix-github-actions",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"poetry2nix": "poetry2nix",
|
||||
"systems": "systems_3",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724283233,
|
||||
"narHash": "sha256-XMPn6YHwFOJCGLE9M5F3AEFKA0u+maf8CpIEWmvaQTQ=",
|
||||
"owner": "ThinkChaos",
|
||||
"repo": "openconnect-sso",
|
||||
"rev": "94f1ddfef1662d56ede0a093bcfc3d23156bc1a1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ThinkChaos",
|
||||
"ref": "fix/nix-flake",
|
||||
"repo": "openconnect-sso",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"poetry2nix": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"openconnect-sso",
|
||||
"flake-utils"
|
||||
],
|
||||
"nix-github-actions": [
|
||||
"openconnect-sso",
|
||||
"nix-github-actions"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"openconnect-sso",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": [
|
||||
"openconnect-sso",
|
||||
"systems"
|
||||
],
|
||||
"treefmt-nix": [
|
||||
"openconnect-sso",
|
||||
"treefmt-nix"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721039874,
|
||||
"narHash": "sha256-XANsG9GYHip8pxZpbqKf/YGv8tIa0xTh289Y+WNBNfw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "poetry2nix",
|
||||
"rev": "d11c01e58587e5f21037ed6477465a7f26a32e27",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "poetry2nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pre-commit-hooks-nix": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
"lanzaboote",
|
||||
"flake-compat"
|
||||
],
|
||||
"flake-utils": [
|
||||
"lanzaboote",
|
||||
"flake-utils"
|
||||
],
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": [
|
||||
"lanzaboote",
|
||||
@ -421,11 +312,11 @@
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681413034,
|
||||
"narHash": "sha256-/t7OjNQcNkeWeSq/CFLYVBfm+IEnkjoSm9iKvArnUUI=",
|
||||
"lastModified": 1717664902,
|
||||
"narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=",
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"rev": "d3de8f69ca88fb6f8b09e5b598be5ac98d28ede5",
|
||||
"rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -442,27 +333,23 @@
|
||||
"local-bitwig": "local-bitwig",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"openconnect-sso": "openconnect-sso"
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"lanzaboote",
|
||||
"flake-utils"
|
||||
],
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
"lanzaboote",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1682129965,
|
||||
"narHash": "sha256-1KRPIorEL6pLpJR04FwAqqnt4Tzcm4MqD84yhlD+XSk=",
|
||||
"lastModified": 1717813066,
|
||||
"narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "2c417c0460b788328220120c698630947547ee83",
|
||||
"rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -500,42 +387,6 @@
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_3": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"openconnect-sso",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721769617,
|
||||
"narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
||||
26
flake.nix
26
flake.nix
@ -2,8 +2,7 @@
|
||||
description = "System configuration for panacea";
|
||||
|
||||
nixConfig = {
|
||||
extra-substituters =
|
||||
"https://cachix.cachix.org https://nix-community.cachix.org";
|
||||
extra-substituters = "https://cachix.cachix.org https://nix-community.cachix.org";
|
||||
extra-trusted-public-keys = ''
|
||||
cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM=
|
||||
nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs='';
|
||||
@ -16,10 +15,6 @@
|
||||
url = "github:ryantm/agenix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
openconnect-sso = {
|
||||
url = "github:ThinkChaos/openconnect-sso/fix/nix-flake";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
cyrus-sasl-xoauth2 = {
|
||||
url = "github:robn/sasl2-oauth";
|
||||
flake = false;
|
||||
@ -29,7 +24,7 @@
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
lanzaboote = {
|
||||
url = "github:nix-community/lanzaboote/v0.3.0";
|
||||
url = "github:nix-community/lanzaboote/v0.4.2";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
local-bitwig = {
|
||||
@ -38,7 +33,8 @@
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, ... }@inputs:
|
||||
outputs =
|
||||
{ self, nixpkgs, ... }@inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
|
||||
@ -47,16 +43,22 @@
|
||||
config.allowUnfree = true;
|
||||
overlays = [
|
||||
(final: prev: {
|
||||
emacs-vterm =
|
||||
((pkgs.emacsPackagesFor pkgs.emacs29-pgtk).emacsWithPackages
|
||||
(epkgs: with epkgs; [ vterm mu4e ]));
|
||||
emacs-vterm = (
|
||||
(pkgs.emacsPackagesFor pkgs.emacs29-pgtk).emacsWithPackages (
|
||||
epkgs: with epkgs; [
|
||||
vterm
|
||||
mu4e
|
||||
]
|
||||
)
|
||||
);
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
lib = nixpkgs.lib;
|
||||
|
||||
in {
|
||||
in
|
||||
{
|
||||
nixosConfigurations.panacea = lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
|
||||
@ -5,9 +5,9 @@ let
|
||||
folder = ../cachix;
|
||||
toImport = name: value: folder + ("/" + name);
|
||||
filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
|
||||
imports = lib.mapAttrsToList toImport
|
||||
(lib.filterAttrs filterCaches (builtins.readDir folder));
|
||||
in {
|
||||
imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
|
||||
in
|
||||
{
|
||||
inherit imports;
|
||||
nix.binaryCaches = [ "https://cache.nixos.org/" ];
|
||||
}
|
||||
|
||||
@ -1,4 +1,9 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
# ZFS automatic snapshots
|
||||
@ -88,48 +93,4 @@
|
||||
};
|
||||
};
|
||||
|
||||
# Automount external storage
|
||||
systemd.mounts = [
|
||||
# UGent Samba
|
||||
{
|
||||
what = "//files.ugent.be/akasroua/home";
|
||||
type = "cifs";
|
||||
where = "/ugent";
|
||||
options =
|
||||
"credentials=${config.age.secrets.samba-ugent.path},noperm,vers=3.11,sec=ntlmv2i,noserverino";
|
||||
mountConfig = { TimeoutSec = "5"; };
|
||||
}
|
||||
];
|
||||
systemd.automounts = [
|
||||
# UGent Samba
|
||||
{
|
||||
where = "/ugent";
|
||||
automountConfig = { TimeoutIdleSec = "5"; };
|
||||
wantedBy = [ "default.target" ];
|
||||
}
|
||||
];
|
||||
|
||||
# HACK Workaround to change the configuration of keyutils in order to get CIFS working
|
||||
environment.etc."request-key.conf" = {
|
||||
text = let
|
||||
upcall = "${pkgs.cifs-utils}/bin/cifs.upcall";
|
||||
keyctl = "${pkgs.keyutils}/bin/keyctl";
|
||||
in ''
|
||||
#OP TYPE DESCRIPTION CALLOUT_INFO PROGRAM
|
||||
# -t is required for DFS share servers...
|
||||
create cifs.spnego * * ${upcall} -t %k
|
||||
create dns_resolver * * ${upcall} %k
|
||||
# Everything below this point is essentially the default configuration,
|
||||
# modified minimally to work under NixOS. Notably, it provides debug
|
||||
# logging.
|
||||
create user debug:* negate ${keyctl} negate %k 30 %S
|
||||
create user debug:* rejected ${keyctl} reject %k 30 %c %S
|
||||
create user debug:* expired ${keyctl} reject %k 30 %c %S
|
||||
create user debug:* revoked ${keyctl} reject %k 30 %c %S
|
||||
create user debug:loop:* * |${pkgs.coreutils}/bin/cat
|
||||
create user debug:* * ${pkgs.keyutils}/share/keyutils/request-key-debug.sh %k %d %c %S
|
||||
negate * * * ${keyctl} negate %k 30 %S
|
||||
'';
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -1,4 +1,9 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
# Improve nix-shell and direnv integration
|
||||
|
||||
@ -1,56 +1,66 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"nvme"
|
||||
"xhci_pci"
|
||||
"usbhid"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "syscea/stateful/root";
|
||||
fsType = "zfs";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "syscea/stateful/root";
|
||||
fsType = "zfs";
|
||||
};
|
||||
|
||||
fileSystems."/nix" =
|
||||
{ device = "syscea/ephemeral/nix";
|
||||
fsType = "zfs";
|
||||
};
|
||||
fileSystems."/nix" = {
|
||||
device = "syscea/ephemeral/nix";
|
||||
fsType = "zfs";
|
||||
};
|
||||
|
||||
fileSystems."/ugent" =
|
||||
{ device = "systemd-1";
|
||||
fsType = "autofs";
|
||||
};
|
||||
fileSystems."/ugent" = {
|
||||
device = "systemd-1";
|
||||
fsType = "autofs";
|
||||
};
|
||||
|
||||
fileSystems."/home/coolneng" =
|
||||
{ device = "syscea/stateful/home";
|
||||
fsType = "zfs";
|
||||
};
|
||||
fileSystems."/home/coolneng" = {
|
||||
device = "syscea/stateful/home";
|
||||
fsType = "zfs";
|
||||
};
|
||||
|
||||
fileSystems."/tmp" =
|
||||
{ device = "syscea/ephemeral/tmp";
|
||||
fsType = "zfs";
|
||||
};
|
||||
fileSystems."/tmp" = {
|
||||
device = "syscea/ephemeral/tmp";
|
||||
fsType = "zfs";
|
||||
};
|
||||
|
||||
fileSystems."/home/coolneng/Downloads" =
|
||||
{ device = "syscea/stateful/home/downloads";
|
||||
fsType = "zfs";
|
||||
};
|
||||
fileSystems."/home/coolneng/Downloads" = {
|
||||
device = "syscea/stateful/home/downloads";
|
||||
fsType = "zfs";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/C374-A2FD";
|
||||
fsType = "vfat";
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/C374-A2FD";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/1231a42f-a71a-4c67-b4d8-7506c02a8328"; }
|
||||
];
|
||||
swapDevices = [
|
||||
{ device = "/dev/disk/by-uuid/1231a42f-a71a-4c67-b4d8-7506c02a8328"; }
|
||||
];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
||||
28
modules/latest-zfs-kernel.nix
Normal file
28
modules/latest-zfs-kernel.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
isUnstable = config.boot.zfs.package == pkgs.zfsUnstable;
|
||||
zfsCompatibleKernelPackages = lib.filterAttrs (
|
||||
name: kernelPackages:
|
||||
(builtins.match "linux_[0-9]+_[0-9]+" name) != null
|
||||
&& (builtins.tryEval kernelPackages).success
|
||||
&& (
|
||||
(!isUnstable && !kernelPackages.zfs.meta.broken)
|
||||
|| (isUnstable && !kernelPackages.zfs_unstable.meta.broken)
|
||||
)
|
||||
) pkgs.linuxKernel.packages;
|
||||
latestKernelPackage = lib.last (
|
||||
lib.sort (a: b: (lib.versionOlder a.kernel.version b.kernel.version)) (
|
||||
builtins.attrValues zfsCompatibleKernelPackages
|
||||
)
|
||||
);
|
||||
in
|
||||
{
|
||||
# Note this might jump back and worth as kernel get added or removed.
|
||||
boot.kernelPackages = latestKernelPackage;
|
||||
}
|
||||
@ -1,4 +1,9 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
with pkgs;
|
||||
|
||||
@ -6,13 +11,14 @@ let
|
||||
sender = "akasroua@disroot.org";
|
||||
recipient = "akasroua+smart@disroot.org";
|
||||
|
||||
in {
|
||||
in
|
||||
{
|
||||
# Notify when a disk starts going haywire
|
||||
services.smartd = {
|
||||
enable = true;
|
||||
defaults.monitored = "-H -f -t -C 197 -U 198 -d nvme";
|
||||
autodetect = false;
|
||||
devices = [{ device = "/dev/nvme0"; }];
|
||||
devices = [ { device = "/dev/nvme0"; } ];
|
||||
notifications.mail = {
|
||||
enable = true;
|
||||
sender = sender;
|
||||
|
||||
@ -1,8 +1,15 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let wireguard_port = "1194";
|
||||
let
|
||||
wireguard_port = "1194";
|
||||
|
||||
in {
|
||||
in
|
||||
{
|
||||
# Set hostname, hostid and enable WiFi
|
||||
networking = {
|
||||
hostName = "panacea";
|
||||
@ -46,11 +53,11 @@ in {
|
||||
name = "wlan0";
|
||||
matchConfig = {
|
||||
Name = "wlan0";
|
||||
SSID = "Zingarata";
|
||||
SSID = "anakinosi";
|
||||
};
|
||||
address = [ "192.168.13.131/24" ];
|
||||
gateway = [ "192.168.13.1" ];
|
||||
dns = [ "192.168.13.2" ];
|
||||
address = [ "192.168.129.3/23" ];
|
||||
gateway = [ "192.168.128.1" ];
|
||||
dns = [ "192.168.128.1" ];
|
||||
networkConfig.MulticastDNS = "yes";
|
||||
};
|
||||
|
||||
@ -62,7 +69,7 @@ in {
|
||||
};
|
||||
address = [ "192.168.13.3/24" ];
|
||||
gateway = [ "192.168.13.1" ];
|
||||
dns = [ "192.168.13.2" ];
|
||||
dns = [ "1.1.1.1" ];
|
||||
networkConfig.MulticastDNS = "yes";
|
||||
};
|
||||
|
||||
@ -77,11 +84,13 @@ in {
|
||||
PrivateKeyFile = config.age.secrets.wireguard.path;
|
||||
FirewallMark = 34952;
|
||||
};
|
||||
wireguardPeers = [{
|
||||
PublicKey = "GN8lqPBZYOulh6xD4GhkoEWI65HMMCpSxJSH5871YnU=";
|
||||
AllowedIPs = [ "0.0.0.0/0" ];
|
||||
Endpoint = "coolneng.duckdns.org:1194";
|
||||
}];
|
||||
wireguardPeers = [
|
||||
{
|
||||
PublicKey = "GN8lqPBZYOulh6xD4GhkoEWI65HMMCpSxJSH5871YnU=";
|
||||
AllowedIPs = [ "0.0.0.0/0" ];
|
||||
Endpoint = "coolneng.duckdns.org:1194";
|
||||
}
|
||||
];
|
||||
};
|
||||
systemd.network.networks."wg0" = {
|
||||
matchConfig.Name = "wg0";
|
||||
@ -90,20 +99,22 @@ in {
|
||||
Address = "10.8.0.2/32";
|
||||
DNS = "10.8.0.1";
|
||||
DNSDefaultRoute = true;
|
||||
Domains = "~.";
|
||||
MulticastDNS = "yes";
|
||||
};
|
||||
routingPolicyRules = [{
|
||||
FirewallMark = 34952;
|
||||
InvertRule = true;
|
||||
Table = 1000;
|
||||
Priority = 10;
|
||||
}];
|
||||
routes = [{
|
||||
Gateway = "10.8.0.1";
|
||||
GatewayOnLink = true;
|
||||
Table = 1000;
|
||||
}];
|
||||
routingPolicyRules = [
|
||||
{
|
||||
FirewallMark = 34952;
|
||||
InvertRule = true;
|
||||
Table = 1000;
|
||||
Priority = 10;
|
||||
}
|
||||
];
|
||||
routes = [
|
||||
{
|
||||
Gateway = "10.8.0.1";
|
||||
GatewayOnLink = true;
|
||||
Table = 1000;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
# Firewall configuration
|
||||
|
||||
@ -1,14 +1,26 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
with pkgs;
|
||||
|
||||
let isync-oauth2 = (isync.override { withCyrusSaslXoauth2 = true; });
|
||||
let
|
||||
isync-oauth2 = (isync.override { withCyrusSaslXoauth2 = true; });
|
||||
|
||||
in {
|
||||
in
|
||||
{
|
||||
# Upgrade Doom Emacs daily
|
||||
systemd.user.services.doom-upgrade = {
|
||||
description = "Upgrade Doom Emacs";
|
||||
path = [ bash emacs-vterm git coreutils ];
|
||||
path = [
|
||||
bash
|
||||
emacs-vterm
|
||||
git
|
||||
coreutils
|
||||
];
|
||||
script = ''
|
||||
${pkgs.bash}/bin/bash -c "/home/coolneng/.emacs.d/bin/doom -! upgrade"
|
||||
'';
|
||||
@ -20,7 +32,10 @@ in {
|
||||
# Upgrade Neovim plugins weekly
|
||||
systemd.user.services.vim-plug-upgrade = {
|
||||
description = "Upgrade Vim-Plug";
|
||||
path = [ git neovim ];
|
||||
path = [
|
||||
git
|
||||
neovim
|
||||
];
|
||||
script = "${pkgs.neovim}/bin/nvim +PlugUpgrade +PlugUpdate +qa";
|
||||
serviceConfig.Type = "oneshot";
|
||||
startAt = "Wed 18:00:00";
|
||||
@ -30,7 +45,11 @@ in {
|
||||
# Push password-store changes to git daily
|
||||
systemd.user.services.password-store-push = {
|
||||
description = "Push password-store changes to git";
|
||||
path = [ pass-wayland git gitAndTools.pass-git-helper ];
|
||||
path = [
|
||||
pass-wayland
|
||||
git
|
||||
gitAndTools.pass-git-helper
|
||||
];
|
||||
script = "${pkgs.pass-wayland}/bin/pass git push";
|
||||
serviceConfig.Type = "oneshot";
|
||||
startAt = "18:00:00";
|
||||
@ -38,36 +57,17 @@ in {
|
||||
};
|
||||
|
||||
# Sync mail using IDLE
|
||||
systemd.user.services.goimapnotify-ugent = {
|
||||
description = "Sync UGent mail using IMAP IDLE";
|
||||
systemd.user.services.goimapnotify-gmail = {
|
||||
description = "Sync gmail mail using IMAP IDLE";
|
||||
wantedBy = [ "default.target" ];
|
||||
path = [
|
||||
goimapnotify
|
||||
pass-wayland
|
||||
isync-oauth2
|
||||
mu
|
||||
python39
|
||||
gnupg
|
||||
nix
|
||||
procps
|
||||
emacs-vterm
|
||||
];
|
||||
script = ''
|
||||
${pkgs.goimapnotify}/bin/goimapnotify -conf /home/coolneng/.config/goimapnotify/ugent.conf
|
||||
'';
|
||||
serviceConfig = {
|
||||
ExecStartPre = "/home/coolneng/.local/share/scripts/mail-sync ugent";
|
||||
Type = "simple";
|
||||
Restart = "always";
|
||||
RestartSec = 20;
|
||||
};
|
||||
after = [ "network-online.target" ];
|
||||
};
|
||||
|
||||
systemd.user.services.goimapnotify-gmail = {
|
||||
description = "Sync gmail mail using IMAP IDLE";
|
||||
wantedBy = [ "default.target" ];
|
||||
path = [ goimapnotify pass-wayland isync-oauth2 mu procps emacs-vterm ];
|
||||
script = ''
|
||||
${pkgs.goimapnotify}/bin/goimapnotify -conf /home/coolneng/.config/goimapnotify/gmail.conf
|
||||
'';
|
||||
@ -83,7 +83,14 @@ in {
|
||||
systemd.user.services.goimapnotify-disroot = {
|
||||
description = "Sync disroot mail using IMAP IDLE";
|
||||
wantedBy = [ "default.target" ];
|
||||
path = [ goimapnotify pass-wayland isync-oauth2 mu procps emacs-vterm ];
|
||||
path = [
|
||||
goimapnotify
|
||||
pass-wayland
|
||||
isync-oauth2
|
||||
mu
|
||||
procps
|
||||
emacs-vterm
|
||||
];
|
||||
script = ''
|
||||
${pkgs.goimapnotify}/bin/goimapnotify -conf /home/coolneng/.config/goimapnotify/disroot.conf
|
||||
'';
|
||||
@ -100,8 +107,16 @@ in {
|
||||
systemd.user.services.periodic-mail-sync = {
|
||||
description = "Run a mail sync operation periodically";
|
||||
wantedBy = [ "default.target" ];
|
||||
path =
|
||||
[ pass-wayland isync-oauth2 mu procps emacs-vterm python39 gnupg nix ];
|
||||
path = [
|
||||
pass-wayland
|
||||
isync-oauth2
|
||||
mu
|
||||
procps
|
||||
emacs-vterm
|
||||
python39
|
||||
gnupg
|
||||
nix
|
||||
];
|
||||
script = ''
|
||||
/home/coolneng/.local/share/scripts/mail-sync -a
|
||||
'';
|
||||
@ -116,13 +131,20 @@ in {
|
||||
script = "chmod 751 /home/coolneng";
|
||||
serviceConfig.Type = "oneshot";
|
||||
after = [ "home-coolneng.mount" ];
|
||||
before = [ "mopidy.service" "mopidy-scan.service" ];
|
||||
before = [
|
||||
"mopidy.service"
|
||||
"mopidy-scan.service"
|
||||
];
|
||||
};
|
||||
|
||||
# Push panacea changes to git daily
|
||||
systemd.user.services.panacea-push = {
|
||||
description = "Push panacea changes to git";
|
||||
path = [ pass-wayland git gitAndTools.pass-git-helper ];
|
||||
path = [
|
||||
pass-wayland
|
||||
git
|
||||
gitAndTools.pass-git-helper
|
||||
];
|
||||
script = "${pkgs.git}/bin/git -C /home/coolneng/Projects/panacea push";
|
||||
serviceConfig.Type = "oneshot";
|
||||
startAt = "14:00:00";
|
||||
|
||||
@ -1,4 +1,9 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
# Enable power-profiles-daemon
|
||||
|
||||
@ -1,10 +1,18 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
# Enable CUPS
|
||||
services.printing = {
|
||||
enable = true;
|
||||
drivers = with pkgs; [ brgenml1cupswrapper hplip ];
|
||||
drivers = with pkgs; [
|
||||
brgenml1cupswrapper
|
||||
hplip
|
||||
];
|
||||
};
|
||||
|
||||
# Enable SANE
|
||||
|
||||
@ -80,8 +80,6 @@ in
|
||||
libreoffice-fresh
|
||||
simple-scan
|
||||
bc
|
||||
citrix_workspace
|
||||
teams-for-linux
|
||||
pdfgrep
|
||||
# Mail stack
|
||||
mu
|
||||
@ -93,18 +91,15 @@ in
|
||||
nodePackages.webtorrent-cli
|
||||
deluge
|
||||
yt-dlp-light
|
||||
ffmpeg
|
||||
calibre
|
||||
beets
|
||||
# File management
|
||||
zip
|
||||
unzip
|
||||
unar
|
||||
cifs-utils
|
||||
keyutils
|
||||
# Overlays
|
||||
cachix
|
||||
# Networking
|
||||
inputs.openconnect-sso.packages.${config.nixpkgs.localSystem.system}.default
|
||||
# Budgeting
|
||||
beancount
|
||||
beancount-language-server
|
||||
@ -116,7 +111,7 @@ in
|
||||
## Nix
|
||||
nixfmt-rfc-style
|
||||
## Python
|
||||
pyright
|
||||
basedpyright
|
||||
black
|
||||
## C/C++
|
||||
clang-tools
|
||||
@ -130,11 +125,11 @@ in
|
||||
# Fonts declaration
|
||||
fonts.packages = with pkgs; [
|
||||
google-fonts
|
||||
inconsolata-nerdfont
|
||||
terminus_font_ttf
|
||||
iosevka-bin
|
||||
libertine
|
||||
(nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
|
||||
nerd-fonts.inconsolata
|
||||
nerd-fonts.symbols-only
|
||||
];
|
||||
|
||||
}
|
||||
|
||||
Binary file not shown.
@ -1,9 +1,8 @@
|
||||
let
|
||||
coolneng =
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC57m1j/G6iQyi2EpU3nj3+df5Z4PL/XbiOmDcqA7ODg";
|
||||
in {
|
||||
coolneng = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC57m1j/G6iQyi2EpU3nj3+df5Z4PL/XbiOmDcqA7ODg";
|
||||
in
|
||||
{
|
||||
"wireguard.age".publicKeys = [ coolneng ];
|
||||
"syncthing.age".publicKeys = [ coolneng ];
|
||||
"samba-ugent.age".publicKeys = [ coolneng ];
|
||||
"msmtp.age".publicKeys = [ coolneng ];
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user