0ec23b8a00673384092f87afb347081fc2a0a0a4
- Author
- TheEdgeOfRage <git@theedgeofrage.com>
- Committer
- TheEdgeOfRage <git@theedgeofrage.com>
- Date
Message
Remove i3
Diff
This diff is truncated to protect this page.
1diff --git a/config_template.yaml b/config_template.yaml
2index 7e8b237ed54107b8f4eee7da9bfac4782c29fff1..8fb054377fcaf21edd0d3b177077dd962f0d241e 100644
3--- a/config_template.yaml
4+++ b/config_template.yaml
5@@ -1,11 +1,5 @@
6 ---
7 data:
8- i3:
9- font_size: 13
10- xrandr: ''
11- tray_output: ''
12- nm_applet: true
13- additional_bindings: ''
14 sway:
15 font_size: 13
16 tray_output: 'eDP-1'
17@@ -17,6 +11,14 @@ data:
18 outputs: |-
19 output <identifier> {
20 }
21+ hyprland:
22+ monitors:
23+ identifier: "resolution@refresh_rate, auto, 1, vrr, 0"
24+ input:
25+ keyboard_layouts: |-
26+ kb_layout = us,rs,rs,de
27+ kb_variant = ,latinunicode,,
28+ sensitivity: "1"
29 bumblebee:
30 modules: 'ytrssil,'
31 parameters:
32@@ -28,6 +30,11 @@ data:
33 offset:
34 x: 0
35 y: 3
36+ ghostty:
37+ font:
38+ size: '14'
39+ cell_width: -1
40+ cell_height: 1
41 rofi:
42 font:
43 size: '15'
44@@ -35,5 +42,3 @@ data:
45 env_vars:
46 - name: 'NAME'
47 value: 'VALUE'
48- xinitrc:
49- additional_commands: ''
50diff --git a/dot_config/i3/config.tmpl b/dot_config/i3/config.tmpl
51deleted file mode 100644
52index 781dad66404724311bf69e5decc11b25cf8b91f7..0000000000000000000000000000000000000000
53--- a/dot_config/i3/config.tmpl
54+++ /dev/null
55@@ -1,251 +0,0 @@
56-# vim: ft=i3config ts=4 sts=4 sw=4 noet
57-#
58-# i3 config file
59-#
60-# Please see http://i3wm.org/docs/userguide.html for a complete reference!
61-
62-set $foreground #ebdbb2
63-set $background #282828
64-set $color0 #1d2021
65-set $color1 #cc241d
66-set $color2 #98971a
67-set $color3 #d79921
68-set $color4 #458588
69-set $color5 #b16286
70-set $color6 #689d6a
71-set $color7 #a89984
72-set $color8 #665c54
73-set $color9 #fb4934
74-set $color10 #b8bb26
75-set $color11 #fabd2f
76-set $color12 #83a598
77-set $color13 #d3869b
78-set $color14 #8ec07c
79-set $color15 #fbf1c7
80-set $color16 #d65d0e
81-set $color17 #fe8019
82-
83-set $mod Mod4
84-set $left h
85-set $down n
86-set $up e
87-set $right i
88-
89-set $telegram ""
90-set $firefox ""
91-set $thunderbird ""
92-
93-# Font for window titles. Will also be used by the bar unless a different font
94-# is used in the bar {} block below.
95-font pango:MonoFont {{ .i3.font_size }}
96-
97-#class background border text split
98-client.focused $color8 $color8 $foreground $color7
99-client.focused_inactive $background $background $color7 $color0
100-client.unfocused $color0 $background $color8 $color0
101-client.urgent $color1 $color1 $foreground $color1
102-client.background $background
103-
104-# Use Mouse+$mod to drag floating windows to their wanted position
105-floating_modifier $mod
106-
107-# kill focused window
108-bindsym $mod+Shift+q kill
109-
110-# change focus
111-bindsym $mod+$left focus left
112-bindsym $mod+$down focus down
113-bindsym $mod+$up focus up
114-bindsym $mod+$right focus right
115-
116-# move focused window
117-bindsym $mod+Shift+$left move left
118-bindsym $mod+Shift+$down move down
119-bindsym $mod+Shift+$up move up
120-bindsym $mod+Shift+$right move right
121-
122-# move workspace to other outputs
123-bindsym $mod+Control+$left move workspace to output left
124-bindsym $mod+Control+$down move workspace to output down
125-bindsym $mod+Control+$up move workspace to output up
126-bindsym $mod+Control+$right move workspace to output right
127-
128-# split in horizontal orientation
129-bindsym $mod+c split h
130-
131-# split in vertical orientation
132-bindsym $mod+v split v
133-
134-# enter fullscreen mode for the focused container
135-bindsym $mod+f fullscreen toggle
136-
137-# change container layout (tabbed, toggle split)
138-bindsym $mod+s layout toggle split
139-bindsym $mod+t layout tabbed
140-
141-# toggle tiling / floating
142-bindsym $mod+Shift+space floating toggle
143-bindsym $mod+Shift+BackSpace floating toggle
144-bindsym $mod+g focus mode_toggle
145-bindsym $mod+a focus parent
146-
147-bindsym $mod+Tab workspace next
148-bindsym $mod+Shift+Tab workspace prev
149-
150-# switch to workspace
151-bindsym $mod+1 workspace number 1
152-bindsym $mod+2 workspace number 2
153-bindsym $mod+3 workspace number 3
154-bindsym $mod+4 workspace number 4
155diff --git a/dot_config/i3/i3-autoname-workspaces.py b/dot_config/i3/i3-autoname-workspaces.py
156deleted file mode 100644
157index 07565155d89fc69f7d68b64a24c894e7c4d84b53..0000000000000000000000000000000000000000
158--- a/dot_config/i3/i3-autoname-workspaces.py
159+++ /dev/null
160@@ -1,233 +0,0 @@
161-#!/usr/bin/env python3
162-
163-# This script listens for i3 events and updates workspace names to show icons
164-# for running programs. It contains icons for a few programs, but more can
165-# easily be added by inserting them into WINDOW_ICONS below.
166-#
167-# Dependencies: xorg-xprop i3ipc fontawesome
168-#
169-# Installation:
170-# Add "exec_always ~/.config/i3/i3-autoname-workspaces.py &" to the i3 config
171-#
172-# Configuration:
173-# The default i3 config's keybingings reference workspaces by name, which is an
174-# issue when using this script because the "names" are constantaly changing to
175-# show window icons. Instead, you'll need to change the keybindings to
176-# reference workspaces by number. Change lines like:
177-# bindsym $mod+1 workspace 1
178-# To:
179-# bindsym $mod+1 workspace number 1
180-
181-import re
182-import signal
183-import subprocess as proc
184-from types import FrameType
185-from typing import Any, Callable
186-
187-import nerdfonts as nf
188-from i3ipc import Connection
189-
190-# Add icons here for common programs you use. The keys are the X window class
191-# (WM_CLASS) names (lower-cased) and the icons can be any text you want to
192-# display.
193-#
194-# These icons are from the Nerd Font patch set.
195-# You can find a list of all here: https://www.nerdfonts.com/cheat-sheet
196-#
197-# If you're not sure what the WM_CLASS is for your application, you can use
198-# xprop (https://linux.die.net/man/1/xprop). Run `xprop | grep WM_CLASS`
199-# then click on the application you want to inspect.
200-WINDOW_ICONS: dict[str, str] = {
201- 'alacritty': nf.icons['fa_terminal'],
202- 'blender': nf.icons['fa_cube'],
203- 'blueman-manager': nf.icons['fa_bluetooth'],
204- 'brave-browser': nf.icons['fa_globe'],
205- 'calibre-gui': nf.icons['fa_book'],
206- 'chromium': nf.icons['fa_chrome'],
207- 'cities.x64': nf.icons['md_city'],
208- 'clonehero': nf.icons['md_guitar_electric'],
209- 'code-oss': nf.icons['fa_code'],
210- 'vscodium': nf.icons['fa_code'],
211- 'cutter': nf.icons['fa_bug'],
212- 'darktable': nf.icons['md_camera'],
213- 'discord': nf.icons['fa_comment'],
214- 'dwarf_fortress': nf.icons['fa_fort_awesome'],
215- 'easyeffects': nf.icons['fa_music'],
216- 'evince': nf.icons['fa_file_pdf_o'],
217- 'factorio': nf.icons['fa_cog'],
218- 'feh': nf.icons['md_image'],
219- 'firefox': nf.icons['fa_firefox'],
220- 'firefoxdeveloperedition': nf.icons['fa_firefox'],
221- 'ghb': nf.icons['md_video'],
222- 'gimp': nf.icons['fa_paint_brush'],
223- 'gimp-2.10': nf.icons['fa_paint_brush'],
224- 'gparted': nf.icons['fa_hdd_o'],
225- 'gsmartcontrol': nf.icons['fa_hdd_o'],
226- 'hoppscotch-app': nf.icons['md_ufo'],
227- 'inkscape': nf.icons['md_fountain_pen_tip'],
228- 'insomnium': nf.icons['md_graphql'],
229- 'kcharselect': nf.icons['fa_font'],
230- 'kicad': nf.icons['fa_microchip'],
231- 'ksp.x86_64': nf.icons['fa_space_shuttle'],
232- 'ledger live': nf.icons['md_wallet'],
233- 'libreoffice-calc': nf.icons['fa_file_excel_o'],
234- 'libreoffice-impress': nf.icons['fa_file_powerpoint_o'],
235- 'libreoffice-writer': nf.icons['fa_file_word_o'],
236- 'lutris': nf.icons['fa_gamepad'],
237- 'mpv': nf.icons['md_video'],
238- 'polymc': nf.icons['md_minecraft'],
239- 'minecraft': nf.icons['md_minecraft'],
240- 'mupdf': nf.icons['fa_file_pdf_o'],
241- 'nemiver': nf.icons['fa_bug'],
242- 'nm-connection-editor': nf.icons['fa_wifi'],
243- 'obs': nf.icons['md_video'],
244- 'openlens': nf.icons['md_kubernetes'],
245- 'org.gnome.nautilus': nf.icons['fa_folder'],
246- 'pavucontrol': nf.icons['fa_volume_up'],
247- 'picard': nf.icons['fa_music'],
248- 'qbittorrent': nf.icons['fa_download'],
249- 'qtcreator': nf.icons['fa_code'],
250- 'seahorse': nf.icons['fa_lock'],
251- 'simplescreenrecorder': nf.icons['md_video'],
252- 'slack': nf.icons['fa_slack'],
253- 'spotify': nf.icons['fa_spotify'],
254- 'sqlitebrowser': nf.icons['fa_database'],
255- 'steam': nf.icons['md_steam'],
256- 'steam_app_671860': nf.icons['md_pistol'], # battlebit
257- 'steam_app_1336490': nf.icons['fae_storm'], # against the storm
258- 'surviving mars': nf.icons['fa_rocket'],
259- 'telegram-desktop': nf.icons['fa_telegram'],
260diff --git a/dot_xinitrc.tmpl b/dot_xinitrc.tmpl
261deleted file mode 100644
262index f55318ebbc0f5e7745f5c1f5717ef2daeb0dfb11..0000000000000000000000000000000000000000
263--- a/dot_xinitrc.tmpl
264+++ /dev/null
265@@ -1,31 +0,0 @@
266-#!/bin/bash
267-
268-userresources=$HOME/.Xresources
269-usermodmap=$HOME/.Xmodmap
270-
271-if [ -f "$userresources" ]; then
272- xrdb -merge "$userresources"
273-fi
274-
275-if [ -f "$usermodmap" ]; then
276- xmodmap "$usermodmap" &
277-fi
278-
279-if [ -d /etc/X11/xinit/xinitrc.d ] ; then
280- for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
281- [ -x "$f" ] && . "$f"
282- done
283- unset f
284-fi
285-
286-eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
287-export SSH_AUTH_SOCK
288-
289-xset fp rehash &
290-xset dpms 30000 30000 30000 &
291-xset s 30000 30000 &
292-xcape -e 'Control_L=Escape' &
293-{{ .xinitrc.additional_commands }}
294-dunst &
295-
296-exec i3
297diff --git a/init.sh b/init.sh
298index f0f4e7f9ed5193a5c6fb6dd86bd4f8bd8f8224f9..b2fb222e8f979cc73275f4c1afa7e27a37385f62 100755
299--- a/init.sh
300+++ b/init.sh
301@@ -31,4 +31,4 @@ sudo pacman -S gcr
302 systemctl enable --user --now gcr-ssh-agent.socket
303
304 # Set cursor theme
305-gsettings set org.gnome.desktop.interface cursor-theme Breeze_Snow
306+gsettings set org.gnome.desktop.interface cursor-theme Breeze_Light