jana/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

icecube config and new colmena

Browse source
This commit is contained in:
Jana Dönszelmann 2026-01-23 10:50:19 +01:00
parent 91ba0212b2
commit f0c21b2e79
No known key found for this signature in database
5 changed files with 189 additions and 285 deletions
Download patch file Download diff file Expand all files Collapse all files

1
default-machine-config.nix
View file

@ -10,6 +10,7 @@
(inputs.self + /modules/machine-type.nix) (inputs.self + /modules/machine-type.nix)
(inputs.self + /modules/program.nix) (inputs.self + /modules/program.nix)
(inputs.self + /programs) (inputs.self + /programs)
(inputs.self + /users)
]; ];
xdg.mime.enable = lib.mkForce false; xdg.mime.enable = lib.mkForce false;

349
flake.lock generated
View file

@ -83,32 +83,10 @@
"type": "github" "type": "github"
} }
}, },
"colmena": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs",
"stable": "stable"
},
"locked": {
"lastModified": 1762034856,
"narHash": "sha256-QVey3iP3UEoiFVXgypyjTvCrsIlA4ecx6Acaz5C8/PQ=",
"owner": "zhaofengli",
"repo": "colmena",
"rev": "349b035a5027f23d88eeb3bc41085d7ee29f18ed",
"type": "github"
},
"original": {
"owner": "zhaofengli",
"repo": "colmena",
"type": "github"
}
},
"compiler-construction-2021": { "compiler-construction-2021": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1759157554, "lastModified": 1759157554,
@ -209,8 +187,8 @@
}, },
"deploy-rs": { "deploy-rs": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_2",
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
@ -229,8 +207,8 @@
}, },
"dumpasm": { "dumpasm": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1732916787, "lastModified": 1732916787,
@ -331,22 +309,6 @@
} }
}, },
"flake-compat": { "flake-compat": {
"flake": false,
"locked": {
"lastModified": 1650374568,
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733328505, "lastModified": 1733328505,
@ -362,7 +324,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_3": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1747046372, "lastModified": 1747046372,
@ -400,23 +362,8 @@
} }
}, },
"flake-utils": { "flake-utils": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_10": {
"inputs": { "inputs": {
"systems": "systems_12" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -432,7 +379,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_11": { "flake-utils_10": {
"inputs": { "inputs": {
"systems": "systems_15" "systems": "systems_15"
}, },
@ -450,7 +397,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_12": { "flake-utils_11": {
"inputs": { "inputs": {
"systems": "systems_16" "systems": "systems_16"
}, },
@ -468,7 +415,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_13": { "flake-utils_12": {
"inputs": { "inputs": {
"systems": "systems_17" "systems": "systems_17"
}, },
@ -486,7 +433,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_14": { "flake-utils_13": {
"inputs": { "inputs": {
"systems": "systems_18" "systems": "systems_18"
}, },
@ -504,7 +451,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_15": { "flake-utils_14": {
"inputs": { "inputs": {
"systems": "systems_19" "systems": "systems_19"
}, },
@ -522,7 +469,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_16": { "flake-utils_15": {
"inputs": { "inputs": {
"systems": "systems_20" "systems": "systems_20"
}, },
@ -542,7 +489,7 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -560,7 +507,7 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -577,24 +524,6 @@
} }
}, },
"flake-utils_4": { "flake-utils_4": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"inputs": { "inputs": {
"systems": "systems_5" "systems": "systems_5"
}, },
@ -612,7 +541,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_6": { "flake-utils_5": {
"inputs": { "inputs": {
"systems": "systems_6" "systems": "systems_6"
}, },
@ -630,7 +559,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_7": { "flake-utils_6": {
"inputs": { "inputs": {
"systems": "systems_7" "systems": "systems_7"
}, },
@ -648,7 +577,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_8": { "flake-utils_7": {
"inputs": { "inputs": {
"systems": "systems_9" "systems": "systems_9"
}, },
@ -666,7 +595,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_9": { "flake-utils_8": {
"inputs": { "inputs": {
"systems": "systems_11" "systems": "systems_11"
}, },
@ -684,9 +613,27 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_9": {
"inputs": {
"systems": "systems_12"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"harmonica": { "harmonica": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1738890519, "lastModified": 1738890519,
@ -767,8 +714,8 @@
}, },
"homepage": { "homepage": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1772058280, "lastModified": 1772058280,
@ -802,7 +749,7 @@
}, },
"jujutsu": { "jujutsu": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_5",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -840,8 +787,8 @@
}, },
"mapf": { "mapf": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_7", "flake-utils": "flake-utils_6",
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1757529600, "lastModified": 1757529600,
@ -881,9 +828,9 @@
}, },
"mifg": { "mifg": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_8", "flake-utils": "flake-utils_7",
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": "nixpkgs_9", "nixpkgs": "nixpkgs_8",
"nixpkgs-mozilla": "nixpkgs-mozilla" "nixpkgs-mozilla": "nixpkgs-mozilla"
}, },
"locked": { "locked": {
@ -903,7 +850,7 @@
"naersk": { "naersk": {
"inputs": { "inputs": {
"fenix": "fenix", "fenix": "fenix",
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1763384566, "lastModified": 1763384566,
@ -922,7 +869,7 @@
"naersk_2": { "naersk_2": {
"inputs": { "inputs": {
"fenix": "fenix_2", "fenix": "fenix_2",
"nixpkgs": "nixpkgs_17" "nixpkgs": "nixpkgs_16"
}, },
"locked": { "locked": {
"lastModified": 1752689277, "lastModified": 1752689277,
@ -944,7 +891,7 @@
"niri-unstable": [ "niri-unstable": [
"niri-unstable" "niri-unstable"
], ],
"nixpkgs": "nixpkgs_10", "nixpkgs": "nixpkgs_9",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-stable": "xwayland-satellite-stable",
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
@ -982,7 +929,7 @@
}, },
"niri-unstable": { "niri-unstable": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_11", "nixpkgs": "nixpkgs_10",
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
@ -999,27 +946,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-github-actions": {
"inputs": {
"nixpkgs": [
"colmena",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729742964,
"narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "e04df33f62cdcf93d73e9a04142464753a16db67",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-github-actions",
"type": "github"
}
},
"nix-index-database": { "nix-index-database": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -1065,8 +991,8 @@
}, },
"nix-minecraft": { "nix-minecraft": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_10", "flake-utils": "flake-utils_9",
"nixpkgs": [ "nixpkgs": [
"p1n3appl3", "p1n3appl3",
"nixpkgs" "nixpkgs"
@ -1119,11 +1045,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1750134718, "lastModified": 1759036355,
"narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1198,22 +1124,6 @@
} }
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": {
"lastModified": 1771848320,
"narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2fc6539b481e1d2569f25f8799236694180c0993",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1757967192, "lastModified": 1757967192,
"narHash": "sha256-/aA9A/OBmnuOMgwfzdsXRusqzUpd8rQnQY8jtrHK+To=", "narHash": "sha256-/aA9A/OBmnuOMgwfzdsXRusqzUpd8rQnQY8jtrHK+To=",
@ -1229,7 +1139,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_12": { "nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1771932323, "lastModified": 1771932323,
"narHash": "sha256-3PadsTzuMJT/x0KmiD/Me1GG6rW8kaHoWVduSs0ue7o=", "narHash": "sha256-3PadsTzuMJT/x0KmiD/Me1GG6rW8kaHoWVduSs0ue7o=",
@ -1244,7 +1154,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_13": { "nixpkgs_12": {
"locked": { "locked": {
"lastModified": 1771369470, "lastModified": 1771369470,
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
@ -1260,7 +1170,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_14": { "nixpkgs_13": {
"locked": { "locked": {
"lastModified": 1767379071, "lastModified": 1767379071,
"narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
@ -1276,7 +1186,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_15": { "nixpkgs_14": {
"locked": { "locked": {
"lastModified": 1722062969, "lastModified": 1722062969,
"narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=",
@ -1292,7 +1202,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_16": { "nixpkgs_15": {
"locked": { "locked": {
"lastModified": 1768564909, "lastModified": 1768564909,
"narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
@ -1308,7 +1218,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_17": { "nixpkgs_16": {
"locked": { "locked": {
"lastModified": 1752077645, "lastModified": 1752077645,
"narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=",
@ -1324,7 +1234,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_18": { "nixpkgs_17": {
"locked": { "locked": {
"lastModified": 1755020227, "lastModified": 1755020227,
"narHash": "sha256-gGmm+h0t6rY88RPTaIm3su95QvQIVjAJx558YUG4Id8=", "narHash": "sha256-gGmm+h0t6rY88RPTaIm3su95QvQIVjAJx558YUG4Id8=",
@ -1338,7 +1248,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_19": { "nixpkgs_18": {
"locked": { "locked": {
"lastModified": 1771931193, "lastModified": 1771931193,
"narHash": "sha256-IRPLf3y0HxdLirCVYoOYXQyoUBIM8llw7/96OHvyQoM=", "narHash": "sha256-IRPLf3y0HxdLirCVYoOYXQyoUBIM8llw7/96OHvyQoM=",
@ -1354,23 +1264,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_19": {
"locked": {
"lastModified": 1759036355,
"narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_20": {
"locked": { "locked": {
"lastModified": 1771207753, "lastModified": 1771207753,
"narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=", "narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=",
@ -1386,7 +1280,23 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_21": { "nixpkgs_2": {
"locked": {
"lastModified": 1743014863,
"narHash": "sha256-jAIUqsiN2r3hCuHji80U7NNEafpIMBXiwKlSrjWMlpg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bd3bac8bfb542dbde7ffffb6987a1a1f9d41699f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_20": {
"locked": { "locked": {
"lastModified": 1710377395, "lastModified": 1710377395,
"narHash": "sha256-KMubsUWtVr7L55pXMBibBDBdmk3xrjbBPduc0E8z28c=", "narHash": "sha256-KMubsUWtVr7L55pXMBibBDBdmk3xrjbBPduc0E8z28c=",
@ -1400,7 +1310,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_22": { "nixpkgs_21": {
"locked": { "locked": {
"lastModified": 1732014248, "lastModified": 1732014248,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
@ -1417,22 +1327,6 @@
} }
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": {
"lastModified": 1743014863,
"narHash": "sha256-jAIUqsiN2r3hCuHji80U7NNEafpIMBXiwKlSrjWMlpg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bd3bac8bfb542dbde7ffffb6987a1a1f9d41699f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1732521221, "lastModified": 1732521221,
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
@ -1448,7 +1342,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1738680400, "lastModified": 1738680400,
"narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=",
@ -1464,7 +1358,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1716137900, "lastModified": 1716137900,
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
@ -1480,7 +1374,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1721379653, "lastModified": 1721379653,
"narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
@ -1496,7 +1390,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_8": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1752077645, "lastModified": 1752077645,
"narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=",
@ -1512,7 +1406,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_9": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1766070988, "lastModified": 1766070988,
"narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
@ -1528,6 +1422,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_9": {
"locked": {
"lastModified": 1771848320,
"narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2fc6539b481e1d2569f25f8799236694180c0993",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
@ -1595,12 +1505,12 @@
"p1n3appl3": { "p1n3appl3": {
"inputs": { "inputs": {
"catppuccin": "catppuccin", "catppuccin": "catppuccin",
"flake-utils": "flake-utils_9", "flake-utils": "flake-utils_8",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nix-minecraft": "nix-minecraft", "nix-minecraft": "nix-minecraft",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_13", "nixpkgs": "nixpkgs_12",
"nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-stable": "nixpkgs-stable_2",
"obs-gamepad": "obs-gamepad", "obs-gamepad": "obs-gamepad",
"ragenix": "ragenix", "ragenix": "ragenix",
@ -1625,8 +1535,8 @@
}, },
"pipethon": { "pipethon": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_11", "flake-utils": "flake-utils_10",
"nixpkgs": "nixpkgs_14" "nixpkgs": "nixpkgs_13"
}, },
"locked": { "locked": {
"lastModified": 1767634075, "lastModified": 1767634075,
@ -1705,12 +1615,12 @@
"inputs": { "inputs": {
"agenix": "agenix_2", "agenix": "agenix_2",
"darwin": "darwin_2", "darwin": "darwin_2",
"flake-utils": "flake-utils_12", "flake-utils": "flake-utils_11",
"home-manager": "home-manager_3", "home-manager": "home-manager_3",
"impermanence": "impermanence", "impermanence": "impermanence",
"nix-index-database": "nix-index-database_2", "nix-index-database": "nix-index-database_2",
"nixos-hardware": "nixos-hardware_2", "nixos-hardware": "nixos-hardware_2",
"nixpkgs": "nixpkgs_15", "nixpkgs": "nixpkgs_14",
"ragenix": "ragenix_2" "ragenix": "ragenix_2"
}, },
"locked": { "locked": {
@ -1729,8 +1639,8 @@
}, },
"raw-data": { "raw-data": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_13", "flake-utils": "flake-utils_12",
"nixpkgs": "nixpkgs_16" "nixpkgs": "nixpkgs_15"
}, },
"locked": { "locked": {
"lastModified": 1768919451, "lastModified": 1768919451,
@ -1748,9 +1658,9 @@
}, },
"reviewqueue": { "reviewqueue": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_14", "flake-utils": "flake-utils_13",
"naersk": "naersk_2", "naersk": "naersk_2",
"nixpkgs": "nixpkgs_18", "nixpkgs": "nixpkgs_17",
"nixpkgs-mozilla": "nixpkgs-mozilla_2" "nixpkgs-mozilla": "nixpkgs-mozilla_2"
}, },
"locked": { "locked": {
@ -1769,13 +1679,12 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"colmena": "colmena",
"compiler-construction-2021": "compiler-construction-2021", "compiler-construction-2021": "compiler-construction-2021",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"dumpasm": "dumpasm", "dumpasm": "dumpasm",
"firefox-addons": "firefox-addons", "firefox-addons": "firefox-addons",
"firefox-sidebar-css": "firefox-sidebar-css", "firefox-sidebar-css": "firefox-sidebar-css",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_3",
"harmonica": "harmonica", "harmonica": "harmonica",
"home-manager": "home-manager", "home-manager": "home-manager",
"homepage": "homepage", "homepage": "homepage",
@ -1786,7 +1695,7 @@
"mifg": "mifg", "mifg": "mifg",
"niri": "niri", "niri": "niri",
"niri-unstable": "niri-unstable", "niri-unstable": "niri-unstable",
"nixpkgs": "nixpkgs_12", "nixpkgs": "nixpkgs_11",
"nixvim": "nixvim", "nixvim": "nixvim",
"noctalia": "noctalia", "noctalia": "noctalia",
"p1n3appl3": "p1n3appl3", "p1n3appl3": "p1n3appl3",
@ -1928,8 +1837,8 @@
}, },
"secrets": { "secrets": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_15", "flake-utils": "flake-utils_14",
"nixpkgs": "nixpkgs_19" "nixpkgs": "nixpkgs_18"
}, },
"locked": { "locked": {
"lastModified": 1769256063, "lastModified": 1769256063,
@ -1975,7 +1884,7 @@
}, },
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_20" "nixpkgs": "nixpkgs_19"
}, },
"locked": { "locked": {
"lastModified": 1771889317, "lastModified": 1771889317,
@ -1991,22 +1900,6 @@
"type": "github" "type": "github"
} }
}, },
"stable": {
"locked": {
"lastModified": 1750133334,
"narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "36ab78dab7da2e4e27911007033713bab534187b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@ -2309,8 +2202,8 @@
}, },
"t": { "t": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_16", "flake-utils": "flake-utils_15",
"nixpkgs": "nixpkgs_21" "nixpkgs": "nixpkgs_20"
}, },
"locked": { "locked": {
"lastModified": 1710410762, "lastModified": 1710410762,
@ -2328,7 +2221,7 @@
}, },
"totpal": { "totpal": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_22" "nixpkgs": "nixpkgs_21"
}, },
"locked": { "locked": {
"lastModified": 1737322813, "lastModified": 1737322813,

90
flake.nix
View file

@ -9,7 +9,6 @@
}; };
# deployment # deployment
colmena.url = "github:zhaofengli/colmena";
deploy-rs.url = "github:serokell/deploy-rs"; deploy-rs.url = "github:serokell/deploy-rs";
# websites # websites
@ -75,7 +74,6 @@
{ {
self, self,
nixpkgs, nixpkgs,
colmena,
flake-utils, flake-utils,
sops-nix, sops-nix,
vpn-confinement, vpn-confinement,
@ -131,6 +129,21 @@
]; ];
specialArgs = specialArgsForSystem system; specialArgs = specialArgsForSystem system;
}; };
nixosConfigurations.ragdoll = home-manager.lib.homeManagerConfiguration (
let
system = "x86_64-linux";
in
{
modules = [
inputs.home-manager.nixosModules.default
{ home-manager.extraSpecialArgs = specialArgsForSystem system; }
./hosts/ragdoll/configuration.nix
./default-machine-config.nix
];
pkgs = pkgsForSystem system;
}
);
deploy.nodes.fili = { deploy.nodes.fili = {
hostname = "fili"; hostname = "fili";
@ -152,56 +165,13 @@
}; };
}; };
colmenaHive = colmena.lib.makeHive self.outputs.colmena; deploy.nodes.ragdoll = {
hostname = "ragdoll";
colmena = { fastConnection = true;
meta = profiles.system = {
let user = "jana";
system = "x86_64-linux"; path = deploy-rs.lib.x86_64-linux.activate.home-manager self.nixosConfigurations.ragdoll;
in sshUser = "jana";
{
nixpkgs = pkgsForSystem system;
specialArgs = {
flakes = inputs;
inherit inputs;
inherit (inputs.secrets.packages.${system}) secrets;
};
};
fili = {
deployment = {
targetHost = "donsz.nl";
targetPort = 22;
replaceUnknownProfiles = false;
tags = [ "server" ];
# buildOnTarget = true;
targetUser = "jana";
};
imports = [
home-manager.nixosModules.home-manager
./hosts/fili/configuration.nix
./users
./default-machine-config.nix
sops-nix.nixosModules.sops
vpn-confinement.nixosModules.default
];
};
kili = {
deployment = {
allowLocalDeployment = true;
targetHost = null;
replaceUnknownProfiles = false;
tags = [ "laptop" ];
# buildOnTarget = true;
targetUser = "jana";
};
imports = [
home-manager.nixosModules.home-manager
./hosts/kili/configuration.nix
./users
];
}; };
}; };
} }
@ -214,12 +184,18 @@
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
lix lix
colmena.packages.${system}.colmena
(pkgs.writeShellScriptBin "apply" '' (pkgs.writeShellScriptBin "apply" ''
colmena apply --no-substitute set -e
'') if [ $# -eq 0 ]
(pkgs.writeShellScriptBin "apply-local" '' then
colmena apply-local --sudo deploy
elif [ $# -eq 1 ]
then
deploy ".#$@"
else
echo "too many parameters"
exit 1
fi
'') '')
deploy-rs.packages.${system}.deploy-rs deploy-rs.packages.${system}.deploy-rs
]; ];

18
hosts/ragdoll/configuration.nix Normal file
View file

@ -0,0 +1,18 @@
{
pkgs,
...
}:
{
imports = [
./hardware-configuration.nix
../../default-machine-config.nix
];
custom.machine = {
type = "pc";
capabilities = [
"cli"
];
homeOnly = "jana";
};
}

16
hosts/ragdoll/hardware-configuration.nix Normal file
View file

@ -0,0 +1,16 @@
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
fileSystems."/" = {
device = "/dev/disk/by-uuid/4919727e-d114-4d57-b206-522b5df5fccc";
fsType = "ext4";
};
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}