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

Compare commits

base: Simmer/nixos:f8ef7b91b6b55231b722a4ff10c3db8bf48d6101
Branches Tags
Simmer/nixos:master
..
compare: Simmer/nixos:master
Branches Tags
Simmer/nixos:master

2 Commits
f8ef7b91b6 .. master

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
9 changed files with 61 additions and 61 deletions
Expand all files Collapse all files
flake.lock
Generated
+20 -20
View File
@@ -59,16 +59,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747688870, "lastModified": 1777851538,
"narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", "narHash": "sha256-Gp8qwTEYNoy2yvmErVGlvLOQvrtEECCAKbonW7VJef8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d5f1f641b289553927b3801580598d200a501863", "rev": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.11", "ref": "release-25.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -80,11 +80,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776046499, "lastModified": 1778248595,
"narHash": "sha256-Wzc4nn07/0RL21ypPHRzNDQZcjhIC8LaYo7QJQjM5T4=", "narHash": "sha256-dhFgEjoeJMYN/7OY6xfxS799YB4IjbbYXTjyGIJyLpc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "287f84846c1eb3b72c986f5f6bebcff0bd67440d", "rev": "fdb2ccba9d5e1238d32e0c4a3ec1a277efa80c1d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -99,11 +99,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1776100724, "lastModified": 1778255203,
"narHash": "sha256-4WsXVFUFZwMLmMj2Ur1naf+THAPSjtmjckwrYfGGDa8=", "narHash": "sha256-Dln84OsomlZdLCIednUO3lX8I0ECejGfyNduRxOkXGk=",
"owner": "ggerganov", "owner": "ggerganov",
"repo": "llama.cpp", "repo": "llama.cpp",
"rev": "a8bad3842e92f61dadcd71417f6e10b68bff0ee4", "rev": "f9cd456ea540c6ce5d4d6246165df91f285155e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -161,27 +161,27 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1751274312, "lastModified": 1778003029,
"narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.11", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1775710090, "lastModified": 1777954456,
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c1018dae018162ec878d42fec712642d214fdfa", "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -238,11 +238,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1775971308, "lastModified": 1777944972,
"narHash": "sha256-VKp9bhVSm0bT6JWctFy06ocqxGGnWHi1NfoE90IgIcY=", "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "31ac5fe5d015f76b54058c69fcaebb66a55871a4", "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
"type": "github" "type": "github"
}, },
"original": { "original": {
flake.nix
+16 -18
View File
@@ -2,11 +2,11 @@
description = "NixOS configuration"; description = "NixOS configuration";
inputs = { 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"; 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-stable.inputs.nixpkgs.follows = "nixpkgs-stable";
home-manager-unstable.url = "github:nix-community/home-manager"; home-manager-unstable.url = "github:nix-community/home-manager";
@@ -115,7 +115,6 @@
school = { school = {
enable = true; enable = true;
citrix = true;
}; };
games = { games = {
@@ -141,8 +140,8 @@
options = { options = {
laptop = { laptop = {
enable = true;
powersave.enable = true; powersave.enable = true;
backlight.enable = true;
}; };
audio = { audio = {
@@ -169,7 +168,6 @@
school = { school = {
enable = true; enable = true;
citrix = true;
}; };
games = { games = {
@@ -177,17 +175,17 @@
}; };
backup = { backup = {
user = "eesim"; enable = true;
paths = [ "/home/eesim" ]; user = "eesim";
repo = "t643s856@t643s856.repo.borgbase.com:repo"; paths = [ "/home/eesim" ];
excludes = [ repo = "t643s856@t643s856.repo.borgbase.com:repo";
"/home/eesim/.cache/" excludes = [
"/home/eesim/configs/mc-distant-horizons" "/home/eesim/.cache/"
"/home/eesim/configs/mc-arcadia" ];
]; passphrase = "/run/secrets/borgbase/nix-alpheratz";
key = "/home/eesim/.ssh/id_ed25519"; key = "/home/eesim/.ssh/id_ed25519_borg";
passphrase = "/run/secrets/borgbase/nix-alpheratz"; compression = "zstd";
repeat = "daily"; repeat = "daily";
}; };
common.nil.enable = true; common.nil.enable = true;
@@ -223,8 +221,8 @@
networking = { networking = {
firewall = { 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 ]; 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 = [ 3478 10001 ]; allowedUDPPorts = [ 2456 2457 2458 3478 10001 42420 ];
}; };
}; };
}; };
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;
hosts/diphda/system.nix
+1 -1
View File
@@ -79,7 +79,7 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
docker-compose docker-compose
beets-unstable beets
]; ];
# Set your time zone. # Set your time zone.
modules/home/sway.nix
+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"; "before-sleep" = "${pkgs.swaylock}/bin/swaylock -f -c 000000";
}); });
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" ];
};
}; };
} }
modules/options/laptop.nix
+5
View File
@@ -9,6 +9,11 @@ with lib; let
in in
{ {
options.simmer.laptop = { options.simmer.laptop = {
enable = mkOption {
description = "Whether to enable laptop specific setting";
type = types.bool;
default = false;
};
backlight.enable = mkOption { backlight.enable = mkOption {
description = "Whether to enable backlight control"; description = "Whether to enable backlight control";
type = types.bool; type = types.bool;