Skip to content

Commit 924a746

Browse files
savollasavolla
committed
feature: added doas and updated .bashrc
1 parent cb6cc2b commit 924a746

File tree

3 files changed

+28
-54
lines changed

3 files changed

+28
-54
lines changed

‎configuration-files/.bashrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,7 @@ alias pg="ping gnu.org"
2727
alias create-python-environment="python -m venv --upgrade-deps ./venv"
2828
alias activate-python-environment="chmod +x ./venv/bin/activate && source ./venv/bin/activate"
2929
alias install-python-requirements="sudo pip install -r requirements.txt"
30+
31+
doasedit() {
32+
emacsclient -nw /doas::${1}
33+
}

‎configuration-files/.xinitrc

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
11
#!/bin/bash
2-
# xrandr -s 1920x1080 # set resolution (vm only)
2+
SCREEN_RESOLUTION_X=1920
3+
SCREEN_RESOLUTION_Y=1080
4+
KEYBOARD_LANGUAGE="tr"
5+
KEY_PRESS_DELAY=180
6+
KEYS_PER_SECOND=60
7+
VIRTUAL_MACHINE_NAME="programming"
8+
PATH_TO_WALLPAPER="$HOME/resource/wallpaper/wallpaper"
9+
10+
xrandr -s "$SCREEN_RESOLUTION_X"x"$SCREEN_RESOLUTION_Y" # set resolution (vm only)
311
# xrandr --output HDMI-1-4 --auto --right-of eDP1 # second monitor support
4-
setxkbmap tr # set keyboard layout to turkish
5-
feh --bg-scale ~/resource/wallpaper/wallpaper # set wallpaper
6-
udiskie & # enable automounting
7-
spice-vdagent & # enable shared clipboard between host and vm
8-
# redshift & # protect my eyes
9-
unclutter --timeout 15 & # remove mouse cursor
12+
setxkbmap "$KEYBOARD_LANGUAGE" # set keyboard layout to turkish
13+
feh --bg-scale "$PATH_TO_WALLPAPER" # set wallpaper
14+
udiskie & # enable automounting
15+
# redshift & # protect my eyes
1016
# pipewire &
1117
# pipewire-pulse &
1218
# xbacklight -set 30
13-
exec dwm # execute window manager
14-
# xset r rate 150 30
19+
unclutter --timeout 15 & # remove mouse cursor
20+
spice-vdagent & # enable shared clipboard between host and vm
21+
xprop -root -set WM_NAME $VIRTUAL_MACHINE_NAME
22+
xset r rate "$KEY_PRESS_DELAY" "$KEYS_PER_SECOND"
23+
exec dwm # execute window manager

‎modules.sh

