diff --git a/flake.nix b/flake.nix index c92d784..3e28c00 100644 --- a/flake.nix +++ b/flake.nix @@ -144,7 +144,7 @@ }; io = { - hostname = "io"; + hostname = "192.168.1.5"; profilesOrder = [ "system" "user" ]; profiles = { system = { diff --git a/hosts/desktops/io.nix b/hosts/desktops/io.nix index 692c99d..0d8ff5b 100644 --- a/hosts/desktops/io.nix +++ b/hosts/desktops/io.nix @@ -79,26 +79,26 @@ }; }; - nixpkgs.overlays = with pkgs; - [ - (final: prev: { - alsa-ucm-conf = prev.alsa-ucm-conf.overrideAttrs (old: { - wttsrc = (fetchFromGitHub { - owner = "WeirdTreeThing"; - repo = "chromebook-ucm-conf"; - rev = "484f5c581ac45c4ee6cfaf62bdecedfa44353424"; - hash = "sha256-Jal+VfxrPSAPg9ZR+e3QCy4jgSWT4sSShxICKTGJvAI="; - }); + # nixpkgs.overlays = with pkgs; + # [ + # (final: prev: { + # alsa-ucm-conf = prev.alsa-ucm-conf.overrideAttrs (old: { + # wttsrc = (fetchFromGitHub { + # owner = "WeirdTreeThing"; + # repo = "chromebook-ucm-conf"; + # rev = "484f5c581ac45c4ee6cfaf62bdecedfa44353424"; + # hash = "sha256-Jal+VfxrPSAPg9ZR+e3QCy4jgSWT4sSShxICKTGJvAI="; + # }); - installPhase = '' - runHook preInstall - mkdir -p $out/share/alsa - cp -r ucm ucm2 $out/share/alsa - mkdir -p $out/share/alsa/ucm2/conf.d - cp -r $wttsrc/{hdmi,dmic}-common $wttsrc/tgl/* $out/share/alsa/ucm2/conf.d - runHook postInstall - ''; - }); - }) - ]; + # installPhase = '' + # runHook preInstall + # mkdir -p $out/share/alsa + # cp -r ucm ucm2 $out/share/alsa + # mkdir -p $out/share/alsa/ucm2/conf.d + # cp -r $wttsrc/{hdmi,dmic}-common $wttsrc/tgl/* $out/share/alsa/ucm2/conf.d + # runHook postInstall + # ''; + # }); + # }) + # ]; } diff --git a/hosts/desktops/io/ephermal.nix b/hosts/desktops/io/ephermal.nix index 7bfc484..66cfd03 100644 --- a/hosts/desktops/io/ephermal.nix +++ b/hosts/desktops/io/ephermal.nix @@ -1,5 +1,5 @@ { config, lib, pkgs, ... }: - + { boot.initrd.systemd.services.recreate-root = { description = "Rolling over and creating new filesystem root"; @@ -17,14 +17,14 @@ }; script = '' mkdir /btrfs_tmp - mount /dev/disk/by-uuid/ef1916a9-e15c-450e-8100-4b2af9f6e1a5 /btrfs_tmp - + mount /dev/disk/by-uuid/1ce9c049-0736-4305b21e-34244004acf50 /btrfs_tmp + if [[ -e /btrfs_tmp/@root ]]; then mkdir -p /btrfs_tmp/old_roots timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/@root)" "+%Y-%m-%-d_%H:%M:%S") mv /btrfs_tmp/@root "/btrfs_tmp/old_roots/$timestamp" fi - + delete_subvolume_recursively() { IFS=$'\n' for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do @@ -32,13 +32,13 @@ done btrfs subvolume delete "$1" } - + for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do delete_subvolume_recursively "$i" done - + btrfs subvolume create /btrfs_tmp/@root umount /btrfs_tmp ''; }; -} \ No newline at end of file +} diff --git a/hosts/desktops/io/hardware-configuration.nix b/hosts/desktops/io/hardware-configuration.nix index ccb13bd..d5c8fd9 100644 --- a/hosts/desktops/io/hardware-configuration.nix +++ b/hosts/desktops/io/hardware-configuration.nix @@ -15,12 +15,12 @@ fileSystems = { "/" = { - device = "/dev/disk/by_uuid/ef1916a9-e15c-450e-8100-4b2af9f6e1a5"; + device = "/dev/disk/by_uuid/1ce9c049-0736-4305b21e-34244004acf50"; fsType = "btrfs"; options = [ "subvol=@root" "noatime" "compress=zstd" ]; }; "/home" = { - device = "/dev/disk/by_uuid/ef1916a9-e15c-450e-8100-4b2af9f6e1a5"; + device = "/dev/disk/by_uuid/1ce9c049-0736-4305b21e-34244004acf50 "; fsType = "btrfs"; options = [ "subvol=@home" "noatime" "compress=zstd" ]; }; @@ -30,12 +30,12 @@ options = [ "noatime" "fmask=0077" "dmask=0077" ]; }; "/nix" = { - device = "/dev/disk/by_uuid/ef1916a9-e15c-450e-8100-4b2af9f6e1a5"; + device = "/dev/disk/by_uuid/1ce9c049-0736-4305b21e-34244004acf50 "; fsType = "btrfs"; options = [ "subvol=@nix" "noatime" "compress=zstd" ]; }; "/persistent" = { - device = "/dev/disk/by_uuid/ef1916a9-e15c-450e-8100-4b2af9f6e1a5"; + device = "/dev/disk/by_uuid/1ce9c049-0736-4305b21e-34244004acf50 "; fsType = "btrfs"; options = [ "subvol=@persistent" "noatime" "compress=zstd" ]; }; diff --git a/result b/result new file mode 120000 index 0000000..76881eb --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/h6v84r1i1w5s4s7a2bqxldvlvjdg4x8w-nixos-system-io-24.05.20240216.5863c27 \ No newline at end of file