From 58e68a003ab819297bd087c8e41317fe2daaa074 Mon Sep 17 00:00:00 2001 From: blake Date: Fri, 7 Nov 2025 01:41:48 -0600 Subject: [PATCH] cleaning up my mess so hopefully this shit builds --- users/blake/dots/programs/default.nix | 4 ++-- users/blake/dots/programs/media_tools/default.nix | 8 ++++---- .../blake/dots/programs/media_tools/kdenlive/default.nix | 2 +- users/blake/dots/programs/{nxsiv => nsxiv}/default.nix | 4 ++-- users/blake/dots/programs/thunderbird/default.nix | 7 ++++--- 5 files changed, 13 insertions(+), 12 deletions(-) rename users/blake/dots/programs/{nxsiv => nsxiv}/default.nix (79%) diff --git a/users/blake/dots/programs/default.nix b/users/blake/dots/programs/default.nix index 177e72a..ad07868 100644 --- a/users/blake/dots/programs/default.nix +++ b/users/blake/dots/programs/default.nix @@ -15,7 +15,7 @@ in { ./zathura ./discord ./mpv - ./nxsiv + ./nsxiv ./media_tools ]; @@ -34,7 +34,7 @@ in { zathura.enable = lib.mkDefault true; mpv.enable = lib.mkDefault true; - nxsiv.enable = lib.mkDefault true; + nsxiv.enable = lib.mkDefault true; media_tools.enable = lib.mkDefault true; }; diff --git a/users/blake/dots/programs/media_tools/default.nix b/users/blake/dots/programs/media_tools/default.nix index a4c4745..bde3f2f 100644 --- a/users/blake/dots/programs/media_tools/default.nix +++ b/users/blake/dots/programs/media_tools/default.nix @@ -4,15 +4,15 @@ config, ... }: let - cfg = config.dots.programs; + cfg = config.dots.media_tools; in { imports = [ ./gimp ./krita ./audacity - ./kenlive + ./kdenlive ]; - options.dots.programs = { + options.dots.media_tools = { enable = lib.mkEnableOption "enables all programs by default"; }; @@ -23,5 +23,5 @@ in { krita.enable = lib.mkDefault true; kdenlive.enable = lib.mkDefault true; }; - } + }; } diff --git a/users/blake/dots/programs/media_tools/kdenlive/default.nix b/users/blake/dots/programs/media_tools/kdenlive/default.nix index 6f833dc..ce72c37 100644 --- a/users/blake/dots/programs/media_tools/kdenlive/default.nix +++ b/users/blake/dots/programs/media_tools/kdenlive/default.nix @@ -14,7 +14,7 @@ in { config = lib.mkIf cfg.enable { # enable with home-manager - home.packages = with pkgs; [kdePackages.kdenlive] + home.packages = with pkgs; [kdePackages.kdenlive]; }; } diff --git a/users/blake/dots/programs/nxsiv/default.nix b/users/blake/dots/programs/nsxiv/default.nix similarity index 79% rename from users/blake/dots/programs/nxsiv/default.nix rename to users/blake/dots/programs/nsxiv/default.nix index 1147936..4551559 100644 --- a/users/blake/dots/programs/nxsiv/default.nix +++ b/users/blake/dots/programs/nsxiv/default.nix @@ -4,7 +4,7 @@ config, ... }: let - program = "nxsiv"; + program = "nsxiv"; cfg = config.dots.${program}; in { options.dots.${program} = { @@ -14,7 +14,7 @@ in { config = lib.mkIf cfg.enable { # just install package - home.packages = with pkgs; [nxsiv]; + home.packages = with pkgs; [nsxiv]; }; } diff --git a/users/blake/dots/programs/thunderbird/default.nix b/users/blake/dots/programs/thunderbird/default.nix index 907b218..a4b6377 100644 --- a/users/blake/dots/programs/thunderbird/default.nix +++ b/users/blake/dots/programs/thunderbird/default.nix @@ -14,9 +14,10 @@ in { config = lib.mkIf cfg.enable { # enable with home-manager - programs.${program} = { - enable = true; - }; + # programs.${program} = { + # enable = true; + # }; + home.packages = with pkgs; [thunderbird]; }; }