Disable/remove more options not needed for plasma6

This commit is contained in:
Evie Litherland-Smith 2024-06-16 20:44:38 +01:00
parent 51171ddb06
commit eb8bb86c17
3 changed files with 85 additions and 155 deletions

View file

@ -1,45 +1 @@
{...}: { {...}: {imports = [./default.nix];}
imports = [./default.nix];
wayland.windowManager.sway.config = {
output."eDP-1".scale = "1.25";
workspaceOutputAssign = [
{
output = "eDP-1";
workspace = "1";
}
];
};
services.kanshi = {
enable = true;
settings = let
laptopScreen = {
criteria = "eDP-1";
scale = 1.25;
position = "3000,636";
};
monitor1 = {
criteria = "Acer Technologies ED270R TJMEE0043W01";
mode = "1920x1080@165Hz";
position = "1080,420";
};
monitor2 = {
criteria = "Ancor Communications Inc VS278 FALMQS032358";
position = "0,0";
transform = "270";
};
in [
{
profile = {
name = "undocked";
outputs = [laptopScreen];
};
}
{
profile = {
name = "docked";
outputs = [laptopScreen monitor1 monitor2];
};
}
];
};
}

View file

@ -4,9 +4,7 @@
../programs/desktop/default.nix ../programs/desktop/default.nix
../programs/shell/default.nix ../programs/shell/default.nix
../programs/emacs/default.nix ../programs/emacs/default.nix
../programs/nyxt/default.nix
../programs/firefox/default.nix ../programs/firefox/default.nix
../programs/cava/default.nix
../programs/obs/default.nix ../programs/obs/default.nix
# Services # Services
../services/email/work.nix # TODO combine again at some point ../services/email/work.nix # TODO combine again at some point

View file

