home/modules/linux/graphical/default.nix

@@ -38,6 +38,7 @@ in
         librewolf
         thunderbird
         vesktop
+        premid
       ];
     };
     defaults.webBrowser = mkOption {
@@ -57,6 +58,7 @@ in
       feh # For images?
       deluge # Torrent client
       pavucontrol # PulseAudio control panel
+      thunderbird # Email
       sublime-music # For navidrome
       # cinny-desktop
       gajim
@@ -76,13 +78,14 @@ in
       slack
       zoom-us
 
+      librewolf
 
       ## CLI stuff
       dex # .desktop file management, startup
       # sct # Display color temperature
       xdg-utils # Open stuff
       wifi-indicator
-    ] ++ cfg.startup);
+    ]);
 
     nki.programs.discord.enable = pkgs.stdenv.isx86_64;
     nki.programs.discord.package = pkgs.vesktop;

home/modules/programs/my-sway/default.nix

@@ -291,8 +291,7 @@ in
       # Assigning windows to workspaces
       assigns = {
         "${builtins.elemAt workspaces 0}" = [
-          { app_id = "^firefox$"; }
-          { app_id = "^librewolf$"; }
+          { class = "^firefox$"; }
         ];
         "${builtins.elemAt workspaces 1}" = [
           { class = "^((d|D)iscord|((A|a)rm(c|C)ord))$"; }
@@ -300,8 +299,6 @@ in
           { app_id = "VencordDesktop"; }
           { class = "vesktop"; }
           { app_id = "vesktop"; }
-
-          { class = "Slack"; }
         ];
         ${extraWorkspaces.mail} = [
           { app_id = "thunderbird"; }

home/nki-x1c1.nix

@@ -29,8 +29,7 @@
   # Graphical set up
   linux.graphical.type = "wayland";
   linux.graphical.wallpaper = ./images/wallpaper_0.png;
-  linux.graphical.startup = with pkgs; [ zen-browser-bin thunderbird vesktop slack ];
-  linux.graphical.defaults.webBrowser = "zen.desktop";
+  linux.graphical.defaults.webBrowser = "librewolf.desktop";
   # Enable sway
   programs.my-sway.enable = true;
   programs.my-sway.fontSize = 14.0;
@@ -97,25 +96,14 @@
   # Multiple screen setup
   services.kanshi = with config.common.monitors; {
     enable = true;
-    settings = [
-      {
-        profile.name = "undocked";
-        profile.outputs = [{ criteria = "LVDS-1"; }];
-      }
-      {
-        profile.name = "work-both";
-        profile.outputs = [
-          { criteria = "eDP-1"; position = "0,${toString (builtins.floor ((2160 / work.scale - 1200) + 1200 / 3))}"; status = "enable"; }
-          { criteria = work.name; position = "1920,0"; }
-        ];
-      }
-      {
-        profile.name = "work-one";
-        profile.outputs = [
-          { criteria = "eDP-1"; status = "disable"; }
-          { criteria = work.name; }
-        ];
-      }
+    profiles.undocked.outputs = [{ criteria = "LVDS-1"; }];
+    profiles.work-both.outputs = [
+      { criteria = "eDP-1"; position = "0,${toString (builtins.floor ((2160 / work.scale - 1200) + 1200 / 3))}"; status = "enable"; }
+      { criteria = work.name; position = "1920,0"; }
+    ];
+    profiles.work-one.outputs = [
+      { criteria = "eDP-1"; status = "disable"; }
+      { criteria = config.common.monitors.work.name; }
     ];
   };
 

modules/common/linux/default.nix

@@ -315,11 +315,6 @@ in
     programs.kdeconnect.enable = true;
     # Flatpaks are useful... sometimes...
     services.flatpak.enable = true;
-    # AppImages should run
-    programs.appimage = {
-      enable = true;
-      binfmt = true;
-    };
     # DConf for GNOME configurations
     programs.dconf.enable = true;
     # Gaming! (not for ARM64)

overlay.nix

@@ -114,10 +114,6 @@ let
           lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration CoreServices ])
         ) ++ (with final; [ libiconv ]);
       };
-
-    zen-browser-bin = final.callPackage ./packages/x86_64-linux/zen-browser-bin.nix {
-      nativeMessagingHosts = with final; [ kdePackages.plasma-browser-integration ];
-    };
   };
 
   overlay-rust-is-dumb = final: prev: {

packages/x86_64-linux/zen-browser-bin.nix

@@ -1,32 +0,0 @@
-{ appimageTools, fetchurl, nativeMessagingHosts ? [ ], ... }:
-let
-  pname = "zen-browser-bin";
-  version = "1.0.1-a.19";
-  src = fetchurl {
-    url = "https://github.com/zen-browser/desktop/releases/download/${version}/zen-specific.AppImage";
-    hash = "sha256-qAPZ4VyVmeZLRfL0kPHF75zyrSUFHKQUSUcpYKs3jk8=";
-  };
-
-  appimageContents = appimageTools.extract {
-    inherit pname version src;
-  };
-
-in
-appimageTools.wrapType2 {
-  inherit pname version src;
-
-  extraInstallCommands = ''
-    mv $out/bin/${pname} $out/bin/zen
-    install -m 444 -D ${appimageContents}/zen.desktop $out/share/applications/zen.desktop
-    install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/128x128/apps/zen.png \
-      $out/share/icons/hicolor/128x128/apps/zen.png
-
-    mkdir -p $out/lib/mozilla/native-messaging-hosts
-    for ext in ${toString nativeMessagingHosts}; do
-        ln -sLt $out/lib/mozilla/native-messaging-hosts $ext/lib/mozilla/native-messaging-hosts/*
-    done
-  '';
-
-  meta.mainProgram = "zen";
-}
-