Simmer/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Repartition and reinstall alpheratz

Browse Source
This commit is contained in:
Ethan Simmons
2026-05-10 09:24:06 -05:00
parent 5e63cd8d6e
commit 5d64abd097
5 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.nix
+3 -6
View File
@@ -115,7 +115,6 @@
school = { school = {
enable = true; enable = true;
citrix = true;
}; };
games = { games = {
@@ -143,7 +142,6 @@
laptop = { laptop = {
enable = true; enable = true;
powersave.enable = true; powersave.enable = true;
backlight.enable = true;
}; };
audio = { audio = {
@@ -170,7 +168,6 @@
school = { school = {
enable = true; enable = true;
citrix = true;
}; };
games = { games = {
@@ -178,16 +175,16 @@
}; };
backup = { backup = {
enable = true;
user = "eesim"; user = "eesim";
paths = [ "/home/eesim" ]; paths = [ "/home/eesim" ];
repo = "t643s856@t643s856.repo.borgbase.com:repo"; repo = "t643s856@t643s856.repo.borgbase.com:repo";
excludes = [ excludes = [
"/home/eesim/.cache/" "/home/eesim/.cache/"
"/home/eesim/configs/mc-distant-horizons"
"/home/eesim/configs/mc-arcadia"
]; ];
key = "/home/eesim/.ssh/id_ed25519";
passphrase = "/run/secrets/borgbase/nix-alpheratz"; passphrase = "/run/secrets/borgbase/nix-alpheratz";
key = "/home/eesim/.ssh/id_ed25519_borg";
compression = "zstd";
repeat = "daily"; repeat = "daily";
}; };
hosts/alpheratz/hardware-configuration.nix
+11 -17
View File
@@ -14,38 +14,32 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/ad45b094-608d-4850-b5ba-0f3917947629"; { device = "/dev/disk/by-uuid/d724cc9a-df7c-4771-8531-3544056b9aa1";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=root" ]; options = [ "subvol=root" ];
}; };
fileSystems."/home" = fileSystems."/home" =
{ device = "/dev/disk/by-uuid/ad45b094-608d-4850-b5ba-0f3917947629"; { device = "/dev/disk/by-uuid/d724cc9a-df7c-4771-8531-3544056b9aa1";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=home" ]; options = [ "subvol=home" ];
}; };
fileSystems."/nix" = fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/ad45b094-608d-4850-b5ba-0f3917947629"; { device = "/dev/disk/by-uuid/d724cc9a-df7c-4771-8531-3544056b9aa1";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=nix" ]; options = [ "subvol=nix" ];
}; };
# Remove comments for optical drive in wine fileSystems."/boot" =
# fileSystems."/mnt/drive0" = { device = "/dev/disk/by-uuid/D7C8-96A5";
# { device = "/dev/sr0"; fsType = "vfat";
# fsType = "auto"; options = [ "fmask=0077" "dmask=0077" ];
# options = [ "ro" "user" "noauto" "unhide" ]; };
# };
swapDevices = [ ]; swapDevices =
[ { device = "/dev/disk/by-uuid/7dc7727f-ebdc-4bd4-8526-193822b78aab"; }
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking ];
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hosts/alpheratz/system.nix
-3
View File
@@ -64,7 +64,6 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
localPackages.x86_64-linux.jhelioviewer localPackages.x86_64-linux.jhelioviewer
bottles
matlab matlab
discord discord
wine wine
@@ -85,8 +84,6 @@
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.systemd-boot.xbootldrMountPoint = "/boot";
boot.loader.efi.efiSysMountPoint = "/efi";
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
modules/nix/backup.nix
+2 -1
View File
@@ -6,6 +6,7 @@
with lib; let with lib; let
cfg = config.simmer.backup; cfg = config.simmer.backup;
compression = if (cfg.compression == "zstd") then "auto,zstd,3" else "auto,lzma";
in in
{ {
config = mkIf cfg.enable { config = mkIf cfg.enable {
@@ -20,7 +21,7 @@ in
passCommand = "cat ${cfg.passphrase}"; passCommand = "cat ${cfg.passphrase}";
}; };
environment.BORG_RSH = "ssh -i ${cfg.key}"; environment.BORG_RSH = "ssh -i ${cfg.key}";
compression = "auto,lzma"; compression = compression;
startAt = cfg.repeat; startAt = cfg.repeat;
}; };
}; };
modules/options/backup.nix
+5
View File
@@ -51,5 +51,10 @@ with lib;
type = types.enum [ "hourly" "daily" "weekly" ]; type = types.enum [ "hourly" "daily" "weekly" ];
}; };
compression = mkOption {
description = "Which compression option to use (lzma, zstd)";
type = types.enum [ "lzma" "zstd" ];
};
}; };
} }