From 5b35604d0901224a1cadd04c1c65e0572e530176 Mon Sep 17 00:00:00 2001 From: Bun Date: Fri, 11 Apr 2025 00:36:56 -0400 Subject: [PATCH] Renamings and individualizations of aliases and such --- flake.lock | 30 +++++++++---------- .../home/programs/misc/avtools/default.nix | 21 ++++++------- .../home/programs/terminal/ranger/default.nix | 2 +- .../system/services/server/nginx/default.nix | 2 +- .../nginx/{virtualhosts => hosts}/default.nix | 0 .../{virtualhosts => hosts}/files/default.nix | 0 .../nixfox/default.nix | 0 7 files changed, 28 insertions(+), 27 deletions(-) rename modules/system/services/server/nginx/{virtualhosts => hosts}/default.nix (100%) rename modules/system/services/server/nginx/{virtualhosts => hosts}/files/default.nix (100%) rename modules/system/services/server/nginx/{virtualhosts => hosts}/nixfox/default.nix (100%) diff --git a/flake.lock b/flake.lock index 25fdf010..f3fc33d6 100644 --- a/flake.lock +++ b/flake.lock @@ -229,11 +229,11 @@ ] }, "locked": { - "lastModified": 1743387206, - "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=", + "lastModified": 1744117652, + "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", "owner": "nix-community", "repo": "home-manager", - "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146", + "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", "type": "github" }, "original": { @@ -314,11 +314,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1743731670, - "narHash": "sha256-CiAsYNtZy+5tMyId4OoJQwkXy6iROvP9hoFkXzuoAFI=", + "lastModified": 1744077311, + "narHash": "sha256-gw66zuvKqFaePakredq9sjliD7fN1xBG1kbycQgIdEI=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "5822965a54c2439c004918cbb7bf1f64b64f3352", + "rev": "ee83e148c2a3c754592e04f2f7d92f4497ffc7ac", "type": "github" }, "original": { @@ -413,11 +413,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1743788749, - "narHash": "sha256-Cxtv5ulVzP04Bjz06nAgOtuCAkNJUm5gsYI9ofH/9kk=", + "lastModified": 1744117814, + "narHash": "sha256-WQr5ksAGbWXjysrwhxxknJcpEolgFFO31nPvBzfu4Lk=", "owner": "nix-community", "repo": "NUR", - "rev": "fa1912e69502896606d7ecf6f7b3a4b2ab576683", + "rev": "fdf2e2088eb7db634720811ede55a9d99f0b8293", "type": "github" }, "original": { @@ -494,11 +494,11 @@ }, "stable": { "locked": { - "lastModified": 1743703532, - "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", + "lastModified": 1743975612, + "narHash": "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bdb91860de2f719b57eef819b5617762f7120c70", + "rev": "a880f49904d68b5e53338d1e8c7bf80f59903928", "type": "github" }, "original": { @@ -560,11 +560,11 @@ }, "unstable": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1743964447, + "narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8", "type": "github" }, "original": { diff --git a/modules/home/programs/misc/avtools/default.nix b/modules/home/programs/misc/avtools/default.nix index 0e4e4dc4..6f4d9356 100644 --- a/modules/home/programs/misc/avtools/default.nix +++ b/modules/home/programs/misc/avtools/default.nix @@ -1,13 +1,14 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, pkgsUnstable, ... }: { - home.packages = with pkgs; lib.mkIf config.home.desktop.enable [ - ffmpeg - ffmpegthumbnailer - playerctl - puddletag - pulsemixer - spotdl - ]; + config = lib.mkIf config.home.desktop.enable { + home.packages = (with pkgs; [ + ffmpeg + ffmpegthumbnailer + playerctl + puddletag + pulsemixer + ]) ++ (with pkgsUnstable; [ spotdl ]); - home.shellAliases.spotopus = "spotdl --m3u --format opus"; + home.shellAliases.spotopus = "spotdl --m3u --format opus"; + }; } diff --git a/modules/home/programs/terminal/ranger/default.nix b/modules/home/programs/terminal/ranger/default.nix index a90a871a..c9be9de7 100644 --- a/modules/home/programs/terminal/ranger/default.nix +++ b/modules/home/programs/terminal/ranger/default.nix @@ -111,7 +111,7 @@ K:/home/${config.home.username}/Network/Midas/Files M:/home/${config.home.username}/Network/Midas/Music V:/home/${config.home.username}/Network/Midas/Videos - V:/home/${config.home.username}/Network/Midas/Photos + P:/home/${config.home.username}/Network/Midas/Photos ''; }; packages = with pkgs; [ diff --git a/modules/system/services/server/nginx/default.nix b/modules/system/services/server/nginx/default.nix index 924d9030..4665f896 100644 --- a/modules/system/services/server/nginx/default.nix +++ b/modules/system/services/server/nginx/default.nix @@ -2,9 +2,9 @@ { imports = [ ./acme + ./hosts ./rtmp ./user - ./virtualhosts ]; options.services.webserver.enable = lib.mkEnableOption "Enable nginx webpages"; diff --git a/modules/system/services/server/nginx/virtualhosts/default.nix b/modules/system/services/server/nginx/hosts/default.nix similarity index 100% rename from modules/system/services/server/nginx/virtualhosts/default.nix rename to modules/system/services/server/nginx/hosts/default.nix diff --git a/modules/system/services/server/nginx/virtualhosts/files/default.nix b/modules/system/services/server/nginx/hosts/files/default.nix similarity index 100% rename from modules/system/services/server/nginx/virtualhosts/files/default.nix rename to modules/system/services/server/nginx/hosts/files/default.nix diff --git a/modules/system/services/server/nginx/virtualhosts/nixfox/default.nix b/modules/system/services/server/nginx/hosts/nixfox/default.nix similarity index 100% rename from modules/system/services/server/nginx/virtualhosts/nixfox/default.nix rename to modules/system/services/server/nginx/hosts/nixfox/default.nix