some changes

8 files changed, 102 insertions, 50 deletions

diff --git a/.config/i3/config b/.config/i3/config
index c6a6e15..983f3bd 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -19,8 +19,9 @@ exec --no-startup-id dex --autostart --environment i3
 # and nm-applet is a desktop environment-independent system tray GUI for it.
 exec --no-startup-id nm-applet
 
-exec_always --no-startup-id xcompmgr
-exec_always --no-startup-id devilspie -a
+exec --no-startup-id devilspie -a
+exec --no-startup-id xcompmgr
+exec --no-startup-id xsettnigsd
 
 # Use pactl to adjust volume in PulseAudio.
 set $refresh_i3status killall -SIGUSR1 i3status
@@ -29,6 +30,11 @@ bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT
 bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
 bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
 
+# Use playerctl
+bindsym XF86AudioPause exec --no-startup-id playerctl play-pause
+bindsym XF86AudioNext exec --no-startup-id playerctl next
+bindsym XF86AudioPrev exec --no-startup-id playerctl previous
+
 bindsym $mod+b exec sudo systemctl start bluetooth.service
 bindsym $mod+Shift+b exec sudo systemctl stop bluetoth.service
 
@@ -120,16 +126,17 @@ bindsym $mod+Shift+a focus child
 
 # Define names for default workspaces for which we configure key bindings later on.
 # We use variables to avoid repeating the names in multiple places.
-set $ws1 "1: terminals"
-set $ws2 "2: browser"
-set $ws3 "3: messengers"
-set $ws4 "4: file manager"
-set $ws5 "5: office"
-set $ws6 "6"
-set $ws7 "7: games"
-set $ws8 "8: media player"
-set $ws9 "9: code assisting"
-set $ws10 "10: code editors"
+# nerd font icons
+set $ws1 "1  "
+set $ws2 "2 󰇩 "
+set $ws3 "3 󰙯 "
+set $ws4 "4  "
+set $ws5 "5 󰏆 "
+set $ws6 "6  "
+set $ws7 "7  "
+set $ws8 "8 󰕼 "
+set $ws9 "9  "
+set $ws10 "10  "
 
 set $monitor_primary "DP-0"
 set $monitor_secondary "HDMI-0"
@@ -171,8 +178,12 @@ assign [class="pr"] workspace $ws5
 assign [class="pm"] workspace $ws5
 assign [class="vlc"] workspace $ws8
 assign [class="libreoffice"] workspace $ws5
+assign [class="libreoffice-writer"] workspace $ws5
+assign [class="libreoffice-impress"] workspace $ws5
+assign [class="libreoffice-calc"] workspace $ws5
 assign [class="steam"] workspace $ws9
 assign [class="org-tlauncher-tlauncher-rmo-TLauncher"] workspace $ws7
+assign [class="dotnet"] workspace $ws7
 assign [class="^Minecraft.*$"] workspace $ws7
 #assign [class="GigaQt"] workspace $ws9
 
@@ -180,8 +191,8 @@ assign [class="^Minecraft.*$"] workspace $ws7
 #monitors
 workspace $ws1 output $monitor_primary
 workspace $ws2 output $monitor_secondary
-workspace $ws3 output $monitor_primary
-# workspace $ws4 output $monitor_primary
+workspace $ws3 output $monitor_secondary
+workspace $ws4 output $monitor_secondary
 workspace $ws5 output $monitor_primary
 workspace $ws6 output $monitor_secondary
 workspace $ws7 output $monitor_primary
@@ -250,22 +261,25 @@ bindsym $mod+Shift+e mode $ModeName
 #Start i3bar to display a workspace bar (plus the system information i3status finds out, if available)
 bar {
         status_command i3status
-#	status_command xmobar
 	position bottom
-	font pango:DejaVu Sans Mono 11
+	font pango:OverpassM Nerd Font 10
+
 }
 
-default_border pixel 3
+default_border pixel 5
+gaps inner 4
+gaps outer 0
 
 # started upon launching
 
-# monito settings
-exec --setprovideroutputsource NVIDIA-G0 Intel
+# monitor settings
+# the first line is actual magic
 exec_always ~/.screenlayout/doublemonitor.layout.sh
 
 # disable integrated keyboard input
 # please, just work (check out that function in bashrc lmao)
-exec_always kboff 
+# only needed for my laptop
+# exec_always kboff 
 # switch keyboard colors
 exec openrgb --color "00FFFF"
 
