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

Compare commits

base: liv:d2a3199e0d56c046931db8ab97935115c1927c91
Branches Tags
liv:master
..
compare: liv:de8b2b6edbac9d6f08238c268acf423de68f3c66
Branches Tags
liv:master

No commits in common. "d2a3199e0d56c046931db8ab97935115c1927c91" and "de8b2b6edbac9d6f08238c268acf423de68f3c66" have entirely different histories.
d2a3199e0d ... de8b2b6edb

12 changed files with 70 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

145
flake.lock generated
View file

@ -41,11 +41,11 @@
]
},
"locked": {
"lastModified": 1760101617,
"narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=",
"lastModified": 1759499898,
"narHash": "sha256-UNzYHLWfkSzLHDep5Ckb5tXc0fdxwPIrT+MY4kpQttM=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "1826a9923881320306231b1c2090379ebf9fa4f8",
"rev": "655e067f96fd44b3f5685e17f566b0e4d535d798",
"type": "github"
},
"original": {
@ -235,11 +235,11 @@
]
},
"locked": {
"lastModified": 1761061028,
"narHash": "sha256-SK12k/LxFrfdCfGqZcDgX1dLk863EYDYGQ3F2AHV9U0=",
"lastModified": 1760130406,
"narHash": "sha256-GKMwBaFRw/C1p1VtjDz4DyhyzjKUWyi1K50bh8lgA2E=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "aa559a682b4ab29e2bea410248dbc60a591299b0",
"rev": "d305eece827a3fe317a2d70138f53feccaf890a1",
"type": "github"
},
"original": {
@ -311,11 +311,11 @@
]
},
"locked": {
"lastModified": 1760445448,
"narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
"lastModified": 1759490292,
"narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=",
"owner": "hyprwm",
"repo": "hyprgraphics",
"rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
"rev": "9431db625cd9bb66ac55525479dce694101d6d7a",
"type": "github"
},
"original": {
@ -342,11 +342,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1760959370,
"narHash": "sha256-eM1kSyA88KiZiY+xqnN/YbAAFeECtzJTrOF62Uuxs+o=",
"lastModified": 1760143218,
"narHash": "sha256-nHgQ3UTtQXzaOBwGqOFJ/zc69IGaT+U1ddFv4CpSjtU=",
"ref": "refs/heads/main",
"rev": "46dab01bcc47b2e29f36cd4d35d04091e4134a67",
"revCount": 6515,
"rev": "d599513d4a72d66ac62ffdedc41d6653fa81b39e",
"revCount": 6493,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@ -369,11 +369,11 @@
]
},
"locked": {
"lastModified": 1759610243,
"narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
"lastModified": 1749046714,
"narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
"rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
"type": "github"
},
"original": {
@ -541,11 +541,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1760659264,
"narHash": "sha256-2IV5aOvkJ/lBObKpJ90HEGHybppMAcw71tRhcg6MBJM=",
"lastModified": 1759314165,
"narHash": "sha256-XA5LrE/I8SIeh9zCNJi01jn63oPGitl5jNjStI5kOuM=",
"owner": "hyprwm",
"repo": "hyprpicker",
"rev": "cd7ba93fadabe391aa8a6e6db6fc9bcdb9e2c428",
"rev": "b3f3f230c99ae2018c896a9a724226bdba45171b",
"type": "github"
},
"original": {
@ -564,11 +564,11 @@
"systems": "systems_3"
},
"locked": {
"lastModified": 1760746576,
"narHash": "sha256-fIW9ul//KDRxfi0FY9mQkwrdHqu1qFselUaHh3XjVVY=",
"lastModified": 1759530592,
"narHash": "sha256-Yk6nDzCXrOehX3At8qdZ0cLr1kPySqACsihMYuP6T8w=",
"owner": "hyprwm",
"repo": "hyprsunset",
"rev": "adac50b0ecf24871223bfa62dc6de6616b321e3c",
"rev": "057feb7a724b7fc0f3a406d6db08b59734db006a",
"type": "github"
},
"original": {
@ -759,11 +759,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1760958188,
"narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=",
"lastModified": 1760106635,
"narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc",
"rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903",
"type": "github"
},
"original": {
@ -805,11 +805,11 @@
},
"nixpkgs_10": {
"locked": {
"lastModified": 1760596604,
"narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=",
"lastModified": 1759570798,
"narHash": "sha256-kbkzsUKYzKhuvMOuxt/aTwWU2mnrwoY964yN3Y4dE98=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43",
"rev": "0d4f673a88f8405ae14484e6a1ea870e0ba4ca26",
"type": "github"
},
"original": {
@ -819,22 +819,6 @@
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1760524057,
"narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1746576598,
@ -901,11 +885,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1760878510,
"narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"lastModified": 1760038930,
"narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3",
"type": "github"
},
"original": {
@ -949,11 +933,11 @@
},
"nixpkgs_9": {
"locked": {
"lastModified": 1760878510,
"narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"lastModified": 1760038930,
"narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3",
"type": "github"
},
"original": {
@ -1009,11 +993,11 @@
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1761061704,
"narHash": "sha256-ZplX25oYp75wY6YESKpkFXZhw8iEAbiSjTUkR+HT9xY=",
"lastModified": 1760182743,
"narHash": "sha256-LKNVE4NOzdOoA820RDJW7TdZvJpriZTCZ/Te/6y/4Mc=",
"owner": "nix-community",
"repo": "NUR",
"rev": "fbb7a461ccab20bac90408ffaa331c119d32fd7a",
"rev": "38b28652317ec6a2e184bf5a904a7a5b5ea7a87e",
"type": "github"
},
"original": {
@ -1056,11 +1040,11 @@
]
},
"locked": {
"lastModified": 1760663237,
"narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
"lastModified": 1758108966,
"narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
"rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
"type": "github"
},
"original": {
@ -1082,8 +1066,7 @@
"nixpkgs": "nixpkgs_6",
"nixvim": "nixvim",
"nur": "nur",
"sops-nix": "sops-nix",
"spicetify-nix": "spicetify-nix"
"sops-nix": "sops-nix"
}
},
"rust-analyzer-src": {
@ -1108,11 +1091,11 @@
"nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1760998189,
"narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
"lastModified": 1759635238,
"narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
"rev": "6e5a38e08a2c31ae687504196a230ae00ea95133",
"type": "github"
},
"original": {
@ -1121,25 +1104,6 @@
"type": "github"
}
},
"spicetify-nix": {
"inputs": {
"nixpkgs": "nixpkgs_11",
"systems": "systems_5"
},
"locked": {
"lastModified": 1760848035,
"narHash": "sha256-H3MFH8+i4wFagkebtHPcosQdkmxQ4a6fl1lMbLb+RkA=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
"rev": "cde9f78ae705343a38f5d1d19ab34858b5e9caa9",
"type": "github"
},
"original": {
"owner": "Gerg-L",
"repo": "spicetify-nix",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1689347949,
@ -1200,21 +1164,6 @@
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": [
@ -1243,11 +1192,11 @@
]
},
"locked": {
"lastModified": 1760713634,
"narHash": "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=",
"lastModified": 1755354946,
"narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "753bbbdf6a052994da94062e5b753288cef28dfb",
"rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0",
"type": "github"
},
"original": {

1
flake.nix
View file

@ -16,7 +16,6 @@
nixvim.url = "github:ahwxorg/nixvim-config";
sops-nix.url = "github:Mic92/sops-nix";
disko.url = "github:nix-community/disko/latest";
spicetify-nix.url = "github:Gerg-L/spicetify-nix";
};
outputs =

