From ec1c6bfeb1dc22dddc4fa8d3e9c5ea60378a0016 Mon Sep 17 00:00:00 2001
From: Asara <amarpreet@minhas.io>
Date: Tue, 25 Jul 2023 14:48:20 -0400
Subject: [PATCH] Add sway, move files around

---
 X/20-intel.conf                 |   5 -
 X/Xdefaults => Xdefaults        |   0
 X/i3.config => config/i3/config |   0
 {X => config/i3}/i3status.conf  |   0
 config/nvim/init.vim            |  23 ++++-
 config/sway/config              | 165 ++++++++++++++++++++++++++++++++
 config/sway/status.sh           |  18 ++++
 config/swaylock/config          |   2 +
 8 files changed, 207 insertions(+), 6 deletions(-)
 delete mode 100644 X/20-intel.conf
 rename X/Xdefaults => Xdefaults (100%)
 rename X/i3.config => config/i3/config (100%)
 rename {X => config/i3}/i3status.conf (100%)
 create mode 100644 config/sway/config
 create mode 100755 config/sway/status.sh
 create mode 100644 config/swaylock/config

diff --git a/X/20-intel.conf b/X/20-intel.conf
deleted file mode 100644
index 9ebbe83..0000000
--- a/X/20-intel.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-Section "Device"
-	Identifier	"Intel Graphics"
-	Driver		"intel"
-	Option		"Backlight" "intel_backlight"
-EndSection
diff --git a/X/Xdefaults b/Xdefaults
similarity index 100%
rename from X/Xdefaults
rename to Xdefaults
diff --git a/X/i3.config b/config/i3/config
similarity index 100%
rename from X/i3.config
rename to config/i3/config
diff --git a/X/i3status.conf b/config/i3/i3status.conf
similarity index 100%
rename from X/i3status.conf
rename to config/i3/i3status.conf
diff --git a/config/nvim/init.vim b/config/nvim/init.vim
index a07227a..c24b329 100644
--- a/config/nvim/init.vim
+++ b/config/nvim/init.vim
@@ -30,12 +30,33 @@ set viminfo='100,<1000,s100,h
 call plug#begin('~/.vim/plugged')
   Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
   Plug 'godlygeek/tabular'
-  Plug 'preservim/vim-markdown'
+"  Plug 'preservim/vim-markdown'
   Plug 'fladson/vim-kitty'
   Plug 'hashivim/vim-terraform'
   Plug 'rhadley-recurly/vim-terragrunt'
+  Plug 'nvim-treesitter/nvim-treesitter'
+  Plug 'nvim-orgmode/orgmode'
 call plug#end()
 
 " terraform fmt/hclfmt on save
 let g:terraform_fmt_on_save=1
 let g:hcl_fmt_autosave = 1
