felix/nixos
1
0
Fork 0
mirror of https://github.com/Stunkymonkey/nixos.git synced 2025-12-16 15:32:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: felix:e23a2921f091de63c74853c612bf3aa0c1055d02
Branches Tags
felix:master
felix:nixos-23.11
..
compare: felix:76d432162d9ac13874c40b6348dcbf10638efe8f
Branches Tags
felix:master
felix:nixos-23.11

8 commits
e23a2921f0 ... 76d432162d

Author SHA1 Message Date
Felix Buehler
76d432162d services/*arr: configure port correctly
Some checks failed
/ Build Nix targets (push) Has been cancelled
Details
2025-11-26 00:06:52 +01:00
Felix Buehler
3d42c4a9aa Revert "profiles/media: use unstable pdfsam" 
This reverts commit b9780ee03d.
 2025-11-26 00:01:00 +01:00
Felix Buehler
c5b6b78721 service/webserver: update metric config 2025-11-25 23:59:04 +01:00
Felix Buehler
237143d416 service/vpn: use local dns 2025-11-25 23:57:46 +01:00
Felix Buehler
44f269fe44 flake: update 2025-11-25 22:54:58 +01:00
Felix Buehler
47be2914d6 profile/desktop-dev: disable fritzing 2025-11-25 22:45:03 +01:00
Felix Buehler
220b4987fe treewide: package renaming for 25.11 2025-11-25 21:17:52 +01:00
Felix Buehler
10cbc4d96b flake/nixos: 25.05 -> 25.11 2025-11-25 21:16:24 +01:00
17 changed files with 63 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

77
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762276996, "lastModified": 1764017209,
"narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=", "narHash": "sha256-RoJGCtKExXXkNCZUmmxezG3eOczEOTBw38DaZGSYJC0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "af087d076d3860760b3323f6b583f4d828c1ac17", "rev": "ec8eabe00c4ee9a2ddc50162c125f0ec2a7099e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -23,11 +23,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1747046372, "lastModified": 1761588595,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -41,11 +41,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1762440070, "lastModified": 1763759067,
"narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=", "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8", "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -59,11 +59,11 @@
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib_2"
}, },
"locked": { "locked": {
"lastModified": 1733312601, "lastModified": 1762980239,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -114,11 +114,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762441963, "lastModified": 1763988335,
"narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -222,11 +222,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1762463231, "lastModified": 1764080039,
"narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=", "narHash": "sha256-b1MtLQsQc4Ji1u08f+C6g5XrmLPkJQ1fhNkCt+0AERQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226", "rev": "da17006633ca9cda369be82893ae36824a2ddf1a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -237,16 +237,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1762498405, "lastModified": 1764020296,
"narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", "narHash": "sha256-6zddwDs2n+n01l+1TG6PlyokDdXzu/oBmEejcH5L5+A=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", "rev": "a320ce8e6e2cc6b4397eef214d202a50a4583829",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"type": "indirect" "type": "indirect"
} }
}, },
@ -267,14 +267,17 @@
}, },
"nixpkgs-lib_2": { "nixpkgs-lib_2": {
"locked": { "locked": {
"lastModified": 1733096140, "lastModified": 1761765539,
"narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
"type": "tarball", "owner": "nix-community",
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" "repo": "nixpkgs.lib",
"rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
"type": "github"
}, },
"original": { "original": {
"type": "tarball", "owner": "nix-community",
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" "repo": "nixpkgs.lib",
"type": "github"
} }
}, },
"nixpkgs-lib_3": { "nixpkgs-lib_3": {
@ -294,11 +297,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1762596750, "lastModified": 1763966396,
"narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -315,11 +318,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757450861, "lastModified": 1763752996,
"narHash": "sha256-7gCs5H0/GIK7ENywSkgSrLc+QTDYy8diTS6YxOw++RI=", "narHash": "sha256-jOSmN5AUZ99FU+0zjjqrSVSQkIOEv6QvHP5bAjYFK9o=",
"owner": "Stunkymonkey", "owner": "Stunkymonkey",
"repo": "passworts", "repo": "passworts",
"rev": "f1c44a029e9521bfec7bd4b3439a6b3dc58ab5c5", "rev": "d46857d78946fda7263b4ebfcbb5b28bc00f67ee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -351,11 +354,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762659808, "lastModified": 1764021963,
"narHash": "sha256-2Kv2mANf+FRisqhpfeZ8j9firBxb23ZvEXwdcunbpGI=", "narHash": "sha256-1m84V2ROwNEbqeS9t37/mkry23GBhfMt8qb6aHHmjuc=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "524312bc62e3f34bd9231a2f66622663d3355133", "rev": "c482a1c1bbe030be6688ed7dc84f7213f304f1ec",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
flake.nix
View file

@ -1,8 +1,7 @@
{ {
description = "NixOS configuration"; description = "NixOS configuration";
inputs = { inputs = {
# nix.url = "github:NixOS/nix"; nixpkgs.url = "nixpkgs/nixos-25.11";
nixpkgs.url = "nixpkgs/nixos-25.05";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";

2
machines/core/core.nix
View file

@ -6,12 +6,12 @@
bind # dig bind # dig
borgbackup borgbackup
cryptsetup cryptsetup
delta
fd # find replacement fd # find replacement
file file
fzf fzf
gettext gettext
git git
gitAndTools.delta
gptfdisk gptfdisk
htop htop
jq jq

12
modules/hardware/graphics/default.nix
View file

@ -31,23 +31,17 @@ in
# Intel GPU # Intel GPU
(lib.mkIf (cfg.cpuFlavor == "intel") { (lib.mkIf (cfg.cpuFlavor == "intel") {
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs: {
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
}; };
hardware.graphics.extraPackages = with pkgs; [ hardware.graphics.extraPackages = with pkgs; [
intel-media-driver # LIBVA_DRIVER_NAME=iHD intel-media-driver # LIBVA_DRIVER_NAME=iHD
vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
vaapiVdpau libva-vdpau-driver
libvdpau-va-gl libvdpau-va-gl
]; ];
}) })
(lib.mkIf (cfg.cpuFlavor == "amd") { (lib.mkIf (cfg.cpuFlavor == "amd") {
hardware.graphics.extraPackages = with pkgs; [
amdvlk
];
hardware.graphics.extraPackages32 = with pkgs; [
driversi686Linux.amdvlk
];
}) })
] ]
); );

2
modules/services/prowlarr/default.nix
View file

@ -3,7 +3,6 @@
let let
cfg = config.my.services.prowlarr; cfg = config.my.services.prowlarr;
inherit (config.networking) domain; inherit (config.networking) domain;
# in 25.05 this might be configurable
port = 9696; port = 9696;
in in
{ {
@ -22,6 +21,7 @@ in
services = { services = {
prowlarr = { prowlarr = {
enable = true; enable = true;
settings.server.port = port;
}; };
prometheus.exporters.exportarr-prowlarr = { prometheus.exporters.exportarr-prowlarr = {
inherit (config.services.prometheus) enable; inherit (config.services.prometheus) enable;

2
modules/services/radarr/default.nix
View file

@ -3,7 +3,6 @@
let let
cfg = config.my.services.radarr; cfg = config.my.services.radarr;
inherit (config.networking) domain; inherit (config.networking) domain;
# in 25.05 this might be configurable
port = 7878; port = 7878;
in in
{ {
@ -22,6 +21,7 @@ in
services = { services = {
radarr = { radarr = {
enable = true; enable = true;
settings.server.port = port;
}; };
prometheus.exporters.exportarr-radarr = { prometheus.exporters.exportarr-radarr = {
inherit (config.services.prometheus) enable; inherit (config.services.prometheus) enable;

2
modules/services/sonarr/default.nix
View file

@ -3,7 +3,6 @@
let let
cfg = config.my.services.sonarr; cfg = config.my.services.sonarr;
inherit (config.networking) domain; inherit (config.networking) domain;
# in 25.05 this might be configurable
port = 8989; port = 8989;
in in
{ {
@ -28,6 +27,7 @@ in
services = { services = {
sonarr = { sonarr = {
enable = true; enable = true;
settings.server.port = port;
}; };
prometheus.exporters.exportarr-sonarr = { prometheus.exporters.exportarr-sonarr = {
inherit (config.services.prometheus) enable; inherit (config.services.prometheus) enable;

1
modules/services/vpn/default.nix
View file

@ -29,6 +29,7 @@ in
inherit (cfg) port; inherit (cfg) port;
settings = { settings = {
dns.base_domain = "buehler.internal"; dns.base_domain = "buehler.internal";
dns.override_local_dns = false;
server_url = "https://vpn.${domain}"; server_url = "https://vpn.${domain}";
metrics_listen_addr = "127.0.0.1:8091"; metrics_listen_addr = "127.0.0.1:8091";
log.level = "warn"; log.level = "warn";

4
modules/services/webserver/default.nix
View file

@ -116,9 +116,7 @@ in
email = "server@buehler.rocks"; email = "server@buehler.rocks";
globalConfig = '' globalConfig = ''
servers{ metrics
metrics
}
''; '';
extraConfig = '' extraConfig = ''
(compress) { (compress) {

3
modules/system/fonts/default.nix
View file

@ -40,8 +40,7 @@ in
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-color-emoji noto-fonts-color-emoji
noto-fonts-extra ubuntu-classic
ubuntu_font_family
unifont # unicode fallback unifont # unicode fallback
] ]
++ cfg.additionalFonts; ++ cfg.additionalFonts;

4
profiles/desktop-apps/default.nix
View file

@ -18,7 +18,7 @@ in
firefox firefox
(gimp-with-plugins.override { (gimp-with-plugins.override {
plugins = with gimpPlugins; [ plugins = with gimpPlugins; [
resynthesizer # disabled because broken with python3 # resynthesizer # disabled because broken with python3
]; ];
}) })
kdePackages.ghostwriter kdePackages.ghostwriter
@ -34,7 +34,7 @@ in
}) })
newsflash newsflash
rhythmbox rhythmbox
tdesktop telegram-desktop
thunderbird thunderbird
vlc vlc
wayvnc wayvnc

2
profiles/desktop-dev/default.nix
View file

@ -18,7 +18,7 @@ in
chromium chromium
dbeaver-bin dbeaver-bin
filezilla filezilla
fritzing # fritzing # disabled because broken
gnome-font-viewer gnome-font-viewer
imhex # hex editor imhex # hex editor
inlyne inlyne

2
profiles/development/default.nix
View file

@ -36,7 +36,7 @@ in
pandas pandas
pillow pillow
plotly plotly
scikitlearn scikit-learn
scipy scipy
tqdm # progressbar in pandas tqdm # progressbar in pandas
wheel # python development wheel # python development

6
profiles/gaming/default.nix
View file

@ -17,14 +17,14 @@ in
blobby blobby
discord discord
gamemode gamemode
minetest luanti
moonlight-qt # steam-link stream moonlight-qt # steam-link stream
openttd openttd
prismlauncher # replace minecraft prismlauncher # replace minecraft
superTuxKart
steam
SDL SDL
SDL2 SDL2
steam
superTuxKart
wine wine
winetricks winetricks
]; ];

5
profiles/media/default.nix
View file

@ -26,16 +26,15 @@ in
mediaelch # video sorting mediaelch # video sorting
metadata-cleaner # mat2-gui metadata-cleaner # mat2-gui
mp3gain # audio volume mp3gain # audio volume
mp3splt # splitting mp3 files
mp3val # audio validation mp3val # audio validation
pdfgrep # grep in pdfs pdfgrep # grep in pdfs
unstable.pdfsam-basic # pdf editing pdfsam-basic # pdf editing
picard # music tagging picard # music tagging
projectm-sdl-cpp # visualization of music projectm-sdl-cpp # visualization of music
puddletag # audio tagging puddletag # audio tagging
shotwell # photo management shotwell # photo management
sonixd # cloud-music-player sonixd # cloud-music-player
soundkonverter # audio converter soundconverter # audio converter
varia # download varia # download
(yt-dlp.override { withAlias = true; }) # video download (yt-dlp.override { withAlias = true; }) # video download
]; ];

2
profiles/meeting/default.nix
View file

@ -17,7 +17,7 @@ in
element-desktop element-desktop
fractal fractal
mumble mumble
teamspeak5_client teamspeak6-client
]; ];
}; };
} }

4
profiles/usb-iso/default.nix
View file

@ -15,10 +15,10 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
# binary blobs are needed for ventoy # binary blobs are needed for ventoy
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
"ventoy-1.1.05" "ventoy-1.1.07"
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
ventoy-bin-full # general ventoy-full # general
woeusb-ng # windows woeusb-ng # windows
]; ];
}; };