0fd72247f333bc54b4c4775dd4a9208e2a66fcf1
- Author
- TheEdgeOfRage <git@theedgeofrage.com>
- Committer
- TheEdgeOfRage <git@theedgeofrage.com>
- Date
Message
Diff
This diff is truncated to protect this page.
1diff --git a/config_template.yaml b/config_template.yaml
2index 8fb054377fcaf21edd0d3b177077dd962f0d241e..14467668f20ec720550b71e5c234ac311083fcaa 100644
3--- a/config_template.yaml
4+++ b/config_template.yaml
5@@ -1,16 +1,5 @@
6 ---
7 data:
8- sway:
9- font_size: 13
10- tray_output: 'eDP-1'
11- nm_applet: true
12- additional_bindings: ''
13- inputs: |-
14- input <identifier> {
15- }
16- outputs: |-
17- output <identifier> {
18- }
19 hyprland:
20 monitors:
21 identifier: "resolution@refresh_rate, auto, 1, vrr, 0"
22@@ -19,11 +8,12 @@ data:
23 kb_layout = us,rs,rs,de
24 kb_variant = ,latinunicode,,
25 sensitivity: "1"
26- bumblebee:
27- modules: 'ytrssil,'
28- parameters:
29- - key: "sensors.path"
30- value: "coretemp-isa-0000/Package id 0/temp1_input"
31+ waybar:
32+ top:
33+ extra_modules: ""
34+ bottom:
35+ cpu_temp_path: pci0000:00/0000:00:14.0/i2c-20/20-0050
36+ cpu_temp_filename: temp1_input
37 alacritty:
38 font:
39 size: '7.5'
40diff --git a/dot_config/bumblebee-status/bottom.toml.tmpl b/dot_config/bumblebee-status/bottom.toml.tmpl
41deleted file mode 100644
42index 06d2f774b40eda6a91ff5383a94fc7ee2d66ebc2..0000000000000000000000000000000000000000
43--- a/dot_config/bumblebee-status/bottom.toml.tmpl
44+++ /dev/null
45@@ -1,13 +0,0 @@
46-[core]
47-modules=traffic, nic, load, cpu2, memory
48-autohide=#comma-separated list of modules to hide, unless in warning/error state
49-theme=gruvbox-powerline
50-
51-[module-parameters]
52-workspacewheel=False
53-traffic.hide_down=True
54-traffic.exclude=lo,virbr,docker,vboxnet,veth,br-,cni,flannel,podman,tun,wg,tailscale,waydroid,wt
55-nic.exclude=lo,virbr,docker,vboxnet,veth,br-,cni,flannel,podman,waydroid
56-nic.states=^down
57-cpu2.layout=cpu2.coresload
58-cpu2.colored=1
59diff --git a/dot_config/bumblebee-status/top.toml.tmpl b/dot_config/bumblebee-status/top.toml.tmpl
60deleted file mode 100644
61index bef664fe78a1c8519443aa91298d7694ac859082..0000000000000000000000000000000000000000
62--- a/dot_config/bumblebee-status/top.toml.tmpl
63+++ /dev/null
64@@ -1,31 +0,0 @@
65-[core]
66-modules=playerctl, getcrypto, dunst, {{ .bumblebee.modules }} sensors, pulsein, pulseout, date, time
67-autohide=#comma-separated list of modules to hide, unless in warning/error state
68-theme=gruvbox-powerline
69-
70-[module-parameters]
71-workspacewheel=False
72-popup_font_size=14
73-getcrypto.interval=300
74-getcrypto.getbtc=0
75-getcrypto.getltc=0
76-playerctl.args=-p Deezer
77-playerctl.layout=playerctl.song,playerctl.prev,playerctl.pause,playerctl.next
78-playerctl.format={{`{{artist}}`}} - {{`{{title}}`}}
79-playerctl.hide=true
80-pulsein.showbars=1
81-pulsein.showdevicename=false
82-pulsein.right-click=select_default_device_popup
83-pulsein.popup-filter=Monitor
84-pulseout.showbars=1
85-pulseout.showdevicename=true
86-pulseout.right-click=select_default_device_popup
87-pulseout.popup-filter=Navi
88-sensors.use_sensors=true
89-sensors.json=true
90-date.format=%a, %Y-%m-%d
91-date.interval=30
92-time.format=%H:%M:%S
93-time.interval=1
94-{{ range $_, $param := .bumblebee.parameters -}}{{ $param.key }}={{ $param.value }}
95-{{end}}
96diff --git a/dot_config/dunst/dunstrc b/dot_config/dunst/dunstrc
97deleted file mode 100644
98index 0faa20a135884ccc7fbc4be547aa9f7f61186b92..0000000000000000000000000000000000000000
99--- a/dot_config/dunst/dunstrc
100+++ /dev/null
101@@ -1,422 +0,0 @@
102-# See dunst(5) for all configuration options
103-[global]
104- ### Display ###
105-
106- # Which monitor should the notifications be displayed on.
107- monitor = 0
108-
109- # Display notification on focused monitor. Possible modes are:
110- # mouse: follow mouse pointer
111- # keyboard: follow window with keyboard focus
112- # none: don't follow anything
113- #
114- # "keyboard" needs a window manager that exports the
115- # _NET_ACTIVE_WINDOW property.
116- # This should be the case for almost all modern window managers.
117- #
118- # If this option is set to mouse or keyboard, the monitor option
119- # will be ignored.
120- follow = mouse
121-
122- ### Geometry ###
123- # dynamic width from 0 to 300
124- width = (0, 800)
125-
126- # The maximum height of a single notification, excluding the frame.
127- height = 300
128-
129- # Position the notification in the top right corner
130- origin = top-right
131-
132- # Offset from the origin
133- offset = 16x32
134-
135- # Scale factor. It is auto-detected if value is 0.
136- scale = 0
137-
138- # Maximum number of notification (0 means no limit)
139- notification_limit = 5
140-
141- ### Progress bar ###
142-
143- # Turn on the progess bar. It appears when a progress hint is passed with
144- # for example dunstify -h int:value:12
145- progress_bar = true
146-
147- # Set the progress bar height. This includes the frame, so make sure
148- # it's at least twice as big as the frame width.
149- progress_bar_height = 10
150-
151- # Set the frame width of the progress bar
152- progress_bar_frame_width = 1
153-
154- # Set the minimum width for the progress bar
155- progress_bar_min_width = 150
156-
157- # Set the maximum width for the progress bar
158- progress_bar_max_width = 300
159-
160-
161- # Show how many messages are currently hidden (because of
162- # notification_limit).
163- indicate_hidden = yes
164-
165- # The transparency of the window. Range: [0; 100].
166- # This option will only work if a compositing window manager is
167- # present (e.g. xcompmgr, compiz, etc.). (X11 only)
168- transparency = 0
169-
170- # Draw a line of "separator_height" pixel height between two
171- # notifications.
172- # Set to 0 to disable.
173- separator_height = 2
174-
175- # Padding between text and separator.
176- padding = 14
177-
178- # Horizontal padding.
179- horizontal_padding = 16
180-
181- # Padding between text and icon.
182- text_icon_padding = 0
183-
184- # Defines width in pixels of frame around the notification window.
185- # Set to 0 to disable.
186- frame_width = 0
187-
188- # Define a color for the separator.
189- # possible values are:
190- # * auto: dunst tries to find a color fitting to the background;
191- # * foreground: use the same color as the foreground;
192- # * frame: use the same color as the frame;
193- # * anything else will be interpreted as a X color.
194- separator_color = frame
195-
196- # Sort messages by urgency.
197- sort = yes
198-
199- # Don't remove messages, if the user is idle (no mouse or keyboard input)
200- # for longer than idle_threshold seconds.
201diff --git a/dot_config/sway/autoname-workspaces.py b/dot_config/sway/autoname-workspaces.py
202deleted file mode 100644
203index 43cc6bca700bf0f0cca2e733a9a7ede13caf2017..0000000000000000000000000000000000000000
204--- a/dot_config/sway/autoname-workspaces.py
205+++ /dev/null
206@@ -1,253 +0,0 @@
207-#!/usr/bin/env python3
208-
209-# This script listens for i3 events and updates workspace names to show icons
210-# for running programs. It contains icons for a few programs, but more can
211-# easily be added by inserting them into WINDOW_ICONS below.
212-#
213-# Dependencies: xorg-xprop i3ipc fontawesome
214-#
215-# Installation:
216-# Add "exec_always ~/.config/i3/i3-autoname-workspaces.py &" to the i3 config
217-#
218-# Configuration:
219-# The default i3 config's keybingings reference workspaces by name, which is an
220-# issue when using this script because the "names" are constantaly changing to
221-# show window icons. Instead, you'll need to change the keybindings to
222-# reference workspaces by number. Change lines like:
223-# bindsym $mod+1 workspace 1
224-# To:
225-# bindsym $mod+1 workspace number 1
226-
227-import re
228-import signal
229-import subprocess as proc
230-from types import FrameType
231-from typing import Any, Callable
232-
233-import nerdfonts as nf
234-from i3ipc import Connection
235-
236-# Add icons here for common programs you use. The keys are the X window class
237-# (WM_CLASS) names (lower-cased) and the icons can be any text you want to
238-# display.
239-#
240-# These icons are from the Nerd Font patch set.
241-# You can find a list of all here: https://www.nerdfonts.com/cheat-sheet
242-#
243-# If you're not sure what the WM_CLASS is for your application, you can use
244-# xprop (https://linux.die.net/man/1/xprop). Run `xprop | grep WM_CLASS`
245-# then click on the application you want to inspect.
246-WINDOW_ICONS: dict[str, str] = {
247- 'alacritty': nf.icons['fa_terminal'],
248- 'blender': nf.icons['fa_cube'],
249- 'blueman-manager': nf.icons['fa_bluetooth'],
250- 'brave-browser': nf.icons['fa_globe'],
251- 'calibre-gui': nf.icons['fa_book'],
252- 'chromium': nf.icons['fa_chrome'],
253- 'cities.x64': nf.icons['md_city'],
254- 'clonehero': nf.icons['md_guitar_electric'],
255- 'code-oss': nf.icons['fa_code'],
256- 'vscodium': nf.icons['fa_code'],
257- 'cutter': nf.icons['fa_bug'],
258- 'darktable': nf.icons['md_camera'],
259- 'discord': nf.icons['fa_comment'],
260- 'dk.gqrx.gqrx': nf.icons['cod_radio_tower'],
261- 'dwarf_fortress': nf.icons['fa_fort_awesome'],
262- 'com.github.wwmm.easyeffects': nf.icons['fa_music'],
263- 'evince': nf.icons['seti_pdf'],
264- 'factorio': nf.icons['fa_cog'],
265- 'feh': nf.icons['md_image'],
266- 'firefox': nf.icons['fa_firefox'],
267- 'firefoxdeveloperedition': nf.icons['fa_firefox'],
268- 'gamescope': nf.icons['md_steam'],
269- 'ghb': nf.icons['md_video'],
270- 'com.mitchellh.ghostty': nf.icons['fa_terminal'],
271- 'gimp': nf.icons['fa_paint_brush'],
272- 'gimp-2.10': nf.icons['fa_paint_brush'],
273- 'gparted': nf.icons['fa_hdd_o'],
274- 'gsmartcontrol': nf.icons['fa_hdd_o'],
275- 'hoppscotch-app': nf.icons['md_ufo'],
276- 'inkscape': nf.icons['md_fountain_pen_tip'],
277- 'insomnium': nf.icons['md_graphql'],
278- 'jetbrains-idea-ce': nf.icons['fa_code'],
279- 'kcharselect': nf.icons['fa_font'],
280- 'kicad': nf.icons['fa_microchip'],
281- 'ksp.x86_64': nf.icons['fa_space_shuttle'],
282- 'ledger live': nf.icons['md_wallet'],
283- 'libreoffice-calc': nf.icons['fa_file_excel_o'],
284- 'libreoffice-impress': nf.icons['fa_file_powerpoint_o'],
285- 'libreoffice-writer': nf.icons['fa_file_word_o'],
286- 'lutris': nf.icons['fa_gamepad'],
287- 'mpv': nf.icons['md_video'],
288- 'polymc': nf.icons['md_minecraft'],
289- 'minecraft': nf.icons['md_minecraft'],
290- 'mupdf': nf.icons['seti_pdf'],
291- 'nemiver': nf.icons['fa_bug'],
292- 'nm-connection-editor': nf.icons['fa_wifi'],
293- 'obs': nf.icons['md_video'],
294- 'openlens': nf.icons['md_kubernetes'],
295- 'org.gnome.nautilus': nf.icons['fa_folder'],
296- 'oversteer': nf.icons['md_gamepad_variant'],
297- 'org.pulseaudio.pavucontrol': nf.icons['fa_volume_up'],
298- 'picard': nf.icons['fa_music'],
299- 'qbittorrent': nf.icons['fa_download'],
300- 'qtcreator': nf.icons['fa_code'],
301- 'sdl application': nf.icons['md_steam'],
302- 'seahorse': nf.icons['fa_lock'],
303- 'simplescreenrecorder': nf.icons['md_video'],
304- 'slack': nf.icons['fa_slack'],
305- 'spotify': nf.icons['fa_spotify'],
306diff --git a/dot_config/sway/config.tmpl b/dot_config/sway/config.tmpl
307deleted file mode 100644
308index 2f5f5d09cc3602df13bbc4aef2fcf729311b985d..0000000000000000000000000000000000000000
309--- a/dot_config/sway/config.tmpl
310+++ /dev/null
311@@ -1,245 +0,0 @@
312-# vim: ft=swayconfig ts=4 sts=4 sw=4 noet
313-
314-include /etc/sway/config.d/*
315-
316-set $foreground #ebdbb2
317-set $background #282828
318-set $color0 #1d2021
319-set $color1 #cc241d
320-set $color2 #98971a
321-set $color3 #d79921
322-set $color4 #458588
323-set $color5 #b16286
324-set $color6 #689d6a
325-set $color7 #a89984
326-set $color8 #665c54
327-set $color9 #fb4934
328-set $color10 #b8bb26
329-set $color11 #fabd2f
330-set $color12 #83a598
331-set $color13 #d3869b
332-set $color14 #8ec07c
333-set $color15 #fbf1c7
334-set $color16 #d65d0e
335-set $color17 #fe8019
336-
337-set $mod Mod4
338-set $alt Mod1
339-set $left h
340-set $down n
341-set $up e
342-set $right i
343-
344-set $telegram ""
345-set $firefox ""
346-set $thunderbird ""
347-
348-# Font for window titles. Will also be used by the bar unless a different font
349-# is used in the bar {} block below.
350-font pango:MonoFont {{ .sway.font_size }}
351-
352-#class background border text split
353-client.focused $color8 $color8 $foreground $color7
354-client.focused_inactive $background $background $color7 $color0
355-client.unfocused $color0 $background $color8 $color0
356-client.urgent $color1 $color1 $foreground $color1
357-client.background $background
358-
359-# Use Mouse+$mod to drag floating windows to their wanted position
360-floating_modifier $mod
361-
362-# kill focused window
363-bindsym $mod+Shift+q kill
364-
365-# change focus
366-bindsym $mod+$left focus left
367-bindsym $mod+$down focus down
368-bindsym $mod+$up focus up
369-bindsym $mod+$right focus right
370-
371-# move focused window
372-bindsym $mod+Shift+$left move left
373-bindsym $mod+Shift+$down move down
374-bindsym $mod+Shift+$up move up
375-bindsym $mod+Shift+$right move right
376-
377-# move workspace to other outputs
378-bindsym $mod+Control+$left move workspace to output left
379-bindsym $mod+Control+$down move workspace to output down
380-bindsym $mod+Control+$up move workspace to output up
381-bindsym $mod+Control+$right move workspace to output right
382-
383-# split in horizontal orientation
384-bindsym $mod+c split h
385-
386-# split in vertical orientation
387-bindsym $mod+v split v
388-
389-# enter fullscreen mode for the focused container
390-bindsym $mod+f fullscreen toggle
391-
392-# change container layout (tabbed, toggle split)
393-bindsym $mod+s layout toggle split
394-bindsym $mod+t layout tabbed
395-
396-# toggle tiling / floating
397-bindsym $mod+Shift+space floating toggle
398-bindsym $mod+Shift+BackSpace floating toggle
399-bindsym $mod+g focus mode_toggle
400-bindsym $mod+a focus parent
401-
402-bindsym $mod+Tab workspace next
403-bindsym $mod+Shift+Tab workspace prev
404-
405-# switch to workspace
406-bindsym $mod+1 workspace number 1
407-bindsym $mod+2 workspace number 2
408-bindsym $mod+3 workspace number 3
409-bindsym $mod+4 workspace number 4
410-bindsym $mod+5 workspace number 5
411diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl
412index 40653919da5a5fd4a151d6b0e932ea8399c249ad..3819623b7e254a27e33011018ecf1c43434b4dd6 100644
413--- a/dot_zshrc.tmpl
414+++ b/dot_zshrc.tmpl
415@@ -106,10 +106,6 @@ autopair-init
416 if [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ] && [[ $(tty) = /dev/tty1 ]]; then
417 # hyprland on tty1
418 exec uwsm start -S hyprland.desktop
419-elif [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ] && [[ $(tty) = /dev/tty1 ]] && uwsm check may-start; then
420- # sway on tty2
421- source ~/.config/uwsm/env
422- exec sway
423 elif [[ $(tty) =~ "/dev/tty[0-9]" ]]; then
424 # Enable unicode characters in the tty
425 unicode_start
426diff --git a/init.sh b/init.sh
427index 97eae047022254e53bc9a77bde2e109cf7b18015..3b90bc4986ce39337fe4348016324a9e99ca1687 100755
428--- a/init.sh
429+++ b/init.sh
430@@ -9,7 +9,6 @@ cd -
431 rm -rf /tmp/yay
432
433 # Install packages
434-git clone https://github.com/TheEdgeOfRage/bumblebee-status ~/.local/share/bumblebee-status
435 GOPATH=$HOME/dev/go go install gitea.theedgeofrage.com/theedgeofrage/rpn
436
437 # Oh My Zsh