From cfd9bfccbd25099d87f92d4c467e815f0b099dd5 Mon Sep 17 00:00:00 2001 From: Sebastian Moser Date: Sat, 28 Dec 2024 18:37:47 +0100 Subject: [PATCH] new fusu --- hardware/fusu.nix | 10 +++++----- hosts/fusu.nix | 4 +++- mybin/htldoc | 12 ++++++++++++ 3 files changed, 20 insertions(+), 6 deletions(-) create mode 100755 mybin/htldoc diff --git a/hardware/fusu.nix b/hardware/fusu.nix index f2f78b4..7d0432b 100644 --- a/hardware/fusu.nix +++ b/hardware/fusu.nix @@ -13,14 +13,14 @@ boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/old" = - { device = "/dev/disk/by-uuid/adbb1f76-7661-4c36-a603-ff510112114d"; - fsType = "ext4"; - }; + #fileSystems."/old" = + #{ device = "/dev/disk/by-uuid/adbb1f76-7661-4c36-a603-ff510112114d"; + #fsType = "ext4"; + #}; fileSystems."/" = { device = "/dev/disk/by-label/fusu-root"; - fsType = "btrfs"; + fsType = "ext4"; }; swapDevices = [ ]; diff --git a/hosts/fusu.nix b/hosts/fusu.nix index 4cf13c6..89f418e 100644 --- a/hosts/fusu.nix +++ b/hosts/fusu.nix @@ -19,6 +19,8 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHTV1VoNAjMha5IP+qb8XABDo02pW3iN0yPBIbSqZA27 me@acern" ]; + + # allow server user to shutdown fusu security.sudo.extraRules = [ { @@ -105,7 +107,7 @@ }; }; networking.interfaces.br0.ipv4.addresses = [ { - address = "192.168.1.3"; + address = "192.168.1.2"; prefixLength = 24; } ]; networking = { diff --git a/mybin/htldoc b/mybin/htldoc new file mode 100755 index 0000000..203620d --- /dev/null +++ b/mybin/htldoc @@ -0,0 +1,12 @@ +#!/bin/sh + +if [ -f "htldoc.nix" ]; then + echo -en "" +else + echo "There is not htldoc.nix in this directory" >&2 + exit 1 +fi + +htldocUrl=$(nix eval --expr 'let config = (import ./htldoc.nix {}); in if builtins.hasAttr "htldocVersion" config then config.htldocVersion else "github:c2vi/htldoc/master"' --impure) + +nix run $htldocUrl