Compare commits

..

5 Commits

Author SHA1 Message Date
Ethan Simmons 5d64abd097 Repartition and reinstall alpheratz 2026-05-10 09:24:23 -05:00
Ethan Simmons 5e63cd8d6e Add ports and update diphda 2026-05-08 12:57:02 -05:00
Ethan Simmons f8ef7b91b6 update ankaa 2026-05-08 12:54:04 -05:00
Ethan Simmons f81955e1b1 update ankaa 2026-05-08 12:54:04 -05:00
Ethan Simmons 48eb4a1aca Add calibre 2026-05-08 12:54:04 -05:00
12 changed files with 70 additions and 66 deletions
Generated
+23 -23
View File
@@ -59,16 +59,16 @@
]
},
"locked": {
"lastModified": 1747688870,
"narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=",
"lastModified": 1777851538,
"narHash": "sha256-Gp8qwTEYNoy2yvmErVGlvLOQvrtEECCAKbonW7VJef8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d5f1f641b289553927b3801580598d200a501863",
"rev": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.11",
"ref": "release-25.11",
"repo": "home-manager",
"type": "github"
}
@@ -80,11 +80,11 @@
]
},
"locked": {
"lastModified": 1772633327,
"narHash": "sha256-jl+DJB2DUx7EbWLRng+6HNWW/1/VQOnf0NsQB4PlA7I=",
"lastModified": 1778248595,
"narHash": "sha256-dhFgEjoeJMYN/7OY6xfxS799YB4IjbbYXTjyGIJyLpc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "5a75730e6f21ee624cbf86f4915c6e7489c74acc",
"rev": "fdb2ccba9d5e1238d32e0c4a3ec1a277efa80c1d",
"type": "github"
},
"original": {
@@ -99,11 +99,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1772630284,
"narHash": "sha256-wF+8Otz2DEBziA/DtaQcedas4McTcdZdQkFmuw4OQ6s=",
"lastModified": 1778255203,
"narHash": "sha256-Dln84OsomlZdLCIednUO3lX8I0ECejGfyNduRxOkXGk=",
"owner": "ggerganov",
"repo": "llama.cpp",
"rev": "d969e933e172821b4519f66aa4b660bc0846b320",
"rev": "f9cd456ea540c6ce5d4d6246165df91f285155e6",
"type": "github"
},
"original": {
@@ -161,27 +161,27 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1751274312,
"narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
"lastModified": 1778003029,
"narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
"rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.11",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1772542754,
"narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=",
"lastModified": 1777954456,
"narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4",
"rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
"type": "github"
},
"original": {
@@ -207,11 +207,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1772173633,
"narHash": "sha256-MOH58F4AIbCkh6qlQcwMycyk5SWvsqnS/TCfnqDlpj4=",
"lastModified": 1775888245,
"narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c0f3d81a7ddbc2b1332be0d8481a672b4f6004d6",
"rev": "13043924aaa7375ce482ebe2494338e058282925",
"type": "github"
},
"original": {
@@ -238,11 +238,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1772495394,
"narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=",
"lastModified": 1777944972,
"narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff",
"rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
"type": "github"
},
"original": {
+8 -10
View File
@@ -2,11 +2,11 @@
description = "NixOS configuration";
inputs = {
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager-stable.url = "github:nix-community/home-manager/release-24.11";
home-manager-stable.url = "github:nix-community/home-manager/release-25.11";
home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable";
home-manager-unstable.url = "github:nix-community/home-manager";
@@ -115,7 +115,6 @@
school = {
enable = true;
citrix = true;
};
games = {
@@ -141,8 +140,8 @@
options = {
laptop = {
enable = true;
powersave.enable = true;
backlight.enable = true;
};
audio = {
@@ -169,7 +168,6 @@
school = {
enable = true;
citrix = true;
};
games = {
@@ -177,16 +175,16 @@
};
backup = {
enable = true;
user = "eesim";
paths = [ "/home/eesim" ];
repo = "t643s856@t643s856.repo.borgbase.com:repo";
excludes = [
"/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";
key = "/home/eesim/.ssh/id_ed25519_borg";
compression = "zstd";
repeat = "daily";
};
@@ -223,8 +221,8 @@
networking = {
firewall = {
allowedTCPPorts = [ 80 443 3000 3843 4533 5030 6600 6722 7474 7878 8000 8080 8081 8083 8089 8096 8120 8181 8443 8787 8889 8902 8989 8998 9000 9091 9696 11112 13378 24454 25565 25600 50300 ];
allowedUDPPorts = [ 3478 10001 ];
allowedTCPPorts = [ 80 443 3000 3843 4533 5030 6600 6722 7474 7878 8000 8080 8081 8083 8089 8096 8120 8181 8443 8787 8889 8902 8989 8998 9000 9091 9696 11112 13378 24454 25565 25600 42420 50300 ];
allowedUDPPorts = [ 2456 2457 2458 3478 10001 42420 ];
};
};
};
+11 -17
View File
@@ -14,38 +14,32 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/ad45b094-608d-4850-b5ba-0f3917947629";
{ device = "/dev/disk/by-uuid/d724cc9a-df7c-4771-8531-3544056b9aa1";
fsType = "btrfs";
options = [ "subvol=root" ];
};
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/ad45b094-608d-4850-b5ba-0f3917947629";
{ device = "/dev/disk/by-uuid/d724cc9a-df7c-4771-8531-3544056b9aa1";
fsType = "btrfs";
options = [ "subvol=home" ];
};
fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/ad45b094-608d-4850-b5ba-0f3917947629";
{ device = "/dev/disk/by-uuid/d724cc9a-df7c-4771-8531-3544056b9aa1";
fsType = "btrfs";
options = [ "subvol=nix" ];
};
# Remove comments for optical drive in wine
# fileSystems."/mnt/drive0" =
# { device = "/dev/sr0";
# fsType = "auto";
# options = [ "ro" "user" "noauto" "unhide" ];
# };
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/D7C8-96A5";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices = [ ];
# 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;
swapDevices =
[ { device = "/dev/disk/by-uuid/7dc7727f-ebdc-4bd4-8526-193822b78aab"; }
];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-3
View File
@@ -64,7 +64,6 @@
environment.systemPackages = with pkgs; [
localPackages.x86_64-linux.jhelioviewer
bottles
matlab
discord
wine
@@ -85,8 +84,6 @@
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.systemd-boot.xbootldrMountPoint = "/boot";
boot.loader.efi.efiSysMountPoint = "/efi";
boot.loader.efi.canTouchEfiVariables = true;
hardware.bluetooth.enable = true;
+2
View File
@@ -57,10 +57,12 @@
orca-slicer
qemu
protonvpn-gui
calibre
];
services.hardware.openrgb.enable = true;
services.avahi.enable = true;
services.flatpak.enable = true;
services.udev.extraRules = ''
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
+1 -1
View File
@@ -79,7 +79,7 @@
environment.systemPackages = with pkgs; [
docker-compose
beets-unstable
beets
];
# Set your time zone.
+1 -1
View File
@@ -38,7 +38,7 @@ in
})
];
events = (mkIf (!gui.sway.desktop) {
events = (mkIf (laptop.enable) {
"before-sleep" = "${pkgs.swaylock}/bin/swaylock -f -c 000000";
});
+2 -1
View File
@@ -13,7 +13,8 @@ in
environment.systemPackages = with pkgs; []
++ optional cfg.pipewire.enable pulseaudio
++ optional cfg.music.enable supersonic
++ optional cfg.tools.helvum helvum
# FIXME: unmaintained
# ++ optional cfg.tools.helvum helvum
++ optional cfg.tools.easyeffects easyeffects
++ optional cfg.tools.pavucontrol pavucontrol;
+2 -1
View File
@@ -6,6 +6,7 @@
with lib; let
cfg = config.simmer.backup;
compression = if (cfg.compression == "zstd") then "auto,zstd,3" else "auto,lzma";
in
{
config = mkIf cfg.enable {
@@ -20,7 +21,7 @@ in
passCommand = "cat ${cfg.passphrase}";
};
environment.BORG_RSH = "ssh -i ${cfg.key}";
compression = "auto,lzma";
compression = compression;
startAt = cfg.repeat;
};
};
+2 -1
View File
@@ -9,7 +9,8 @@ with lib; let
in
{
config.programs.light.enable = mkIf cfg.backlight.enable true;
# FIXME: No longer maintained
# config.programs.light.enable = mkIf cfg.backlight.enable true;
config.powerManagement.powertop.enable = mkIf cfg.powersave.enable true;
config.services.auto-cpufreq = mkIf cfg.powersave.enable {
+5
View File
@@ -51,5 +51,10 @@ with lib;
type = types.enum [ "hourly" "daily" "weekly" ];
};
compression = mkOption {
description = "Which compression option to use (lzma, zstd)";
type = types.enum [ "lzma" "zstd" ];
};
};
}
+5
View File
@@ -9,6 +9,11 @@ with lib; let
in
{
options.simmer.laptop = {
enable = mkOption {
description = "Whether to enable laptop specific setting";
type = types.bool;
default = false;
};
backlight.enable = mkOption {
description = "Whether to enable backlight control";
type = types.bool;