This commit is contained in:
Ingolf Wagner 2023-02-06 14:02:45 +01:00
parent f6221f2d8e
commit 8560cec8ec
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
3 changed files with 57 additions and 81 deletions

View file

@ -23,18 +23,17 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"stable": "stable" "stable": "stable"
}, },
"locked": { "locked": {
"lastModified": 1669917327, "lastModified": 1675400331,
"narHash": "sha256-YYjaNOUJZaM5t35GbWtfX825TlI9LAksbfdhaCYWmfY=", "narHash": "sha256-ja0DhWBARzcimqMBhQ+DP7NQoJSlNasqvlj5GiHRYY0=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "colmena", "repo": "colmena",
"rev": "64c46fa0169233d4faed70c52583cd3183c7f5aa", "rev": "31d8240504e91c3ea5c758d92f02f94af3fae6c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -91,11 +90,11 @@
"ws-butler": "ws-butler" "ws-butler": "ws-butler"
}, },
"locked": { "locked": {
"lastModified": 1671758850, "lastModified": 1675387812,
"narHash": "sha256-B6us/CLIIPJRJgjn/hVp7N07j90kil4HmjUVj8TBhKE=", "narHash": "sha256-fGjWMg97w1mP0cDIR9Y8qCa77sEtiIdYzqiRB+P2YcM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-doom-emacs", "repo": "nix-doom-emacs",
"rev": "85a48dbec84e9c26785b58fecdefa1cfc580aea7", "rev": "8de922e4e23158790970a266234a853305b1928d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -123,11 +122,11 @@
"emacs-overlay": { "emacs-overlay": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1671729646, "lastModified": 1675362118,
"narHash": "sha256-crrTM9K1q8zGZ2gibEPJAudAnr0bMqPiLr1I8P+I5ls=", "narHash": "sha256-11CqDTkQA9P5I4InVCXmj/IaHvz4nUJaLNFiDiHVvIg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "9c95614e0b1a2f6a3f4cf9b99b17439887ea0373", "rev": "a018577287e390e01654a8b44d57d183a51b72b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -139,11 +138,11 @@
"emacs-overlay_2": { "emacs-overlay_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673838100, "lastModified": 1675674706,
"narHash": "sha256-iLNzJqL01hHuZcnxNoB7bqj65lfQtEAc7+krVW4R6ck=", "narHash": "sha256-OkbmD3qf+Lv5P7n7sr6TEOO57whO7DxViGS/7UpdT+c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "b63cf575927c768ad4dbc4a70f64201e59cf3da6", "rev": "cf267241b56b425d20faed46ab8e16dd0434a663",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -289,11 +288,11 @@
"flake-compat_2": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1668681692, "lastModified": 1673956053,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "009399224d5e398d03b22badca40a37ac85412a1", "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -438,11 +437,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1672244468, "lastModified": 1674440933,
"narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=", "narHash": "sha256-CASRcD/rK3fn5vUCti3jzry7zi0GsqRsBohNq9wPgLs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706", "rev": "65c47ced082e3353113614f77b1bc18822dc731f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -491,32 +490,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-eval-jobs": {
"inputs": {
"flake-utils": [
"colmena",
"flake-utils"
],
"nixpkgs": [
"colmena",
"nixpkgs"
]
},
"locked": {
"lastModified": 1660713017,
"narHash": "sha256-w6KLNkT/2fI7UvPg3NoKj7gve4CgUHpyWOFq0BUwW7o=",
"owner": "zhaofengli",
"repo": "nix-eval-jobs",
"rev": "b4c078a4870c5b1a5b74420ca1dca41f4d75b7cc",
"type": "github"
},
"original": {
"owner": "zhaofengli",
"ref": "colmena",
"repo": "nix-eval-jobs",
"type": "github"
}
},
"nix-straight": { "nix-straight": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -535,11 +508,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1673803274, "lastModified": 1674550793,
"narHash": "sha256-zaJDlHFXewT4KUsidMpRcPE+REymGH1Y3Eoc3Pjv4Xs=", "narHash": "sha256-ljJlIFQZwtBbzWqWTmmw2O5BFmQf1A/DspwMOQtGXHk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "7bd6b87b3712e68007823e8dd5c37ee9b114fee3", "rev": "b7ac0a56029e4f9e6743b9993037a5aaafd57103",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -572,11 +545,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1667229616, "lastModified": 1674305531,
"narHash": "sha256-FZXQ7r1acO7s8v8kzUug1vamZ4T0kPqTmYM2ncuqM/s=", "narHash": "sha256-0p7gNg56XlmZJrk5VIv4ZGnO6mkJ50eCNKoLaOvTH0w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-fmt", "repo": "nixpkgs-fmt",
"rev": "cddd029dea02942fe2e1d15bc5fef71c8a3acbfd", "rev": "d94168e9d7f8ffb24fe43726d3f9bd29c95b9ef3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -603,11 +576,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1673740915, "lastModified": 1675556398,
"narHash": "sha256-MMH8zONfqahgHly3K8/A++X34800rajA/XgZ2DzNL/M=", "narHash": "sha256-5Gf5KlmFXfIGVQb2hmiiE7FQHoLd4UtEhIolLQvNB/A=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7c65528c3f8462b902e09d1ccca23bb9034665c2", "rev": "e32c33811815ca4a535a16faf1c83eeb4493145b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -619,11 +592,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1673631141, "lastModified": 1675545634,
"narHash": "sha256-AprpYQ5JvLS4wQG/ghm2UriZ9QZXvAwh1HlgA/6ZEVQ=", "narHash": "sha256-TbQeQcM5TA/wIho6xtzG+inUfiGzUXi8ewwttiQWYJE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "befc83905c965adfd33e5cae49acb0351f6e0404", "rev": "0591d6b57bfeb55dfeec99a671843337bc2c3323",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -650,11 +623,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1673704454, "lastModified": 1675600654,
"narHash": "sha256-5Wdj1MgdOgn3+dMFIBtg+IAYZApjF8JzwLWDPieg0C4=", "narHash": "sha256-ipsDTkzRq1CAl2g5tYd7ugjVMSKF6KLh9F+5Kso0lT0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a83ed85c14fcf242653df6f4b0974b7e1c73c6c6", "rev": "cff83d5032a21aad4f69bf284e95b5f564f4a54e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -680,11 +653,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1673606088, "lastModified": 1675523619,
"narHash": "sha256-wdYD41UwNwPhTdMaG0AIe7fE1bAdyHe6bB4HLUqUvck=", "narHash": "sha256-jHvkAwkbAj1s0O5riHMghSDHh9iz8AwLTbXQuVQKQcg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "37b97ae3dd714de9a17923d004a2c5b5543dfa6d", "rev": "5a211d5e8d18b20b5a2b22157266cc00f8c4f3b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -729,11 +702,11 @@
"org": { "org": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1670680538, "lastModified": 1673519709,
"narHash": "sha256-afmN2tOY6Par235bVsqhtFHOSVyw4NBgTxI5Eo6Yk5A=", "narHash": "sha256-XtGk32Lw2iGDgH5Q4Rjhig0Iq5hpIM0EKQoptJ+nT3k=",
"owner": "emacs-straight", "owner": "emacs-straight",
"repo": "org-mode", "repo": "org-mode",
"rev": "42153ea2fec66f90c1623be25d6774d96ecf8062", "rev": "ecb62e2e317b1a4b5b8a6c0f111ed7ef18413040",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -848,8 +821,11 @@
}, },
"retiolum": { "retiolum": {
"locked": { "locked": {
"lastModified": 1675123215, "lastModified": 1675172931,
"narHash": "sha256-ZDnwiqDJHF3Bxf+JpzRtqNY9jsGO7+z8P854o9JQCs4=", "narHash": "sha256-ZDnwiqDJHF3Bxf+JpzRtqNY9jsGO7+z8P854o9JQCs4=",
"ref": "refs/heads/master",
"rev": "a0078df20c98fd5bc199385985e652dad5ac4fe9",
"revCount": 279,
"type": "git", "type": "git",
"url": "file:///home/palo/dev/nixos/retiolum" "url": "file:///home/palo/dev/nixos/retiolum"
}, },
@ -861,11 +837,11 @@
"revealjs": { "revealjs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1670408834, "lastModified": 1674652670,
"narHash": "sha256-2LG8/AwMC+caNK9DKDyVGw+EPT2W6ys177xQj7mdKng=", "narHash": "sha256-ViqeZlOjQTlY0KM7YcOOjdgkxRLPMZrRKXTqtyc1I00=",
"owner": "hakimel", "owner": "hakimel",
"repo": "reveal.js", "repo": "reveal.js",
"rev": "4fe3946cb43de57f79aaa7b646aee7e78f4bcc75", "rev": "b1a9842b2f4544a2fda546383db38cc7a81f6b74",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -932,11 +908,11 @@
"secrets": { "secrets": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1675174539, "lastModified": 1675175172,
"narHash": "sha256-RdHMRqzvtVFOQ009z8v3Ir7QyMUr+PyHaMznxHykuE8=", "narHash": "sha256-dzsn+X8S94JfMxN2Maq2UYwgzBTYr7SocJUcz1yYIr8=",
"ref": "main", "ref": "main",
"rev": "d3c4b49122aa5b5d3fcbe98823dfbbc26cd048e3", "rev": "e95db1263a5ff908bf2123fb0e45d0ff43d55d91",
"revCount": 42, "revCount": 43,
"type": "git", "type": "git",
"url": "ssh://gitea@git.ingolf-wagner.de/palo/nixos-secrets.git" "url": "ssh://gitea@git.ingolf-wagner.de/palo/nixos-secrets.git"
}, },
@ -968,11 +944,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1673752321, "lastModified": 1675566616,
"narHash": "sha256-EFfXY1ZHJq4FNaNQA9x0djtu/jiOhBbT0Xi+BT06cJw=", "narHash": "sha256-Wki1ffvQUIB044M9ltjOxpXJGsqnQiVQPvMpQ0RiEBE=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "e18eefd2b133a58309475298052c341c08470717", "rev": "4d16c18787ba8ff80c1ff8db25c5ca56f68ceed3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1000,11 +976,11 @@
"ts-fold": { "ts-fold": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1671426601, "lastModified": 1673328482,
"narHash": "sha256-NrvSK+olbi4P+9q5KOomNHGgmrRtI9cW9ZqkdU4n0Sc=", "narHash": "sha256-6yQ35uJDAK531QNQZgloQaOQayRa8azOlOMbO8lXsHE=",
"owner": "jcs-elpa", "owner": "jcs-elpa",
"repo": "ts-fold", "repo": "ts-fold",
"rev": "a64f5252a66253852bef1c627cea9e39928e6392", "rev": "75d6f9ed317b042b5bc7cb21503596d1c7a1b8c0",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -167,6 +167,7 @@
nixpkgs-fmt.defaultPackage.${system} nixpkgs-fmt.defaultPackage.${system}
colmena.packages.${system}.colmena colmena.packages.${system}.colmena
]; ];
boot.tmpOnTmpfs = lib.mkDefault true; # make /tmp a tmpfs (performance!)
imports = [ imports = [
./nixos/machines/${name}/configuration.nix ./nixos/machines/${name}/configuration.nix
(sopsModule name) (sopsModule name)

View file

@ -40,7 +40,6 @@
fsType = "tmpfs"; fsType = "tmpfs";
}; };
boot.tmpOnTmpfs = true;
nix.settings.max-jobs = lib.mkDefault 4; nix.settings.max-jobs = lib.mkDefault 4;