@ -2,111 +2,87 @@
config, config,
pkgs, pkgs,
... ...
}: { }: let
imports = [ protonmail-setup-bridge = with pkgs; (writeShellScriptBin "protonmail-setup-bridge" ''
./plasma6/default.nix
# ./sway/default.nix
# ./niri/default.nix
# ./foot/default.nix
./alacritty/default.nix
# ./avizo/default.nix
# ./fuzzel/default.nix
# ./swaylock/default.nix
# ./swayidle/default.nix
# ./mako/default.nix
# ./waybar/default.nix
# ./wlogout/default.nix
];
home.packages = with pkgs; [
pinentry
ffmpeg
evince
libreoffice-fresh
inkscape
webcord
swayimg
swaybg
(writeShellScriptBin "set-background" ''
${swaybg}/bin/swaybg -m fill -i ${./wallpapers/landscapes/tropic_island_day.jpg}
'')
(writeShellScriptBin "protonmail-setup-bridge" ''
pkill -9 -f protonmail-bridge pkill -9 -f protonmail-bridge
${protonmail-bridge}/bin/protonmail-bridge -c ${protonmail-bridge}/bin/protonmail-bridge -c
swaymsg exec "${protonmail-bridge}/bin/protonmail-bridge -n" swaymsg exec "${protonmail-bridge}/bin/protonmail-bridge -n"
'') '');
(writeShellScriptBin "davmail-setup" '' davmail-setup = with pkgs; (writeShellScriptBin "davmail-setup" ''
systemctl --user restart davmail # Ensure config file is present systemctl --user restart davmail # Ensure config file is present
systemctl --user stop davmail systemctl --user stop davmail
${davmail}/bin/davmail -n ~/.davmail.properties ${davmail}/bin/davmail -n ~/.davmail.properties
systemctl --user restart davmail systemctl --user restart davmail
'') '');
in {
imports = [
./plasma6/default.nix
./alacritty/default.nix
];
home.packages = with pkgs; [
libreoffice-fresh
inkscape
webcord
protonmail-setup-bridge
davmail-setup
]; ];
services = { services = {
avizo.enable = true;
gpg-agent.pinentryPackage = pkgs.pinentry-gtk2;
remmina.enable = true;
syncthing.enable = true; syncthing.enable = true;
kdeconnect = { kdeconnect = {
enable = true; enable = true;
indicator = true; indicator = true;
}; };
udiskie = {
enable = true;
notify = true;
automount = true;
tray = "never";
};
};
programs.mpv.enable = true;
gtk = {
enable = true;
iconTheme = {
package = pkgs.papirus-icon-theme.override {color = "violet";};
name =
if config.scheme.variant == "light"
then "Papirus-Light"
else "Papirus-Dark";
};
cursorTheme = {
package = pkgs.volantes-cursors;
name =
if config.scheme.variant == "light"
then "volantes_cursors"
else "volantes_light_cursors";
size = 32;
};
theme = {
package = pkgs.gnome.gnome-themes-extra;
name =
if config.scheme.variant == "light"
then "Adwaita"
else "Adwaita-dark";
};
};
qt = {
enable = true;
style = {
package = pkgs.adwaita-qt;
name =
if config.scheme.variant == "light"
then "adwaita"
else "adwaita-dark";
};
}; };
# programs.mpv.enable = true;
# gtk = {
# enable = true;
# iconTheme = {
# package = pkgs.papirus-icon-theme.override {color = "violet";};
# name =
# if config.scheme.variant == "light"
# then "Papirus-Light"
# else "Papirus-Dark";
# };
# cursorTheme = {
# package = pkgs.volantes-cursors;
# name =
# if config.scheme.variant == "light"
# then "volantes_cursors"
# else "volantes_light_cursors";
# size = 32;
# };
# theme = {
# package = pkgs.gnome.gnome-themes-extra;
# name =
# if config.scheme.variant == "light"
# then "Adwaita"
# else "Adwaita-dark";
# };
# };
# qt = {
# enable = true;
# style = {
# package = pkgs.adwaita-qt;
# name =
# if config.scheme.variant == "light"
# then "adwaita"
# else "adwaita-dark";
# };
# };
xdg = { xdg = {
mime.enable = true; # mime.enable = true;
mimeApps = let # mimeApps = let
defaultApplications = import ./mimeapps.nix; # defaultApplications = import ./mimeapps.nix;
in { # in {
enable = true; # enable = true;
inherit defaultApplications; # inherit defaultApplications;
associations = { # associations = {
added = defaultApplications; # added = defaultApplications;
removed = { # removed = {
"x-scheme-handler/zoomus" = config.xdg.mimeApps.defaultApplications."x-scheme-handler/http"; # "x-scheme-handler/zoomus" = config.xdg.mimeApps.defaultApplications."x-scheme-handler/http";
}; # };
}; # };
}; # };
userDirs = { userDirs = {
enable = true; enable = true;
createDirectories = true; createDirectories = true;
@ -115,24 +91,24 @@
}; };
}; };
}; };
xresources.properties = with config.scheme.withHashtag; { # xresources.properties = with config.scheme.withHashtag; {
"*background" = base00; # "*background" = base00;
"*foreground" = base05; # "*foreground" = base05;
"*color0" = base00; # "*color0" = base00;
"*color1" = red; # "*color1" = red;
"*color2" = green; # "*color2" = green;
"*color3" = yellow; # "*color3" = yellow;
"*color4" = blue; # "*color4" = blue;
"*color5" = magenta; # "*color5" = magenta;
"*color6" = cyan; # "*color6" = cyan;
"*color7" = base04; # "*color7" = base04;
"*color8" = base01; # "*color8" = base01;
"*color9" = red; # "*color9" = red;
"*color10" = green; # "*color10" = green;
"*color11" = yellow; # "*color11" = yellow;
"*color12" = blue; # "*color12" = blue;
"*color13" = magenta; # "*color13" = magenta;
"*color14" = cyan; # "*color14" = cyan;
"*color15" = base05; # "*color15" = base05;
}; # };
} }