@@ -77,37 +77,68 @@ pkgs.buildFHSEnv {
77
77
( python3 . withPackages ( ps : with ps ; [
78
78
i3ipc
79
79
] ) )
80
+
81
+ # Sway specific tools
82
+ gtklock
83
+ playerctl
84
+ sway-contrib . grimshot
85
+
86
+ # System utilities
87
+ xdg-desktop-portal
88
+ xdg-desktop-portal-wlr
89
+
90
+ # Media controls
91
+ nautilus
80
92
] ;
81
93
82
94
multiPkgs = pkgs : all-inputs ;
83
95
84
96
extraOutputsToInstall = [ "usr" "etc" "lib" "share" ] ;
85
97
86
- # Add environment variables to handle key binding conflicts
98
+ # Updated profile with absolute paths and additional error handling
87
99
profile = ''
88
100
export REGOLITH_PATH=/usr/share/regolith
89
101
export XDG_DATA_DIRS=$XDG_DATA_DIRS:/usr/share/regolith
90
102
export XDG_CONFIG_HOME=$HOME/.config
91
103
export GNOME_SHELL_SESSION_MODE=regolith
104
+ alias mate-polkit="${ pkgs . mate . mate-polkit } /bin/mate-polkit"
92
105
93
106
# Create systemd user directory if it doesn't exist
94
107
mkdir -p $HOME/.config/systemd/user
95
108
96
- # Link systemd services
97
- ln -sf /usr/lib/systemd/user/regolith-wayland.target $HOME/.config/systemd/user/
98
- ln -sf /usr/lib/systemd/user/regolith-init-kanshi.service $HOME/.config/systemd/user/
99
- ln -sf /usr/lib/systemd/user/regolith-init-displayd.service $HOME/.config/systemd/user/
100
- ln -sf /usr/lib/systemd/user/regolith-init-powerd.service $HOME/.config/systemd/user/
101
- ln -sf /usr/lib/systemd/user/regolith-init-inputd.service $HOME/.config/systemd/user/
109
+ # Copy systemd user service files
110
+ if [ -d "/usr/lib/systemd/user" ]; then
111
+ cp -rf /usr/lib/systemd/user/* $HOME/.config/systemd/user/
112
+ fi
102
113
103
- # Enable the services
104
- systemctl --user daemon-reload
105
- systemctl --user enable regolith-wayland.target
106
- systemctl --user enable regolith-init-kanshi.service
107
- systemctl --user enable regolith-init-displayd.service
108
- systemctl --user enable regolith-init-powerd.service
109
- systemctl --user enable regolith-init-inputd.service
114
+ # # Reload systemd user services
115
+ # ${ pkgs . systemd } /bin/systemctl --user daemon-reload
116
+ # echo "Reloaded systemd user services"
117
+ # ${ pkgs . systemd } /bin/systemctl --user enable regolith-wayland.target
118
+ # echo "Enabled regolith-wayland.target"
119
+ # ${ pkgs . systemd } /bin/systemctl --user enable regolith-init-kanshi.service
120
+ # echo "Enabled regolith-init-kanshi.service"
121
+ # ${ pkgs . systemd } /bin/systemctl --user enable regolith-init-displayd.service
122
+ # echo "Enabled regolith-init-displayd.service"
123
+ # ${ pkgs . systemd } /bin/systemctl --user enable regolith-init-powerd.service
124
+ # echo "Enabled regolith-init-powerd.service"
125
+ # ${ pkgs . systemd } /bin/systemctl --user enable regolith-init-inputd.service
126
+ # echo "Enabled regolith-init-inputd.service"
127
+
128
+ # Ensure XDG_RUNTIME_DIR exists
129
+ if [ -z "$XDG_RUNTIME_DIR" ]; then
130
+ export XDG_RUNTIME_DIR=/run/user/$(id -u)
131
+ mkdir -p $XDG_RUNTIME_DIR
132
+ chmod 700 $XDG_RUNTIME_DIR
133
+ fi
110
134
'' ;
111
135
112
136
runScript = "${ pkgs . fish } /bin/fish" ;
113
- }
137
+ }
138
+
139
+ # Enabled regolith-init-kanshi.service
140
+ # Enabled regolith-init-displayd.service
141
+ # Failed to enable unit: Unit regolith-init-powerd.service does not exist
142
+ # Enabled regolith-init-powerd.service
143
+ # Failed to enable unit: Unit regolith-init-inputd.service does not exist
144
+ # Enabled regolith-init-inputd.service
0 commit comments