let hm manage xsession to make .profile unnecessary

This commit is contained in:
Julian Mutter 2024-06-19 21:11:40 +02:00
parent 294e40987c
commit 05e71d800d
5 changed files with 10 additions and 25 deletions

View File

@ -92,7 +92,7 @@
## My scripts
pkgs.frajul.deploy-to-pianopi
pkgs.frajul.edit-config
pkgs.frajul.open-messaging
# pkgs.frajul.open-messaging
]
++ lib.lists.concatMap (packages-list-file: import packages-list-file { inherit pkgs; }) [
./fonts.nix

View File

@ -1,16 +0,0 @@
export GOPATH="$HOME/go";
export PATH=$GOPATH/bin:$PATH
export PATH=/opt/dart-sdk/bin:$PATH
export PATH=~/dev/flutter/bin:$PATH
export PATH=~/.config/emacs/bin:$PATH
export PATH=~/.cargo/bin:$PATH
export PATH=~/perl5/bin:$PATH
export PATH=~/.local/bin:$PATH
export PATH=~/.config/i3/scripts:$PATH
export PATH=~/miniconda3/bin:$PATH
# Add desktop files from nix
export XDG_DATA_DIRS="$HOME/.nix-profile/share:$XDG_DATA_DIRS"

View File

@ -44,11 +44,14 @@ in
nitrogen
xfce.xfce4-screenshooter
];
xsession.enable = true; # Give gui programs access to sessionVariables
xsession.windowManager.i3 = {
enable = true;
package = pkgs.i3-gaps;
};
xsession.importedVariables = [ ];
# Overwrite default home-manager config file
xdg.configFile."i3/config".source = lib.mkForce (
if host == "kardorf" then ./i3/config-kardorf else ./i3/config
@ -64,8 +67,5 @@ in
};
home.sessionPath = [ "/home/julian/.config/i3/scripts" ];
# home.file = {
# ".profile".source = ./.profile;
# };
};
}

View File

@ -3,7 +3,7 @@
# Please see https://i3wm.org/docs/userguide.html for a complete reference!
set $mod Mod4
set $scripts ~/.config/i3/scripts
set $scripts /home/julian/.config/i3/scripts
set $lock "i3lock --ignore-empty-password --color=000000"
# Font for window titles
@ -196,7 +196,8 @@ bar {
set $mode_system System (l) lock, (e) logout, (r) reboot, (s) shutdown
mode "$mode_system" {
bindsym l exec --no-startup-id $lock, mode "default"
bindsym e exec --no-startup-id i3-msg exit, mode "default" # logout
# logout
bindsym e exec --no-startup-id i3-msg exit, mode "default"
bindsym r exec --no-startup-id systemctl reboot, mode "default"
bindsym s exec --no-startup-id systemctl poweroff, mode "default"
bindsym h exec --no-startup-id $lock && systemctl hibernate, mode "default"
@ -216,7 +217,7 @@ bindsym $mod+c exec qalculate-gtk
bindsym $mod+Shift+p exec xwacomcalibrate
bindsym $mod+e exec thunar
bindsym $mod+b exec firefox
bindsym $mod+p exec display-toggle-mirror
bindsym $mod+p exec $scripts/display-toggle-mirror
workspace_auto_back_and_forth yes
@ -294,7 +295,7 @@ exec --no-startup-id nitrogen --restore
# exec_always --no-startup-id ff-theme-util
# exec_always --no-startup-id fix_xcursor
exec_always --no-startup-id "display-layoutpicker"
exec_always --no-startup-id "$scripts/display-layoutpicker"
#############################

View File

@ -32,7 +32,7 @@ interval = 5
block = "sound"
[[block.click]]
button = "left"
cmd = "~/.config/i3/scripts/pulse_popup"
cmd = "pulseaudio-popup"
[[block]]
block = "battery"