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

@@ -4,8 +4,7 @@
     ./programs/desktop/default.nix
     ./programs/shell/default.nix
     ./programs/emacs/default.nix
-    ./programs/firefox/default.nix
+    ./programs/browser/default.nix
-    ./programs/obs/default.nix
     # Services
     ./services/email/work.nix # TODO combine again at some point
     ./services/password-store/default.nix

flake.nix

@@ -68,7 +68,6 @@
           package = packages.iosevka-custom-nerdfont;
         };
       };
-      bookmarks = builtins.fromJSON (builtins.readFile ./bookmarks.json);
     };
     defaultModules = [
       plasma-manager.homeManagerModules.plasma-manager

personal.nix

@@ -1,11 +1,14 @@
 {pkgs, ...}: {
   imports = [
-    ./default.nix
+    # Programs
-    ../programs/games/default.nix
+    ./programs/games/default.nix
+    ./programs/streaming/default.nix
   ];
-  home.packages = with pkgs; [
+  home.packages = with pkgs;
+  with kdePackages; [
     blender
     freecad
     prusa-slicer
+    ktorrent
   ];
 }

programs/browser/default.nix

@@ -0,0 +1 @@
+{...}: {imports = [./firefox.nix];}

programs/browser/firefox.nix

@@ -1,9 +1,4 @@
-{
+{pkgs, ...}: {
-  lib,
-  pkgs,
-  bookmarks,
-  ...
-}: {
   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;

programs/cava/default.nix

@@ -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}'";
-      };
-    };
-  };
-}

programs/desktop/plasma6/konsole.nix

@@ -1,4 +1,9 @@
-{fonts, ...}: {
+{
+  pkgs,
+  fonts,
+  ...
+}: {
+  home.packages = [pkgs.kdePackages.yakuake];
   programs.konsole = {
     enable = true;
     defaultProfile = "One-Light";

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; [

work.nix

@@ -4,7 +4,6 @@
   pkgs,
   ...
 }: {
-  imports = [./default.nix];
   home.packages = with pkgs; [
     twinkle
     teams-for-linux