From e4516d5585ccf611c58e668ca9123eefff225f39 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Sat, 22 Jun 2024 16:28:15 +0100 Subject: [PATCH] Some more renaming and moving Move more to naming folders after function than specific program (exception being Emacs...), renamed firefox -> browser and obs -> streaming Also move importing obs/streaming to personal.nix instead of default Move Nyxt config into browser directory Add some KDE apps: ktorrent for personal, kdenlive and krita for streaming --- default.nix | 3 +-- flake.nix | 1 - personal.nix | 9 ++++++--- .../browser/bookmarks.json | 0 programs/{nyxt => browser}/bookmarks.lisp | 0 programs/{nyxt => browser}/config.lisp | 0 programs/browser/default.nix | 1 + .../default.nix => browser/firefox.nix} | 9 ++------- programs/{nyxt/default.nix => browser/nyxt.nix} | 0 programs/cava/default.nix | 17 ----------------- programs/desktop/plasma6/konsole.nix | 7 ++++++- programs/{obs => streaming}/default.nix | 7 ++++++- work.nix | 1 - 13 files changed, 22 insertions(+), 33 deletions(-) rename bookmarks.json => programs/browser/bookmarks.json (100%) rename programs/{nyxt => browser}/bookmarks.lisp (100%) rename programs/{nyxt => browser}/config.lisp (100%) create mode 100644 programs/browser/default.nix rename programs/{firefox/default.nix => browser/firefox.nix} (98%) rename programs/{nyxt/default.nix => browser/nyxt.nix} (100%) delete mode 100644 programs/cava/default.nix rename programs/{obs => streaming}/default.nix (69%) diff --git a/default.nix b/default.nix index 311d875..9dea358 100644 --- a/default.nix +++ b/default.nix @@ -4,8 +4,7 @@ ./programs/desktop/default.nix ./programs/shell/default.nix ./programs/emacs/default.nix - ./programs/firefox/default.nix - ./programs/obs/default.nix + ./programs/browser/default.nix # Services ./services/email/work.nix # TODO combine again at some point ./services/password-store/default.nix diff --git a/flake.nix b/flake.nix index 721efec..25b4ad1 100644 --- a/flake.nix +++ b/flake.nix @@ -68,7 +68,6 @@ package = packages.iosevka-custom-nerdfont; }; }; - bookmarks = builtins.fromJSON (builtins.readFile ./bookmarks.json); }; defaultModules = [ plasma-manager.homeManagerModules.plasma-manager diff --git a/personal.nix b/personal.nix index b47ab9d..d73418e 100644 --- a/personal.nix +++ b/personal.nix @@ -1,11 +1,14 @@ {pkgs, ...}: { imports = [ - ./default.nix - ../programs/games/default.nix + # Programs + ./programs/games/default.nix + ./programs/streaming/default.nix ]; - home.packages = with pkgs; [ + home.packages = with pkgs; + with kdePackages; [ blender freecad prusa-slicer + ktorrent ]; } diff --git a/bookmarks.json b/programs/browser/bookmarks.json similarity index 100% rename from bookmarks.json rename to programs/browser/bookmarks.json diff --git a/programs/nyxt/bookmarks.lisp b/programs/browser/bookmarks.lisp similarity index 100% rename from programs/nyxt/bookmarks.lisp rename to programs/browser/bookmarks.lisp diff --git a/programs/nyxt/config.lisp b/programs/browser/config.lisp similarity index 100% rename from programs/nyxt/config.lisp rename to programs/browser/config.lisp diff --git a/programs/browser/default.nix b/programs/browser/default.nix new file mode 100644 index 0000000..7fe62d1 --- /dev/null +++ b/programs/browser/default.nix @@ -0,0 +1 @@ +{...}: {imports = [./firefox.nix];} diff --git a/programs/firefox/default.nix b/programs/browser/firefox.nix similarity index 98% rename from programs/firefox/default.nix rename to programs/browser/firefox.nix index f63d22d..21188cf 100644 --- a/programs/firefox/default.nix +++ b/programs/browser/firefox.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - bookmarks, - ... -}: { +{pkgs, ...}: { programs = { browserpass = { enable = true; @@ -95,7 +90,7 @@ StartDownloadsInTempDirectory = true; }; profiles.default = { - inherit bookmarks; + bookmarks = builtins.fromJSON (builtins.readFile ./bookmarks.json); settings = { "app.shield.optoutstudies.enabled" = false; "browser.bookmarks.addedImportButton" = false; diff --git a/programs/nyxt/default.nix b/programs/browser/nyxt.nix similarity index 100% rename from programs/nyxt/default.nix rename to programs/browser/nyxt.nix diff --git a/programs/cava/default.nix b/programs/cava/default.nix deleted file mode 100644 index 7f61e7d..0000000 --- a/programs/cava/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{config, ...}: { - programs.cava = { - enable = true; - settings = { - color = with config.scheme.withHashtag; { - gradient = 1; - gradient_count = 6; - gradient_color_1 = "'${red}'"; - gradient_color_2 = "'${yellow}'"; - gradient_color_3 = "'${green}'"; - gradient_color_4 = "'${cyan}'"; - gradient_color_5 = "'${blue}'"; - gradient_color_6 = "'${magenta}'"; - }; - }; - }; -} diff --git a/programs/desktop/plasma6/konsole.nix b/programs/desktop/plasma6/konsole.nix index a49634a..22459e1 100644 --- a/programs/desktop/plasma6/konsole.nix +++ b/programs/desktop/plasma6/konsole.nix @@ -1,4 +1,9 @@ -{fonts, ...}: { +{ + pkgs, + fonts, + ... +}: { + home.packages = [pkgs.kdePackages.yakuake]; programs.konsole = { enable = true; defaultProfile = "One-Light"; diff --git a/programs/obs/default.nix b/programs/streaming/default.nix similarity index 69% rename from programs/obs/default.nix rename to programs/streaming/default.nix index c251e0d..d5cc4ea 100644 --- a/programs/obs/default.nix +++ b/programs/streaming/default.nix @@ -1,5 +1,10 @@ {pkgs, ...}: { - home.packages = with pkgs; [helvum]; + home.packages = with pkgs; + with kdePackages; [ + helvum + kdenlive + krita + ]; programs.obs-studio = { enable = true; plugins = with pkgs.obs-studio-plugins; [ diff --git a/work.nix b/work.nix index 9b930b6..ff14f80 100644 --- a/work.nix +++ b/work.nix @@ -4,7 +4,6 @@ pkgs, ... }: { - imports = [./default.nix]; home.packages = with pkgs; [ twinkle teams-for-linux