summaryrefslogtreecommitdiff
path: root/hosts
diff options
context:
space:
mode:
authorFuwn <[email protected]>2024-09-23 05:37:24 -0700
committerFuwn <[email protected]>2024-09-23 05:37:24 -0700
commit505fffa82419e85f2a8db8c1b64f8d47fe4723d0 (patch)
treed76b652d421c245c87382edb1fd6deb9944722a5 /hosts
parentcontainers: pull newer (diff)
downloadnixos-config-505fffa82419e85f2a8db8c1b64f8d47fe4723d0.tar.xz
nixos-config-505fffa82419e85f2a8db8c1b64f8d47fe4723d0.zip
himeji: move options to top-level module
Diffstat (limited to 'hosts')
-rw-r--r--hosts/himeji/default.nix18
-rw-r--r--hosts/himeji/options.nix14
2 files changed, 16 insertions, 16 deletions
diff --git a/hosts/himeji/default.nix b/hosts/himeji/default.nix
index 9d3045d..ef52532 100644
--- a/hosts/himeji/default.nix
+++ b/hosts/himeji/default.nix
@@ -4,8 +4,22 @@
./hardware-configuration.nix
../../modules/options
../../modules/server
- ./options.nix
];
- system.stateVersion = "24.05";
+ config = {
+ modules = {
+ nix.extend = false;
+
+ containers = {
+ engine = "podman";
+
+ extraOptions = [
+ "--restart=on-failure"
+ "--pull=newer"
+ ];
+ };
+ };
+
+ system.stateVersion = "24.05";
+ };
}
diff --git a/hosts/himeji/options.nix b/hosts/himeji/options.nix
deleted file mode 100644
index 6d21e7b..0000000
--- a/hosts/himeji/options.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- config.modules = {
- nix.extend = false;
-
- containers = {
- engine = "podman";
-
- extraOptions = [
- "--restart=on-failure"
- "--pull=newer"
- ];
- };
- };
-}