diff --git a/config/xsession/xsession.nix b/config/xsession/xsession.nix index 7e94790..c96b331 100644 --- a/config/xsession/xsession.nix +++ b/config/xsession/xsession.nix @@ -7,114 +7,108 @@ layout = "no-latin1"; }; - wayland.windowManager.sway { + wayland.windowManager.sway = { enable = true; - terminal = "kitty"; config = { + terminal = "kitty"; bars = [ { command = "${pkgs.waybar}/bin/waybar"; } - ]; }; }; -# xsession = { -# 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"; -# }; + xsession = { + enable = true; -# gtk = { -# enable = true; -# theme = { -# package = pkgs.breeze-gtk; -# name = "Breeze"; -# }; -# iconTheme = { -# package = pkgs.breeze-icons; -# name = "breeze"; -# }; -# }; + initExtra = '' + export PATH="$HOME/.config/nixpkgs/nix-dotfiles/bin:$PATH" -# qt = { -# enable = true; -# #useGtkTheme = true; -# platformTheme = "gtk"; -# }; + 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 = { + 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 = [ pkgs.brightnessctl pkgs.pavucontrol -# pkgs.xorg.xkill -# pkgs.arandr + pkgs.xorg.xkill + pkgs.arandr pkgs.dunst pkgs.libnotify pkgs.dmenu -# pkgs.scrot -# pkgs.xclip + pkgs.scrot + pkgs.xclip pkgs.dejavu_fonts -# pkgs.breeze-qt5 -# pkgs.breeze-icons + pkgs.breeze-qt5 + pkgs.breeze-icons ]; } - - - -