shuffle some prefs

home/home.nix

@@ -9,11 +9,12 @@ in {
   home.stateVersion = "22.11";
 
   imports = [
-    ./programs/cli.nix
-    ./programs/desktop.nix
-    ./programs/dev.nix
-    ./programs/theming.nix
+    ./modules/cli.nix
+    ./modules/desktop.nix
+    ./modules/dev.nix
+    ./modules/theming.nix
     ./util/ez.nix
+    ./util/flatpak.nix
     inputs.nix-index-database.hmModules.nix-index
   ];
 

home/modules/chat.nix

@@ -0,0 +1,23 @@
+{config, ...}: {
+  imports = [
+    ../util/firefox-webapp.nix
+    ../util/flatpak.nix
+  ];
+  programs.firefox.webapps = {
+    "Microsoft-Teams" = {
+      url = "https://teams.microsoft.com";
+      id = 1;
+      extraSettings = config.programs.firefox.profiles.default.settings;
+      name = "Microsoft Teams";
+      icon = ../icons/ms_teams.png;
+    };
+    "Facebook-Messenger" = {
+      url = "https://www.messenger.com";
+      id = 2;
+      extraSettings = config.programs.firefox.profiles.default.settings;
+      name = "Facebook Messenger";
+      icon = ../icons/fb_msg.png;
+    };
+  };
+  flatpaks = ["im.fluffychat.Fluffychat"];
+}

home/modules/cli.nix

@@ -1,10 +1,10 @@
 {pkgs, ...}: {
   imports = [
-    ./kitty.nix
-    ./zsh.nix
-    ./xresources.nix
-    ./helix.nix
-    ./atuin.nix
+    ../programs/kitty.nix
+    ../programs/zsh.nix
+    ../programs/xresources.nix
+    ../programs/helix.nix
+    ../programs/atuin.nix
   ];
   home.packages = with pkgs; [
     btop

home/modules/creative.nix

@@ -1,4 +1,7 @@
 {...}: {
+  imports = [
+    ../util/flatpak.nix
+  ];
   flatpaks = [
     "ar.com.tuxguitar.TuxGuitar"
     "org.inkscape.Inkscape"

home/modules/desktop.nix

@@ -1,12 +1,11 @@
 {pkgs, ...}: {
   imports = [
     ./media-players.nix
-    ./firefox.nix
-    ./flatpak.nix
     ./webapps.nix
-    ./vscode.nix
     ./documents.nix
     ./creative.nix
+    ./chat.nix
+    ../programs/firefox.nix
   ];
   home.packages = with pkgs; [
     gnome.file-roller

home/modules/dev.nix

@@ -1,4 +1,8 @@
 {pkgs, ...}: {
+  imports = [
+    ../programs/vscode.nix
+  ];
+
   home.packages = with pkgs; [
     git-credential-keepassxc
     direnv

home/modules/documents.nix

@@ -1,4 +1,7 @@
 {...}: {
+  imports = [
+    ../util/flatpak.nix
+  ];
   flatpaks = [
     {
       name = "md.obsidian.Obsidian";

home/modules/theming.nix

@@ -17,7 +17,7 @@
     #   inherit package name;
     # };
     theme = {
-      name = "adw-gtk3-dark";
+      name = "Adwaita-dark";
       package = adw-gtk3; # cosmic
     };
     iconTheme = with icons; {

home/modules/webapps.nix

@@ -0,0 +1,21 @@
+{config, ...}: {
+  imports = [
+    ../util/firefox-webapp.nix
+  ];
+  programs.firefox.webapps = {
+    "Syncthing" = {
+      url = "http://127.0.0.1:8384";
+      id = 3;
+      extraSettings = config.programs.firefox.profiles.default.settings;
+      name = "Syncthing";
+      icon = ../icons/syncthing.png;
+    };
+    "StudyTAFE" = {
+      url = "https://www.studytafensw.edu.au";
+      id = 4;
+      extraSettings = config.programs.firefox.profiles.default.settings;
+      name = "TAFE Study";
+      icon = ../icons/tafe.jpg;
+    };
+  };
+}

home/programs/firefox.nix

@@ -77,6 +77,8 @@ in {
       name = "Default";
       settings = {
         "browser.startup.homepage" = "about:blank";
+        "browser.shell.didSkipDefaultBrowserCheckOnFirstRun" = true;
+        "browser.policies.applied" = true;
         "widget.use-xdg-desktop-portal.file-picker" = 1;
         "widget.use-xdg-desktop-portal.mime-handler" = 1;
       };

home/programs/ollama.nix

@@ -11,7 +11,7 @@ in {
     openwebui = rec {
       name = "Ollama (OpenWebUI)";
       genericName = "Ollama";
-      icon = ./icons/openwebui.png;
+      icon = ../icons/openwebui.png;
       id = 6;
       port = 3021;
       service = let

home/programs/stable-diffusion.nix

@@ -11,7 +11,7 @@ in {
     stable-diffusion = {
       name = "Stable Diffusion (ComfyUI)";
       genericName = "Stable Diffusion";
-      icon = ./icons/comfyui.png;
+      icon = ../icons/comfyui.png;
       id = 5;
       port = 7860;
       service = {

home/programs/webapps.nix

@@ -1,35 +0,0 @@
-{config, ...}: {
-  imports = [
-    ../util/firefox-webapp.nix
-  ];
-  programs.firefox.webapps = {
-    "Microsoft-Teams" = {
-      url = "https://teams.microsoft.com";
-      id = 1;
-      extraSettings = config.programs.firefox.profiles.default.settings;
-      name = "Microsoft Teams";
-      icon = ./icons/ms_teams.png;
-    };
-    "Facebook-Messenger" = {
-      url = "https://www.messenger.com";
-      id = 2;
-      extraSettings = config.programs.firefox.profiles.default.settings;
-      name = "Facebook Messenger";
-      icon = ./icons/fb_msg.png;
-    };
-    "Syncthing" = {
-      url = "http://127.0.0.1:8384";
-      id = 3;
-      extraSettings = config.programs.firefox.profiles.default.settings;
-      name = "Syncthing";
-      icon = ./icons/syncthing.png;
-    };
-    "StudyTAFE" = {
-      url = "https://www.studytafensw.edu.au";
-      id = 4;
-      extraSettings = config.programs.firefox.profiles.default.settings;
-      name = "TAFE Study";
-      icon = ./icons/tafe.jpg;
-    };
-  };
-}