From 63303f780af3909348eed4fb2543a37f23736c69 Mon Sep 17 00:00:00 2001 From: blahai Date: Wed, 19 Feb 2025 00:48:48 +0200 Subject: [PATCH] ... --- flake.lock | 38 ++++++++++++++--------------- home/elissa/default.nix | 1 + modules/base/users/mkuser.nix | 3 ++- modules/profiles/server/default.nix | 7 +++++- systems/nyx/default.nix | 1 + systems/nyx/overrides.nix | 2 +- systems/nyx/users.nix | 6 +++++ systems/ptocheia/default.nix | 5 ++++ systems/ptocheia/users.nix | 4 ++- systems/theia/default.nix | 10 ++++---- 10 files changed, 49 insertions(+), 28 deletions(-) create mode 100644 home/elissa/default.nix create mode 100644 systems/nyx/users.nix diff --git a/flake.lock b/flake.lock index dbfbe11..0f33347 100644 --- a/flake.lock +++ b/flake.lock @@ -69,11 +69,11 @@ ] }, "locked": { - "lastModified": 1739799871, - "narHash": "sha256-Nn5RQDvl+pK0V1sn5R88j1cyqm81VFO9zxHGYk0YIBo=", + "lastModified": 1739809963, + "narHash": "sha256-h591Geqwg7uum8gj06OUZqbu9PGwUixDqgTRTcAkPxc=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "f450c658f012cdf93fc4d0e85a208a23a27efadb", + "rev": "fed54798c45c0729877c5e5b9091da83ab509fa7", "type": "github" }, "original": { @@ -293,11 +293,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1739814478, - "narHash": "sha256-y/O5nx9yZq3IAmFIQ0HR8a91o9Q0HT6MrrmZwfQU2gI=", + "lastModified": 1739836864, + "narHash": "sha256-rse0tFpjIryj1XWgVzvXHff/cIeOSBBAq9/okGvWrME=", "ref": "refs/heads/main", - "rev": "d882f4a1e850c936d58fb9794416c9ab31fb5257", - "revCount": 71, + "rev": "4766a1ed9d876531873be02f76bce28f900b7a1c", + "revCount": 72, "type": "git", "url": "https://git.blahai.gay/blahai/haipkgs.git" }, @@ -334,11 +334,11 @@ ] }, "locked": { - "lastModified": 1739802995, - "narHash": "sha256-kZv0upOigS/4sUEgZuZd6/uO6s8X8oYOLk9/sGMsl+c=", + "lastModified": 1739907986, + "narHash": "sha256-Vo7LHigoL4VdIJt+rVaQEctBzWN5di1FUvygeLg141E=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d0d48f4c3d2fb1a8c8607da143bb567a741d914", + "rev": "a135aae1be749a10227413f9eb944a6f887dab86", "type": "github" }, "original": { @@ -423,11 +423,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1739757807, - "narHash": "sha256-HYaYpFFCopski3zyKDp/XTARlkwCkSHvfWBoCAcbqkk=", + "lastModified": 1739892000, + "narHash": "sha256-Dm/FHOSmOPX2yBiM0Ezd+SadhhHn2kaSNmoh12TgGis=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "59c615c321c45302491de3b1c003844c86aefca7", + "rev": "0137a5f6cdd24d5a10f813572791f1e641221a5b", "type": "github" }, "original": { @@ -767,11 +767,11 @@ ] }, "locked": { - "lastModified": 1739673031, - "narHash": "sha256-Z/GT8ebbvc4goxN4A0A5ACj26G1HaGJO+VetrPuC5Mo=", + "lastModified": 1739759407, + "narHash": "sha256-YIrVxD2SaUyaEdMry2nAd2qG1E0V38QIV6t6rpguFwk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "538528d55318e0c8af1c307dcf10b7629b988fc3", + "rev": "6e6ae2acf4221380140c22d65b6c41f4726f5932", "type": "github" }, "original": { @@ -847,11 +847,11 @@ ] }, "locked": { - "lastModified": 1738953846, - "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=", + "lastModified": 1739829690, + "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd", + "rev": "3d0579f5cc93436052d94b73925b48973a104204", "type": "github" }, "original": { diff --git a/home/elissa/default.nix b/home/elissa/default.nix new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/home/elissa/default.nix @@ -0,0 +1 @@ +{} diff --git a/modules/base/users/mkuser.nix b/modules/base/users/mkuser.nix index f4fd5f6..fd389fb 100644 --- a/modules/base/users/mkuser.nix +++ b/modules/base/users/mkuser.nix @@ -14,7 +14,7 @@ in { in { home = "/home/" + name; #shell = hm.olympus.programs.${hm.olympus.programs.defaults.shell}.package; - uid = mkDefault 1000; + #uid = mkDefault 1000; isNormalUser = true; initialPassword = mkDefault "changeme"; @@ -41,6 +41,7 @@ in { "git" "libvirtd" "cloudflared" + "jellyfin" ]; } ); diff --git a/modules/profiles/server/default.nix b/modules/profiles/server/default.nix index 713e092..9db19e2 100644 --- a/modules/profiles/server/default.nix +++ b/modules/profiles/server/default.nix @@ -1,5 +1,10 @@ -{lib, ...}: let +{ + lib, + pkgs, + ... +}: let inherit (lib.modules) mkForce; in { + boot.kernelPackages = mkForce pkgs.linuxPackages_6_12; time.timeZone = mkForce "UTC"; } diff --git a/systems/nyx/default.nix b/systems/nyx/default.nix index b145d14..dc120ed 100644 --- a/systems/nyx/default.nix +++ b/systems/nyx/default.nix @@ -2,6 +2,7 @@ imports = [ ./hardware.nix ./overrides.nix + ./users.nix ]; olympus = { diff --git a/systems/nyx/overrides.nix b/systems/nyx/overrides.nix index 787ad11..ef6a902 100644 --- a/systems/nyx/overrides.nix +++ b/systems/nyx/overrides.nix @@ -8,7 +8,7 @@ in { config = { boot = { - kernelPackages = mkForce pkgs.linux; + kernelPackages = mkForce pkgs.linuxPackages_6_12; zfs = { forceImportRoot = false; extraPools = ["zpool" "zootfs" "zepool"]; diff --git a/systems/nyx/users.nix b/systems/nyx/users.nix new file mode 100644 index 0000000..b61ebe8 --- /dev/null +++ b/systems/nyx/users.nix @@ -0,0 +1,6 @@ +{ + olympus.system = { + mainUser = "pingu"; + useHomeManager = true; + }; +} diff --git a/systems/ptocheia/default.nix b/systems/ptocheia/default.nix index 7c0e2f5..a8b4e37 100644 --- a/systems/ptocheia/default.nix +++ b/systems/ptocheia/default.nix @@ -17,6 +17,11 @@ initrd.enableTweaks = true; plymouth.enable = true; }; + networking = { + tailscale = { + enable = true; + }; + }; }; }; } diff --git a/systems/ptocheia/users.nix b/systems/ptocheia/users.nix index cf908bc..25ff406 100644 --- a/systems/ptocheia/users.nix +++ b/systems/ptocheia/users.nix @@ -1,5 +1,7 @@ { olympus.system = { - mainUser = "pingu"; + mainUser = "elissa"; + users = ["elissa" "pingu"]; + useHomeManager = true; }; } diff --git a/systems/theia/default.nix b/systems/theia/default.nix index 4c0c24b..13cc6f1 100644 --- a/systems/theia/default.nix +++ b/systems/theia/default.nix @@ -20,11 +20,11 @@ initrd.enableTweaks = true; plymouth.enable = false; }; - #networking = { - # tailscale = { - # enable = true; - # }; - #}; + networking = { + tailscale = { + enable = true; + }; + }; }; }; }