+
+"orgmode
+lua << EOF
+require('orgmode').setup_ts_grammar()
+
+require('nvim-treesitter.configs').setup {
+  highlight = {
+    enable = true,
+    additional_vim_regex_highlighting = {'org'},
+  },
+  ensure_installed = {'org'},
+}
+
+require('orgmode').setup({
+  org_agenda_files = {'~/org/*'},
+  org_default_notes_file = '~/org/refile.org',
+})
+
+EOF
diff --git a/config/sway/config b/config/sway/config
new file mode 100644
index 0000000..d2e329a
--- /dev/null
+++ b/config/sway/config
@@ -0,0 +1,165 @@
+set $mod Mod4
+
+# Home row direction keys, like vim
+set $left h
+set $down j
+set $up k
+set $right l
+
+# back and forth
+workspace_auto_back_and_forth yes
+
+# Your preferred terminal emulator
+set $term LIBGL_ALWAYS_SOFTWARE=1 kitty
+# Your preferred application launcher
+# Note: pass the final command to swaymsg so that the resulting window can be opened
+# on the original workspace that the command was run on.
+set $menu dmenu_path | fuzzel -d | xargs swaymsg exec --
+
+### Key bindings
+#
+# Basics:
+#
+    # Start a terminal
+    bindsym $mod+Return exec $term
+
+    # Kill focused window
+    bindsym $mod+Shift+q kill
+
+    # Start your launcher
+    bindsym $mod+p exec $menu
+
+    # Drag floating windows by holding down $mod and left mouse button.
+    # Resize them with right mouse button + $mod.
+    # Despite the name, also works for non-floating windows.
+    # Change normal to inverse to use left mouse button for resizing and right
+    # mouse button for dragging.
+    floating_modifier $mod normal
+
+    # Reload the configuration file
+    bindsym $mod+Shift+c reload
+
+    # Exit sway (logs you out of your Wayland session)
+    bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
+#
+# Moving around:
+#
+    # Move your focus around
+    bindsym $mod+$left focus left
+    bindsym $mod+$down focus down
+    bindsym $mod+$up focus up
+    bindsym $mod+$right focus right
+    # Or use $mod+[up|down|left|right]
+    bindsym $mod+Left focus left
+    bindsym $mod+Down focus down
+    bindsym $mod+Up focus up
+    bindsym $mod+Right focus right
+
+    # Move the focused window with the same, but add Shift
+    bindsym $mod+Shift+$left move left
+    bindsym $mod+Shift+$down move down
+    bindsym $mod+Shift+$up move up
+    bindsym $mod+Shift+$right move right
+    # Ditto, with arrow keys
+    bindsym $mod+Shift+Left move left
+    bindsym $mod+Shift+Down move down
+    bindsym $mod+Shift+Up move up
+    bindsym $mod+Shift+Right move right
+#
+# Workspaces:
+#
+    # Switch to workspace
+    bindsym $mod+1 workspace number 1
+    bindsym $mod+2 workspace number 2
+    bindsym $mod+3 workspace number 3
+    bindsym $mod+4 workspace number 4
+    bindsym $mod+5 workspace number 5
+    bindsym $mod+6 workspace number 6
+    bindsym $mod+7 workspace number 7
+    bindsym $mod+8 workspace number 8
+    bindsym $mod+9 workspace number 9
+    bindsym $mod+0 workspace number 10
+    # Move focused container to workspace
+    bindsym $mod+Shift+1 move container to workspace number 1
+    bindsym $mod+Shift+2 move container to workspace number 2
+    bindsym $mod+Shift+3 move container to workspace number 3
+    bindsym $mod+Shift+4 move container to workspace number 4
+    bindsym $mod+Shift+5 move container to workspace number 5
+    bindsym $mod+Shift+6 move container to workspace number 6
+    bindsym $mod+Shift+7 move container to workspace number 7
+    bindsym $mod+Shift+8 move container to workspace number 8
+    bindsym $mod+Shift+9 move container to workspace number 9
+    bindsym $mod+Shift+0 move container to workspace number 10
+    # Note: workspaces can have any name you want, not just numbers.
+    # We just use 1-10 as the default.
+#
+# Layout stuff:
+#
+    # You can "split" the current object of your focus with
+    # $mod+b or $mod+v, for horizontal and vertical splits
+    # respectively.
+    bindsym $mod+b splith
+    bindsym $mod+v splitv
+
+    # Switch the current container between different layout styles
+    bindsym $mod+s layout stacking
+    bindsym $mod+w layout tabbed
+    bindsym $mod+e layout toggle split
+
+    # Make the current focus fullscreen
+    bindsym $mod+f fullscreen
+
+    # Toggle the current focus between tiling and floating mode
+    bindsym $mod+Shift+space floating toggle
+
+    # Swap focus between the tiling area and the floating area
+    bindsym $mod+space focus mode_toggle
+
+    # Move focus to the parent container
+    bindsym $mod+a focus parent
+#
+# Scratchpad:
+#
+    # Sway has a "scratchpad", which is a bag of holding for windows.
+    # You can send windows there and get them back later.
+
+    # Move the currently focused window to the scratchpad
+    bindsym $mod+Shift+minus move scratchpad
+
+    # Show the next scratchpad window or hide the focused scratchpad window.
+    # If there are multiple scratchpad windows, this command cycles through them.
+    bindsym $mod+minus scratchpad show
+#
+# Resizing containers:
+#
+mode "resize" {
+    # left will shrink the containers width
+    # right will grow the containers width
+    # up will shrink the containers height
+    # down will grow the containers height
+    bindsym $left resize shrink width 10px
+    bindsym $down resize grow height 10px
+    bindsym $up resize shrink height 10px
+    bindsym $right resize grow width 10px
+
+    # Ditto, with arrow keys
+    bindsym Left resize shrink width 10px
+    bindsym Down resize grow height 10px
+    bindsym Up resize shrink height 10px
+    bindsym Right resize grow width 10px
+
+    # Return to default mode
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+}
+bindsym $mod+r mode "resize"
+
+#
+# Status Bar:
+#
+# Read `man 5 sway-bar` for more information about this section.
+bar {
+    swaybar_command waybar
+}
+
+#include @sysconfdir@/sway/config.d/*
diff --git a/config/sway/status.sh b/config/sway/status.sh
new file mode 100755
index 0000000..0a9f870
--- /dev/null
+++ b/config/sway/status.sh
@@ -0,0 +1,18 @@
+# The Sway configuration file in ~/.config/sway/config calls this script.
+# You should see changes to the status bar after saving this script.
+# If not, do "killall swaybar" and $mod+Shift+c to reload the configuration.
+
+# The abbreviated weekday (e.g., "Sat"), followed by the ISO-formatted date
+# like 2018-10-06 and the time (e.g., 14:01)
+date_formatted=$(date "+%a %F %H:%M")
+
+# Get the Linux version but remove the "-1-ARCH" part
+linux_version=$(uname -r | cut -d '-' -f1)
+
+# Returns the battery status: "Full", "Discharging", or "Charging".
+battery_status=$(cat /sys/class/power_supply/BAT0/status)
+battery_percentage=$(acpi -b | cut -d',' -f2)
+
+# Emojis and characters for the status bar
+# 💎 💻 💡  ⚡ 📁 \|
+echo  🐧$linux_version 🔋 $battery_status 🔌 $battery_percentage $date_formatted
diff --git a/config/swaylock/config b/config/swaylock/config
new file mode 100644
index 0000000..d611acd
--- /dev/null
+++ b/config/swaylock/config
@@ -0,0 +1,2 @@
+color=000000
+