diff --git a/.config/i3status/config b/.config/i3status/config
new file mode 100644
index 0000000..7985398
--- /dev/null
+++ b/.config/i3status/config
@@ -0,0 +1,54 @@
+
+general {
+	output_format = "i3bar"
+	colors = true
+	interval = 5
+}
+
+order += "wireless wlan0"
+order += "ethernet enp3s0"
+order += "volume master"
+order += "disk /"
+order += "memory"
+order += "cpu_usage"
+order += "cpu_temperature 0"
+order += "time"
+
+wireless wlan0 {
+	format_up = "%quality at %ip"
+	format_down = ""
+}
+
+ethernet enp3s0 {
+	format_up = "Eth: %ip"
+	format_down = "Eth: N/A"
+}
+
+volume master {
+	format = "󰕾 %volume"
+	format_muted = "󰝟 "
+	device = "default"
+	mixer = "Master"
+}
+
+disk "/" {
+	format = " %avail"
+}
+
+cpu_usage {
+	format = " %usage"
+	max_threshold = 75
+} 
+cpu_temperature 0 {
+	format = "%degrees 󰔄"
+	max_threshold = 75
+	format_above_threshold = "TEMPERATURE: %degrees 󰔄"
+}
+
+memory {
+	format = "󰍛 %used"
+}
+
+time {
+	format = "%H:%M:%S %Y-%m-%d "
+}
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
deleted file mode 100644
index 2ab507c..0000000
--- a/.config/nvim/lazy-lock.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "LuaSnip": { "branch": "master", "commit": "954c81b53989097faaff0fabc11c29575288c3e1" },
-  "awesome-vim-colorschemes": { "branch": "master", "commit": "4b2787b8894c4a70c42d15c2808d7cf278cb6abb" },
-  "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
-  "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
-  "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "colorschemes": { "branch": "master", "commit": "e29f32990d6e2c7c3a4763326194fbd847b49dac" },
-  "crates.nvim": { "branch": "main", "commit": "b8ea20fda2e1029fbbb1bae7a9eab35c84037ca0" },
-  "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" },
-  "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
-  "nerdtree": { "branch": "master", "commit": "9ec27d45a863aeb82fea56cebcb8a75a4e369fc9" },
-  "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" },
-  "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" },
-  "nvim-lspconfig": { "branch": "master", "commit": "511609ae0311abfcfaed3c398429a147e895ce2c" },
-  "nvim-treesitter": { "branch": "master", "commit": "1b5bbb54b385c4eae217113f72df5284bc3cc94b" },
-  "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
-  "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
-  "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
-  "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" },
-  "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" },
-  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
-  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
-}
\ No newline at end of file
diff --git a/.config/nvim/lua/user/lsp/asm.lua b/.config/nvim/lua/user/lsp/asm.lua
new file mode 100644
index 0000000..04814a9
--- /dev/null
+++ b/.config/nvim/lua/user/lsp/asm.lua
@@ -0,0 +1,7 @@
+local lsp = require'lspconfig'
+
+lsp.asm_lsp.setup{
+	cmd = { "asm-lsp", "--stdio" },
+	filetypes = { "s", "asm", "S" },
+	root_dir = lsp.util.root_pattern("Makefile", ".git"),
+}
diff --git a/.config/nvim/lua/user/lspinit.lua b/.config/nvim/lua/user/lspinit.lua
index 4a75ec2..47e4a63 100644
--- a/.config/nvim/lua/user/lspinit.lua
+++ b/.config/nvim/lua/user/lspinit.lua
@@ -6,6 +6,6 @@ require 'user.lsp.bash'
 require 'user.lsp.rust'
 require 'user.lsp.cxx'
 require 'user.lsp.lua'
-
+require 'user.lsp.asm'
 -- lsp = require 'lspconfig'
 
diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf
new file mode 100644
index 0000000..c5312b4
--- /dev/null
+++ b/.config/picom/picom.conf
@@ -0,0 +1 @@
+inactive-opacity = 0.95;
diff --git a/.config/sakura/sakura.conf b/.config/sakura/sakura.conf
index caeaa49..47d82b2 100644
--- a/.config/sakura/sakura.conf
+++ b/.config/sakura/sakura.conf
@@ -1,6 +1,6 @@
 [sakura]
 colorset1_fore=rgb(255,255,255)
-colorset1_back=rgb(41,41,41)
+colorset1_back=rgba(41,41,41,0.95)
 colorset1_curs=rgb(143,240,164)
 colorset1_scheme=0
 colorset1_key=F1
diff --git a/.config/xsettingsd/xsettingsd.conf b/.config/xsettingsd/xsettingsd.conf
new file mode 100644
index 0000000..39e1fbf
--- /dev/null
+++ b/.config/xsettingsd/xsettingsd.conf
@@ -0,0 +1,4 @@
+Xft/Hinting 1
+Xft/HintStyle "hintsfull"
+Xft/Antialias 1
+Xft/RGBA "rgb"