liv/nixos-config
1
0
Fork 0
mirror of https://github.com/Ahwxorg/nixos-config.git synced 2025-12-04 23:00:14 +01:00
Code Issues 1 Projects Releases Packages Wiki Activity Actions

Compare commits

base: liv:5a3a3b0cd5a3d383121508428928893e051067b1
Branches Tags
liv:master
..
compare: liv:48ca8a3495bfe9ff3932e9e0fbe1d4cb6684866b
Branches Tags
liv:master

No commits in common. "5a3a3b0cd5a3d383121508428928893e051067b1" and "48ca8a3495bfe9ff3932e9e0fbe1d4cb6684866b" have entirely different histories.
5a3a3b0cd5 ... 48ca8a3495

7 changed files with 65 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

105
flake.lock generated
View file

@ -41,11 +41,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753216019, "lastModified": 1752743471,
"narHash": "sha256-zik7WISrR1ks2l6T1MZqZHb/OqroHdJnSnAehkE0kCk=", "narHash": "sha256-4izhj1j7J4mE8LgljCXSIUDculqOsxxhdoC81VhqizM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "be166e11d86ba4186db93e10c54a141058bdce49", "rev": "e31b575d19e7cf8a8f4398e2f9cffe27a1332506",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -235,11 +235,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1754263839, "lastModified": 1753470191,
"narHash": "sha256-ck7lILfCNuunsLvExPI4Pw9OOCJksxXwozum24W8b+8=", "narHash": "sha256-hOUWU5L62G9sm8NxdiLWlLIJZz9H52VuFiDllHdwmVA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1d7abbd5454db97e0af51416f4960b3fb64a4773", "rev": "a1817d1c0e5eabe7dfdfe4caa46c94d9d8f3fdb6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -282,11 +282,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753964049, "lastModified": 1749155331,
"narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -342,11 +342,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1754254502, "lastModified": 1753523167,
"narHash": "sha256-uxfjGhR1BeD1lgPgPjIkcGxdWHOKA0+KoCTWfIsegLM=", "narHash": "sha256-DLVvtdF8zPmL+7dYubnMfK9IIITriecCg7ijLErUTg0=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "1b86d35f7ebc2c613f5ef6cba89dcd8d1ceedaa4", "rev": "e1fff05d0db9c266679ec7ea1b5734c73d6b0a57",
"revCount": 6344, "revCount": 6314,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -462,11 +462,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753819801, "lastModified": 1750371812,
"narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=", "narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-qtutils", "repo": "hyprland-qtutils",
"rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc", "rev": "b13c7481e37856f322177010bdf75fccacd1adc8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -491,11 +491,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753622892, "lastModified": 1750371198,
"narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=", "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809", "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -564,11 +564,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1753819183, "lastModified": 1753378338,
"narHash": "sha256-KjuaXO9pdSHwpnsdj+TXqLDVZ8EhqfV5duSzIssBlzY=", "narHash": "sha256-Ctk7zophp8obM/u9S2c8a6nOWV+VeIzq6ma+dI5BE3s=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprsunset", "repo": "hyprsunset",
"rev": "233aaccdbdd20af848be3f30ab318342e28cd7e3", "rev": "962f519df793ea804810b1ddebfc8a88b80a845c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -589,11 +589,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753800567, "lastModified": 1752252310,
"narHash": "sha256-W0xgXsaqGa/5/7IBzKNhf0+23MqGPymYYfqT7ECqeTE=", "narHash": "sha256-06i1pIh6wb+sDeDmWlzuPwIdaFMxLlj1J9I5B9XqSeo=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "c65d41d4f4e6ded6fdb9d508a73e2fe90e55cdf7", "rev": "bcabcbada90ed2aacb435dc09b91001819a6dc82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -759,11 +759,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1754316476, "lastModified": 1753122741,
"narHash": "sha256-Ry1gd1BQrNVJJfT11cpVP0FY8XFMx4DJV2IDp01CH9w=", "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "9368056b73efb46eb14fd4667b99e0f81b805f28", "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -805,11 +805,11 @@
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": { "locked": {
"lastModified": 1744868846, "lastModified": 1753432016,
"narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "rev": "6027c30c8e9810896b92429f0092f624f7b1aace",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -885,11 +885,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1754214453, "lastModified": 1753429684,
"narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -933,11 +933,11 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1754214453, "lastModified": 1753429684,
"narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -993,11 +993,11 @@
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1754319480, "lastModified": 1753530457,
"narHash": "sha256-Q2sQCiGrQ80bPdD2b8xrjKXEr+frwDP7Oa5LtgRqiy8=", "narHash": "sha256-ElI7ya0YQ07RMDEaF94bQe7Rmz4tr2pKYa+KdRchrEY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "4de6ec34385c2fdd449989fc3751586caaf1dc12", "rev": "8c37eaf318485018b37efa1006af881c5c7f5616",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1066,8 +1066,7 @@
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_6",
"nixvim": "nixvim", "nixvim": "nixvim",
"nur": "nur", "nur": "nur",
"sops-nix": "sops-nix", "sops-nix": "sops-nix"
"stablepkgs": "stablepkgs"
} }
}, },
"rust-analyzer-src": { "rust-analyzer-src": {
@ -1105,22 +1104,6 @@
"type": "github" "type": "github"
} }
}, },
"stablepkgs": {
"locked": {
"lastModified": 1754292888,
"narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ce01daebf8489ba97bd1609d185ea276efdeb121",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
@ -1209,11 +1192,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753633878, "lastModified": 1751300244,
"narHash": "sha256-js2sLRtsOUA/aT10OCDaTjO80yplqwOIaLUqEe0nMx0=", "narHash": "sha256-PFuv1TZVYvQhha0ac53E3YgdtmLShrN0t4T6xqHl0jE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "371b96bd11ad2006ed4f21229dbd1be69bed3e8a", "rev": "6115f3fdcb2c1a57b4a80a69f3c797e47607b90a",
"type": "github" "type": "github"
}, },
"original": { "original": {

58
hosts/dandelion/default.nix
View file

@ -16,6 +16,8 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOLdcB5JFWx6OK2BAr8J0wPHNhr2VP2/Ci6fv3a+DPfo liv@violet" # allow violet to log in over ssh to do back ups "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOLdcB5JFWx6OK2BAr8J0wPHNhr2VP2/Ci6fv3a+DPfo liv@violet" # allow violet to log in over ssh to do back ups
]; ];
networking.hostName = "dandelion";
liv.server.enable = true; liv.server.enable = true;
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
@ -25,34 +27,8 @@
time.timeZone = "Europe/Amsterdam"; time.timeZone = "Europe/Amsterdam";
networking = {
hostName = "dandelion";
firewall = {
allowedTCPPorts = [
5201
];
allowedUDPPorts = [
5201
];
interfaces."ens4s1".allowedTCPPorts = [
# allow everything for local link
{
from = 1;
to = 65354;
}
];
interfaces."ens4s1".allowedUDPPorts = [
# allow everything for local link
{
from = 1;
to = 65354;
}
];
};
};
systemd.network.networks."99-local" = { systemd.network.networks."99-local" = {
matchConfig.name = "ens4s1"; matchConfig.name = "ens3s1";
address = [ address = [
"192.168.1.100/24" "192.168.1.100/24"
]; ];
@ -84,22 +60,16 @@
trim.enable = true; trim.enable = true;
}; };
boot.zfs.extraPools = [ boot.zfs.extraPools = [ "spinners" ];
"spinners"
];
# fileSystems = { fileSystems = {
# "/spinners/rootvol" = { "/spinners/rootvol" = {
# device = "spinners/rootvol"; device = "terrabite/rootvol";
# fsType = "zfs"; fsType = "zfs";
# }; };
# "/spinners/ahwx" = { "/spinners/ahwx" = {
# device = "spinners/ahwx"; device = "terrabite/ahwx";
# fsType = "zfs"; fsType = "zfs";
# }; };
# "/spinners/violet" = { };
# device = "spinners/violet";
# fsType = "zfs";
# };
# };
} }