33
hosts/violet/hardware-configuration.nix
View file

@ -1,28 +1,14 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{
config,
lib,
pkgs,
modulesPath,
...
}:
{ config, lib, pkgs, modulesPath, ... }:
{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [
"xhci_pci"
"ehci_pci"
"uhci_hcd"
"hpsa"
"usbhid"
"usb_storage"
"sd_mod"
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "uhci_hcd" "hpsa" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
@ -32,6 +18,15 @@
fsType = "ext4";
};
fileSystems."/mnt/array" = {
device = "/dev/disk/by-uuid/c503088f-95aa-4bb0-85eb-d1de1e0158d0";
fsType = "ext4";
options = [
"nofail" # Prevent system from failing if this drive doesn't mount
];
};
swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking

1
modules/home/default.nix
View file

@ -13,7 +13,6 @@
++ [ (import ./zathura.nix) ]
++ [ (import ./packages.nix) ]
++ [ (import ./scripts/scripts.nix) ]
++ [ (import ./spotify.nix) ]
++ [ (import ./waybar) ]
++ [ (import ./zsh.nix) ]
++ [ (import ./qutebrowser.nix) ]

28
modules/home/spotify.nix
View file

@ -1,28 +0,0 @@
{ inputs, pkgs, ... }:
let
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
in
{
imports = [ inputs.spicetify-nix.homeManagerModules.default ];
programs.spicetify = {
enable = true;
enabledExtensions = with spicePkgs.extensions; [
# adblock
# hidePodcasts
shuffle # shuffle+ (special characters are sanitized out of extension names)
];
enabledCustomApps = with spicePkgs.apps; [
newReleases
ncsVisualizer
];
enabledSnippets = with spicePkgs.snippets; [
rotatingCoverart
pointer
];
# theme = spicePkgs.themes.catppuccin;
# colorScheme = "mocha";
theme = spicePkgs.themes.defaultDynamic;
};
}

2
modules/services/microbin.nix
View file

@ -19,7 +19,7 @@
sslCertificate = "/var/lib/acme/liv.town/cert.pem";
sslCertificateKey = "/var/lib/acme/liv.town/key.pem";
locations."/" = {
proxyPass = "http://localhost:8070"; # TODO: add anubis
proxyPass = "http://localhost:8080";
proxyWebsockets = true;
};
};

6
modules/services/nginx.nix
View file

@ -9,12 +9,6 @@
security.acme = {
acceptTerms = true;
defaults.email = lib.mkDefault "ahwx@ahwx.org";
defaults = {
# server = "https://acme-staging-v02.api.letsencrypt.org/directory";
# dnsPropagationCheck = false;
extraLegoFlags = [ "--dns.propagation-wait=300s" ];
dnsProvider = "ns1.desec.io:53";
};
certs = {
"liv.town" = {
domain = "*.liv.town";

2
modules/services/smart-monitoring.nix
View file

@ -6,7 +6,7 @@
enable =
if (host == "dandelion") then
true
else if (host == "sunflower") then
else if (host == "lily") then
true
else
false;

2
modules/services/uptime-kuma.nix
View file

@ -3,7 +3,7 @@
services = {
uptime-kuma = {
enable = true;
settings.PORT = "4800";
settings.PORT = 4800;
};
anubis.instances.uptime-kuma = {
settings = {

3
modules/services/violet.nix
View file

@ -26,14 +26,13 @@
++ [ (import ./nix-serve.nix) ]
++ [ (import ./ollama.nix) ]
++ [ (import ./paperless-ngx.nix) ]
++ [ (import ./prosody.nix) ]
++ [ (import ./radicale.nix) ]
++ [ (import ./remote-build.nix) ]
++ [ (import ./readarr.nix) ]
++ [ (import ./sharkey-proxy.nix) ]
# ++ [ (import ./komga.nix) ]
# ++ [ (import ./xmpp.nix) ]
++ [ (import ./tailscale.nix) ]
++ [ (import ./uptime-kuma.nix) ]
++ [ (import ./vaultwarden.nix) ];
# ++ [ (import ./smart-monitoring.nix) ]
}

20
modules/services/prosody.nix → modules/services/xmpp.nix
View file

@ -1,15 +1,12 @@
{ pkgs, config, ... }:
{
services.prosody = {
enable = true;
# user = "prosody";
user = config.services.nginx.user;
user = "root";
modules = {
welcome = true;
websocket = true;
watchregistrations = true;
};
httpFileShare.domain = "uploads.liv.town";
admins = [ "liv@liv.town" ];
allowRegistration = false;
ssl.cert = "/var/lib/acme/liv.town/cert.pem";
@ -25,17 +22,8 @@
domain = "conference.liv.town";
}
];
uploadHttp = {
domain = "upload.liv.town";
};
};
networking.firewall.allowedTCPPorts = [
# File transfer proxy
5000
# Client connections
5222
# Client connections (direct TLS)
5223
# Server-to-server connections
5269
# Server-to-server connections (direct TLS)
5270
];
}

2
roles/gui.nix
View file

@ -39,7 +39,7 @@ in
imv
libreoffice
xfce.thunar
# spotify
spotify
spotify-player
thunderbird
lxqt.pavucontrol-qt