...
This commit is contained in:
parent
221159aaeb
commit
63303f780a
10 changed files with 49 additions and 28 deletions
38
flake.lock
generated
38
flake.lock
generated
|
@ -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": {
|
||||
|
|
1
home/elissa/default.nix
Normal file
1
home/elissa/default.nix
Normal file
|
@ -0,0 +1 @@
|
|||
{}
|
|
@ -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"
|
||||
];
|
||||
}
|
||||
);
|
||||
|
|
|
@ -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";
|
||||
}
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
imports = [
|
||||
./hardware.nix
|
||||
./overrides.nix
|
||||
./users.nix
|
||||
];
|
||||
|
||||
olympus = {
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
in {
|
||||
config = {
|
||||
boot = {
|
||||
kernelPackages = mkForce pkgs.linux;
|
||||
kernelPackages = mkForce pkgs.linuxPackages_6_12;
|
||||
zfs = {
|
||||
forceImportRoot = false;
|
||||
extraPools = ["zpool" "zootfs" "zepool"];
|
||||
|
|
6
systems/nyx/users.nix
Normal file
6
systems/nyx/users.nix
Normal file
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
olympus.system = {
|
||||
mainUser = "pingu";
|
||||
useHomeManager = true;
|
||||
};
|
||||
}
|
|
@ -17,6 +17,11 @@
|
|||
initrd.enableTweaks = true;
|
||||
plymouth.enable = true;
|
||||
};
|
||||
networking = {
|
||||
tailscale = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
{
|
||||
olympus.system = {
|
||||
mainUser = "pingu";
|
||||
mainUser = "elissa";
|
||||
users = ["elissa" "pingu"];
|
||||
useHomeManager = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -20,11 +20,11 @@
|
|||
initrd.enableTweaks = true;
|
||||
plymouth.enable = false;
|
||||
};
|
||||
#networking = {
|
||||
# tailscale = {
|
||||
# enable = true;
|
||||
# };
|
||||
#};
|
||||
networking = {
|
||||
tailscale = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue