Compare commits
3 commits
32b4df7c28
...
43a33c2313
Author | SHA1 | Date | |
---|---|---|---|
|
43a33c2313 | ||
|
ec187e65c0 | ||
|
4afc60bd6a |
|
@ -38,7 +38,6 @@ in
|
||||||
librewolf
|
librewolf
|
||||||
thunderbird
|
thunderbird
|
||||||
vesktop
|
vesktop
|
||||||
premid
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
defaults.webBrowser = mkOption {
|
defaults.webBrowser = mkOption {
|
||||||
|
@ -58,7 +57,6 @@ in
|
||||||
feh # For images?
|
feh # For images?
|
||||||
deluge # Torrent client
|
deluge # Torrent client
|
||||||
pavucontrol # PulseAudio control panel
|
pavucontrol # PulseAudio control panel
|
||||||
thunderbird # Email
|
|
||||||
sublime-music # For navidrome
|
sublime-music # For navidrome
|
||||||
# cinny-desktop
|
# cinny-desktop
|
||||||
gajim
|
gajim
|
||||||
|
@ -78,14 +76,13 @@ in
|
||||||
slack
|
slack
|
||||||
zoom-us
|
zoom-us
|
||||||
|
|
||||||
librewolf
|
|
||||||
|
|
||||||
## CLI stuff
|
## CLI stuff
|
||||||
dex # .desktop file management, startup
|
dex # .desktop file management, startup
|
||||||
# sct # Display color temperature
|
# sct # Display color temperature
|
||||||
xdg-utils # Open stuff
|
xdg-utils # Open stuff
|
||||||
wifi-indicator
|
wifi-indicator
|
||||||
]);
|
] ++ cfg.startup);
|
||||||
|
|
||||||
nki.programs.discord.enable = pkgs.stdenv.isx86_64;
|
nki.programs.discord.enable = pkgs.stdenv.isx86_64;
|
||||||
nki.programs.discord.package = pkgs.vesktop;
|
nki.programs.discord.package = pkgs.vesktop;
|
||||||
|
|
|
@ -291,7 +291,8 @@ in
|
||||||
# Assigning windows to workspaces
|
# Assigning windows to workspaces
|
||||||
assigns = {
|
assigns = {
|
||||||
"${builtins.elemAt workspaces 0}" = [
|
"${builtins.elemAt workspaces 0}" = [
|
||||||
{ class = "^firefox$"; }
|
{ app_id = "^firefox$"; }
|
||||||
|
{ app_id = "^librewolf$"; }
|
||||||
];
|
];
|
||||||
"${builtins.elemAt workspaces 1}" = [
|
"${builtins.elemAt workspaces 1}" = [
|
||||||
{ class = "^((d|D)iscord|((A|a)rm(c|C)ord))$"; }
|
{ class = "^((d|D)iscord|((A|a)rm(c|C)ord))$"; }
|
||||||
|
@ -299,6 +300,8 @@ in
|
||||||
{ app_id = "VencordDesktop"; }
|
{ app_id = "VencordDesktop"; }
|
||||||
{ class = "vesktop"; }
|
{ class = "vesktop"; }
|
||||||
{ app_id = "vesktop"; }
|
{ app_id = "vesktop"; }
|
||||||
|
|
||||||
|
{ class = "Slack"; }
|
||||||
];
|
];
|
||||||
${extraWorkspaces.mail} = [
|
${extraWorkspaces.mail} = [
|
||||||
{ app_id = "thunderbird"; }
|
{ app_id = "thunderbird"; }
|
||||||
|
|
|
@ -29,7 +29,8 @@
|
||||||
# Graphical set up
|
# Graphical set up
|
||||||
linux.graphical.type = "wayland";
|
linux.graphical.type = "wayland";
|
||||||
linux.graphical.wallpaper = ./images/wallpaper_0.png;
|
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
|
# Enable sway
|
||||||
programs.my-sway.enable = true;
|
programs.my-sway.enable = true;
|
||||||
programs.my-sway.fontSize = 14.0;
|
programs.my-sway.fontSize = 14.0;
|
||||||
|
@ -96,14 +97,25 @@
|
||||||
# Multiple screen setup
|
# Multiple screen setup
|
||||||
services.kanshi = with config.common.monitors; {
|
services.kanshi = with config.common.monitors; {
|
||||||
enable = true;
|
enable = true;
|
||||||
profiles.undocked.outputs = [{ criteria = "LVDS-1"; }];
|
settings = [
|
||||||
profiles.work-both.outputs = [
|
{
|
||||||
{ criteria = "eDP-1"; position = "0,${toString (builtins.floor ((2160 / work.scale - 1200) + 1200 / 3))}"; status = "enable"; }
|
profile.name = "undocked";
|
||||||
{ criteria = work.name; position = "1920,0"; }
|
profile.outputs = [{ criteria = "LVDS-1"; }];
|
||||||
];
|
}
|
||||||
profiles.work-one.outputs = [
|
{
|
||||||
{ criteria = "eDP-1"; status = "disable"; }
|
profile.name = "work-both";
|
||||||
{ criteria = config.common.monitors.work.name; }
|
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; }
|
||||||
|
];
|
||||||
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -315,6 +315,11 @@ in
|
||||||
programs.kdeconnect.enable = true;
|
programs.kdeconnect.enable = true;
|
||||||
# Flatpaks are useful... sometimes...
|
# Flatpaks are useful... sometimes...
|
||||||
services.flatpak.enable = true;
|
services.flatpak.enable = true;
|
||||||
|
# AppImages should run
|
||||||
|
programs.appimage = {
|
||||||
|
enable = true;
|
||||||
|
binfmt = true;
|
||||||
|
};
|
||||||
# DConf for GNOME configurations
|
# DConf for GNOME configurations
|
||||||
programs.dconf.enable = true;
|
programs.dconf.enable = true;
|
||||||
# Gaming! (not for ARM64)
|
# Gaming! (not for ARM64)
|
||||||
|
|
|
@ -114,6 +114,10 @@ let
|
||||||
lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration CoreServices ])
|
lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration CoreServices ])
|
||||||
) ++ (with final; [ libiconv ]);
|
) ++ (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: {
|
overlay-rust-is-dumb = final: prev: {
|
||||||
|
|
32
packages/x86_64-linux/zen-browser-bin.nix
Normal file
32
packages/x86_64-linux/zen-browser-bin.nix
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
{ 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";
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue