mirror of
https://github.com/gburd/nix-config.git
synced 2024-10-05 04:56:57 +00:00
fixes
This commit is contained in:
parent
82f5854f20
commit
489bbeef3c
5 changed files with 9 additions and 39 deletions
4
NOTES
4
NOTES
|
@ -22,6 +22,7 @@
|
||||||
* udevadm trigger
|
* udevadm trigger
|
||||||
|
|
||||||
INSTALL:
|
INSTALL:
|
||||||
|
nix-env -iA nixos.pkgs.gitAndTools.gitFull
|
||||||
export device=/dev/nvme0n1
|
export device=/dev/nvme0n1
|
||||||
export hostname=floki
|
export hostname=floki
|
||||||
wipefs/shread/scrub ${device}
|
wipefs/shread/scrub ${device}
|
||||||
|
@ -96,7 +97,7 @@ home-manager switch --flake .#username@hostname
|
||||||
|
|
||||||
sudo nixos-rebuild switch --flake .#my-hostname
|
sudo nixos-rebuild switch --flake .#my-hostname
|
||||||
clear; sudo nixos-rebuild dry-activate --flake .#${hostname}
|
clear; sudo nixos-rebuild dry-activate --flake .#${hostname}
|
||||||
sudo nix run github:nix-community/disko -- --mode disko /tmp/disko-config.nix --arg disks '[ "/dev/nvme0n1" ]'
|
sudo nix --extra-experimental-features "flakes nix-command" run github:nix-community/disko -- --mode disko nixos/${hostname}/disks.nix --arg disks '[ "/dev/nvme0n1" ]' --arg config.networking.hostName ${hostname}
|
||||||
|
|
||||||
-------
|
-------
|
||||||
services.pcscd.enable = true;
|
services.pcscd.enable = true;
|
||||||
|
@ -123,4 +124,5 @@ TODO:
|
||||||
EXAMPLE COMMANDS:
|
EXAMPLE COMMANDS:
|
||||||
|
|
||||||
* nh os switch --ask
|
* nh os switch --ask
|
||||||
|
* nix run github:viperML/nh os switch --ask --nom .
|
||||||
* clear; sudo nixos-rebuild dry-activate --flake .#floki
|
* clear; sudo nixos-rebuild dry-activate --flake .#floki
|
||||||
|
|
|
@ -126,6 +126,7 @@
|
||||||
];
|
];
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
PAGER = "moar";
|
PAGER = "moar";
|
||||||
|
FLAKE = "/home/${username}/ws/nix-config";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
programs = {
|
programs = {
|
||||||
|
|
|
@ -1,33 +0,0 @@
|
||||||
_:
|
|
||||||
{
|
|
||||||
fileSystems."/" =
|
|
||||||
{
|
|
||||||
device = "/dev/disk/by-uuid/bf75af76-49b0-41fa-a4e5-9a52a6a0a667";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=root" "compress=zstd" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/nix" =
|
|
||||||
{
|
|
||||||
device = "/dev/disk/by-uuid/bf75af76-49b0-41fa-a4e5-9a52a6a0a667";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=nix" "noatime" "compress=zstd" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/persist" =
|
|
||||||
{
|
|
||||||
device = "/dev/disk/by-uuid/bf75af76-49b0-41fa-a4e5-9a52a6a0a667";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=persist" "noatime" "compression=zstd" ];
|
|
||||||
neededForBoot = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/var/logs" =
|
|
||||||
{
|
|
||||||
device = "/dev/disk/by-uuid/bf75af76-49b0-41fa-a4e5-9a52a6a0a667";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=logs" "noatime" "compress=zstd" ];
|
|
||||||
neededForBoot = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
|
@ -5,11 +5,10 @@
|
||||||
#inputs.nixos-hardware.nixosModules.common-gpu-nvidia
|
#inputs.nixos-hardware.nixosModules.common-gpu-nvidia
|
||||||
inputs.nixos-hardware.nixosModules.common-pc
|
inputs.nixos-hardware.nixosModules.common-pc
|
||||||
inputs.nixos-hardware.nixosModules.common-pc-ssd
|
inputs.nixos-hardware.nixosModules.common-pc-ssd
|
||||||
(import ./disks.nix { })
|
(import ./disks.nix)
|
||||||
|
|
||||||
../_mixins/hardware/systemd-boot.nix
|
../_mixins/hardware/systemd-boot.nix
|
||||||
../_mixins/filesystems/encrypted-root.nix
|
../_mixins/filesystems/encrypted-root.nix
|
||||||
../_mixins/filesystems/btrfs.nix
|
|
||||||
../_mixins/services/bluetooth.nix
|
../_mixins/services/bluetooth.nix
|
||||||
../_mixins/services/pipewire.nix
|
../_mixins/services/pipewire.nix
|
||||||
../_mixins/virt
|
../_mixins/virt
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ disks ? [ "/dev/nvme0n1" ], ... }:
|
{ config, disk ? "/dev/nvme0n1", ... }:
|
||||||
let
|
let
|
||||||
hostname = config.networking.hostName;
|
hostname = config.networking.hostName;
|
||||||
in
|
in
|
||||||
|
@ -7,7 +7,7 @@ in
|
||||||
disk = {
|
disk = {
|
||||||
nvme = {
|
nvme = {
|
||||||
type = "disk";
|
type = "disk";
|
||||||
device = "/dev/nvme0n1";
|
device = disk;
|
||||||
content = {
|
content = {
|
||||||
type = "gpt";
|
type = "gpt";
|
||||||
partitions = {
|
partitions = {
|
||||||
|
@ -63,5 +63,6 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
|
||||||
|
|
||||||
|
fileSystems."/persist".neededForBoot = true;
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue