diff --git a/flake.lock b/flake.lock index 8a1e517..8e91a0f 100644 --- a/flake.lock +++ b/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1773889306, - "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=", + "lastModified": 1776613567, + "narHash": "sha256-gC9Cp5ibBmGD5awCA9z7xy6MW6iJufhazTYJOiGlCUI=", "owner": "nix-community", "repo": "disko", - "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347", + "rev": "32f4236bfc141ae930b5ba2fb604f561fed5219d", "type": "github" }, "original": { @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1776373306, - "narHash": "sha256-iAJIzHngGZeLIkjzuuWI6VBsYJ1n89a/Esq0m8R1vjs=", + "lastModified": 1777086106, + "narHash": "sha256-hlNpIN18pw3xo34Lsrp6vAMUPn0aB/zFBqL0QXI1Pmk=", "owner": "nix-community", "repo": "home-manager", - "rev": "d401492e2acd4fea42f7705a3c266cea739c9c36", + "rev": "5826802354a74af18540aef0b01bc1320f82cc17", "type": "github" }, "original": { @@ -103,11 +103,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1775490113, - "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=", + "lastModified": 1776983936, + "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7", + "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61", "type": "github" }, "original": { @@ -127,11 +127,11 @@ ] }, "locked": { - "lastModified": 1776255237, - "narHash": "sha256-LQjlc0VEn55WAT4BiI8sIsokb/2FNlcbBD+Xr3MTE24=", + "lastModified": 1776910211, + "narHash": "sha256-0ku3gW8bZ9TTpEU2fQw86oU6ZLT2vF6pacF+cLaf7VY=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "9a8c2a85f1ffdcecfb0f9c52c5a73c49ceb43911", + "rev": "4e6cad241baa0115a7aae8c55b04c166da4997c9", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776255774, - "narHash": "sha256-psVTpH6PK3q1htMJpmdz1hLF5pQgEshu7gQWgKO6t6Y=", + "lastModified": 1776949667, + "narHash": "sha256-GMSVw35Q+294GlrTUKlx087E31z7KurReQ1YHSKp5iw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "566acc07c54dc807f91625bb286cb9b321b5f42a", + "rev": "01fbdeef22b76df85ea168fbfe1bfd9e63681b30", "type": "github" }, "original": { @@ -175,27 +175,27 @@ }, "nixpkgs-calibre": { "locked": { - "lastModified": 1772956932, - "narHash": "sha256-M0yS4AafhKxPPmOHGqIV0iKxgNO8bHDWdl1kOwGBwRY=", + "lastModified": 1776255774, + "narHash": "sha256-psVTpH6PK3q1htMJpmdz1hLF5pQgEshu7gQWgKO6t6Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "608d0cadfed240589a7eea422407a547ad626a14", + "rev": "566acc07c54dc807f91625bb286cb9b321b5f42a", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "608d0cadfed240589a7eea422407a547ad626a14", + "rev": "566acc07c54dc807f91625bb286cb9b321b5f42a", "type": "github" } }, "nixpkgs-master": { "locked": { - "lastModified": 1776413370, - "narHash": "sha256-fj1TBLDj+OV6LSQxNf2C0t4PP7jytv6MfeguXy7V+OU=", + "lastModified": 1777133385, + "narHash": "sha256-ATzAf3WqPFk+R9fvlxqTRMcEFony6i/gRZKUQjNCkH4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cbd8951c5b4faf35297d56bbe2e5886f2f5177d9", + "rev": "09478df5fc81dcb06317dd7ef2d90c658a60c3d0", "type": "github" }, "original": { @@ -207,11 +207,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1776221942, - "narHash": "sha256-FbQAeVNi7G4v3QCSThrSAAvzQTmrmyDLiHNPvTF2qFM=", + "lastModified": 1776734388, + "narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1766437c5509f444c1b15331e82b8b6a9b967000", + "rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac", "type": "github" }, "original": { @@ -229,11 +229,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1776302695, - "narHash": "sha256-xZc9o1JLQpmWn2Dqui323+Tq2Ai4sSdtdvbFZCs4qLo=", + "lastModified": 1777079905, + "narHash": "sha256-TvYEXwkZnRFQRuFyyqTNSfPnU2tMdhtiBOXSk2AWLJA=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "a7c724181fca5d1aff2d47b18fa733504cfdbda2", + "rev": "a50c92167c8d438000270f7eca36f6eea74f388e", "type": "github" }, "original": { @@ -252,11 +252,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775957204, - "narHash": "sha256-d4CVRtAty2GzDYXx4xYQmR+nlOjjKovyprQfZhgLckU=", + "lastModified": 1776585574, + "narHash": "sha256-j35EWhKoGhKrfcXcAOpoRVgXEPQt41Eukji/h59cnjk=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "68e82fe34c68ee839a9c37e3466820e266af0c86", + "rev": "75d180c28a9ab4470e980f3d6f706ad6c5213add", "type": "github" }, "original": { @@ -317,11 +317,11 @@ ] }, "locked": { - "lastModified": 1776119890, - "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=", + "lastModified": 1776771786, + "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd", + "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d9b5201..fb99181 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ # nixpkgs nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; # nixpkgs-last-unstable.url = "github:NixOS/nixpkgs/6b4955211758ba47fac850c040a27f23b9b4008f"; - nixpkgs-calibre.url = "github:NixOS/nixpkgs/608d0cadfed240589a7eea422407a547ad626a14"; + nixpkgs-calibre.url = "github:NixOS/nixpkgs/566acc07c54dc807f91625bb286cb9b321b5f42a"; nixpkgs-master.url = "github:NixOS/nixpkgs/master"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs-beets.url = "github:NixOS/nixpkgs/832efc09b4caf6b4569fbf9dc01bec3082a00611"; # 2343bbb58f99267223bc2aac4fc9ea301a155a16 diff --git a/home/apps/default.nix b/home/apps/default.nix index 401ee20..8756b74 100644 --- a/home/apps/default.nix +++ b/home/apps/default.nix @@ -5,7 +5,7 @@ imports = [ ./gramps.nix ./streamrip.nix - ./v2rayn.nix + # ./v2rayn.nix ./yt-dlp.nix ]; } diff --git a/home/secondary.nix b/home/secondary.nix index f7a6284..b36a478 100644 --- a/home/secondary.nix +++ b/home/secondary.nix @@ -14,7 +14,7 @@ let "${config.home.homeDirectory}/Games/PrismLaunchers/${config.home.username}" = ".local/share/PrismLauncher"; - #"${xlib.dirs.lamet-drive}/Users/oqyude/Music" = "Music"; + "${xlib.dirs.lamet-drive}/Users/oqyude/Music" = "Music"; }; mkLinks = lib.mapAttrs' (sourcePath: targetPath: { name = targetPath; diff --git a/modules/essentials/packages.nix b/modules/essentials/packages.nix index d2af48f..ff13457 100644 --- a/modules/essentials/packages.nix +++ b/modules/essentials/packages.nix @@ -89,7 +89,9 @@ in # To save tuios bluetui - jocalsend + nil + speedtest-cli + # jocalsend tlrc lazyssh mcat diff --git a/modules/server/calibre-web.nix b/modules/server/calibre-web.nix index 60fe14f..e80bbfc 100644 --- a/modules/server/calibre-web.nix +++ b/modules/server/calibre-web.nix @@ -12,7 +12,7 @@ let in { services.calibre-web = { - # package = stable.calibre-web; + package = stable.calibre-web; enable = true; # dataDir = "${xlib.dirs.services-mnt-folder}/calibre-web"; options = { diff --git a/modules/server/default.nix b/modules/server/default.nix index 6b616ad..2faf0e3 100644 --- a/modules/server/default.nix +++ b/modules/server/default.nix @@ -10,6 +10,7 @@ ./immich.nix ./miniflux.nix ./n8n.nix + ./navidrome.nix ./netdata.nix ./nextcloud.nix ./nginx.nix diff --git a/modules/server/navidrome.nix b/modules/server/navidrome.nix new file mode 100644 index 0000000..fb2feda --- /dev/null +++ b/modules/server/navidrome.nix @@ -0,0 +1,22 @@ +{ + config, + inputs, + lib, + pkgs, + xlib, + ... +}: +{ + services = { + navidrome = { + enable = false; + openFirewall = true; + # environmentFile = ""; + settings = { + Address = "0.0.0.0"; + Port = "4533"; + MusicFolder = "/mnt/beets/music"; + }; + }; + }; +}