Lines changed: 6 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
#!/bin/bash
2-
32
updateSystem() {
43
sudo xbps-install -S xbps -y
54
sudo xbps-install -Syu
65
}
7-
86
placeVitalFiles() {
97
# xinitrc
108
rm ~/.xinitrc
@@ -14,30 +12,29 @@ placeVitalFiles() {
1412
rm /home/"$USER"/.bashrc
1513
ln -sf "$(pwd)"/configuration-files/.bashrc /home/"$USER"/
1614
}
17-
1815
replaceSudoWithDoas() {
19-
exit
16+
sudo xbps-install -S opendoas -y
17+
sudo touch /etc/doas.conf
18+
sudo echo "permit $USER as root"
19+
# sudo ln -sf /bin/doas /bin/sudo
20+
sudo ln -sf "$(pwd)"/configuration-files/99-settings.conf /etc/xbps.d/
21+
doas xbps-remove sudo -y
2022
}
21-
2223
installDistrobox() {
2324
sudo xbps-install -S podman -y
2425
sudo ln -sf /etc/sv/podman /var/service/
2526
sudo ln -sf /etc/sv/podman-docker /var/service/
2627
curl -s https://raw.githubusercontent.com/89luca89/distrobox/main/install | sh -s -- --prefix ~/.local
2728
}
28-
2929
installFedoraCoverage() {
3030
~/.local/bin/distrobox create --image registry.fedoraproject.org/fedora-toolbox:39 --name fedora
3131
}
32-
3332
installUbuntuCoverage() {
3433
~/.local/bin/distrobox create --image docker.io/library/ubuntu:22.04 --name ubuntu
3534
}
36-
3735
installArchCoverage() {
3836
~/.local/bin/distrobox create --image docker.io/library/archlinux:latest --name archlinux
3937
}
40-
4138
installVitalPackages() {
4239
sudo xbps-install -S git -y
4340
sudo xbps-install -S curl -y
@@ -67,7 +64,6 @@ installVitalPackages() {
6764
sudo xbps-install -S ntfs-3g -y
6865
sudo xbps-install -S unclutter-xfixes -y
6966
}
70-
7167
createPARAfolderStructure() {
7268
## remove all empty unnecessary files
7369
rmdir ~/*
@@ -78,7 +74,6 @@ createPARAfolderStructure() {
7874
mkdir -p ~/resource/wallpaper
7975
mkdir -p ~/archive
8076
}
81-
8277
installDoomEmacs() {
8378
sudo xbps-install -S emacs-x11 -y
8479
sudo xbps-install -S ripgrep -y
@@ -92,20 +87,17 @@ installDoomEmacs() {
9287
ln -s "$(pwd)"/configuration-files/doom-emacs-conf-files/packages.el /home/"$USER"/.config/doom/
9388
ln -s "$(pwd)"/configuration-files/doom-emacs-conf-files/gravatar-savolla.png /home/"$USER"/.config/doom/
9489
}
95-
9690
installFiracodeFont() {
9791
sudo xbps-install -S font-fira-otf -y
9892
sudo xbps-install -S font-fira-ttf -y
9993
sudo xbps-install -S font-firacode -y
10094
}
101-
10295
installGoProgrammingLanguage() {
10396
sudo xbps-install -S go -y
10497
go install github.com/x-motemen/gore/cmd/gore@latest
10598
go install github.com/cweill/gotests@latest
10699
go install github.com/fatih/gomodifytags@latest
107100
}
108-
109101
installWebDevStuff() {
110102
sudo xbps-install -S nodejs -y
111103
sudo xbps-install -S jq -y
@@ -116,7 +108,6 @@ installWebDevStuff() {
116108
sudo xbps-install -S shfmt -y
117109
sudo xbps-install -S shellcheck -y
118110
}
119-
120111
installProgrammingHelperTools() {
121112
sudo xbps-install -S nodejs -y
122113
sudo xbps-install -S cmake -y
@@ -139,29 +130,24 @@ installProgrammingHelperTools() {
139130
sudo xbps-install -S sassc -y
140131

141132
}
142-
143133
installRust() {
144134
sudo xbps-install -S rust-analyzer -y
145135
sudo xbps-install -S cargo -y
146136
sudo xbps-install -S rustc -y
147137
}
148-
149138
installJava() {
150139
sudo xbps-install -S openjdk -y
151140
}
152-
153141
installRuby() {
154142
sudo xbps-install -S ruby -y
155143
}
156-
157144
installDwm() {
158145
sudo xbps-install -S xorg -y
159146
sudo xbps-install -S dmenu -y
160147
sudo xbps-install -S dwm -y
161148
sudo xbps-install -S st -y
162149
sudo xbps-install -S slock -y
163150
}
164-
165151
installGnome() {
166152
sudo xbps-install -S xorg -y
167153
sudo xbps-install -S gnome -y
@@ -174,56 +160,47 @@ installGnome() {
174160
sudo ln -sv /etc/sv/NetworkManager /var/service
175161
setupPulseaudio
176162
}
177-
178163
enablePSD() {
179164
git clone https://github.com/madand/runit-services
180165
cd runit-services || exit
181166
sudo mv psd /etc/sv/
182167
sudo ln -s /etc/sv/psd /var/service/
183168
sudo chmod +x etc/sv/psd/*
184169
}
185-
186170
installThunar() {
187171
sudo xbps-install -S Thunar -y
188172
sudo xbps-install -S thunar-volman -y
189173
}
190-
191174
installFirefox() {
192175
sudo xbps-install -S firefox -y
193176
}
194-
195177
installTransmission() {
196178
sudo xbps-install -S transmission-gtk -y
197179
}
198-
199180
installRanger() {
200181
sudo xbps-install -S ranger -y
201182
sudo xbps-install -S w3m -y
202183
sudo xbps-install -S w3m-img -y
203184
}
204-
205185
installDocker() {
206186
sudo xbps-install -S docker -y
207187
sudo ln -sf /etc/sv/docker/ /var/service/
208188

209189
sudo xbps-install -S go -y
210190
go install github.com/jessfraz/dockfmt@latest # for doom emacs
211191
}
212-
213192
enableBluetooth() {
214193
sudo xbps-install -S bluez -y
215194
sudo usermod -aG bluetooth "$USER"
216195
sudo xbps-install -S dbus -y
217196
sudo ln -sf /etc/sv/dbus/ /var/service/
218197
sudo ln -sf /etc/sv/bluetoothd/ /var/service/
219198
}
220-
221199
setupAlsa() {
222200
sudo usermod -aG audio "$USER"
223201
sudo xbps-install -S bluez-alsa -y
224202
sudo ln -sf /etc/sv/bluez-alsa/ /var/service/
225203
}
226-
227204
setupPipewire() {
228205
sudo usermod -aG audio "$USER"
229206
sudo xbps-install -S pipewire -y
@@ -232,7 +209,6 @@ setupPipewire() {
232209
sudo mkdir -p /etc/pipewire/pipewire.conf.d
233210
sudo ln -sf /usr/share/examples/wireplumber/10-wireplumber.conf /etc/pipewire/pipewire.conf.d/
234211
}
235-
236212
setupPulseaudio() {
237213
sudo usermod -aG audio "$USER"
238214
sudo xbps-install -S pulseaudio -y
@@ -242,54 +218,46 @@ setupPulseaudio() {
242218
sudo xbps-install -S dbus -y
243219
sudo ln -sf /etc/sv/dbus/ /var/service/
244220
}
245-
246221
installXdgRelatedStuff() {
247222
sudo xbps-install -S xdg-utils -y
248223
sudo xbps-install -S xdg-desktop-portal -y
249224
sudo xbps-install -S xdg-desktop-portal-gtk -y
250225
sudo xbps-install -S xdg-user-dirs -y
251226
sudo xbps-install -S xdg-user-dirs-gtk -y
252227
}
253-
254228
enableVitalServices() {
255229
sudo xbps-install -S dbus -y
256230
sudo ln -sf /etc/sv/dbus/ /var/service/
257231
sudo ln -sf /etc/sv/polkitd/ /var/service/
258232
sudo xbps-install -S elogind -y
259233
sudo ln -sf /etc/sv/elogind /var/service/ # needed for redirecting usb devices into vms
260234
}
261-
262235
enableVideoAcceleration() {
263236
sudo xbps-install -Rs mesa-vdpau mesa-vaapi -y
264237
}
265-
266238
installProprietaryNvidiaDrivers() {
267239
xbps-install -Sy void-repo-nonfree -y
268240
xbps-install -S nvidia -y
269241
}
270-
271242
enableNixPackageManager() {
272243
sudo xbps-install -S nix -y
273244
sudo ln -sf /etc/sv/nix-daemon /var/service
274245
sudo nix-channel --add https://nixos.org/channels/nixpkgs-unstable
275246
sudo nix-channel --update
276247
}
277-
278248
installLogseq() {
279249
enableNixPackageManager
280250
export NIXPKGS_ALLOW_INSECURE=1
281251
nix-env -iA nixpkgs.logseq
282252
sudo chmod +x "$(pwd)"/configuration-files/nix-programs/logseq
283253
sudo ln -sf "$(pwd)"/configuration-files/nix-programs/logseq /bin/
284254
}
285-
286255
installLibrewolf() {
287256
enableNixPackageManager
288257
nix-env -iA nixpkgs.librewolf
289258
sudo chmod +x "$(pwd)"/configuration-files/nix-programs/librewolf
290259
sudo ln -sf "$(pwd)"/configuration-files/nix-programs/librewolf /bin/
291260
}
292-
293261
setupKVM() {
294262
## setup libvirt
295263
sudo xbps-install -S virt-manager libvirt qemu bridge-utils iptables -y
@@ -303,37 +271,30 @@ setupKVM() {
303271
sudo xbps-install -S spice-vdagent -y
304272
sudo xbps-install -S virt-viewer -y
305273
}
306-
307274
enableAutoMountingDisks() {
308275
sudo xbps-install -S udiskie -y
309276
sudo xbps-install -S python3-distutils-extra -y # needed for udiskie to work
310277
sudo cp "$(pwd)"/configuration-files/10-udisks2.rules /etc/polkit-1/rules.d/
311278
}
312-
313279
enableHotKeyDaemon() {
314280
sudo xbps-install -S sxhkd -y
315281
mkdir /home/"$USER"/.config/sxhkd
316282
ln -sf "$(pwd)"/configuration-files/sxhdkrc /home/"$USER"/.config/sxhkd/
317283
}
318-
319284
enableRedshift() {
320285
sudo xbps-install -S redshift -y
321286
ln -sf "$(pwd)"/configuration-files/redshift.conf /home/"$USER"/.config/
322287
}
323-
324288
enableTapToClick() {
325289
sudo mkdir /etc/X11/xorg.conf.d
326290
sudo ln -sf "$(pwd)"/configuration-files/30-touchpad.conf /etc/X11/xorg.conf.d/
327291
}
328-
329292
disableSSH() {
330293
sudo rm /var/service/sshd
331294
}
332-
333295
removeXbpsCache() {
334296
sudo xbps-remove -Oo -y
335297
}
336-
337298
installEmpttyLoginManager() {
338299
sudo xbps-install -S emptty -y
339300
sudo rm /etc/emptty/conf

0 commit comments

Comments
 (0)