24
hosts/yoshino/default.nix
View file

@ -12,7 +12,6 @@
# ./../../modules/home/nfs.nix # ./../../modules/home/nfs.nix
./../../modules/core/virtualization.nix ./../../modules/core/virtualization.nix
./../../modules/services/tailscale.nix ./../../modules/services/tailscale.nix
./../../modules/services/mpd.nix
]; ];
powerManagement = { powerManagement = {
@ -21,24 +20,6 @@
cpuFreqGovernor = lib.mkDefault "performance"; cpuFreqGovernor = lib.mkDefault "performance";
}; };
networking = {
hostName = "yoshino";
networkmanager.enable = true;
};
systemd.network.networks."99-local" = {
matchConfig.name = "enp68s0";
address = [
"192.168.1.100/24"
];
routes = [
{
Gateway = "172.16.10.1";
GatewayOnLink = false;
}
];
};
liv = { liv = {
desktop.enable = true; desktop.enable = true;
creative.enable = true; creative.enable = true;
@ -47,6 +28,11 @@
gui.enable = true; gui.enable = true;
}; };
networking = {
hostName = "yoshino";
networkmanager.enable = true;
};
boot = { boot = {
kernelParams = [ ]; kernelParams = [ ];
kernelModules = [ "acpi_call" ]; kernelModules = [ "acpi_call" ];

2
modules/core/services.nix
View file

@ -9,5 +9,5 @@
''; '';
# To prevent getting stuck at shutdown. # To prevent getting stuck at shutdown.
# systemd.extraConfig = "DefaultTimeoutStopSec=10s"; # Deprecated now systemd.extraConfig = "DefaultTimeoutStopSec=10s";
} }

4
modules/core/sops.nix
View file

@ -25,14 +25,10 @@
else if (host == "sakura") then else if (host == "sakura") then
{ {
"systemMailerPassword" = { }; "systemMailerPassword" = { };
"dandelionSyncthingId" = { };
"sakuraSyncthingId" = { };
} }
else if (host == "dandelion") then else if (host == "dandelion") then
{ {
"systemMailerPassword" = { }; "systemMailerPassword" = { };
"dandelionSyncthingId" = { };
"sakuraSyncthingId" = { };
} }
else else
{ }; { };

1
modules/services/dandelion.nix
View file

@ -7,7 +7,6 @@
++ [ (import ./home-assistant.nix) ] ++ [ (import ./home-assistant.nix) ]
++ [ (import ./monitoring.nix) ] ++ [ (import ./monitoring.nix) ]
++ [ (import ./smart-monitoring.nix) ] ++ [ (import ./smart-monitoring.nix) ]
++ [ (import ./syncthing.nix) ]
++ [ (import ./tailscale.nix) ] ++ [ (import ./tailscale.nix) ]
++ [ (import ./nfs.nix) ] ++ [ (import ./nfs.nix) ]
++ [ (import ./hd-idle.nix) ]; ++ [ (import ./hd-idle.nix) ];

2
modules/services/nfs.nix
View file

@ -8,7 +8,7 @@
services = { services = {
# Network shares # Network shares
samba = { samba = {
package = pkgs.samba; package = pkgs.samba4Full;
# ^^ `samba4Full` is compiled with avahi, ldap, AD etc support (compared to the default package, `samba` # ^^ `samba4Full` is compiled with avahi, ldap, AD etc support (compared to the default package, `samba`
# Required for samba to register mDNS records for auto discovery # Required for samba to register mDNS records for auto discovery
# See https://github.com/NixOS/nixpkgs/blob/592047fc9e4f7b74a4dc85d1b9f5243dfe4899e3/pkgs/top-level/all-packages.nix#L27268 # See https://github.com/NixOS/nixpkgs/blob/592047fc9e4f7b74a4dc85d1b9f5243dfe4899e3/pkgs/top-level/all-packages.nix#L27268