diff --git a/home/modules/linux/graphical/default.nix b/home/modules/linux/graphical/default.nix index 554d138..35a29eb 100644 --- a/home/modules/linux/graphical/default.nix +++ b/home/modules/linux/graphical/default.nix @@ -38,7 +38,6 @@ in librewolf thunderbird vesktop - premid ]; }; defaults.webBrowser = mkOption { @@ -58,7 +57,6 @@ in feh # For images? deluge # Torrent client pavucontrol # PulseAudio control panel - thunderbird # Email sublime-music # For navidrome # cinny-desktop gajim @@ -78,14 +76,13 @@ 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; diff --git a/home/modules/programs/my-sway/default.nix b/home/modules/programs/my-sway/default.nix index a01b4c0..428c56e 100644 --- a/home/modules/programs/my-sway/default.nix +++ b/home/modules/programs/my-sway/default.nix @@ -291,7 +291,8 @@ in # Assigning windows to workspaces assigns = { "${builtins.elemAt workspaces 0}" = [ - { class = "^firefox$"; } + { app_id = "^firefox$"; } + { app_id = "^librewolf$"; } ]; "${builtins.elemAt workspaces 1}" = [ { class = "^((d|D)iscord|((A|a)rm(c|C)ord))$"; } @@ -299,6 +300,8 @@ in { app_id = "VencordDesktop"; } { class = "vesktop"; } { app_id = "vesktop"; } + + { class = "Slack"; } ]; ${extraWorkspaces.mail} = [ { app_id = "thunderbird"; } diff --git a/home/nki-x1c1.nix b/home/nki-x1c1.nix index 49f0ed0..dbad824 100644 --- a/home/nki-x1c1.nix +++ b/home/nki-x1c1.nix @@ -29,7 +29,8 @@ # Graphical set up linux.graphical.type = "wayland"; linux.graphical.wallpaper = ./images/wallpaper_0.png; - linux.graphical.defaults.webBrowser = "librewolf.desktop"; + linux.graphical.startup = with pkgs; [ zen-browser-bin thunderbird vesktop slack ]; + linux.graphical.defaults.webBrowser = "zen.desktop"; # Enable sway programs.my-sway.enable = true; programs.my-sway.fontSize = 14.0; @@ -96,14 +97,25 @@ # Multiple screen setup services.kanshi = with config.common.monitors; { enable = true; - 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; } + 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; } + ]; + } ]; }; diff --git a/packages/x86_64-linux/zen-browser-bin.nix b/packages/x86_64-linux/zen-browser-bin.nix index 33c7633..18d3d67 100644 --- a/packages/x86_64-linux/zen-browser-bin.nix +++ b/packages/x86_64-linux/zen-browser-bin.nix @@ -1,4 +1,4 @@ -{ appimageTools, fetchurl, nativeMessagingHosts, ... }: +{ appimageTools, fetchurl, nativeMessagingHosts ? [ ], ... }: let pname = "zen-browser-bin"; version = "1.0.1-a.19";