Compare commits
2 commits
f92d9bd462
...
dc89a7bbe3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dc89a7bbe3 | ||
|
|
7eb87c4524 |
2 changed files with 43 additions and 18 deletions
|
|
@ -3,9 +3,11 @@
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||||
home-manager.url = "github:rycee/home-manager/release-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";
|
common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/common";
|
||||||
# de_plasma.url = "path:../../../../flakes/de_plasma";
|
# 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";
|
ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim";
|
||||||
|
|
||||||
# impermanence.url = "github:nix-community/impermanence";
|
# impermanence.url = "github:nix-community/impermanence";
|
||||||
|
|
@ -36,18 +38,18 @@
|
||||||
inputs.home-manager.nixosModules.default
|
inputs.home-manager.nixosModules.default
|
||||||
|
|
||||||
inputs.ros_neovim.nixosModules.default
|
inputs.ros_neovim.nixosModules.default
|
||||||
# ({
|
({
|
||||||
# ringofstorms-nvim.includeAllRuntimeDependencies = true;
|
ringofstorms-nvim.includeAllRuntimeDependencies = true;
|
||||||
# })
|
})
|
||||||
|
|
||||||
# inputs.de_plasma.nixosModules.default
|
inputs.de_plasma.nixosModules.default
|
||||||
# ({
|
({
|
||||||
# ringofstorms.dePlasma = {
|
ringofstorms.dePlasma = {
|
||||||
# enable = true;
|
enable = true;
|
||||||
# gpu.intel.enable = true;
|
gpu.intel.enable = true;
|
||||||
# sddm.autologinUser = "luser";
|
sddm.autologinUser = "luser";
|
||||||
# };
|
};
|
||||||
# })
|
})
|
||||||
|
|
||||||
inputs.common.nixosModules.essentials
|
inputs.common.nixosModules.essentials
|
||||||
inputs.common.nixosModules.git
|
inputs.common.nixosModules.git
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ ... }:
|
{ pkgs, ... }:
|
||||||
let
|
let
|
||||||
BOOT = "/dev/disk/by-uuid/ABDB-2A38";
|
BOOT = "/dev/disk/by-uuid/ABDB-2A38";
|
||||||
PRIMARY = "/dev/disk/by-uuid/08610781-26d3-456f-9026-35dd4a40846f";
|
PRIMARY = "/dev/disk/by-uuid/08610781-26d3-456f-9026-35dd4a40846f";
|
||||||
|
|
@ -16,11 +16,6 @@ in
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# PRIMARY unencrypt
|
|
||||||
# TODO how to auto unencrypt with options...
|
|
||||||
# - USB key
|
|
||||||
# - TPM
|
|
||||||
|
|
||||||
# PRIMARY
|
# PRIMARY
|
||||||
fileSystems."/" = {
|
fileSystems."/" = {
|
||||||
device = PRIMARY;
|
device = PRIMARY;
|
||||||
|
|
@ -70,6 +65,34 @@ 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
|
# Reset root
|
||||||
# TODO
|
# TODO
|
||||||
# boot.initrd.systemd.services.rollback-root = {
|
# boot.initrd.systemd.services.rollback-root = {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue