Compare commits
46
Commits
07f1f811b9
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a00258ed3d | ||
|
|
1eb528fdc7 | ||
|
|
900a830660 | ||
|
|
4e32f3c193 | ||
|
|
8f32d561f5 | ||
|
|
e766d73c6d | ||
|
|
550b91fd59 | ||
|
|
9d5b87e036 | ||
|
|
7b729d68aa | ||
|
|
71b94afced | ||
|
|
af7fee8ea7 | ||
|
|
b8594b37b5 | ||
|
|
f39b398e8a | ||
|
|
b00cadd7a3 | ||
|
|
3572ef72af | ||
|
|
ea41bef16c | ||
|
|
addef281d7 | ||
|
|
4f8df6192f | ||
|
|
bcddfd1443 | ||
|
|
2f5bcb3029 | ||
|
|
d8dffd131f | ||
|
|
d2123f4e8d | ||
|
|
2ab6b4a932 | ||
|
|
9753013fa9 | ||
|
|
fc5fb9af0e | ||
|
|
91ea0a10cf | ||
|
|
7e300df6fa | ||
|
|
24e58fc71d | ||
|
|
e5c52d516a | ||
|
|
682f49d002 | ||
|
|
0df48f3021 | ||
|
|
6a41a274cf | ||
|
|
49d3f8bb5b | ||
|
|
89980b6244 | ||
|
|
bf094a3e08 | ||
|
|
b052afabc1 | ||
|
|
62e3df59bf | ||
|
|
8bf6c4fcc0 | ||
|
|
86e84cad1b | ||
|
|
36952f5bae | ||
|
|
7f59ae2652 | ||
|
|
a386bd81c3 | ||
|
|
f0294a80ce | ||
|
|
6d6b690218 | ||
|
|
cc8b2636db | ||
|
|
acc6970571 |
Generated
+22
-22
@@ -37,11 +37,11 @@
|
|||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1785239295,
|
"lastModified": 1788229478,
|
||||||
"narHash": "sha256-aYFoftXjm7Df7CAoR0XoMQjJ9rTZ/l9d1jr9EqD7sHM=",
|
"narHash": "sha256-G0F2rFORVcFkEvVdE/qWQTnYekIc77YP5/vRF9nZlxU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "42bb40f7aaab63a107b64a20c4a4ade6550758d0",
|
"rev": "1dc2d1f720ab17fc7981e087346bf54b26d284b1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -97,11 +97,11 @@
|
|||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1785210256,
|
"lastModified": 1788146779,
|
||||||
"narHash": "sha256-8yI7hhBzUVprMDUecN5SkstELX80Mv8xAmk1CAneRaI=",
|
"narHash": "sha256-DPpSweCi/XNpD7r2mrL83gaN0/UsQIF6ihb2HY2G2Jc=",
|
||||||
"owner": "cynicsketch",
|
"owner": "cynicsketch",
|
||||||
"repo": "nix-mineral",
|
"repo": "nix-mineral",
|
||||||
"rev": "c5a5196fc1415806be79c1e78abdfdaa5c13a2ab",
|
"rev": "9e05f8a852c7ca53e797379deef275b608d47ef4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -115,11 +115,11 @@
|
|||||||
"nixpkgs": "nixpkgs_4"
|
"nixpkgs": "nixpkgs_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1785232496,
|
"lastModified": 1788044418,
|
||||||
"narHash": "sha256-65EQYIRRpTdpH8lUiB6Mvo5uBkG60aBIzAJuALfx+O0=",
|
"narHash": "sha256-cmOd3iGoE140M2GidgQMQbyxHZ4dT7C0QZq2+CrXQyA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "2e790b0a6be8ec2b76174ac0931b8ff11919ec98",
|
"rev": "dc3f0cfde2050172abf6c3cdb684f735c15a57c5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -131,11 +131,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1783604885,
|
"lastModified": 1787209939,
|
||||||
"narHash": "sha256-tzMgSkV7kljEkqIjlgV6F+n+xD+/a35Db8bs7a4BFAo=",
|
"narHash": "sha256-WvvHR4kSQLAbtouMC/ruZ5UpLwlUcY3K4FAllMN+yGk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "767b0d3ec98a143ad9ed7dfc0d5553510ac27133",
|
"rev": "391b592eb44808b3bd0cb80bb71b63a5a118b8bb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -207,11 +207,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1785090369,
|
"lastModified": 1788179007,
|
||||||
"narHash": "sha256-m0pDuRJG7EDo9ri+4Ksu83VsI+PlxNC9lNBfydejce4=",
|
"narHash": "sha256-hn1oU2rue2SYK8dAr8+WNZWtbsz1S2W5mnHlSEuh3bo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "624af665418d3c65d544145b4d34ad696439570e",
|
"rev": "34ab99075ac4f7e40cf037eef32cb1c360bb85e9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -223,11 +223,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_6": {
|
"nixpkgs_6": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1784796856,
|
"lastModified": 1787900134,
|
||||||
"narHash": "sha256-vwxWgF+Gj276WznzGb1LxGsK/39HaQwgQXiU3EkC844=",
|
"narHash": "sha256-5GWj0FI2uOwKNpXkmpWrSFDe1rCaNBCUQ8d+HDtFQPI=",
|
||||||
"rev": "e2587caef70cea85dd97d7daab492899902dbf5d",
|
"rev": "83199d0d373dd3ac2b9a1996b1d0263f76ab7a4c",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1040357.e2587caef70c/nixexprs.tar.xz"
|
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1063296.83199d0d373d/nixexprs.tar.xz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
@@ -250,11 +250,11 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1785048222,
|
"lastModified": 1788083617,
|
||||||
"narHash": "sha256-LjFVfwxensz76SjnvofF1Jsw+xTLd8Qp31W0J6nh2XI=",
|
"narHash": "sha256-aXMDRUxm/9se+vgKViKdDcClk1k3qA3sUwT0kAYo3Fg=",
|
||||||
"owner": "Gerg-L",
|
"owner": "Gerg-L",
|
||||||
"repo": "spicetify-nix",
|
"repo": "spicetify-nix",
|
||||||
"rev": "17e524f330c282d31c32dfe076222d4a12277886",
|
"rev": "bf4ed54253a61c8324a5b461638c42db77c0b980",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -70,9 +70,11 @@
|
|||||||
./modules/gui/apps/steam.nix
|
./modules/gui/apps/steam.nix
|
||||||
./modules/gui/fonts.nix
|
./modules/gui/fonts.nix
|
||||||
./modules/gui/services/flatpak.nix
|
./modules/gui/services/flatpak.nix
|
||||||
|
./modules/gui/services/geoclue.nix
|
||||||
./modules/gui/services/kdeconnect.nix
|
./modules/gui/services/kdeconnect.nix
|
||||||
./modules/gui/services/kwallet.nix
|
./modules/gui/services/kwallet.nix
|
||||||
./modules/gui/services/xdg.nix
|
./modules/gui/services/xdg.nix
|
||||||
|
./modules/gui/services/waydroid.nix
|
||||||
|
|
||||||
./modules/net/services/avahi.nix
|
./modules/net/services/avahi.nix
|
||||||
./modules/net/services/fail2ban.nix
|
./modules/net/services/fail2ban.nix
|
||||||
@@ -91,18 +93,19 @@
|
|||||||
./modules/sys/hw/boot.nix
|
./modules/sys/hw/boot.nix
|
||||||
./modules/sys/hw/libinput.nix
|
./modules/sys/hw/libinput.nix
|
||||||
./modules/sys/hw/cpu/amd64.nix
|
./modules/sys/hw/cpu/amd64.nix
|
||||||
./modules/sys/hw/gpu/amd.nix
|
./modules/sys/hw/gpu/nvidia.nix
|
||||||
./modules/sys/hw/gpu/vmware.nix
|
./modules/sys/hw/gpu/vmware.nix
|
||||||
./modules/sys/hw/input/keyboard.nix
|
./modules/sys/hw/input/keyboard.nix
|
||||||
./modules/sys/hw/input/tablet.nix
|
./modules/sys/hw/input/tablet.nix
|
||||||
./modules/sys/hw/input/xbox.nix
|
./modules/sys/hw/input/xbox.nix
|
||||||
|
./modules/sys/hw/misc/ios.nix
|
||||||
|
|
||||||
./modules/sys/nix.nix
|
./modules/sys/nix.nix
|
||||||
./modules/sys/perf.nix
|
./modules/sys/perf.nix
|
||||||
./modules/sys/pkgs.nix
|
./modules/sys/pkgs.nix
|
||||||
./modules/sys/rc/openssh.nix
|
./modules/sys/rc/openssh.nix
|
||||||
./modules/sys/rc/sunshine.nix
|
./modules/sys/rc/sunshine.nix
|
||||||
./modules/sys/rc/x2goserver.nix
|
./modules/sys/rc/synergy.nix
|
||||||
|
|
||||||
./modules/sys/rgb.nix
|
./modules/sys/rgb.nix
|
||||||
./modules/sys/security.nix
|
./modules/sys/security.nix
|
||||||
@@ -112,6 +115,8 @@
|
|||||||
./modules/sys/time.nix
|
./modules/sys/time.nix
|
||||||
./modules/sys/users/k3t.nix
|
./modules/sys/users/k3t.nix
|
||||||
|
|
||||||
|
./modules/sys/vm.nix
|
||||||
|
|
||||||
./hosts/TheBlackBox/configuration.nix
|
./hosts/TheBlackBox/configuration.nix
|
||||||
spicetify-nix.nixosModules.spicetify
|
spicetify-nix.nixosModules.spicetify
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
@@ -122,117 +127,6 @@
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
"NixNAS" = mkHost "x86_64-linux" [
|
|
||||||
./modules/net/services/avahi.nix
|
|
||||||
./modules/net/services/fail2ban.nix
|
|
||||||
./modules/net/services/networkmanager.nix
|
|
||||||
./modules/net/services/tailscale.nix
|
|
||||||
|
|
||||||
./modules/sys/compat.nix
|
|
||||||
./modules/sys/firewall.nix
|
|
||||||
|
|
||||||
./modules/sys/fs/btrfs.nix
|
|
||||||
./modules/sys/fs/mounts/efi.nix
|
|
||||||
./modules/sys/fs/mounts/root-btrfs.nix
|
|
||||||
./modules/sys/fs/mounts/swap.nix
|
|
||||||
|
|
||||||
./modules/sys/hw/boot.nix
|
|
||||||
./modules/sys/hw/hyperv.nix
|
|
||||||
|
|
||||||
./modules/sys/nix.nix
|
|
||||||
./modules/sys/perf.nix
|
|
||||||
./modules/sys/pkgs.nix
|
|
||||||
./modules/sys/rc/openssh.nix
|
|
||||||
./modules/sys/security.nix
|
|
||||||
./modules/sys/shell.nix
|
|
||||||
./modules/sys/stateversion.nix
|
|
||||||
./modules/sys/sysctl.nix
|
|
||||||
./modules/sys/time.nix
|
|
||||||
./modules/sys/users/k3t.nix
|
|
||||||
|
|
||||||
./hosts/NixNAS/configuration.nix
|
|
||||||
home-manager.nixosModules.home-manager
|
|
||||||
{
|
|
||||||
home-manager.useGlobalPkgs = true;
|
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
home-manager.users.k3t = ./home/server.nix;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
"NixServe" = mkHost "x86_64-linux" [
|
|
||||||
./modules/net/services/avahi.nix
|
|
||||||
./modules/net/services/fail2ban.nix
|
|
||||||
./modules/net/services/networkmanager.nix
|
|
||||||
./modules/net/services/tailscale.nix
|
|
||||||
|
|
||||||
./modules/sys/compat.nix
|
|
||||||
./modules/sys/firewall.nix
|
|
||||||
|
|
||||||
./modules/sys/fs/btrfs.nix
|
|
||||||
./modules/sys/fs/mounts/efi.nix
|
|
||||||
./modules/sys/fs/mounts/root-btrfs.nix
|
|
||||||
./modules/sys/fs/mounts/swap.nix
|
|
||||||
|
|
||||||
./modules/sys/hw/boot.nix
|
|
||||||
./modules/sys/hw/hyperv.nix
|
|
||||||
|
|
||||||
./modules/sys/nix.nix
|
|
||||||
./modules/sys/perf.nix
|
|
||||||
./modules/sys/pkgs.nix
|
|
||||||
./modules/sys/rc/openssh.nix
|
|
||||||
./modules/sys/security.nix
|
|
||||||
./modules/sys/shell.nix
|
|
||||||
./modules/sys/stateversion.nix
|
|
||||||
./modules/sys/sysctl.nix
|
|
||||||
./modules/sys/time.nix
|
|
||||||
./modules/sys/users/k3t.nix
|
|
||||||
|
|
||||||
./hosts/NixServe/configuration.nix
|
|
||||||
home-manager.nixosModules.home-manager
|
|
||||||
{
|
|
||||||
home-manager.useGlobalPkgs = true;
|
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
home-manager.users.k3t = ./home/server.nix;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
"NixGame" = mkHost "x86_64-linux" [
|
|
||||||
./modules/net/services/avahi.nix
|
|
||||||
./modules/net/services/fail2ban.nix
|
|
||||||
./modules/net/services/networkmanager.nix
|
|
||||||
./modules/net/services/tailscale.nix
|
|
||||||
|
|
||||||
./modules/sys/compat.nix
|
|
||||||
./modules/sys/firewall.nix
|
|
||||||
|
|
||||||
./modules/sys/fs/btrfs.nix
|
|
||||||
./modules/sys/fs/mounts/efi.nix
|
|
||||||
./modules/sys/fs/mounts/root-btrfs.nix
|
|
||||||
./modules/sys/fs/mounts/swap.nix
|
|
||||||
|
|
||||||
./modules/sys/hw/boot.nix
|
|
||||||
./modules/sys/hw/hyperv.nix
|
|
||||||
|
|
||||||
./modules/sys/nix.nix
|
|
||||||
./modules/sys/perf.nix
|
|
||||||
./modules/sys/pkgs.nix
|
|
||||||
./modules/sys/rc/openssh.nix
|
|
||||||
./modules/sys/security.nix
|
|
||||||
./modules/sys/shell.nix
|
|
||||||
./modules/sys/stateversion.nix
|
|
||||||
./modules/sys/sysctl.nix
|
|
||||||
./modules/sys/time.nix
|
|
||||||
./modules/sys/users/k3t.nix
|
|
||||||
|
|
||||||
./hosts/NixGame/configuration.nix
|
|
||||||
home-manager.nixosModules.home-manager
|
|
||||||
{
|
|
||||||
home-manager.useGlobalPkgs = true;
|
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
home-manager.users.k3t = ./home/server.nix;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
"IdeaPad" = mkHost "x86_64-linux" [
|
"IdeaPad" = mkHost "x86_64-linux" [
|
||||||
./modules/audio/base.nix
|
./modules/audio/base.nix
|
||||||
./modules/audio/zeroconf.nix
|
./modules/audio/zeroconf.nix
|
||||||
@@ -244,6 +138,7 @@
|
|||||||
./modules/gui/apps/firefox.nix
|
./modules/gui/apps/firefox.nix
|
||||||
./modules/gui/fonts.nix
|
./modules/gui/fonts.nix
|
||||||
./modules/gui/services/flatpak.nix
|
./modules/gui/services/flatpak.nix
|
||||||
|
./modules/gui/services/geoclue.nix
|
||||||
./modules/gui/services/kdeconnect.nix
|
./modules/gui/services/kdeconnect.nix
|
||||||
./modules/gui/services/kwallet.nix
|
./modules/gui/services/kwallet.nix
|
||||||
./modules/gui/services/xdg.nix
|
./modules/gui/services/xdg.nix
|
||||||
@@ -315,6 +210,7 @@
|
|||||||
./modules/sys/perf.nix
|
./modules/sys/perf.nix
|
||||||
./modules/sys/pkgs.nix
|
./modules/sys/pkgs.nix
|
||||||
./modules/sys/rc/openssh.nix
|
./modules/sys/rc/openssh.nix
|
||||||
|
./modules/sys/rc/synergy.nix
|
||||||
./modules/sys/rc/sunshine.nix
|
./modules/sys/rc/sunshine.nix
|
||||||
./modules/sys/rgb.nix
|
./modules/sys/rgb.nix
|
||||||
./modules/sys/security.nix
|
./modules/sys/security.nix
|
||||||
@@ -333,7 +229,7 @@
|
|||||||
home-manager.users.k3t = ./home/desktop.nix;
|
home-manager.users.k3t = ./home/desktop.nix;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
"T14" = mkHost "x86_64-linux" [
|
"ThinkPad" = mkHost "x86_64-linux" [
|
||||||
./modules/audio/base.nix
|
./modules/audio/base.nix
|
||||||
./modules/audio/zeroconf.nix
|
./modules/audio/zeroconf.nix
|
||||||
|
|
||||||
@@ -348,9 +244,11 @@
|
|||||||
./modules/gui/apps/steam.nix
|
./modules/gui/apps/steam.nix
|
||||||
./modules/gui/fonts.nix
|
./modules/gui/fonts.nix
|
||||||
./modules/gui/services/flatpak.nix
|
./modules/gui/services/flatpak.nix
|
||||||
|
./modules/gui/services/geoclue.nix
|
||||||
./modules/gui/services/kdeconnect.nix
|
./modules/gui/services/kdeconnect.nix
|
||||||
./modules/gui/services/kwallet.nix
|
./modules/gui/services/kwallet.nix
|
||||||
./modules/gui/services/xdg.nix
|
./modules/gui/services/xdg.nix
|
||||||
|
./modules/gui/services/waydroid.nix
|
||||||
|
|
||||||
./modules/net/services/avahi.nix
|
./modules/net/services/avahi.nix
|
||||||
./modules/net/services/fail2ban.nix
|
./modules/net/services/fail2ban.nix
|
||||||
@@ -360,14 +258,22 @@
|
|||||||
|
|
||||||
./modules/sys/compat.nix
|
./modules/sys/compat.nix
|
||||||
./modules/sys/firewall.nix
|
./modules/sys/firewall.nix
|
||||||
|
|
||||||
./modules/sys/fs/btrfs.nix
|
./modules/sys/fs/btrfs.nix
|
||||||
|
./modules/sys/fs/mounts/efi.nix
|
||||||
|
./modules/sys/fs/mounts/btrfs/tbb-btrfs.nix
|
||||||
|
./modules/sys/fs/mounts/swap.nix
|
||||||
|
|
||||||
|
|
||||||
./modules/sys/hw/boot.nix
|
./modules/sys/hw/boot.nix
|
||||||
./modules/sys/hw/cpu/amd64.nix
|
./modules/sys/hw/cpu/intel.nix
|
||||||
./modules/sys/hw/gpu/amd.nix
|
./modules/sys/hw/gpu/intel.nix
|
||||||
|
./modules/sys/hw/misc/ios.nix
|
||||||
./modules/sys/nix.nix
|
./modules/sys/nix.nix
|
||||||
./modules/sys/perf.nix
|
./modules/sys/perf.nix
|
||||||
./modules/sys/pkgs.nix
|
./modules/sys/pkgs.nix
|
||||||
./modules/sys/rc/openssh.nix
|
./modules/sys/rc/openssh.nix
|
||||||
|
./modules/sys/rc/synergy.nix
|
||||||
./modules/sys/rc/sunshine.nix
|
./modules/sys/rc/sunshine.nix
|
||||||
./modules/sys/rgb.nix
|
./modules/sys/rgb.nix
|
||||||
./modules/sys/security.nix
|
./modules/sys/security.nix
|
||||||
|
|||||||
@@ -4,12 +4,12 @@
|
|||||||
|
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
let
|
#let
|
||||||
amdgpu-kernel-module = pkgs.callPackage ./amdgpu-kernel-module.nix {
|
# amdgpu-kernel-module = pkgs.callPackage ./amdgpu-kernel-module.nix {
|
||||||
# Make sure the module targets the same kernel as your system is using.
|
# Make sure the module targets the same kernel as your system is using.
|
||||||
kernel = config.boot.kernelPackages.kernel;
|
# kernel = config.boot.kernelPackages.kernel;
|
||||||
};
|
# };
|
||||||
in
|
#in
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
@@ -20,11 +20,14 @@ in
|
|||||||
networking.hostName = "TheBlackBox";
|
networking.hostName = "TheBlackBox";
|
||||||
|
|
||||||
# Linux and VR... nightmare below
|
# Linux and VR... nightmare below
|
||||||
boot.extraModulePackages = [
|
#boot.extraModulePackages = [
|
||||||
(amdgpu-kernel-module.overrideAttrs (_: {
|
# (amdgpu-kernel-module.overrideAttrs (_: {
|
||||||
patches = [ ./amdgpu-cap_sys_nice_begone.patch ];
|
# patches = [ ./amdgpu-cap_sys_nice_begone.patch ];
|
||||||
}))
|
# }))
|
||||||
];
|
#];
|
||||||
|
|
||||||
|
# Synergy
|
||||||
|
#services.synergy.server.enable = true;
|
||||||
|
|
||||||
services.wivrn = {
|
services.wivrn = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -64,6 +67,11 @@ in
|
|||||||
users.users.k3t = {
|
users.users.k3t = {
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
virt-viewer
|
virt-viewer
|
||||||
|
fuse-overlayfs
|
||||||
|
fuse3
|
||||||
|
psmisc
|
||||||
|
dwarfs
|
||||||
|
wineWow64Packages.staging
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
networking.hostName = "T14"; # Define your hostname.
|
networking.hostName = "ThinkPad"; # Define your hostname.
|
||||||
|
|
||||||
users.users.k3t = {
|
users.users.k3t = {
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
|
|||||||
@@ -8,28 +8,11 @@
|
|||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
fileSystems."/" =
|
|
||||||
{ device = "/dev/disk/by-label/NixOS";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=@" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/home" =
|
|
||||||
{ device = "/dev/disk/by-label/NixOS";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=@home" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/boot" =
|
|
||||||
{ device = "/dev/disk/by-uuid/E0C2-A3A3";
|
|
||||||
fsType = "vfat";
|
|
||||||
options = [ "fmask=0077" "dmask=0077" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
#swapDevices =
|
#swapDevices =
|
||||||
# [ { device = "/dev/disk/by-uuid/fe32f9af-3382-4505-90e3-aaf1c41bf5d4"; }
|
# [ { device = "/dev/disk/by-uuid/fe32f9af-3382-4505-90e3-aaf1c41bf5d4"; }
|
||||||
# ];
|
# ];
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
hardware.sensor.iio.enable = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,6 +14,20 @@
|
|||||||
|
|
||||||
networking.hostName = "nixcloud"; # Define your hostname.
|
networking.hostName = "nixcloud"; # Define your hostname.
|
||||||
|
|
||||||
|
# podman
|
||||||
|
virtualisation.podman = {
|
||||||
|
enable = true;
|
||||||
|
autoPrune.enable = true;
|
||||||
|
dockerCompat = true; # optional; lets you use `docker` CLI
|
||||||
|
};
|
||||||
|
virtualisation.oci-containers.backend = "podman";
|
||||||
|
|
||||||
|
# Enable container name DNS for all Podman networks.
|
||||||
|
networking.firewall.interfaces = let
|
||||||
|
matchAll = if !config.networking.nftables.enable then "podman+" else "podman*";
|
||||||
|
in {
|
||||||
|
"${matchAll}".allowedUDPPorts = [ 53 ];
|
||||||
|
};
|
||||||
|
|
||||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||||
users.users = {
|
users.users = {
|
||||||
@@ -37,9 +51,15 @@
|
|||||||
|
|
||||||
# List packages installed in system profile.
|
# List packages installed in system profile.
|
||||||
# You can use https://search.nixos.org/ to find more packages (and options).
|
# You can use https://search.nixos.org/ to find more packages (and options).
|
||||||
#environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# wget
|
waypipe
|
||||||
#];
|
];
|
||||||
|
|
||||||
|
# enable mesa
|
||||||
|
hardware.graphics.enable = true;
|
||||||
|
|
||||||
|
# desktop in the sky
|
||||||
|
services.desktopManager.plasma6.enable = true;
|
||||||
|
|
||||||
|
|
||||||
# Open ports in the firewall.
|
# Open ports in the firewall.
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
prefetching = true;
|
prefetching = true;
|
||||||
};
|
};
|
||||||
ports = {
|
ports = {
|
||||||
dns = 53;
|
dns = 5353;
|
||||||
tls = 853;
|
tls = 853;
|
||||||
http = 4000;
|
http = 4000;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
{
|
||||||
|
virtualisation.oci-containers.containers = {
|
||||||
|
"matrix-gomuks" = {
|
||||||
|
image = "dock.mau.dev/gomuks/gomuks";
|
||||||
|
volumes = [
|
||||||
|
"/var/lib/gomuks:/data:rw"
|
||||||
|
];
|
||||||
|
ports = [
|
||||||
|
"127.0.0.1:29325:29325/tcp"
|
||||||
|
];
|
||||||
|
log-driver = "journald";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
services.nginx.virtualHosts."gomuks.k3t.dev" = {
|
||||||
|
enableACME = true;
|
||||||
|
forceSSL = true;
|
||||||
|
locations."/" = {
|
||||||
|
proxyPass = "http://127.0.0.1:29325";
|
||||||
|
proxyWebsockets = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -6,7 +6,7 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
global = {
|
global = {
|
||||||
address = [ "127.0.0.1" ];
|
address = [ "0.0.0.0" ];
|
||||||
server_name = "k3t.dev";
|
server_name = "k3t.dev";
|
||||||
trusted_servers = [
|
trusted_servers = [
|
||||||
"matrix.org"
|
"matrix.org"
|
||||||
|
|||||||
@@ -3,232 +3,102 @@
|
|||||||
{ pkgs, lib, config, ... }:
|
{ pkgs, lib, config, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# Runtime
|
|
||||||
virtualisation.podman = {
|
|
||||||
enable = true;
|
|
||||||
autoPrune.enable = true;
|
|
||||||
dockerCompat = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Enable container name DNS for all Podman networks.
|
# Containers
|
||||||
|
virtualisation.oci-containers.containers = {
|
||||||
|
"matrix-mautrix-bluesky" = {
|
||||||
|
image = "dock.mau.dev/mautrix/bluesky:latest";
|
||||||
|
volumes = [
|
||||||
|
"/var/lib/mautrix/bluesky:/data:rw"
|
||||||
|
];
|
||||||
|
ports = [
|
||||||
|
"127.0.0.1:29340:29340/tcp"
|
||||||
|
];
|
||||||
|
log-driver = "journald";
|
||||||
|
};
|
||||||
|
"matrix-mautrix-discord" = {
|
||||||
|
image = "dock.mau.dev/mautrix/discord:latest";
|
||||||
|
volumes = [
|
||||||
|
"/var/lib/mautrix/discord:/data:rw"
|
||||||
|
];
|
||||||
|
ports = [
|
||||||
|
"127.0.0.1:29334:29334/tcp"
|
||||||
|
];
|
||||||
|
log-driver = "journald";
|
||||||
|
};
|
||||||
|
"matrix-mautrix-linkedin" = {
|
||||||
|
image = "dock.mau.dev/mautrix/linkedin:latest";
|
||||||
|
volumes = [
|
||||||
|
"/var/lib/mautrix/linkedin:/data:rw"
|
||||||
|
];
|
||||||
|
ports = [
|
||||||
|
"127.0.0.1:29341:29341/tcp"
|
||||||
|
];
|
||||||
|
log-driver = "journald";
|
||||||
|
};
|
||||||
|
"matrix-mautrix-meta" = {
|
||||||
|
image = "dock.mau.dev/mautrix/meta:latest";
|
||||||
|
volumes = [
|
||||||
|
"/var/lib/mautrix/meta:/data:rw"
|
||||||
|
];
|
||||||
|
ports = [
|
||||||
|
"127.0.0.1:29319:29319/tcp"
|
||||||
|
];
|
||||||
|
log-driver = "journald";
|
||||||
|
};
|
||||||
|
"matrix-mautrix-instagram" = {
|
||||||
|
image = "dock.mau.dev/mautrix/meta:ig-latest";
|
||||||
|
volumes = [
|
||||||
|
"/var/lib/mautrix/instagram:/data:rw"
|
||||||
|
];
|
||||||
|
ports = [
|
||||||
|
"127.0.0.1:29330:29330/tcp"
|
||||||
|
];
|
||||||
|
log-driver = "journald";
|
||||||
|
};
|
||||||
|
"matrix-mautrix-signal" = {
|
||||||
|
image = "dock.mau.dev/mautrix/signal:latest";
|
||||||
|
volumes = [
|
||||||
|
"/var/lib/mautrix/signal:/data:rw"
|
||||||
|
];
|
||||||
|
ports = [
|
||||||
|
"127.0.0.1:29328:29328/tcp"
|
||||||
|
];
|
||||||
|
log-driver = "journald";
|
||||||
|
};
|
||||||
|
"matrix-mautrix-twitter" = {
|
||||||
|
image = "dock.mau.dev/mautrix/twitter:latest";
|
||||||
|
volumes = [
|
||||||
|
"/var/lib/mautrix/twitter:/data:rw"
|
||||||
|
];
|
||||||
|
ports = [
|
||||||
|
"127.0.0.1:29327:29327/tcp"
|
||||||
|
];
|
||||||
|
log-driver = "journald";
|
||||||
|
};
|
||||||
|
"matrix-mautrix-whatsapp" = {
|
||||||
|
image = "dock.mau.dev/mautrix/whatsapp:latest";
|
||||||
|
volumes = [
|
||||||
|
"/var/lib/mautrix/whatsapp:/data:rw"
|
||||||
|
];
|
||||||
|
ports = [
|
||||||
|
"127.0.0.1:29318:29318/tcp"
|
||||||
|
];
|
||||||
|
log-driver = "journald";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
services.nginx.virtualHosts."discord-media-mxc.k3t.dev" = {
|
||||||
|
enableACME = true;
|
||||||
|
forceSSL = true;
|
||||||
|
locations."/" = {
|
||||||
|
proxyPass = "http://127.0.0.1:29334";
|
||||||
|
proxyWebsockets = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
# Allow podman containers to access continuwuity
|
||||||
networking.firewall.interfaces = let
|
networking.firewall.interfaces = let
|
||||||
matchAll = if !config.networking.nftables.enable then "podman+" else "podman*";
|
matchAll = if !config.networking.nftables.enable then "podman+" else "podman*";
|
||||||
in {
|
in {
|
||||||
"${matchAll}".allowedUDPPorts = [ 53 ];
|
"${matchAll}".allowedTCPPorts = [ 6167 ];
|
||||||
};
|
|
||||||
|
|
||||||
virtualisation.oci-containers.backend = "podman";
|
|
||||||
|
|
||||||
# Containers
|
|
||||||
virtualisation.oci-containers.containers."matrix-mautrix-bluesky" = {
|
|
||||||
image = "dock.mau.dev/mautrix/bluesky:latest";
|
|
||||||
volumes = [
|
|
||||||
"/var/lib/mautrix/bluesky:/data:rw"
|
|
||||||
];
|
|
||||||
ports = [
|
|
||||||
"127.0.0.4:29340:29340/tcp"
|
|
||||||
];
|
|
||||||
log-driver = "journald";
|
|
||||||
extraOptions = [
|
|
||||||
"--network-alias=mautrix-bluesky"
|
|
||||||
"--network=matrix_default"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
systemd.services."podman-matrix-mautrix-bluesky" = {
|
|
||||||
serviceConfig = {
|
|
||||||
Restart = lib.mkOverride 90 "always";
|
|
||||||
};
|
|
||||||
after = [
|
|
||||||
"podman-network-matrix_default.service"
|
|
||||||
];
|
|
||||||
requires = [
|
|
||||||
"podman-network-matrix_default.service"
|
|
||||||
];
|
|
||||||
partOf = [
|
|
||||||
"podman-compose-matrix-root.target"
|
|
||||||
];
|
|
||||||
wantedBy = [
|
|
||||||
"podman-compose-matrix-root.target"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
virtualisation.oci-containers.containers."matrix-mautrix-discord" = {
|
|
||||||
image = "dock.mau.dev/mautrix/discord:latest";
|
|
||||||
volumes = [
|
|
||||||
"/var/lib/mautrix/discord:/data:rw"
|
|
||||||
];
|
|
||||||
ports = [
|
|
||||||
"127.0.0.4:29334:29334/tcp"
|
|
||||||
];
|
|
||||||
log-driver = "journald";
|
|
||||||
extraOptions = [
|
|
||||||
"--network-alias=mautrix-discord"
|
|
||||||
"--network=matrix_default"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
systemd.services."podman-matrix-mautrix-discord" = {
|
|
||||||
serviceConfig = {
|
|
||||||
Restart = lib.mkOverride 90 "always";
|
|
||||||
};
|
|
||||||
after = [
|
|
||||||
"podman-network-matrix_default.service"
|
|
||||||
];
|
|
||||||
requires = [
|
|
||||||
"podman-network-matrix_default.service"
|
|
||||||
];
|
|
||||||
partOf = [
|
|
||||||
"podman-compose-matrix-root.target"
|
|
||||||
];
|
|
||||||
wantedBy = [
|
|
||||||
"podman-compose-matrix-root.target"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
virtualisation.oci-containers.containers."matrix-mautrix-linkedin" = {
|
|
||||||
image = "dock.mau.dev/mautrix/linkedin:latest";
|
|
||||||
volumes = [
|
|
||||||
"/var/lib/mautrix/linkedin:/data:rw"
|
|
||||||
];
|
|
||||||
ports = [
|
|
||||||
"127.0.0.4:29341:29341/tcp"
|
|
||||||
];
|
|
||||||
log-driver = "journald";
|
|
||||||
extraOptions = [
|
|
||||||
"--network-alias=mautrix-linkedin"
|
|
||||||
"--network=matrix_default"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
systemd.services."podman-matrix-mautrix-linkedin" = {
|
|
||||||
serviceConfig = {
|
|
||||||
Restart = lib.mkOverride 90 "always";
|
|
||||||
};
|
|
||||||
after = [
|
|
||||||
"podman-network-matrix_default.service"
|
|
||||||
];
|
|
||||||
requires = [
|
|
||||||
"podman-network-matrix_default.service"
|
|
||||||
];
|
|
||||||
partOf = [
|
|
||||||
"podman-compose-matrix-root.target"
|
|
||||||
];
|
|
||||||
wantedBy = [
|
|
||||||
"podman-compose-matrix-root.target"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
virtualisation.oci-containers.containers."matrix-mautrix-meta" = {
|
|
||||||
image = "dock.mau.dev/mautrix/meta:latest";
|
|
||||||
volumes = [
|
|
||||||
"/var/lib/mautrix/meta:/data:rw"
|
|
||||||
];
|
|
||||||
ports = [
|
|
||||||
"127.0.0.4:29319:29319/tcp"
|
|
||||||
];
|
|
||||||
log-driver = "journald";
|
|
||||||
extraOptions = [
|
|
||||||
"--network-alias=mautrix-meta"
|
|
||||||
"--network=matrix_default"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
systemd.services."podman-matrix-mautrix-meta" = {
|
|
||||||
serviceConfig = {
|
|
||||||
Restart = lib.mkOverride 90 "always";
|
|
||||||
};
|
|
||||||
after = [
|
|
||||||
"podman-network-matrix_default.service"
|
|
||||||
];
|
|
||||||
requires = [
|
|
||||||
"podman-network-matrix_default.service"
|
|
||||||
];
|
|
||||||
partOf = [
|
|
||||||
"podman-compose-matrix-root.target"
|
|
||||||
];
|
|
||||||
wantedBy = [
|
|
||||||
"podman-compose-matrix-root.target"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
virtualisation.oci-containers.containers."matrix-mautrix-twitter" = {
|
|
||||||
image = "dock.mau.dev/mautrix/twitter:latest";
|
|
||||||
volumes = [
|
|
||||||
"/var/lib/mautrix/twitter:/data:rw"
|
|
||||||
];
|
|
||||||
ports = [
|
|
||||||
"127.0.0.4:29327:29327/tcp"
|
|
||||||
];
|
|
||||||
log-driver = "journald";
|
|
||||||
extraOptions = [
|
|
||||||
"--network-alias=mautrix-twitter"
|
|
||||||
"--network=matrix_default"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
systemd.services."podman-matrix-mautrix-twitter" = {
|
|
||||||
serviceConfig = {
|
|
||||||
Restart = lib.mkOverride 90 "always";
|
|
||||||
};
|
|
||||||
after = [
|
|
||||||
"podman-network-matrix_default.service"
|
|
||||||
];
|
|
||||||
requires = [
|
|
||||||
"podman-network-matrix_default.service"
|
|
||||||
];
|
|
||||||
partOf = [
|
|
||||||
"podman-compose-matrix-root.target"
|
|
||||||
];
|
|
||||||
wantedBy = [
|
|
||||||
"podman-compose-matrix-root.target"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
virtualisation.oci-containers.containers."matrix-mautrix-whatsapp" = {
|
|
||||||
image = "dock.mau.dev/mautrix/whatsapp:latest";
|
|
||||||
volumes = [
|
|
||||||
"/var/lib/mautrix/whatsapp:/data:rw"
|
|
||||||
];
|
|
||||||
ports = [
|
|
||||||
"127.0.0.4:29318:29318/tcp"
|
|
||||||
];
|
|
||||||
log-driver = "journald";
|
|
||||||
extraOptions = [
|
|
||||||
"--network-alias=mautrix-whatsapp"
|
|
||||||
"--network=matrix_default"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
systemd.services."podman-matrix-mautrix-whatsapp" = {
|
|
||||||
serviceConfig = {
|
|
||||||
Restart = lib.mkOverride 90 "always";
|
|
||||||
};
|
|
||||||
after = [
|
|
||||||
"podman-network-matrix_default.service"
|
|
||||||
];
|
|
||||||
requires = [
|
|
||||||
"podman-network-matrix_default.service"
|
|
||||||
];
|
|
||||||
partOf = [
|
|
||||||
"podman-compose-matrix-root.target"
|
|
||||||
];
|
|
||||||
wantedBy = [
|
|
||||||
"podman-compose-matrix-root.target"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Networks
|
|
||||||
systemd.services."podman-network-matrix_default" = {
|
|
||||||
path = [ pkgs.podman ];
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
RemainAfterExit = true;
|
|
||||||
ExecStop = "podman network rm -f matrix_default";
|
|
||||||
};
|
|
||||||
script = ''
|
|
||||||
podman network inspect matrix_default || podman network create matrix_default
|
|
||||||
'';
|
|
||||||
partOf = [ "podman-compose-matrix-root.target" ];
|
|
||||||
wantedBy = [ "podman-compose-matrix-root.target" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Root service
|
|
||||||
# When started, this will automatically create all resources and start
|
|
||||||
# the containers. When stopped, this will teardown all resources.
|
|
||||||
systemd.targets."podman-compose-matrix-root" = {
|
|
||||||
unitConfig = {
|
|
||||||
Description = "Root target generated by compose2nix.";
|
|
||||||
};
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,41 +1,20 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
virtualisation.podman = {
|
virtualisation.oci-containers.containers."minecraft-server" = {
|
||||||
enable = true;
|
image = "ghcr.io/graalvm/graalvm-community:25";
|
||||||
autoPrune.enable = true;
|
volumes = [
|
||||||
dockerCompat = true; # optional; lets you use `docker` CLI
|
"/var/lib/minecraft:/data:rw"
|
||||||
|
];
|
||||||
|
ports = [
|
||||||
|
"25565:25565/tcp"
|
||||||
|
"24454:24454/udp"
|
||||||
|
];
|
||||||
|
extraOptions = [
|
||||||
|
"--tty"
|
||||||
|
"--interactive"
|
||||||
|
];
|
||||||
|
entrypoint = "/data/run.sh";
|
||||||
|
log-driver = "journald";
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services.minecraft-container = {
|
|
||||||
description = "Minecraft Server Container (GraalVM JVM 25)";
|
|
||||||
after = [ "network-online.target" ];
|
|
||||||
wants = [ "network-online.target" ];
|
|
||||||
serviceConfig = {
|
|
||||||
ExecStart = ''
|
|
||||||
${pkgs.podman}/bin/podman run \
|
|
||||||
--rm \
|
|
||||||
--name minecraft-server \
|
|
||||||
-v /var/lib/minecraft:/data \
|
|
||||||
-p 25565:25565 \
|
|
||||||
-p 24454:24454/udp \
|
|
||||||
ghcr.io/graalvm/graalvm-community:25 \
|
|
||||||
/data/run.sh
|
|
||||||
'';
|
|
||||||
ExecStop = "${pkgs.podman}/bin/podman stop minecraft-server";
|
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "10s";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Ensure the directory exists
|
|
||||||
preStart = ''
|
|
||||||
mkdir -p /var/lib/minecraft
|
|
||||||
'';
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Give Podman permission to access persistent storage
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"d /var/lib/minecraft 0755 root root"
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
services = {
|
||||||
|
localtimed.enable = true;
|
||||||
|
geoclue2.enable = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
{pkgs, ...}:
|
||||||
|
|
||||||
|
{
|
||||||
|
virtualisation.waydroid = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.waydroid-nftables;
|
||||||
|
};
|
||||||
|
environment.systemPackages = [ pkgs.wl-clipboard ];
|
||||||
|
}
|
||||||
+15
-10
@@ -1,13 +1,18 @@
|
|||||||
{
|
{
|
||||||
networking.firewall = {
|
networking = {
|
||||||
enable = true;
|
nftables = {
|
||||||
allowedTCPPorts = [ 4713 ];
|
enable = false;
|
||||||
#allowedUDPPorts = [ 80 443 ];
|
};
|
||||||
allowedTCPPortRanges = [
|
firewall = {
|
||||||
{ from = 8000; to = 9000; }
|
enable = true;
|
||||||
];
|
allowedTCPPorts = [ 4713 ];
|
||||||
allowedUDPPortRanges = [
|
#allowedUDPPorts = [ 80 443 ];
|
||||||
{ from = 8000; to = 9000; }
|
allowedTCPPortRanges = [
|
||||||
];
|
{ from = 8000; to = 9000; }
|
||||||
|
];
|
||||||
|
allowedUDPPortRanges = [
|
||||||
|
{ from = 8000; to = 9000; }
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -1,9 +1,20 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
hardware.cpu.amd.updateMicrocode = true;
|
hardware.cpu.amd = {
|
||||||
boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
|
ryzen-smu.enable = true;
|
||||||
boot.binfmt.preferStaticEmulators = true;
|
updateMicrocode = true;
|
||||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" "x86_64-windows" ];
|
};
|
||||||
boot.kernelModules = [ "kvm-amd" ];
|
boot = {
|
||||||
|
binfmt = {
|
||||||
|
preferStaticEmulators = true;
|
||||||
|
emulatedSystems = [ "aarch64-linux" "x86_64-windows" ];
|
||||||
|
};
|
||||||
|
kernelModules = [ "kvm-amd" ];
|
||||||
|
kernelPackages = pkgs.linuxPackages_xanmod_latest;
|
||||||
|
};
|
||||||
|
programs = {
|
||||||
|
ryzen-monitor-ng.enable = true;
|
||||||
|
corectrl.enable = true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@@ -2,8 +2,16 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
hardware.cpu.intel.updateMicrocode = true;
|
hardware.cpu.intel.updateMicrocode = true;
|
||||||
boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
|
boot = {
|
||||||
boot.binfmt.preferStaticEmulators = true;
|
binfmt = {
|
||||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" "x86_64-windows" ];
|
preferStaticEmulators = true;
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
emulatedSystems = [ "aarch64-linux" "x86_64-windows" ];
|
||||||
|
};
|
||||||
|
kernelModules = [ "kvm-intel" ];
|
||||||
|
kernelPackages = pkgs.linuxPackages_xanmod_latest;
|
||||||
|
};
|
||||||
|
services = {
|
||||||
|
thermald.enable = true;
|
||||||
|
throttled.enable = true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@@ -1,11 +1,12 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
|
|
||||||
#services.lact.enable = true;
|
services.lact.enable = true;
|
||||||
|
|
||||||
nixpkgs.config.rocmSupport = true;
|
nixpkgs.config.rocmSupport = true;
|
||||||
hardware = {
|
hardware = {
|
||||||
amdgpu = {
|
amdgpu = {
|
||||||
|
overdrive.enable = true;
|
||||||
opencl.enable = true;
|
opencl.enable = true;
|
||||||
initrd.enable = true;
|
initrd.enable = true;
|
||||||
zluda.enable = true;
|
zluda.enable = true;
|
||||||
|
|||||||
@@ -2,20 +2,24 @@
|
|||||||
{
|
{
|
||||||
boot.kernelParams = [ "i915.enable_guc=3" ];
|
boot.kernelParams = [ "i915.enable_guc=3" ];
|
||||||
# Graphics
|
# Graphics
|
||||||
hardware.enableRedistributableFirmware = true;
|
hardware = {
|
||||||
hardware.graphics = {
|
enableRedistributableFirmware = true;
|
||||||
enable = true;
|
intel-gpu-tools.enable = true;
|
||||||
enable32Bit = true;
|
graphics = {
|
||||||
extraPackages = with pkgs; [
|
enable = true;
|
||||||
# Required for modern Intel GPUs (Xe iGPU and ARC)
|
enable32Bit = true;
|
||||||
intel-media-driver # VA-API (iHD) userspace
|
extraPackages = with pkgs; [
|
||||||
vpl-gpu-rt # oneVPL (QSV) runtime
|
# Required for modern Intel GPUs (Xe iGPU and ARC)
|
||||||
|
intel-media-driver # VA-API (iHD) userspace
|
||||||
|
vpl-gpu-rt # oneVPL (QSV) runtime
|
||||||
|
|
||||||
# Optional (compute / tooling):
|
# Optional (compute / tooling):
|
||||||
intel-compute-runtime # OpenCL (NEO) + Level Zero for Arc/Xe
|
intel-compute-runtime # OpenCL (NEO) + Level Zero for Arc/Xe
|
||||||
# NOTE: 'intel-ocl' also exists as a legacy package; not recommended for Arc/Xe.
|
# NOTE: 'intel-ocl' also exists as a legacy package; not recommended for Arc/Xe.
|
||||||
libvdpau-va-gl # Only if you must run VDPAU-only apps
|
libvdpau-va-gl # Only if you must run VDPAU-only apps
|
||||||
vkbasalt
|
vkbasalt
|
||||||
];
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
virtualisation.kvmgt.enable = true;
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
|
||||||
|
nixpkgs.config.rocmSupport = true;
|
||||||
|
hardware = {
|
||||||
|
enableRedistributableFirmware = true;
|
||||||
|
graphics = {
|
||||||
|
enable = true;
|
||||||
|
enable32Bit = true;
|
||||||
|
extraPackages = with pkgs; [
|
||||||
|
vkbasalt
|
||||||
|
mangohud
|
||||||
|
lsfg-vk
|
||||||
|
];
|
||||||
|
};
|
||||||
|
nvidia = {
|
||||||
|
open = true;
|
||||||
|
modesetting.enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
services.xserver.videoDrivers = [ "nvidia" ];
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
{pkgs, ...}:
|
||||||
|
{
|
||||||
|
services.usbmuxd = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.usbmuxd2;
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
libimobiledevice
|
||||||
|
ifuse # optional, to mount using 'ifuse'
|
||||||
|
];
|
||||||
|
}
|
||||||
+36
-7
@@ -8,17 +8,46 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
services.fstrim.enable = true;
|
services.fstrim.enable = true;
|
||||||
services.system76-scheduler.enable = true;
|
services.system76-scheduler = {
|
||||||
#services.thermald.enable = true;
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
processScheduler = {
|
||||||
|
foregroundBoost = {
|
||||||
|
#background = {
|
||||||
|
# ioClass = "idle";
|
||||||
|
#};
|
||||||
|
foreground = {
|
||||||
|
ioClass = "realtime";
|
||||||
|
class = "fifo";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
pipewireBoost.profile = {
|
||||||
|
ioClass = "realtime";
|
||||||
|
class = "fifo";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
services.power-profiles-daemon.enable = true;
|
services.power-profiles-daemon.enable = true;
|
||||||
systemd.coredump.enable = false;
|
systemd.coredump = { # https://discourse.nixos.org/t/how-to-completely-disable-coredump/77335/11
|
||||||
|
enable = true;
|
||||||
|
settings.Coredump = {
|
||||||
|
Storage = "none";
|
||||||
|
ProcessSizeMax = "0";
|
||||||
|
};
|
||||||
|
};
|
||||||
zramSwap = {
|
zramSwap = {
|
||||||
enable = true;
|
enable = true;
|
||||||
algorithm = "zstd";
|
algorithm = "zstd";
|
||||||
memoryPercent = 90;
|
memoryPercent = 90;
|
||||||
};
|
};
|
||||||
services.udev.extraRules = ''
|
hardware.block.scheduler = {
|
||||||
ACTION=="add|change", KERNEL=="nvme[0-9]*", ATTR{queue/scheduler}="kyber"
|
"mmcblk[0-9]*" = "bfq";
|
||||||
ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="kyber"
|
"nvme[0-9]*" = "kyber";
|
||||||
'';
|
"sd[a-z]" = "kyber";
|
||||||
|
};
|
||||||
|
services.scx = {
|
||||||
|
enable = true;
|
||||||
|
scheduler = "scx_cake";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
services.synergy = {
|
||||||
|
client = {
|
||||||
|
#enable = true;
|
||||||
|
serverAddress = "theblackbox";
|
||||||
|
};
|
||||||
|
#server.enable = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
{lib, ...}:
|
||||||
{
|
{
|
||||||
# NTP configuration - NIST atomic clocks
|
# NTP configuration - NIST atomic clocks
|
||||||
services.timesyncd = {
|
services.timesyncd = {
|
||||||
@@ -14,7 +15,7 @@
|
|||||||
"0.pool.ntp.org"
|
"0.pool.ntp.org"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
time.timeZone = "America/Denver";
|
time.timeZone = lib.mkDefault "America/Denver";
|
||||||
i18n.defaultLocale = "en_US.UTF-8";
|
i18n.defaultLocale = "en_US.UTF-8";
|
||||||
i18n.extraLocaleSettings = {
|
i18n.extraLocaleSettings = {
|
||||||
LC_ADDRESS = "en_US.UTF-8";
|
LC_ADDRESS = "en_US.UTF-8";
|
||||||
|
|||||||
Reference in New Issue
Block a user