screenshots & i3lock customization & README update

7 files changed, 128 insertions, 60 deletions

diff --git a/.xinitrc b/.xinitrc
index ef072be..8396b3e 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-xmodmap -e "pointer = 3 2 1"
+xmodmap -e "pointer = 3 2 1" &
 dunst &
 nitrogen --restore &
 
diff --git a/README.md b/README.md
index 6d7f1e0..49574c5 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
   <br>
 </h1>
 <h4 align="center">
-  A configuration for NixOS + Hyprland<br>
+  A configuration for NixOS + i3<br>
   An opinionated setup for programmers who don't believe in auto complete
 </h4>
 
@@ -44,78 +44,32 @@ But make sure you download all the dependencies that are used in nixos/desktop-e
 
 ### Features
 - ly Display Manager for login
-- hyprland as desktop environment
+- i3 as desktop environment
 - tmux for terminal sessions
 - kitty as terminal
-- quickshell for top bar & elements
-- hyprsunset for nightlight
-- hyprlock for lock screen
-- nvim using NvChad
+- i3lock for lock screen
+- nvim
 - tmux
 - yazi for file exploring
 
-### Hyprland
-Low battery warning notifications<br>
-
-- 30% (Low)
-- 15% (Critical)
-
-Change these values in quickshell/shell.qml(look for "redBatteryPoint" & "orangeBatteryPoint") & hypr/battery-notif.sh<br>
-<br>
-
-### Quickshell
-
-Configure in quickshell/shell.qml<br>
-
-
-|Label|Description|
-|-|-|
-|Radio|Network info, clicking it will open NetworkManager|
-|Low Energy|Bluetooth, clicking it will open blue-tui|
-|Electrons|Battery %, When charging the % will be wrapped in "AC/DC()", e.g. AC/DC(50)|
-|Waves|Volume, clicking it will mute|
-|Photons|Brightness %|
-|Photons Bracket|Red shift (Night light), 6000 is normal, lower value is redder, higher value is bluer|
-|Radiation|CPU Temperature in Kelvin|
-|Latch|RAM Usage|
-|Data Bus|CPU Speed|
-|Spin|Time|
-
 ### Keyboard shortcuts
 Configure in i3/config
 
-I am left handed so my mouse is in left handed mode<br>
-IF YOU ARE NOT LEFT HANDED, change this in hypr/hyprland/input.conf:input:left_handed<bgr>
-
-
 |Keybind|Description|
 |-|-|
 |Win + T|**Spawn Terminal** (kitty)|
 |Win + Q|Kill active window|
 |Win + Shift + L|Sign out|
 |Win + L|Lock|
-|Win + D|DnD/Privacy Mode (No notifications, Wifi & Bluetooth names hidden, No blink reminder)|
-|Win + Shift + D|Super DnD Mode (Hide navbar)|
 |Win + E|Spawn File Explorer (yazi)|
 |Win + F|Make active window floating|
