keep xorg around

This commit is contained in:
Daniel Lovbrotte Olsen 2020-06-13 13:06:41 +02:00
parent 6998845f01
commit 6acd2d3f3c
1 changed files with 77 additions and 83 deletions

View File

@ -7,114 +7,108 @@
layout = "no-latin1"; layout = "no-latin1";
}; };
wayland.windowManager.sway { wayland.windowManager.sway = {
enable = true; enable = true;
terminal = "kitty";
config = { config = {
terminal = "kitty";
bars = [ bars = [
{ {
command = "${pkgs.waybar}/bin/waybar"; command = "${pkgs.waybar}/bin/waybar";
} }
]; ];
}; };
}; };
# xsession = { xsession = {
# enable = true; enable = true;
#
#
# initExtra = ''
# export PATH="$HOME/.config/nixpkgs/nix-dotfiles/bin:$PATH"
#
# export XDG_CURRENT_DESKTOP=kde
# export DESKTOP_SESSION=kde
#
# export QT_STYLE_OVERRIDE="breeze"
# '';
#
# windowManager = {
# i3.enable = true;
# i3.config = {
# modifier = "Mod4";
# keybindings = let modifier = "Mod4"; #xsession.windowManager.i3.config.modifier;
# in lib.mkOptionDefault {
# "${modifier}+0" = "workspace 10";
# "${modifier}+Shift+0" = "move container to workspace 10";
#
# "${modifier}+Tab" = "workspace next";
# "${modifier}+Shift+Tab" = "workspace prev";
#
# "XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume 0 +5%";
# "XF86AudioLowerVolume" = "exec --no-startup-id pactl set-sink-volume 0 -5%";
# "XF86AudioMute" = "exec --no-startup-id pactl set-sink-mute 0 toggle";
# "XF86AudioMicMute" = "exec --no-startup-id pactl set-source-mute 1 toggle";
#
# "XF86MonBrightnessUp" = "exec --no-startup-id brightnessctl set +5%";
# "XF86MonBrightnessDown" = "exec --no-startup-id brightnessctl set 5%-";
#
# "XF86Display" = "exec arandr";
#
# "Print" = "exec scrot %Y-%m-%d_$wx$h_scrot.png -z -e 'mv $f /home/daniel/Pictures/screenshots/'";
# "${modifier}+Print" = "exec scrot /home/daniel/Pictures/Screenshots/%Y-%m-%d_$wx$h_scrot.png -z";
# "${modifier}+Shift+U" = "exec $HOME/.config/nixpkgs/nix-dotfiles/scripts/dmenuunicode";
#
# "${modifier}+n" = "exec dolphin";
# "${modifier}+b" = "exec firefox";
# "${modifier}+t" = "exec gedit";
#
# "${modifier}+Return" = lib.mkForce "exec kitty";
# "${modifier}+Shift+Return" = "exec kitty -e ssh dandellion@lilith";
# };
# };
# };
# };
# services.picom = {
# enable = true;
# backend = "xrender";
# };
# gtk = { initExtra = ''
# enable = true; export PATH="$HOME/.config/nixpkgs/nix-dotfiles/bin:$PATH"
# theme = {
# package = pkgs.breeze-gtk;
# name = "Breeze";
# };
# iconTheme = {
# package = pkgs.breeze-icons;
# name = "breeze";
# };
# };
# qt = { export XDG_CURRENT_DESKTOP=kde
# enable = true; export DESKTOP_SESSION=kde
# #useGtkTheme = true;
# platformTheme = "gtk"; export QT_STYLE_OVERRIDE="breeze"
# }; '';
windowManager = {
i3.enable = true;
i3.config = {
modifier = "Mod4";
keybindings = let modifier = "Mod4"; #xsession.windowManager.i3.config.modifier;
in lib.mkOptionDefault {
"${modifier}+0" = "workspace 10";
"${modifier}+Shift+0" = "move container to workspace 10";
"${modifier}+Tab" = "workspace next";
"${modifier}+Shift+Tab" = "workspace prev";
"XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume 0 +5%";
"XF86AudioLowerVolume" = "exec --no-startup-id pactl set-sink-volume 0 -5%";
"XF86AudioMute" = "exec --no-startup-id pactl set-sink-mute 0 toggle";
"XF86AudioMicMute" = "exec --no-startup-id pactl set-source-mute 1 toggle";
"XF86MonBrightnessUp" = "exec --no-startup-id brightnessctl set +5%";
"XF86MonBrightnessDown" = "exec --no-startup-id brightnessctl set 5%-";
"XF86Display" = "exec arandr";
"Print" = "exec scrot %Y-%m-%d_$wx$h_scrot.png -z -e 'mv $f /home/daniel/Pictures/screenshots/'";
"${modifier}+Print" = "exec scrot /home/daniel/Pictures/Screenshots/%Y-%m-%d_$wx$h_scrot.png -z";
"${modifier}+Shift+U" = "exec $HOME/.config/nixpkgs/nix-dotfiles/scripts/dmenuunicode";
"${modifier}+n" = "exec dolphin";
"${modifier}+b" = "exec firefox";
"${modifier}+t" = "exec gedit";
"${modifier}+Return" = lib.mkForce "exec kitty";
"${modifier}+Shift+Return" = "exec kitty -e ssh dandellion@lilith";
};
};
};
};
services.picom = {
enable = true;
backend = "xrender";
};
gtk = {
enable = true;
theme = {
package = pkgs.breeze-gtk;
name = "Breeze";
};
iconTheme = {
package = pkgs.breeze-icons;
name = "breeze";
};
};
qt = {
enable = true;
#useGtkTheme = true;
platformTheme = "gtk";
};
home.packages = [ home.packages = [
pkgs.brightnessctl pkgs.brightnessctl
pkgs.pavucontrol pkgs.pavucontrol
# pkgs.xorg.xkill pkgs.xorg.xkill
# pkgs.arandr pkgs.arandr
pkgs.dunst pkgs.dunst
pkgs.libnotify pkgs.libnotify
pkgs.dmenu pkgs.dmenu
# pkgs.scrot pkgs.scrot
# pkgs.xclip pkgs.xclip
pkgs.dejavu_fonts pkgs.dejavu_fonts
# pkgs.breeze-qt5 pkgs.breeze-qt5
# pkgs.breeze-icons pkgs.breeze-icons
]; ];
} }