no more dhall

8 files changed, 19 insertions, 104 deletions

diff --git a/modules/desktop/home/default.nix b/modules/desktop/home/default.nix
index 98b6059..cab01fe 100644
--- a/modules/desktop/home/default.nix
+++ b/modules/desktop/home/default.nix
@@ -3,7 +3,6 @@
     ./environments/gnome
     ./gtk
 
-    ./programs/firefox/default.nix
     ./programs/blackbox.nix
   ];
 }
diff --git a/modules/desktop/home/programs/firefox/adwaita.nix b/modules/desktop/home/programs/firefox/adwaita.nix
deleted file mode 100644
index 2655f42..0000000
--- a/modules/desktop/home/programs/firefox/adwaita.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.collinux.desktop.programs.firefox;
-
-  firefox-gnome-theme = builtins.fetchGit {
-    url = "https://github.com/rafaelmardojai/firefox-gnome-theme";
-    rev = "59e3de00f01e5adb851d824cf7911bd90c31083a";
-  };
-in
-  lib.mkIf (cfg.enable && cfg.theme == "adwaita") {
-    home.file.".mozilla/firefox/${cfg.profileName}/chrome" = {
-      recursive = true;
-      source = firefox-gnome-theme;
-    };
-
-    programs.firefox.profiles."${cfg.profileName}" = {
-      settings = {
-        "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
-        "svg.context-properties.content.enabled" = true;
-      };
-    };
-  }
diff --git a/modules/desktop/home/programs/firefox/catppuccin.nix b/modules/desktop/home/programs/firefox/catppuccin.nix
deleted file mode 100644
index 7c78fab..0000000
--- a/modules/desktop/home/programs/firefox/catppuccin.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.collinux.desktop.programs.firefox;
-in
-  lib.mkIf (cfg.enable && cfg.theme == "catppuccin") {
-    programs.firefox.profiles."${cfg.profileName}".settings = {
-      "browser.compactmode.show" = true;
-      "browser.uidensity" = 1;
-
-      "browser.tabs.inTitlebar" = 0;
-      "sidebar.verticalTabs" = true;
-      "sidebar.main.tools" = "";
-
-      "browser.uiCustomization.state" = ''{"placements":{"widget-overflow-fixed-list":[],"unified-extensions-area":[],"nav-bar":["sidebar-button","customizableui-special-spring4","back-button","forward-button","urlbar-container","ublock0_raymondhill_net-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","unified-extensions-button","vertical-spacer"],"toolbar-menubar":["menubar-items"],"TabsToolbar":[],"vertical-tabs":["tabbrowser-tabs"],"PersonalToolbar":["import-button","personal-bookmarks"]},"seen":["save-to-pocket-button","developer-button","ublock0_raymondhill_net-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action"],"dirtyAreaCache":["nav-bar","TabsToolbar","vertical-tabs","PersonalToolbar","toolbar-menubar","unified-extensions-area"],"currentVersion":21,"newElementCount":6}'';
-      "browser.uiCustomization.navBarWhenVerticalTabs" = ''["sidebar-button","customizableui-special-spring4","back-button","forward-button","urlbar-container","ublock0_raymondhill_net-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","unified-extensions-button","vertical-spacer"]'';
-    };
-  }
diff --git a/modules/desktop/home/programs/firefox/default.nix b/modules/desktop/home/programs/firefox/default.nix
deleted file mode 100644
index 91230d9..0000000
--- a/modules/desktop/home/programs/firefox/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.collinux.desktop.programs.firefox;
-in {
-  imports = [
-    ./profile.nix
-    ./adwaita.nix
-    ./catppuccin.nix
-  ];
-
-  config = lib.mkIf (cfg.enable) {
-    programs.firefox.enable = true;
-  };
-}
diff --git a/modules/desktop/home/programs/firefox/profile.nix b/modules/desktop/home/programs/firefox/profile.nix
deleted file mode 100644
index cab8f40..0000000
--- a/modules/desktop/home/programs/firefox/profile.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.collinux.desktop.programs.firefox;
-in
-  lib.mkIf cfg.enable {
-    programs.firefox.profiles."${cfg.profileName}" = {
-      isDefault = true;
-      search.default = "ddg";
-
-      containersForce = true;
-      containers = {
-        "school" = {
-          color = "orange";
-          icon = "briefcase";
-          id = 3;
-        };
-        "personal" = {
-          color = "blue";
-          icon = "fingerprint";
-          id = 2;
-        };
-        "default" = {
-          color = "red";
-          icon = "circle";
-          id = 1;
-        };
-      };
-
-      settings = {
-        "browser.aboutConfig.showWarning" = false;
-        "browser.toolbars.bookmarks.visibility" = "never";
-        "browser.urlbar.groupLabels.enabled" = false;
-      };
-    };
-  }
diff --git a/modules/desktop/system/environments/sway.nix b/modules/desktop/system/environments/sway.nix
index df87da4..880095b 100644
--- a/modules/desktop/system/environments/sway.nix
+++ b/modules/desktop/system/environments/sway.nix
@@ -78,6 +78,7 @@
     bindsym Mod4+Shift+Return exec ${pkgs.foot}/bin/foot
     bindsym Mod4+Space exec ${pkgs.fuzzel}/bin/fuzzel
     bindsym Mod4+b exec ${pkgs.firefox}/bin/firefox
+    bindsym Mod4+Shift+b exec ${pkgs.qutebrowser}/bin/qutebrowser
     bindsym Mod4+q kill
 
     bindsym XF86AudioRaiseVolume exec 'wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; dunstify -t 300 -h string:x-canonical-private-synchronous:audio "Volume: " -h int:value:"$(dec=$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | sed 's/Volume:\ //'); echo "$dec * 100" | bc)"'
diff --git a/modules/desktop/system/programs/firefox.nix b/modules/desktop/system/programs/firefox.nix
index e5c5e21..7f4435b 100644
--- a/modules/desktop/system/programs/firefox.nix
+++ b/modules/desktop/system/programs/firefox.nix
@@ -33,4 +33,18 @@ in
           ];
       };
     };
+
+    hjem.users."${config.collinux.user.name}".files = {
+      ".mozilla/firefox/profiles.ini".text = ''
+        [Profile0]
+        Name=collin
+        IsRelative=1
+        Path=collin
+        Default=1
+
+        [General]
+        StartWithLastProfile=1
+        Version=2
+      '';
+    };
   }
diff --git a/modules/desktop/system/programs/foot.nix b/modules/desktop/system/programs/foot.nix
index d6f97c7..fe93901 100644
--- a/modules/desktop/system/programs/foot.nix
+++ b/modules/desktop/system/programs/foot.nix
@@ -11,9 +11,10 @@
     main = {
       font = "Iosevka Nerd Font:size=12";
       shell =
-        if config.collinux.terminal.programs.tmux.enable
-        then "${pkgs.tmux}/bin/tmux"
-        else "${pkgs.fish}/bin/fish";
+        # if config.collinux.terminal.programs.tmux.enable
+        # then "${pkgs.tmux}/bin/tmux"
+        # else
+        "${pkgs.fish}/bin/fish";
     };
 
     cursor.color = "11111b f5e0dc";