diff --git a/hosts/nixos/default.nix b/hosts/nixos/default.nix index bbbcd1b..1ed69ce 100644 --- a/hosts/nixos/default.nix +++ b/hosts/nixos/default.nix @@ -15,15 +15,21 @@ wget curl dig + nmap rsync + iperf3 + jq git age vim + ncdu btop + powertop + iotop cifs-utils usbutils pciutils - powertop + lm_sensors ]; # set timezone @@ -37,7 +43,7 @@ powerManagement.powertop.enable = true; # enable flakes - nix.settings.experimental-features = ["nix-command" "flakes"]; + nix.settings.experimental-features = lib.mkDefault ["nix-command" "flakes"]; users.defaultUserShell = pkgs.zsh; # passwordless rebuild diff --git a/users/blake/dots/programs/browsers/default.nix b/users/blake/dots/programs/_browsers/default.nix similarity index 100% rename from users/blake/dots/programs/browsers/default.nix rename to users/blake/dots/programs/_browsers/default.nix diff --git a/users/blake/dots/programs/browsers/firefox/default.nix b/users/blake/dots/programs/_browsers/firefox/default.nix similarity index 100% rename from users/blake/dots/programs/browsers/firefox/default.nix rename to users/blake/dots/programs/_browsers/firefox/default.nix diff --git a/users/blake/dots/programs/browsers/librewolf/default.nix b/users/blake/dots/programs/_browsers/librewolf/default.nix similarity index 100% rename from users/blake/dots/programs/browsers/librewolf/default.nix rename to users/blake/dots/programs/_browsers/librewolf/default.nix diff --git a/users/blake/dots/programs/media_tools/audacity/default.nix b/users/blake/dots/programs/_media-tools/audacity/default.nix similarity index 100% rename from users/blake/dots/programs/media_tools/audacity/default.nix rename to users/blake/dots/programs/_media-tools/audacity/default.nix diff --git a/users/blake/dots/programs/media_tools/default.nix b/users/blake/dots/programs/_media-tools/default.nix similarity index 57% rename from users/blake/dots/programs/media_tools/default.nix rename to users/blake/dots/programs/_media-tools/default.nix index bde3f2f..ef5079f 100644 --- a/users/blake/dots/programs/media_tools/default.nix +++ b/users/blake/dots/programs/_media-tools/default.nix @@ -4,24 +4,36 @@ config, ... }: let - cfg = config.dots.media_tools; + cfg = config.dots.media-tools; in { imports = [ + ./mpv + ./nsxiv + ./obs ./gimp - ./krita ./audacity + ./krita ./kdenlive ]; - options.dots.media_tools = { + options.dots.media-tools = { enable = lib.mkEnableOption "enables all programs by default"; }; config = lib.mkIf cfg.enable { dots = { - audacity.enable = lib.mkDefault true; + mpv.enable = lib.mkDefault true; + nsxiv.enable = lib.mkDefault true; + obs.enable = lib.mkDefault true; gimp.enable = lib.mkDefault true; + audacity.enable = lib.mkDefault true; krita.enable = lib.mkDefault true; kdenlive.enable = lib.mkDefault true; }; + + home.packages = with pkgs; [ + mediainfo + ffmpeg_6 + imagemagick + ]; }; } diff --git a/users/blake/dots/programs/media_tools/gimp/default.nix b/users/blake/dots/programs/_media-tools/gimp/default.nix similarity index 100% rename from users/blake/dots/programs/media_tools/gimp/default.nix rename to users/blake/dots/programs/_media-tools/gimp/default.nix diff --git a/users/blake/dots/programs/media_tools/kdenlive/default.nix b/users/blake/dots/programs/_media-tools/kdenlive/default.nix similarity index 100% rename from users/blake/dots/programs/media_tools/kdenlive/default.nix rename to users/blake/dots/programs/_media-tools/kdenlive/default.nix diff --git a/users/blake/dots/programs/media_tools/krita/default.nix b/users/blake/dots/programs/_media-tools/krita/default.nix similarity index 100% rename from users/blake/dots/programs/media_tools/krita/default.nix rename to users/blake/dots/programs/_media-tools/krita/default.nix diff --git a/users/blake/dots/programs/mpv/default.nix b/users/blake/dots/programs/_media-tools/mpv/default.nix similarity index 100% rename from users/blake/dots/programs/mpv/default.nix rename to users/blake/dots/programs/_media-tools/mpv/default.nix diff --git a/users/blake/dots/programs/nsxiv/default.nix b/users/blake/dots/programs/_media-tools/nsxiv/default.nix similarity index 100% rename from users/blake/dots/programs/nsxiv/default.nix rename to users/blake/dots/programs/_media-tools/nsxiv/default.nix diff --git a/users/blake/dots/programs/_media-tools/obs/default.nix b/users/blake/dots/programs/_media-tools/obs/default.nix new file mode 100644 index 0000000..1dbff89 --- /dev/null +++ b/users/blake/dots/programs/_media-tools/obs/default.nix @@ -0,0 +1,23 @@ +{ + pkgs, + lib, + config, + ... +}: let + program = "obs"; + cfg = config.dots.${program}; +in { + options.dots.${program} = { + enable = lib.mkEnableOption "enables ${program}"; + }; + + config = lib.mkIf cfg.enable { + + # enable with home-manager + programs.obs-studio = { + enable = true; + plugins = []; + }; + + }; +} diff --git a/users/blake/dots/programs/default.nix b/users/blake/dots/programs/default.nix index e26414e..9059059 100644 --- a/users/blake/dots/programs/default.nix +++ b/users/blake/dots/programs/default.nix @@ -7,6 +7,9 @@ cfg = config.dots.programs; in { imports = [ + ./_media-tools + ./_browsers + ./thunderbird ./libreoffice ./gnucash @@ -14,13 +17,8 @@ in { ./bitwarden ./zathura ./discord - ./mpv - ./nsxiv ./slippi - - ./media_tools - ./browsers ]; options.dots.programs = { @@ -29,21 +27,19 @@ in { config = lib.mkIf cfg.enable { dots = { + media-tools.enable = lib.mkDefault true; + browsers.enable = lib.mkDefault true; + thunderbird.enable = lib.mkDefault true; libreoffice.enable = lib.mkDefault true; gnucash.enable = lib.mkDefault true; qalculate.enable = lib.mkDefault true; bitwarden.enable = lib.mkDefault true; discord.enable = lib.mkDefault true; - zathura.enable = lib.mkDefault true; - mpv.enable = lib.mkDefault true; - nsxiv.enable = lib.mkDefault true; slippi.enable = lib.mkDefault true; - media_tools.enable = lib.mkDefault true; - browsers.enable = lib.mkDefault true; }; }; } diff --git a/users/blake/home.nix b/users/blake/home.nix index b55dfa5..bb903c2 100644 --- a/users/blake/home.nix +++ b/users/blake/home.nix @@ -30,9 +30,7 @@ in stateVersion = "25.05"; packages = with pkgs; [ ripgrep - iperf3 p7zip - imagemagick sops usbutils ];