diff --git a/configuration.nix b/configuration.nix index aac41b2..9c046cb 100644 --- a/configuration.nix +++ b/configuration.nix @@ -6,6 +6,7 @@ username, eth_interface, service_configs, + options, ... }: { @@ -38,6 +39,15 @@ hybrid-sleep.enable = false; }; + # srvos enables vim, i don't want to use vim, disable it here: + programs.vim = + { + defaultEditor = false; + } + // lib.optionalAttrs (options.programs.vim ? enable) { + enable = false; + }; + powerManagement = { powertop.enable = true; enable = true; diff --git a/flake.lock b/flake.lock index 852639f..209878a 100644 --- a/flake.lock +++ b/flake.lock @@ -331,6 +331,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-qbt": "nixpkgs-qbt", + "srvos": "srvos", "vpn-confinement": "vpn-confinement" } }, @@ -355,6 +356,26 @@ "type": "github" } }, + "srvos": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1750295173, + "narHash": "sha256-W2dgraLz7VZZz/x+6LGt+hiHb94+FCjfyGfxN0TR+Qo=", + "owner": "nix-community", + "repo": "srvos", + "rev": "7c93b611d175a62f3ce57fbda976c29261525a15", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "srvos", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 7f86b4f..aa7eed6 100644 --- a/flake.nix +++ b/flake.nix @@ -34,6 +34,11 @@ url = "github:ggml-org/llama.cpp"; inputs.nixpkgs.follows = "nixpkgs"; }; + + srvos = { + url = "github:nix-community/srvos"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = @@ -47,6 +52,7 @@ lanzaboote, disko, llamacpp, + srvos, ... }@inputs: let @@ -189,6 +195,9 @@ } ) + # sets up things like the watchdog + srvos.nixosModules.server + ./disk-config.nix disko.nixosModules.disko ./configuration.nix