diff --git a/hosts/i001/flake.nix b/hosts/i001/flake.nix index f2c7aa00..a4dfe366 100644 --- a/hosts/i001/flake.nix +++ b/hosts/i001/flake.nix @@ -3,11 +3,9 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; home-manager.url = "github:rycee/home-manager/release-25.11"; - # common.url = "path:../../../../flakes/common"; common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/common"; # de_plasma.url = "path:../../../../flakes/de_plasma"; - de_plasma.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/de_plasma"; - + # de_plasma.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/de_plasma"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; # impermanence.url = "github:nix-community/impermanence"; @@ -38,18 +36,18 @@ inputs.home-manager.nixosModules.default inputs.ros_neovim.nixosModules.default - ({ - ringofstorms-nvim.includeAllRuntimeDependencies = true; - }) + # ({ + # ringofstorms-nvim.includeAllRuntimeDependencies = true; + # }) - inputs.de_plasma.nixosModules.default - ({ - ringofstorms.dePlasma = { - enable = true; - gpu.intel.enable = true; - sddm.autologinUser = "luser"; - }; - }) + # inputs.de_plasma.nixosModules.default + # ({ + # ringofstorms.dePlasma = { + # enable = true; + # gpu.intel.enable = true; + # sddm.autologinUser = "luser"; + # }; + # }) inputs.common.nixosModules.essentials inputs.common.nixosModules.git diff --git a/hosts/i001/hardware-mounts.nix b/hosts/i001/hardware-mounts.nix index 5888133f..e8fddc67 100644 --- a/hosts/i001/hardware-mounts.nix +++ b/hosts/i001/hardware-mounts.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: let BOOT = "/dev/disk/by-uuid/ABDB-2A38"; PRIMARY = "/dev/disk/by-uuid/08610781-26d3-456f-9026-35dd4a40846f"; @@ -16,6 +16,11 @@ in ]; }; + # PRIMARY unencrypt + # TODO how to auto unencrypt with options... + # - USB key + # - TPM + # PRIMARY fileSystems."/" = { device = PRIMARY; @@ -65,34 +70,6 @@ in } ]; - # PRIMARY unencrypt - # TODO how to auto unencrypt with options... - # - USB key - # - TPM - boot.initrd.availableKernelModules = [ "bcachefs" ]; - boot.initrd.extraUtilsCommands = '' - copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs - ''; - - boot.initrd.preDeviceCommands = '' - ${pkgs.bcachefs-tools}/bin/bcachefs unlock /dev/disk/by-uuid/XXXX - ''; - - # # Run unlock before devices are scanned/mounted - # boot.initrd.preDeviceCommands = '' - # echo "Unlocking bcachefs..." - # # Example: ask for a passphrase - # /bin/echo -n "Bcachefs passphrase: " - # /bin/stty -echo - # read PASSPHRASE - # /bin/stty echo - # echo - # - # # Use the passphrase to unlock the device - # # Replace /dev/disk/by-uuid/XXXX with your actual device - # echo "$PASSPHRASE" | ${pkgs.bcachefs-tools}/bin/bcachefs unlock /dev/disk/by-uuid/XXXX - # ''; - # Reset root # TODO # boot.initrd.systemd.services.rollback-root = {