-|Win + R|**Spawn App Menu**|
-|Win + P|Pseudo ??? (I don't know what this is used for)|
-|Win + J|Toggle window split|
+|Win + D|**Spawn App Menu** (rofi)|
 |Ctrl + Shift + Escape|Spawn Task Manager (btop)|
 |Win + arrow keys|Move focus of window|
 |Win + [1-9]|Switch workspace|
-|Win + S|Switch to Special workspace|
-|Win + Shift + S|Move current window to Special workspace|
-|Win + Ctrl + S|Move current window from Special workspace to current workspace|
-|Win + Left click|Resize window|
-|Win + Right click|Move window|
 |PrintSrc|Take a fullscreen screenshot and save it in ~/Pictures/Screenshots|
 |Shift + PrintSrc|Take a partial screen screenshot and save it in ~/Pictures/Screenshots|
 |Win + PrintSrc|Take a partial screen screenshot and copy it to clipboard|
-|Win + Shift + R|Start/Stop screen recording (without audio)|
-|Win + =|Zoom in/out|
-|Win + \[|Increase red shift (night light)|
-|Win + \]|Decrease red shift|
 
 ### Fonts
 Jetbrains Mono Nerd Font
@@ -161,4 +115,4 @@ Configure in nixos/apps.nix<br>
 Configure in nixos/games<br>
 
 - Minecraft (Prism Launcher)
-- Steam (Comes installed with the Assetto Corsa compatible Proton version)
+- Steam
diff --git a/i3/config b/i3/config
index 7a158fa..04701dc 100644
--- a/i3/config
+++ b/i3/config
@@ -14,10 +14,23 @@ floating_modifier $mod
 tiling_drag modifier titlebar
 
 bindsym $mod+t exec kitty
+bindsym Control+Shift+Escape exec kitty -e btop --force-utf
 bindsym $mod+q kill
-
-bindsym $mod+r exec --no-startup-id rofi -show drun
-bindsym $mod+Shift+r exec --no-startup-id rofi -show window
+bindsym $mod+l exec i3lock --color=282828 --ring-color=83a598 --inside-color=282828 --line-color=282828 --separator-color=282828 --keyhl-color=fabd2f --bshl-color=fb4934 --verif-color=b8bb26 --wrong-color=fb4934 --time-color=ebdbb2 --date-color=a89984 --layout-color=d3869b --clock
+bindsym $mod+p exec xwd
+
+set $shots $HOME/Pictures/Screenshots
+bindsym Print exec --no-startup-id \
+    mkdir -p "$shots" && \
+    scrot "$shots/%Y-%m-%d_%H-%M-%S.png"
+bindsym Shift+Print exec --no-startup-id \
+    mkdir -p "$shots" && \
+    scrot -s "$shots/%Y-%m-%d_%H-%M-%S.png"
+bindsym $mod+Print exec --no-startup-id \
+    scrot -s -e 'xclip -selection clipboard -t image/png -i "$f" && rm "$f"'
+
+bindsym $mod+d exec --no-startup-id rofi -show drun
+bindsym $mod+Shift+d exec --no-startup-id rofi -show window
 
 bindsym $mod+Left focus left
 bindsym $mod+Down focus down
@@ -79,11 +92,8 @@ bindsym $mod+Shift+8 move container to workspace number $ws8
 bindsym $mod+Shift+9 move container to workspace number $ws9
 bindsym $mod+Shift+0 move container to workspace number $ws10
 
-# reload the configuration file
 bindsym $mod+Shift+c reload
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
 bindsym $mod+Shift+r restart
-# exit i3 (logs you out of your X session)
 bindsym $mod+Shift+l exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
 
 mode "resize" {
diff --git a/kitty/gruvbox_dark.conf b/kitty/gruvbox_dark.conf
new file mode 100644
index 0000000..4f40ebe
--- /dev/null
+++ b/kitty/gruvbox_dark.conf
@@ -0,0 +1,50 @@
+# gruvbox dark by morhetz, https://github.com/morhetz/gruvbox
+# This work is licensed under the terms of the MIT license.
+# For a copy, see https://opensource.org/licenses/MIT.
+
+# 235_bg, 223_fg1
+background #282828
+foreground #ebdbb2
+
+# 245_gray, 237_bg1
+selection_foreground #928374
+selection_background #3c3836
+
+# 229_fg0, 236_bg0_s
+cursor            #fbf1c7
+cursor_text_color #32302f
+
+# 208_orange
+url_color #fe8019
+
+# 235_bg, 241_bg3
+color0 #282828
+color8 #665c54
+
+# 124_red, 167_red
+color1 #cc241d
+color9 #fb4934
+
+# 106_green, 142_green
+color2  #98971a
+color10 #b8bb26
+
+# 172_yellow, 214_yellow
+color3  #d79921
+color11 #fabd2f
+
+# 72_aqua, 109_blue
+color4  #689d6a
+color12 #83a598
+
+# 132_purple, 175_purple
+color5  #b16286
+color13 #d3869b
+
+# 72_aqua, 108_aqua
+color6  #689d6a
+color14 #8ec07c
+
+# 246_gray, 245_gray
+color7  #a89984
+color15 #928374
diff --git a/kitty/gruvbox_light.conf b/kitty/gruvbox_light.conf
new file mode 100644
index 0000000..73c9f9b
--- /dev/null
+++ b/kitty/gruvbox_light.conf
@@ -0,0 +1,50 @@
+# gruvbox dark by morhetz, https://github.com/morhetz/gruvbox
+# This work is licensed under the terms of the MIT license.
+# For a copy, see https://opensource.org/licenses/MIT.
+
+# 229_bg, 237_fg1
+background #fbf1c7
+foreground #3c3836
+
+# 237_fg1, 244_gray
+selection_foreground #3c3836
+selection_background #928374
+
+# 244_gray, 228_bg0_s
+cursor            #928374
+cursor_text_color #f2e5bc
+
+# 130_orange
+url_color #af3a03
+
+# 229_bg0, 241_fg3
+color0 #fbf1c7
+color8 #665c54
+
+# 124_red, 88_red
+color1 #cc241d
+color9 #9d0006
+
+# 106_green, 100_green
+color2  #98971a
+color10 #79740e
+
+# 172_yellow, 136_yellow
+color3  #d79921
+color11 #b57614
+
+# 72_aqua, 24_blue
+color4  #689d6a
+color12 #076678
+
+# 132_purple, 96_purple
+color5  #b16286
+color13 #8f3f71
+
+# 72_aqua, 66_aqua
+color6  #689d6a
+color14 #427b58
+
+# 243_gray, 244_gray
+color7  #7c6f64
+color15 #928374
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index d019b9e..a987c32 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -1,2 +1,5 @@
+include gruvbox_dark.conf
+# include gruvbox_light.conf
+
 font_family JetBrains Mono Nerd Font
 confirm_os_window_close 0
diff --git a/nixos/desktop-environment.nix b/nixos/desktop-environment.nix
index 3fe408f..09fe302 100644
--- a/nixos/desktop-environment.nix
+++ b/nixos/desktop-environment.nix
@@ -39,9 +39,10 @@
 
       # Useful i3 tools
       rofi
+      scrot
       nitrogen
       dunst
       i3status
-      i3lock
+      i3lock-color
     ];
 }