hyprland config and roficonfig

.bashrc

@@ -1,19 +1,9 @@
-# homebrew
-eval "$(/opt/homebrew/bin/brew shellenv)"
-
 # ----------------------
 # Aliases
 # ----------------------
-alias ga='git add'
-alias gaa='git add -A'
-alias gcm='git commit -m'
-alias gpsh='git push'
-alias gs='git status'
-
 alias ls='lsd'
 alias nv='nvim'
 alias neofetch="fastfetch"
-alias python='python3'
 
 # ---- Air for GO ----
 alias air="~/go/bin/air"

.clang-format

@@ -1,245 +0,0 @@
----
-Language:        Cpp
-# BasedOnStyle:  LLVM
-AccessModifierOffset: -4
-AlignAfterOpenBracket: Align
-AlignArrayOfStructures: None
-AlignConsecutiveAssignments:
-  Enabled:         false
-  AcrossEmptyLines: false
-  AcrossComments:  false
-  AlignCompound:   false
-  AlignFunctionPointers: false
-  PadOperators:    true
-AlignConsecutiveBitFields:
-  Enabled:         false
-  AcrossEmptyLines: false
-  AcrossComments:  false
-  AlignCompound:   false
-  AlignFunctionPointers: false
-  PadOperators:    false
-AlignConsecutiveDeclarations:
-  Enabled:         false
-  AcrossEmptyLines: false
-  AcrossComments:  false
-  AlignCompound:   false
-  AlignFunctionPointers: false
-  PadOperators:    false
-AlignConsecutiveMacros:
-  Enabled:         false
-  AcrossEmptyLines: false
-  AcrossComments:  false
-  AlignCompound:   false
-  AlignFunctionPointers: false
-  PadOperators:    false
-AlignConsecutiveShortCaseStatements:
-  Enabled:         false
-  AcrossEmptyLines: false
-  AcrossComments:  false
-  AlignCaseColons: false
-AlignEscapedNewlines: Right
-AlignOperands:   Align
-AlignTrailingComments:
-  Kind:            Always
-  OverEmptyLines:  0
-AllowAllArgumentsOnNextLine: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowBreakBeforeNoexceptSpecifier: Never
-AllowShortBlocksOnASingleLine: Never
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortCompoundRequirementOnASingleLine: true
-AllowShortEnumsOnASingleLine: true
-AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: Never
-AllowShortLambdasOnASingleLine: All
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: MultiLine
-AttributeMacros:
-  - __capability
-BinPackArguments: true
-BinPackParameters: true
-BitFieldColonSpacing: Both
-BraceWrapping:
-  AfterCaseLabel:  false
-  AfterClass:      false
-  AfterControlStatement: Never
-  AfterEnum:       false
-  AfterExternBlock: false
-  AfterFunction:   false
-  AfterNamespace:  false
-  AfterObjCDeclaration: false
-  AfterStruct:     false
-  AfterUnion:      false
-  BeforeCatch:     false
-  BeforeElse:      false 
-  BeforeLambdaBody: false
-  BeforeWhile:     false
-  IndentBraces:    false
-  SplitEmptyFunction: true
-  SplitEmptyRecord: true
-  SplitEmptyNamespace: true
-BreakAdjacentStringLiterals: true
-BreakAfterAttributes: Leave
-BreakAfterJavaFieldAnnotations: false
-BreakArrays:     true
-BreakBeforeBinaryOperators: None
-BreakBeforeConceptDeclarations: Always
-BreakBeforeBraces: Attach
-BreakBeforeInlineASMColon: OnlyMultiline
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializers: BeforeColon
-BreakInheritanceList: BeforeColon
-BreakStringLiterals: true
-ColumnLimit:     80
-CommentPragmas:  '^ IWYU pragma:'
-CompactNamespaces: false
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DerivePointerAlignment: false
-DisableFormat:   false
-EmptyLineAfterAccessModifier: Never
-EmptyLineBeforeAccessModifier: LogicalBlock
-ExperimentalAutoDetectBinPacking: false
-FixNamespaceComments: true
-ForEachMacros:
-  - foreach
-  - Q_FOREACH
-  - BOOST_FOREACH
-IfMacros:
-  - KJ_IF_MAYBE
-IncludeBlocks:   Preserve
-IncludeCategories:
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-    Priority:        2
-    SortPriority:    0
-    CaseSensitive:   false
-  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
-    Priority:        3
-    SortPriority:    0
-    CaseSensitive:   false
-  - Regex:           '.*'
-    Priority:        1
-    SortPriority:    0
-    CaseSensitive:   false
-IncludeIsMainRegex: '(Test)?$'
-IncludeIsMainSourceRegex: ''
-IndentAccessModifiers: false
-IndentCaseBlocks: false
-IndentCaseLabels: false
-IndentExternBlock: AfterExternBlock
-IndentGotoLabels: true
-IndentPPDirectives: None
-IndentRequiresClause: true
-IndentWidth:     4
-IndentWrappedFunctionNames: false
-InsertBraces:    false
-InsertNewlineAtEOF: false
-InsertTrailingCommas: None
-IntegerLiteralSeparator:
-  Binary:          0
-  BinaryMinDigits: 0
-  Decimal:         0
-  DecimalMinDigits: 0
-  Hex:             0
-  HexMinDigits:    0
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
-KeepEmptyLinesAtTheStartOfBlocks: true
-KeepEmptyLinesAtEOF: false
-LambdaBodyIndentation: Signature
-LineEnding:      DeriveLF
-MacroBlockBegin: ''
-MacroBlockEnd:   ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
-ObjCBinPackProtocolList: Auto
-ObjCBlockIndentWidth: 4
-ObjCBreakBeforeNestedBlockParam: true
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: true
-PackConstructorInitializers: BinPack
-PenaltyBreakAssignment: 2
-PenaltyBreakBeforeFirstCallParameter: 19
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakOpenParenthesis: 0
-PenaltyBreakScopeResolution: 500
-PenaltyBreakString: 1000
-PenaltyBreakTemplateDeclaration: 10
-PenaltyExcessCharacter: 1000000
-PenaltyIndentedWhitespace: 0
-PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Right
-PPIndentWidth:   -1
-QualifierAlignment: Leave
-ReferenceAlignment: Pointer
-ReflowComments:  true
-RemoveBracesLLVM: false
-RemoveParentheses: Leave
-RemoveSemicolon: false
-RequiresClausePosition: OwnLine
-RequiresExpressionIndentation: OuterScope
-SeparateDefinitionBlocks: Leave
-ShortNamespaceLines: 1
-SkipMacroDefinitionBody: false
-SortIncludes:    CaseSensitive
-SortJavaStaticImport: Before
-SortUsingDeclarations: LexicographicNumeric
-SpaceAfterCStyleCast: false
-SpaceAfterLogicalNot: false
-SpaceAfterTemplateKeyword: true
-SpaceAroundPointerQualifiers: Default
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeCaseColon: false
-SpaceBeforeCpp11BracedList: false
-SpaceBeforeCtorInitializerColon: true
-SpaceBeforeInheritanceColon: true
-SpaceBeforeJsonColon: false
-SpaceBeforeParens: ControlStatements
-SpaceBeforeParensOptions:
-  AfterControlStatements: true
-  AfterForeachMacros: true
-  AfterFunctionDefinitionName: false
-  AfterFunctionDeclarationName: false
-  AfterIfMacros:   true
-  AfterOverloadedOperator: false
-  AfterPlacementOperator: true
-  AfterRequiresInClause: false
-  AfterRequiresInExpression: false
-  BeforeNonEmptyParentheses: false
-SpaceBeforeRangeBasedForLoopColon: true
-SpaceBeforeSquareBrackets: false
-SpaceInEmptyBlock: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles:  Never
-SpacesInContainerLiterals: true
-SpacesInLineCommentPrefix:
-  Minimum:         1
-  Maximum:         -1
-SpacesInParens:  Never
-SpacesInParensOptions:
-  InCStyleCasts:   false
-  InConditionalStatements: false
-  InEmptyParentheses: false
-  Other:           false
-SpacesInSquareBrackets: false
-Standard:        Latest
-StatementAttributeLikeMacros:
-  - Q_EMIT
-StatementMacros:
-  - Q_UNUSED
-  - QT_REQUIRE_VERSION
-TabWidth:        8
-UseTab:          Never
-VerilogBreakBetweenInstancePorts: true
-WhitespaceSensitiveMacros:
-  - BOOST_PP_STRINGIZE
-  - CF_SWIFT_NAME
-  - NS_SWIFT_NAME
-  - PP_STRINGIZE
-  - STRINGIZE
-...

.config/alacritty/alacritty.toml

@@ -14,7 +14,7 @@ x = 0
 y = 1
 
 [font.normal]
-family = "MesloLGS Nerd Font Mono"
+family = "JetBrainsMono Nerd Font"
 
 [font.italic]
 style = "Italic"

.config/alacritty/themes/catppuccin-mocha.toml

@@ -1,75 +0,0 @@
-[colors.primary]
-background = "#1E1E2E"
-foreground = "#CDD6F4"
-dim_foreground = "#CDD6F4"
-bright_foreground = "#CDD6F4"
-
-[colors.cursor]
-text = "#1E1E2E"
-cursor = "#F5E0DC"
-
-[colors.vi_mode_cursor]
-text = "#1E1E2E"
-cursor = "#B4BEFE"
-
-[colors.search.matches]
-foreground = "#1E1E2E"
-background = "#A6ADC8"
-
-[colors.search.focused_match]
-foreground = "#1E1E2E"
-background = "#A6E3A1"
-
-[colors.footer_bar]
-foreground = "#1E1E2E"
-background = "#A6ADC8"
-
-[colors.hints.start]
-foreground = "#1E1E2E"
-background = "#F9E2AF"
-
-[colors.hints.end]
-foreground = "#1E1E2E"
-background = "#A6ADC8"
-
-[colors.selection]
-text = "#1E1E2E"
-background = "#F5E0DC"
-
-[colors.normal]
-black = "#45475A"
-red = "#F38BA8"
-green = "#A6E3A1"
-yellow = "#F9E2AF"
-blue = "#89B4FA"
-magenta = "#F5C2E7"
-cyan = "#94E2D5"
-white = "#BAC2DE"
-
-[colors.bright]
-black = "#585B70"
-red = "#F38BA8"
-green = "#A6E3A1"
-yellow = "#F9E2AF"
-blue = "#89B4FA"
-magenta = "#F5C2E7"
-cyan = "#94E2D5"
-white = "#A6ADC8"
-
-[colors.dim]
-black = "#45475A"
-red = "#F38BA8"
-green = "#A6E3A1"
-yellow = "#F9E2AF"
-blue = "#89B4FA"
-magenta = "#F5C2E7"
-cyan = "#94E2D5"
-white = "#BAC2DE"
-
-[[colors.indexed_colors]]
-index = 16
-color = "#FAB387"
-
-[[colors.indexed_colors]]
-index = 17
-color = "#F5E0DC"

.config/btop/btop.conf

@@ -1,4 +1,4 @@
-#? Config file for btop v. 1.4.0
+#? Config file for btop v. 1.4.1
 
 #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
 #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
@@ -18,7 +18,7 @@ force_tty = False
 #* Format: "box_name:P:G,box_name:P:G" P=(0 or 1) for alternate positions, G=graph symbol to use for box.
 #* Use whitespace " " as separator between different presets.
 #* Example: "cpu:0:default,mem:0:tty,proc:1:default cpu:0:braille,proc:0:tty"
-presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:default cpu:0:block,net:0:tty"
+presets = "cpu:0:default mem:0:default net:0:default"
 
 #* Set to True to enable "h,j,k,l,g,G" keys for directional control in lists.
 #* Conflicting keys for h:"help" and k:"kill" is accessible while holding shift.
@@ -57,7 +57,7 @@ update_ms = 2000
 proc_sorting = "memory"
 
 #* Reverse sorting order, True or False.
-proc_reversed = True
+proc_reversed = False
 
 #* Show processes as a tree.
 proc_tree = True
@@ -128,7 +128,7 @@ cpu_core_map = ""
 temp_scale = "celsius"
 
 #* Use base 10 for bits/bytes sizes, KB = 1000 instead of KiB = 1024.
-base_10_sizes = True
+base_10_sizes = False
 
 #* Show CPU frequency.
 show_cpu_freq = True
@@ -160,13 +160,13 @@ zfs_arc_cached = True
 show_swap = True
 
 #* Show swap as a disk, ignores show_swap value above, inserts itself after first disk.
-swap_disk = False
+swap_disk = True
 
 #* If mem box should be split to also show disks info.
 show_disks = True
 
 #* Filter out non physical disks. Set this to False to include network disks, RAM disks and similar.
-only_physical = False
+only_physical = True
 
 #* Read disks list from /etc/fstab. This also disables only_physical.
 use_fstab = True
@@ -204,8 +204,11 @@ net_sync = True
 #* Starts with the Network Interface specified here.
 net_iface = ""
 
+#* "True" shows bitrates in base 10 (Kbps, Mbps). "False" shows bitrates in binary sizes (Kibps, Mibps, etc.). "Auto" uses base_10_sizes.
+base_10_bitrate = "Auto"
+
 #* Show battery stats in top right if battery is present.
-show_battery = False
+show_battery = True
 
 #* Which battery to use if multiple are present. "Auto" for auto detection.
 selected_battery = "Auto"

.config/fastfetch/config.jsonc

@@ -1,108 +1,93 @@
 {
-    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+  "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-    "logo": {
+  "logo": {
-        "padding": {
+    "padding": {
-            "top": 2
+      "top": 2
-        }
+    }
+  },
+  "display": {
+    "separator": " ➜  "
+  },
+  "modules": [
+    "break",
+    "break",
+    "break",
+    {
+      "type": "os",
+      "key": "OS   ",
+      "keyColor": "red"
     },
-    "display": {
+    {
-        "separator": " ➜  "
+      "type": "kernel",
+      "key": " ├  ",
+      "keyColor": "red"
     },
-    "modules": [
+    {
-        "break",
+      "type": "shell",
-        "break",
+      "key": " └  ",
-        "break",
+      "keyColor": "red"
-        {
+    },
-            "type": "os",
+    "break",
-            "key": "OS   ",
+    {
-            "keyColor": "red"
+      "type": "wm",
-        },
+      "key": "WM   ",
-        {
+      "keyColor": "green"
-            "type": "kernel",
+    },
-            "key": " ├  ",
+    {
-            "keyColor": "red"
+      "type": "terminal",
-        },
+      "key": " ├  ",
-        {
+      "keyColor": "green"
-            "type": "shell",
+    },
-            "key": " └  ",
+    {
-            "keyColor": "red"
+      "type": "terminalfont",
-        },
+      "key": " └  ",
-        "break",
+      "keyColor": "green"
-        {
+    },
-            "type": "wm",
+    "break",
-            "key": "WM   ",
+    {
-            "keyColor": "green"
+      "type": "host",
-        },
+      "format": "{5} {1} Type {2}",
-        {
+      "key": "PC   ",
-            "type": "wmtheme",
+      "keyColor": "yellow"
-            "key": " ├ 󰉼 ",
+    },
-            "keyColor": "green"
+    {
-        },
+      "type": "cpu",
-        {
+      "format": "{1} ({3}) @ {7} GHz",
-            "type": "icons",
+      "key": " ├  ",
-            "key": " ├ 󰀻 ",
+      "keyColor": "yellow"
-            "keyColor": "green"
+    },
-        },
+    {
-        {
+      "type": "gpu",
-            "type": "cursor",
+      "format": "{1} {2} @ {12} GHz",
-            "key": " ├  ",
+      "key": " ├ 󰢮 ",
-            "keyColor": "green"
+      "keyColor": "yellow"
-        },
+    },
-        {
+    {
-            "type": "terminal",
+      "type": "uptime",
-            "key": " ├  ",
+      "key": " └  ",
-            "keyColor": "green"
+      "keyColor": "yellow"
-        },
+    },
-        {
+    {
-            "type": "terminalfont",
+      "type": "memory",
-            "key": " └  ",
+      "key": " ├  ",
-            "keyColor": "green"
+      "keyColor": "yellow"
-        },
+    },
-        "break",
+    {
-        {
+      "type": "swap",
-            "type": "host",
+      "key": " ├ 󰓡 ",
-            "format": "{5} {1} Type {2}",
+      "keyColor": "yellow"
-            "key": "PC   ",
+    },
-            "keyColor": "yellow"
+    {
-        },
+      "type": "disk",
-        {
+      "key": " ├ 󰋊 ",
-            "type": "cpu",
+      "keyColor": "yellow"
-            "format": "{1} ({3}) @ {7} GHz",
+    },
-            "key": " ├  ",
+    {
-            "keyColor": "yellow"
+      "type": "monitor",
-        },
+      "key": " └  ",
-        {
+      "keyColor": "yellow"
-            "type": "gpu",
+    },
-            "format": "{1} {2} @ {12} GHz",
+    "break",
-            "key": " ├ 󰢮 ",
+    "break"
-            "keyColor": "yellow"
+  ]
-        },
-        {
-            "type": "uptime",
-            "key": " └  ",
-            "keyColor": "yellow"
-        },
-        {
-            "type": "memory",
-            "key": " ├  ",
-            "keyColor": "yellow"
-        },
-        {
-            "type": "swap",
-            "key": " ├ 󰓡 ",
-            "keyColor": "yellow"
-        },
-        {
-            "type": "disk",
-            "key": " ├ 󰋊 ",
-            "keyColor": "yellow"
-        },
-        {
-            "type": "monitor",
-            "key": " └  ",
-            "keyColor": "yellow"
-        },
-        "break",
-        "break"
-    ]
 }

.config/ghostty/config

@@ -1,17 +1,22 @@
 theme = "catppuccin-mocha"
+cursor-text = 181825
 
-font-size = 14
+font-size = 12
-font-family = "MesloLGS Nerd Font Mono"
+font-family = "JetbrainsMono Nerd Font"
 font-thicken = true
 
-cursor-style = block
+cursor-style = bar
 cursor-style-blink = false
 
-background-opacity = 0.95
+background-opacity = 0.9
 background-blur-radius = 8
 
 mouse-hide-while-typing = true
 
+font-feature = -calt
+font-feature = -liga
+font-feature = -dlig
+
 clipboard-read = allow
 clipboard-write = allow
 copy-on-select = clipboard
@@ -23,15 +28,3 @@ window-decoration = false
 window-padding-x = 2
 window-padding-y = 2
 window-padding-balance = true
-
-# Don't use if using fullscreen
-window-width = 168
-window-height = 45
-
-# macos stuff
-quit-after-last-window-closed = true
-macos-option-as-alt = true
-fullscreen = true
-# macos-non-native-fullscreen = true # fullscreen, hide menubar and dock toooo
-
-keybind = cmd+backspace=text:\x15 

.config/git/config

@@ -1,7 +1,11 @@
 [credential]
-	helper = cache
+  helper = cache
 [user]
-	name = Kulvir Singh
+  name = Kulvir Singh
-	email = kulvirs734@gmail.com
+  email = kulvirs734@gmail.com
 [init]
-	defaultBranch = trunk
+  defaultBranch = trunk
+[lfs]
+  enable = true
+[push]
+  autoSetupRemote = true

.config/hypr/hyprland.conf

@@ -0,0 +1,203 @@
+source=~/.config/hypr/mocha.conf
+
+# exec-once = hyprctl setcursor catppuccin-mocha-dark-cursors 28
+
+# See https://wiki.hyprland.org/Configuring/Monitors/
+monitor=,preferred,auto,auto
+
+# Set programs that you use
+$terminal = ghostty
+$menu = rofi -show drun drun
+$powerMenu = rofi -show power-menu -modi "power-menu:rofi-power-menu --choices=shutdown/reboot/logout/lockscreen/suspend"
+
+# Autostart necessary processes (like notifications daemons, status bars, etc.)
+# Or execute your favorite apps at launch like this:
+exec-once=waybar & swaync & hyprpaper & hypridle
+
+# env variables
+env = XCURSOR_SIZE,18
+env = HYPRCURSOR_SIZE,18
+
+# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
+input {
+    kb_layout = us
+    kb_variant =
+    kb_model =
+    kb_options =
+    kb_rules =
+    kb_options = 
+    # kb_options = ctrl:nocaps
+
+    follow_mouse = 1
+
+    sensitivity = 0 # -1.0 to 1.0, 0 means no modification.
+
+    touchpad {
+        natural_scroll = yes
+    }
+}
+
+# https://wiki.hyprland.org/Configuring/Variables/#gestures
+gestures {
+    workspace_swipe = false
+}
+
+general {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+    
+    border_size = 1
+
+    col.active_border = $peach
+    col.inactive_border = $surface2
+
+    resize_on_border = true
+
+    gaps_in = 2
+    gaps_out = 3
+
+    layout = dwindle
+
+    # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
+    allow_tearing = false
+}
+
+decoration {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+
+    rounding = 4
+    
+    blur {
+        enabled = true
+        size = 3
+        passes = 1
+        
+        new_optimizations = true
+    }
+}
+
+animations {
+    enabled = false 
+
+    bezier = linear, 0.0, 0.0, 1, 1
+    animation = borderangle, 1, 50, linear, loop
+
+    animation=workspaces,1,0.5,default
+    animation=windows,0,0.1,default
+    animation=fade,0,0.1,default
+}
+
+dwindle {
+    # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
+    pseudotile = true # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+    preserve_split = true # you probably want this
+}
+
+misc {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+    force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers
+}
+
+# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
+device {
+    name = epic-mouse-v1
+    sensitivity = -0.5
+}
+
+# See https://wiki.hyprland.org/Configuring/Keywords/ for more
+$mainMod = super
+
+# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
+bind = $mainMod, W, killactive, 
+bind = $mainMod, Q, exit, 
+bind = $mainMod, V, togglefloating, 
+bind = $mainMod, F, fullscreen, # dwindle
+bind = $mainMod, P, pseudo, # dwindle
+# bind = $mainMod, E, togglesplit, # dwindle
+
+bind = $mainMod, space, exec, $menu
+bind = $mainMod, return, exec, $terminal
+bind = $mainMod, F1, exec, powermenu
+# bind = $mainMod, period, exec, $emojiPicker # install emoji picker first
+
+# Move focus with mainMod + arrow keys
+bind = $mainMod, h, movefocus, l
+bind = $mainMod, l, movefocus, r
+bind = $mainMod, k, movefocus, u
+bind = $mainMod, j, movefocus, d
+
+
+# bind = $SUPER_SHIFT, l, exec, hyprlock
+# bind = $SUPER_SHIFT, R, exec, hyprctl reload
+
+# Switch workspaces with mainMod + [0-9]
+bind = $mainMod, 1, workspace, 1
+bind = $mainMod, 2, workspace, 2
+bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 9, workspace, 9
+bind = $mainMod, 0, workspace, 10
+
+# Move active window to a workspace with mainMod + SHIFT + [0-9]
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
+
+# Example special workspace (scratchpad)
+bind = $mainMod, S, togglespecialworkspace, magic
+bind = $mainMod SHIFT, S, movetoworkspace, special:magic
+
+# Scroll through existing workspaces with mainMod + scroll
+bind = $mainMod, mouse_down, workspace, e+1
+bind = $mainMod, mouse_up, workspace, e-1
+
+# screenshots w Hyprshot
+# bind = , Print, exec, hyprshot -m window
+# bind = shift, Print, exec, hyprshot -m region
+bind = $mainMod, PRINT, exec, hyprshot --freeze -m window --clipboard-only
+bind = , PRINT, exec, hyprshot --freeze -m output #--clipboard-only
+bind = SHIFT, PRINT, exec, hyprshot --freeze -m region --clipboard-only
+# Move/resize windows with mainMod + LMB/RMB and dragging
+bindm = $mainMod, mouse:272, movewindow
+bindm = $mainMod, mouse:273, resizewindow
+
+# Sound through pactl
+bindel = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +10%
+bindel = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -10%
+bindel = , XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
+
+# Brightness through brightnessctl
+bindel = , XF86MonBrightnessUp, exec, brightnessctl set +5%
+bindel = , XF86MonBrightnessDown, exec, brightnessctl set 5%-
+
+# Requires playerctl
+bindl = , XF86AudioNext, exec, playerctl next
+bindl = , XF86AudioPause, exec, playerctl play-pause
+bindl = , XF86AudioPlay, exec, playerctl play-pause
+bindl = , XF86AudioPrev, exec, playerctl previous
+
+
+# Example windowrule
+# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
+# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
+
+# Ignore maximize requests from apps. You'll probably like this.
+windowrule = suppressevent maximize, class:.*
+layerrule = noanim, rofi 
+
+# Fix some dragging issues with XWayland
+windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
+
+# windowrulev2 = workspace 9, class:zen
+# windowrulev2 = fullscreen,class:^steam_app\d+$
+

.config/hypr/hyprpaper.conf

@@ -0,0 +1,3 @@
+preload = ~/wall/lofiwallpaper.png
+wallpaper = , ~/wall/lofiwallpaper.png 
+

.config/hypr/mocha.conf

@@ -0,0 +1,77 @@
+$rosewater = rgb(f5e0dc)
+$rosewaterAlpha = f5e0dc
+
+$flamingo = rgb(f2cdcd)
+$flamingoAlpha = f2cdcd
+
+$pink = rgb(f5c2e7)
+$pinkAlpha = f5c2e7
+
+$mauve = rgb(cba6f7)
+$mauveAlpha = cba6f7
+
+$red = rgb(f38ba8)
+$redAlpha = f38ba8
+
+$maroon = rgb(eba0ac)
+$maroonAlpha = eba0ac
+
+$peach = rgb(fab387)
+$peachAlpha = fab387
+
+$yellow = rgb(f9e2af)
+$yellowAlpha = f9e2af
+
+$green = rgb(a6e3a1)
+$greenAlpha = a6e3a1
+
+$teal = rgb(94e2d5)
+$tealAlpha = 94e2d5
+
+$sky = rgb(89dceb)
+$skyAlpha = 89dceb
+
+$sapphire = rgb(74c7ec)
+$sapphireAlpha = 74c7ec
+
+$blue = rgb(89b4fa)
+$blueAlpha = 89b4fa
+
+$lavender = rgb(b4befe)
+$lavenderAlpha = b4befe
+
+$text = rgb(cdd6f4)
+$textAlpha = cdd6f4
+
+$subtext1 = rgb(bac2de)
+$subtext1Alpha = bac2de
+
+$subtext0 = rgb(a6adc8)
+$subtext0Alpha = a6adc8
+
+$overlay2 = rgb(9399b2)
+$overlay2Alpha = 9399b2
+
+$overlay1 = rgb(7f849c)
+$overlay1Alpha = 7f849c
+
+$overlay0 = rgb(6c7086)
+$overlay0Alpha = 6c7086
+
+$surface2 = rgb(585b70)
+$surface2Alpha = 585b70
+
+$surface1 = rgb(45475a)
+$surface1Alpha = 45475a
+
+$surface0 = rgb(313244)
+$surface0Alpha = 313244
+
+$base = rgb(1e1e2e)
+$baseAlpha = 1e1e2e
+
+$mantle = rgb(181825)
+$mantleAlpha = 181825
+
+$crust = rgb(11111b)
+$crustAlpha = 11111b

.config/kitty/kitty.conf

@@ -1,49 +1,38 @@
 include themes/Catppuccin_Mocha.conf
-# include themes/carbonfox.conf 
 
-font_family MesloLGS Nerd Font Mono
+font_family JetBrainsMono Nerd Font
-
+font_size 12.0
-font_size 14.0
 
 cursor_shape beam
 
-background_opacity 0.95
+background_opacity 0.9
 background_blur 12
 
 enable_audio_bell no
 hide_window_decorations yes
 
-# tab bar at bottom
-tab_bar_style powerline
-tab_bar_min_tabs 2
-tab_title_template "{index}:{tab.active_exe}"
-active_tab_title_template "{index}:{tab.active_exe}*"
-tab_bar_background none
-
-macos_quit_when_last_window_closed yes
-macos_titlebar_color background
-macos_show_window_title_in none
-
 shell_integration enabled
 
 map kitty_mod+enter no_op
 map cmd+enter       no_op
 
-# Jump to tabs
+# # tab bar at bottom
-map cmd+1       goto_tab 1
+# tab_bar_style powerline
-map cmd+2       goto_tab 2
+# tab_bar_min_tabs 2
-map cmd+3       goto_tab 3
+# tab_title_template "{index}:{tab.active_exe}"
-map cmd+4       goto_tab 4
+# active_tab_title_template "{index}:{tab.active_exe}*"
-map cmd+5       goto_tab 5
+# tab_bar_background none
-map cmd+6       goto_tab 6
-map cmd+7       goto_tab 7
-map cmd+8       goto_tab 8
-map cmd+9       goto_tab 9
 
-map cmd+t new_tab_with_cwd
+# # Jump to tabs
+# map cmd+1       goto_tab 1
+# map cmd+2       goto_tab 2
+# map cmd+3       goto_tab 3
+# map cmd+4       goto_tab 4
+# map cmd+5       goto_tab 5
+# map cmd+6       goto_tab 6
+# map cmd+7       goto_tab 7
+# map cmd+8       goto_tab 8
+# map cmd+9       goto_tab 9
+#
+# map cmd+t new_tab_with_cwd
 
-# macOS nightmares - CMD/Option navs
-map cmd+backspace send_text all \x15
-map alt+backspace send_text all \x17
-map cmd+left send_text all \x01
-map cmd+right send_text all \x05

.config/kitty/themes/Gruvbox_Dark_Hard.conf

@@ -1,33 +0,0 @@
-## name: Gruvbox Dark Hard
-## author: Pavel Pertsev
-## license: MIT/X11
-## upstream: https://raw.githubusercontent.com/gruvbox-community/gruvbox-contrib/master/kitty/gruvbox-dark-hard.conf
-
-
-selection_foreground    #ebdbb2
-selection_background    #d65d0e
-
-background              #1d2021
-foreground              #ebdbb2
-
-color0                  #3c3836
-color1                  #cc241d
-color2                  #98971a
-color3                  #d79921
-color4                  #458588
-color5                  #b16286
-color6                  #689d6a
-color7                  #a89984
-color8                  #928374
-color9                  #fb4934
-color10                 #b8bb26
-color11                 #fabd2f
-color12                 #83a598
-color13                 #d3869b
-color14                 #8ec07c
-color15                 #fbf1c7
-
-cursor                  #bdae93
-cursor_text_color       #665c54
-
-url_color               #458588

.config/kitty/themes/Rose_Pine.conf

@@ -1,53 +0,0 @@
-## name: Rosé Pine
-## author: mvllow
-## license: MIT
-## upstream: https://github.com/rose-pine/kitty/blob/main/dist/rose-pine.conf
-## blurb: All natural pine, faux fur and a bit of soho vibes for the classy minimalist
-
-foreground               #e0def4
-background               #191724
-selection_foreground     #e0def4
-selection_background     #403d52
-
-cursor                   #524f67
-cursor_text_color        #e0def4
-
-url_color                #c4a7e7
-
-active_tab_foreground    #e0def4
-active_tab_background    #26233a
-inactive_tab_foreground  #6e6a86
-inactive_tab_background  #191724
-
-# black
-color0   #26233a
-color8   #6e6a86
-
-# red
-color1   #eb6f92
-color9   #eb6f92
-
-# green
-color2   #31748f
-color10  #31748f
-
-# yellow
-color3   #f6c177
-color11  #f6c177
-
-# blue
-color4   #9ccfd8
-color12  #9ccfd8
-
-# magenta
-color5   #c4a7e7
-color13  #c4a7e7
-
-# cyan
-color6   #ebbcba
-color14  #ebbcba
-
-# white
-color7   #e0def4
-color15  #e0def4
-

.config/kitty/themes/carbonfox.conf

@@ -1,50 +0,0 @@
-# Nightfox colors for Kitty
-## name: carbonfox
-## upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/carbonfox/kitty.conf
-
-background #161616
-foreground #f2f4f8
-selection_background #2a2a2a
-selection_foreground #f2f4f8
-cursor_text_color #161616
-url_color #25be6a
-
-# Cursor
-# uncomment for reverse background
-# cursor none
-cursor #f2f4f8
-
-# Border
-active_border_color #78a9ff
-inactive_border_color #535353
-bell_border_color #3ddbd9
-
-# Tabs
-active_tab_background #78a9ff
-active_tab_foreground #0c0c0c
-inactive_tab_background #2a2a2a
-inactive_tab_foreground #6e6f70
-
-# normal
-color0 #282828
-color1 #ee5396
-color2 #25be6a
-color3 #08bdba
-color4 #78a9ff
-color5 #be95ff
-color6 #33b1ff
-color7 #dfdfe0
-
-# bright
-color8 #484848
-color9 #f16da6
-color10 #46c880
-color11 #2dc7c4
-color12 #8cb6ff
-color13 #c8a5ff
-color14 #52bdff
-color15 #e4e4e5
-
-# extended colors
-color16 #3ddbd9
-color17 #ff7eb6

.config/nvim/.luarc.json

@@ -0,0 +1,5 @@
+{
+    "diagnostics.globals": [
+        "vim"
+    ]
+}

.config/nvim/lazy-lock.json

@@ -1,44 +1,28 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "b20f287e59a5376ca0de23140c6d94563d64695d" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "55d2ae33ce57de9fcd0cc3c8ee2f225ddbf2cd6a" },
+  "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" },
-  "catpuccin": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" },
+  "catpuccin": { "branch": "main", "commit": "1bf070129c0b6f77cc23f6a2212dcdc868308c52" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "conform.nvim": { "branch": "master", "commit": "2b2b30260203af3b93a7470ac6c8457ddd6e32d9" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
+  "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "gitsigns.nvim": { "branch": "main", "commit": "e399f9748d7cfd8859747c8d6c4e9c8b4d50a1bd" },
-  "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
-  "conform.nvim": { "branch": "master", "commit": "f4e8837878fc5712d053ba3091a73d27d96a09e2" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "fidget.nvim": { "branch": "main", "commit": "9238947645ce17d96f30842e61ba81147185b657" },
+  "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
-  "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "d39a75bbce4b8aad5d627191ea915179c77c100f" },
-  "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
+  "mason-tool-installer.nvim": { "branch": "main", "commit": "75d60a8f928decd8b38897f80849768b7c540a5b" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" },
+  "mason.nvim": { "branch": "main", "commit": "7c7318e8bae7e3536ef6b9e86b9e38e74f2e125e" },
-  "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
+  "mdx.nvim": { "branch": "main", "commit": "464a74be368dce212cff02f6305845dc7f209ab3" },
-  "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
+  "mini.nvim": { "branch": "main", "commit": "009435c6c3653d54bc62997ca6b2e8513bc52cf4" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "2daa8921b7afdcfa47419a21ea343c3df6d74fa0" },
+  "nvim-lint": { "branch": "master", "commit": "fdb04e9285edefbe25a02a31a35e8fbb10fe054d" },
-  "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" },
+  "nvim-lspconfig": { "branch": "master", "commit": "ac1dfbe3b60e5e23a2cff90e3bd6a3bc88031a57" },
-  "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
-  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "mini.nvim": { "branch": "main", "commit": "2faada1cffce5609d78ac5e81eaf3754e0476758" },
-  "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
-  "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" },
-  "nvim-dap": { "branch": "master", "commit": "a6070b4e9e9a8ff1bc513c3748eff27080b0f44a" },
-  "nvim-dap-go": { "branch": "main", "commit": "6aa88167ea1224bcef578e8c7160fe8afbb44848" },
-  "nvim-dap-python": { "branch": "master", "commit": "34282820bb713b9a5fdb120ae8dd85c2b3f49b51" },
-  "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" },
-  "nvim-lint": { "branch": "master", "commit": "1fea92f1d9908eaa5eb8bafe08b4293d7aadaa55" },
-  "nvim-lspconfig": { "branch": "master", "commit": "8b15a1a597a59f4f5306fad9adfe99454feab743" },
-  "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
   "nvim-tmux-navigation": { "branch": "main", "commit": "4898c98702954439233fdaf764c39636681e2861" },
-  "nvim-treesitter": { "branch": "master", "commit": "7e0fcf0d456fc5818da1af35b1a3f5c784fce457" },
+  "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "b0debd5c424969b4baeabdc8f54db3036c691732" },
-  "nvim-web-devicons": { "branch": "master", "commit": "0eb18da56e2ba6ba24de7130a12bcc4e31ad11cb" },
+  "nvim-web-devicons": { "branch": "master", "commit": "d360317f8f509b99229bb31d42269987696df6ff" },
-  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
+  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
-  "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
+  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }
-  "vim-dadbod": { "branch": "master", "commit": "f740950d0703099e0f172016f10e0e39f50fd0ba" },
-  "vim-dadbod-completion": { "branch": "master", "commit": "9e354e86fcc67a5ec2c104f312e374ea2f89c799" },
-  "vim-dadbod-ui": { "branch": "master", "commit": "0fec59e3e1e619e302198cd491b7d27f8d398b7c" }
 }

.config/nvim/lua/lilJ/completions.lua

@@ -1,82 +0,0 @@
-local luasnip = require "luasnip"
-luasnip.config.setup {
-    history = false,
-    updateevents = "TextChanged,TextChangedI",
-}
-
-require("luasnip.loaders.from_vscode").lazy_load()
-
-local lspkind = require "lspkind"
-lspkind.init {}
-
-local cmp = require "cmp"
-cmp.setup {
-    window = {
-        documentation = {
-            border = "rounded",
-        },
-        completion = {
-            border = "rounded",
-        },
-    },
-    sources = {
-        { name = "nvim_lsp" },
-        { name = "path" },
-        { name = "buffer" },
-    },
-    completion = {
-        completeopt = "menu, menuone, noinsert, noselect",
-    },
-    formatting = {
-        fields = { "kind", "abbr", "menu" },
-        expandable_indicator = true,
-        format = lspkind.cmp_format {
-            mode = "symbol",
-        },
-    },
-
-    -- No, but seriously. Please read `:help ins-completion`, it is really good!
-    mapping = cmp.mapping.preset.insert {
-        ["<C-n>"] = cmp.mapping.select_next_item(),
-        ["<C-p>"] = cmp.mapping.select_prev_item(),
-
-        ["<C-b>"] = cmp.mapping.scroll_docs(-4),
-        ["<C-f>"] = cmp.mapping.scroll_docs(4),
-
-        ["<C-y>"] = cmp.mapping.confirm { select = true },
-
-        ["<C-Space>"] = cmp.mapping.complete {},
-
-        -- Think of <c-l> as moving to the right of your snippet expansion.
-        --  So if you have a snippet that's like:
-        --  function $name($args)
-        --    $body
-        --  end
-        --
-        -- <c-l> will move you to the right of each of the expansion locations.
-        -- <c-h> is similar, except moving you backwards.
-        ["<C-l>"] = cmp.mapping(function()
-            if luasnip.expand_or_locally_jumpable() then
-                luasnip.expand_or_jump()
-            end
-        end, { "i", "s" }),
-        ["<C-h>"] = cmp.mapping(function()
-            if luasnip.locally_jumpable(-1) then
-                luasnip.jump(-1)
-            end
-        end, { "i", "s" }),
-    },
-
-    snippet = {
-        expand = function(args)
-            require("luasnip").lsp_expand(args.body)
-        end,
-    },
-}
-
-cmp.setup.filetype({ "sql" }, {
-    sources = {
-        { name = "vim-dadbod-completion" },
-        { name = "buffer" },
-    },
-})

.config/nvim/lua/lilJ/health.lua

@@ -6,47 +6,47 @@
 --]]
 
 local check_version = function()
-	local verstr = string.format("%s.%s.%s", vim.version().major, vim.version().minor, vim.version().patch)
+    local verstr = string.format("%s.%s.%s", vim.version().major, vim.version().minor, vim.version().patch)
-	if not vim.version.cmp then
+    if not vim.version.cmp then
-		vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
+        vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
-		return
+        return
-	end
+    end
 
-	if vim.version.cmp(vim.version(), { 0, 9, 4 }) >= 0 then
+    if vim.version.cmp(vim.version(), { 0, 9, 4 }) >= 0 then
-		vim.health.ok(string.format("Neovim version is: '%s'", verstr))
+        vim.health.ok(string.format("Neovim version is: '%s'", verstr))
-	else
+    else
-		vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
+        vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
-	end
+    end
 end
 
 local check_external_reqs = function()
-	-- Basic utils: `git`, `make`, `unzip`
+    -- Basic utils: `git`, `make`, `unzip`
-	for _, exe in ipairs({ "git", "make", "unzip", "rg" }) do
+    for _, exe in ipairs { "git", "make", "unzip", "rg" } do
-		local is_executable = vim.fn.executable(exe) == 1
+        local is_executable = vim.fn.executable(exe) == 1
-		if is_executable then
+        if is_executable then
-			vim.health.ok(string.format("Found executable: '%s'", exe))
+            vim.health.ok(string.format("Found executable: '%s'", exe))
-		else
+        else
-			vim.health.warn(string.format("Could not find executable: '%s'", exe))
+            vim.health.warn(string.format("Could not find executable: '%s'", exe))
-		end
+        end
-	end
+    end
 
-	return true
+    return true
 end
 
 return {
-	check = function()
+    check = function()
-		vim.health.start("kickstart.nvim")
+        vim.health.start "kickstart.nvim"
 
-		vim.health.info([[NOTE: Not every warning is a 'must-fix' in `:checkhealth`
+        vim.health.info [[NOTE: Not every warning is a 'must-fix' in `:checkhealth`
 
   Fix only warnings for plugins and languages you intend to use.
     Mason will give warnings for languages that are not installed.
-    You do not need to install, unless you want to use those languages!]])
+    You do not need to install, unless you want to use those languages!]]
 
-		local uv = vim.uv or vim.loop
+        local uv = vim.uv or vim.loop
-		vim.health.info("System Information: " .. vim.inspect(uv.os_uname()))
+        vim.health.info("System Information: " .. vim.inspect(uv.os_uname()))
 
-		check_version()
+        check_version()
-		check_external_reqs()
+        check_external_reqs()
-	end,
+    end,
 }

.config/nvim/lua/lilJ/plugins/blink.lua

@@ -0,0 +1,51 @@
+return {
+    "saghen/blink.cmp",
+    event = "InsertEnter",
+
+    -- use a release tag to download pre-built binaries
+    version = "1.*",
+    dependencies = {
+        "folke/lazydev.nvim",
+    },
+
+    ---@module 'blink.cmp'
+    ---@type blink.cmp.Config
+    opts = {
+        -- See :h blink-cmp-config-keymap for defining your own keymap
+        keymap = { preset = "default" },
+
+        appearance = {
+            nerd_font_variant = "mono",
+        },
+
+        completion = {
+            documentation = { auto_show = true, auto_show_delay_ms = 500, window = { border = "rounded" } },
+
+            menu = {
+                border = "rounded",
+                draw = {
+                    columns = {
+                        { "kind_icon", "label", "label_description", gap = 1 },
+                        { "kind" },
+                    },
+                    treesitter = { "lsp" },
+                },
+            },
+        },
+
+        -- Default list of enabled providers defined so that you can extend it
+        -- elsewhere in your config, without redefining it, due to `opts_extend`
+        sources = {
+            default = { "lsp", "path", "lazydev", "snippets", "buffer" },
+            providers = {
+                lazydev = { module = "lazydev.integrations.blink", score_offset = 100 },
+            },
+        },
+
+        fuzzy = { implementation = "prefer_rust_with_warning" },
+
+        -- Shows a signature help window while you type arguments for a function
+        signature = { enabled = true, window = { border = "rounded" } },
+    },
+    opts_extend = { "sources.default" },
+}

.config/nvim/lua/lilJ/plugins/carbonfox.lua

@@ -1,28 +0,0 @@
-return {
-    -- "EdenEast/nightfox.nvim",
-    -- lazy = false,
-    -- priority = 1000,
-    -- init = function()
-    --     require("nightfox").setup {
-    --         transparent_background = true,
-    --     }
-    --     vim.cmd.colorscheme "carbonfox"
-    --
-    --     vim.cmd.hi "Comment gui=none"
-    --     vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
-    --     vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
-    --     vim.api.nvim_set_hl(0, "NormalNC", { bg = "none" })
-    --
-    --     vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {
-    --         border = "rounded",
-    --     })
-    --
-    --     vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, {
-    --         border = "rounded",
-    --     })
-    --
-    --     vim.diagnostic.config {
-    --         float = { border = "rounded" },
-    --     }
-    -- end,
-}

.config/nvim/lua/lilJ/plugins/catppuccin.lua

@@ -8,22 +8,5 @@ return {
             transparent_background = true,
         }
         vim.cmd.colorscheme "catppuccin"
-
-        vim.cmd.hi "Comment gui=none"
-        vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
-        vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
-        vim.api.nvim_set_hl(0, "NormalNC", { bg = "none" })
-
-        vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {
-            border = "rounded",
-        })
-
-        vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, {
-            border = "rounded",
-        })
-
-        vim.diagnostic.config {
-            float = { border = "rounded" },
-        }
     end,
 }

.config/nvim/lua/lilJ/plugins/completions.lua

@@ -1,27 +0,0 @@
-return {
-    "hrsh7th/nvim-cmp",
-    event = "InsertEnter",
-    dependencies = {
-        "onsails/lspkind.nvim",
-        "hrsh7th/cmp-nvim-lsp",
-        "hrsh7th/cmp-path",
-        "hrsh7th/cmp-buffer",
-        {
-            "L3MON4D3/LuaSnip",
-            build = "make install_jsregexp",
-            dependencies = {
-                --    https://github.com/rafamadriz/friendly-snippets
-                {
-                    "rafamadriz/friendly-snippets",
-                    config = function()
-                        require("luasnip.loaders.from_vscode").lazy_load()
-                    end,
-                },
-            },
-        },
-        "saadparwaiz1/cmp_luasnip",
-    },
-    config = function()
-        require "lilJ.completions"
-    end,
-}

.config/nvim/lua/lilJ/plugins/conform.lua

@@ -1,20 +1,31 @@
 return {
     "stevearc/conform.nvim",
+    event = { "BufWritePre" },
+    cmd = { "ConformInfo" },
     opts = {
         notify_on_error = false,
+
         format_on_save = function(bufnr)
-            local disable_filetypes = {}
+            -- Disable "format_on_save lsp_fallback" for languages that don't
-            return {
+            -- have a well standardized coding style. You can add additional
-                timeout_ms = 500,
+            -- languages here or re-enable it for the disabled ones.
-                lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype],
+            local disable_filetypes = { c = true, cpp = true }
-            }
+            if disable_filetypes[vim.bo[bufnr].filetype] then
+                return nil
+            else
+                return {
+                    timeout_ms = 500,
+                    lsp_format = "fallback",
+                }
+            end
         end,
+
         formatters_by_ft = {
-            c = { "clang-format" },
             css = { "prettier" },
             go = { "gofumpt", "goimports_reviser" },
             html = { "prettier" },
             lua = { "stylua" },
+            python = { "autopep8" },
             typescript = { "prettier" },
             typescriptreact = { "prettier" },
         },

.config/nvim/lua/lilJ/plugins/dadbod.lua

@@ -1,5 +0,0 @@
-return {
-    "tpope/vim-dadbod",
-    "kristijanhusak/vim-dadbod-completion",
-    "kristijanhusak/vim-dadbod-ui",
-}

.config/nvim/lua/lilJ/plugins/debug.lua

@@ -1,89 +0,0 @@
--- debug.lua
--- Shows how to use the DAP plugin to debug your code.
---
--- Primarily focused on configuring the debugger for Go, but can
--- be extended to other languages as well. That's why it's called
--- kickstart.nvim and not kitchen-sink.nvim ;)
-
-return {
-    "mfussenegger/nvim-dap",
-    dependencies = {
-        "rcarriga/nvim-dap-ui",
-        "nvim-neotest/nvim-nio",
-        "theHamsta/nvim-dap-virtual-text",
-        "williamboman/mason.nvim",
-        "jay-babu/mason-nvim-dap.nvim",
-
-        -- GO DEBUG
-        "leoluz/nvim-dap-go",
-        "mfussenegger/nvim-dap-python",
-    },
-    config = function()
-        local dap = require "dap"
-        local ui = require "dapui"
-
-        require("dapui").setup()
-        require("dap-go").setup()
-
-        require("nvim-dap-virtual-text").setup {
-            -- This just tries to mitigate the chance that I leak tokens here. Probably won't stop it from happening...
-            -- But I am not a streamer, so I may not want this, or prolly change it in future, but rn its commented
-            --
-            -- display_callback = function(variable)
-            --     local name = string.lower(variable.name)
-            --     local value = string.lower(variable.value)
-            --     if name:match "secret" or name:match "api" or value:match "secret" or value:match "api" then
-            --         return "*****"
-            --     end
-            --
-            --     if #variable.value > 15 then
-            --         return " " .. string.sub(variable.value, 1, 15) .. "... "
-            --     end
-            --
-            --     return " " .. variable.value
-            -- end,
-        }
-
-        require("mason-nvim-dap").setup {
-            automatic_setup = true,
-
-            automatic_installation = true,
-
-            handlers = {},
-            ensure_installed = {
-                "debugpy",
-                "delve",
-            },
-        }
-
-        vim.keymap.set("n", "<leader>dt", dap.toggle_breakpoint, { desc = "Debug: Toggle Breakpoint" })
-
-        vim.keymap.set("n", "<Space>?", function()
-            require("dapui").eval(nil, { enter = true })
-        end)
-
-        -- Basic debugging keymaps, feel free to change to your liking!
-        vim.keymap.set("n", "<F5>", dap.continue, { desc = "Start/Continue" })
-        vim.keymap.set("n", "<F4>", dap.step_into, { desc = "Step Into" })
-        vim.keymap.set("n", "<F3>", dap.step_over, { desc = "Step Over" })
-        vim.keymap.set("n", "<F2>", dap.step_out, { desc = "Step Out" })
-        vim.keymap.set("n", "<F1>", dap.step_back, { desc = "Step Back" })
-        vim.keymap.set("n", "<F10>", dap.restart, { desc = "Restart" })
-
-        dap.listeners.before.attach.dapui_config = function()
-            ui.open()
-        end
-        dap.listeners.before.launch.dapui_config = function()
-            ui.open()
-        end
-        dap.listeners.before.event_terminated.dapui_config = function()
-            ui.close()
-        end
-        dap.listeners.before.event_exited.dapui_config = function()
-            ui.close()
-        end
-
-        require("dap-go").setup()
-        require("dap-python").setup "~/.local/share/nvim/mason/packages/debugpy/venv/bin/python"
-    end,
-}

.config/nvim/lua/lilJ/plugins/indent_line.lua

@@ -1,10 +1,9 @@
 return {
-    {
+    "lukas-reineke/indent-blankline.nvim",
-        "lukas-reineke/indent-blankline.nvim",
+    main = "ibl",
-        main = "ibl",
+    event = "BufReadPre",
-        opts = {
+    opts = {
-            indent = { char = "┊" },
+        indent = { char = "┊" },
-            whitespace = { highlight = { "Whitespace", "NonText" } },
+        whitespace = { highlight = { "Whitespace", "NonText" } },
-        },
     },
 }

.config/nvim/lua/lilJ/plugins/lazydev.lua

@@ -0,0 +1,12 @@
+return {
+    -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins
+    -- used for completion, annotations and signatures of Neovim apis
+    "folke/lazydev.nvim",
+    ft = "lua",
+    opts = {
+        library = {
+            -- Load luvit types when the `vim.uv` word is found
+            { path = "${3rd}/luv/library", words = { "vim%.uv" } },
+        },
+    },
+}

.config/nvim/lua/lilJ/plugins/lint.lua

@@ -1,45 +1,24 @@
 return {
-    {
+    "mfussenegger/nvim-lint",
-        "mfussenegger/nvim-lint",
+    event = { "BufReadPre", "BufNewFile" },
-        event = { "BufReadPre", "BufNewFile" },
+    config = function()
-        config = function()
+        local lint = require "lint"
-            local lint = require "lint"
 
-            lint.linters_by_ft = {
+        lint.linters_by_ft = {
-                python = { "ruff", "mypy" },
+            json = { "jsonlint" },
-                dockerfile = { "hadolint" },
+            python = { "mypy" },
-                json = { "jsonlint" },
+            -- typescript = { "eslint" },
-                markdown = { "vale" },
+            -- typescriptreact = { "eslint" },
-            }
+        }
 
-            -- To allow other plugins to add linters to require('lint').linters_by_ft,
+        -- Create autocommand which carries out the actual linting
-            -- instead set linters_by_ft like this:
+        -- on the specified events.
-            -- lint.linters_by_ft = lint.linters_by_ft or {}
+        local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true })
-            -- lint.linters_by_ft['markdown'] = { 'markdownlint' }
+        vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, {
-            --
+            group = lint_augroup,
-            -- However, note that this will enable a set of default linters,
+            callback = function()
-            -- which will cause errors unless these tools are available:
+                require("lint").try_lint()
-            -- {
+            end,
-            --   dockerfile = { "hadolint" },
+        })
-            --   json = { "jsonlint" },
+    end,
-            --   markdown = { "vale" },
-            --   text = { "vale" }
-            -- }
-            --
-            -- You can disable the default linters by setting their filetypes to nil:
-            -- lint.linters_by_ft['dockerfile'] = nil
-            -- lint.linters_by_ft['json'] = nil
-            -- lint.linters_by_ft['text'] = nil
-
-            -- Create autocommand which carries out the actual linting
-            -- on the specified events.
-            local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true })
-            vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, {
-                group = lint_augroup,
-                callback = function()
-                    require("lint").try_lint()
-                end,
-            })
-        end,
-    },
 }

.config/nvim/lua/lilJ/plugins/lsp.lua

@@ -2,32 +2,167 @@ return {
     "neovim/nvim-lspconfig",
 
     dependencies = {
-        "williamboman/mason.nvim",
+        { "williamboman/mason.nvim", opts = {} },
         "williamboman/mason-lspconfig.nvim",
         "WhoIsSethDaniel/mason-tool-installer.nvim",
 
+        -- Useful status updates for LSP.
         { "j-hui/fidget.nvim", opts = {} },
-
-        { "folke/neodev.nvim", opts = {} },
-
         "b0o/SchemaStore.nvim",
+
+        -- Allows extra capabilities provided by blink.cmp
+        "saghen/blink.cmp",
     },
 
     config = function()
-        local capabilities = nil
+        --  This function gets run when an LSP attaches to a particular buffer.
-        if pcall(require, "cmp_nvim_lsp") then
+        --    That is to say, every time a new file is opened that is associated with
-            capabilities = require("cmp_nvim_lsp").default_capabilities()
+        --    an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this
-        end
+        --    function will be executed to configure the current buffer
+        vim.api.nvim_create_autocmd("LspAttach", {
+            group = vim.api.nvim_create_augroup("lsp-attach", { clear = true }),
+            callback = function(event)
+                local map = function(keys, func, desc, mode)
+                    mode = mode or "n"
+                    vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = "LSP: " .. desc })
+                end
 
-        -- Enable the following language servers
+                -- Opens a popup that displays documentation about the word under your cursor
+                --  See `:help K` for why this keymap.
+                map("K", function()
+                    vim.lsp.buf.hover { border = "rounded" }
+                end, "Hover Documentation")
+
+                -- Jump to the definition of the word under your cursor.
+                --  This is where a variable was first declared, or where a function is defined, etc.
+                --  To jump back, press <C-t>.
+                map("gd", require("telescope.builtin").lsp_definitions, "[G]oto [D]efinition")
+
+                -- Jump to the implementation of the word under your cursor.
+                --  Useful when your language has ways of declaring types without an actual implementation.
+                map("gI", require("telescope.builtin").lsp_implementations, "[G]oto [I]mplementation")
+
+                -- Rename the variable under your cursor.
+                --  Most Language Servers support renaming across files, etc.
+                map("grn", vim.lsp.buf.rename, "[R]e[n]ame")
+
+                -- Execute a code action, usually your cursor needs to be on top of an error
+                -- or a suggestion from your LSP for this to activate.
+                map("gra", vim.lsp.buf.code_action, "[G]oto Code [A]ction", { "n", "x" })
+
+                -- Find references for the word under your cursor.
+                map("grr", require("telescope.builtin").lsp_references, "[G]oto [R]eferences")
+
+                --  This is not Goto Definition, this is Goto Declaration.
+                --  For example, in C this would take you to the header.
+                map("gD", vim.lsp.buf.declaration, "[G]oto [D]eclaration")
+
+                -- Jump to the type of the word under your cursor.
+                --  Useful when you're not sure what type a variable is and you want to see
+                --  the definition of its *type*, not where it was *defined*.
+                map("grt", require("telescope.builtin").lsp_type_definitions, "[G]oto [T]ype Definition")
+
+                -- NOTE: commenting this untile I figure out when to use it
+                -- Fuzzy find all the symbols in your current workspace.
+                --  Similar to document symbols, except searches over your entire project.
+                -- map("gW", require("telescope.builtin").lsp_dynamic_workspace_symbols, "Open Workspace Symbols")
+                ---
+                -- Fuzzy find all the symbols in your current document.
+                --  Symbols are things like variables, functions, types, etc.
+                -- map("gO", require("telescope.builtin").lsp_document_symbols, "Open Document Symbols")
+
+                -- The following two autocommands are used to highlight references of the
+                -- word under your cursor when your cursor rests there for a little while.
+                --    See `:help CursorHold` for information about when this is executed
+                --
+                -- When you move your cursor, the highlights will be cleared (the second autocommand).
+                local client = vim.lsp.get_client_by_id(event.data.client_id)
+                if
+                    client
+                    and client:supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf)
+                then
+                    local highlight_augroup = vim.api.nvim_create_augroup("lsp-highlight", { clear = false })
+
+                    vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, {
+                        buffer = event.buf,
+                        group = highlight_augroup,
+                        callback = vim.lsp.buf.document_highlight,
+                    })
+
+                    vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, {
+                        buffer = event.buf,
+                        group = highlight_augroup,
+                        callback = vim.lsp.buf.clear_references,
+                    })
+
+                    vim.api.nvim_create_autocmd("LspDetach", {
+                        group = vim.api.nvim_create_augroup("lsp-detach", { clear = true }),
+                        callback = function(event2)
+                            vim.lsp.buf.clear_references()
+                            vim.api.nvim_clear_autocmds { group = "lsp-highlight", buffer = event2.buf }
+                        end,
+                    })
+                end
+
+                -- NOTE: commenting this untile I figure out when to use it
+                -- The following code creates a keymap to toggle inlay hints in your
+                -- code, if the language server you are using supports them
+                -- This may be unwanted, since they displace some of your code
+                --
+                -- if client and client:supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then
+                --     map("<leader>th", function()
+                --         vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf })
+                --     end, "[T]oggle Inlay [H]ints")
+                -- end
+            end,
+        })
+
+        -- Diagnostic Config
+        -- See :help vim.diagnostic.Opts
+        vim.diagnostic.config {
+            severity_sort = true,
+            float = { border = "rounded", source = "if_many" },
+            underline = { severity = vim.diagnostic.severity.ERROR },
+            signs = vim.g.have_nerd_font and {
+                text = {
+                    [vim.diagnostic.severity.ERROR] = "󰅚 ",
+                    [vim.diagnostic.severity.WARN] = "󰀪 ",
+                    [vim.diagnostic.severity.INFO] = "󰋽 ",
+                    [vim.diagnostic.severity.HINT] = "󰌶 ",
+                },
+            } or {},
+            virtual_text = {
+                source = "if_many",
+                spacing = 2,
+                format = function(diagnostic)
+                    local diagnostic_message = {
+                        [vim.diagnostic.severity.ERROR] = diagnostic.message,
+                        [vim.diagnostic.severity.WARN] = diagnostic.message,
+                        [vim.diagnostic.severity.INFO] = diagnostic.message,
+                        [vim.diagnostic.severity.HINT] = diagnostic.message,
+                    }
+                    return diagnostic_message[diagnostic.severity]
+                end,
+            },
+        }
+
+        -- LSP servers and clients are able to communicate to each other what features they support.
+        --  By default, Neovim doesn't support everything that is in the LSP specification.
+        --  When you add blink.cmp, luasnip, etc. Neovim now has *more* capabilities.
+        --  So, we create new capabilities with blink.cmp, and then broadcast that to the servers.
+        local capabilities = require("blink.cmp").get_lsp_capabilities()
+
+        -- enable the following language servers
+        --  Add any additional override configuration in the following tables. Available keys are:
+        --  - cmd (table): Override the default command used to start the server
+        --  - filetypes (table): Override the default list of associated filetypes for the server
+        --  - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features.
+        --  - settings (table): Override the default settings passed when initializing the server.
+        --        For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
         local servers = {
-            clangd = {},
             gopls = {
                 filetypes = { "go", "gomod", "gowork", "gotmpl" },
             },
-            html = {
-                filetypes = { "html", "tmpl" },
-            },
             jsonls = {
                 settings = {
                     json = {
@@ -41,41 +176,41 @@ return {
                 -- filetypes = { ...},
                 -- capabilities = {},
                 settings = {
-                    Lua = {
+                    lua = {
                         completion = {
-                            callSnippet = "Replace",
+                            callsnippet = "replace",
                         },
-                        -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
+                        -- you can toggle below to ignore lua_ls's noisy `missing-fields` warnings
                         -- diagnostics = { disable = { 'missing-fields' } },
                     },
                 },
             },
+
             pyright = {},
+
             ts_ls = {},
 
             tailwindcss = {
-                filetypes = { "html", "css", "typescript", "typescriptreact" },
+                filetypes = { "html", "css", "typescript", "typescriptreact", "astro" },
             },
         }
 
-        require("mason").setup()
-
         local ensure_installed = vim.tbl_keys(servers or {})
         vim.list_extend(ensure_installed, {
-            "clang-format",
             "gofumpt",
             "goimports-reviser",
-            "hadolint",
             "jsonlint",
-            "mypy",
             "prettier",
-            "ruff",
+            "mypy",
+            "autopep8",
             "stylua",
-            "vale",
         })
+
         require("mason-tool-installer").setup { ensure_installed = ensure_installed }
 
         require("mason-lspconfig").setup {
+            ensure_installed = {}, -- explicitly set to an empty table because we populates installs via mason-tool-installer
+            automatic_installation = true,
             handlers = {
                 function(server_name)
                     local server = servers[server_name] or {}
@@ -83,79 +218,6 @@ return {
                     require("lspconfig")[server_name].setup(server)
                 end,
             },
-            ensure_installed = {},
-            automatic_installation = true,
         }
-
-        local signs = { Error = " ", Warn = " ", Hint = "󰠠 ", Info = " " }
-        for type, icon in pairs(signs) do
-            local hl = "DiagnosticSign" .. type
-            vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
-        end
-
-        vim.api.nvim_create_autocmd("LspAttach", {
-            group = vim.api.nvim_create_augroup("kickstart-lsp-attach", { clear = true }),
-            callback = function(event)
-                local map = function(keys, func, desc)
-                    vim.keymap.set("n", keys, func, { buffer = event.buf, desc = "LSP: " .. desc })
-                end
-
-                -- Jump to the definition of the word under your cursor.
-                --  This is where a variable was first declared, or where a function is defined, etc.
-                --  To jump back, press <C-t>.
-                map("gd", require("telescope.builtin").lsp_definitions, "[G]oto [D]efinition")
-
-                -- Find references for the word under your cursor.
-                map("gr", require("telescope.builtin").lsp_references, "[G]oto [R]eferences")
-
-                -- Jump to the implementation of the word under your cursor.
-                --  Useful when your language has ways of declaring types without an actual implementation.
-                map("gI", require("telescope.builtin").lsp_implementations, "[G]oto [I]mplementation")
-
-                -- Jump to the type of the word under your cursor.
-                --  Useful when you're not sure what type a variable is and you want to see
-                --  the definition of its *type*, not where it was *defined*.
-                map("<leader>D", require("telescope.builtin").lsp_type_definitions, "Type [D]efinition")
-
-                -- Fuzzy find all the symbols in your current document.
-                --  Symbols are things like variables, functions, types, etc.
-                map("<leader>ds", require("telescope.builtin").lsp_document_symbols, "[D]ocument [S]ymbols")
-
-                -- Fuzzy find all the symbols in your current workspace.
-                --  Similar to document symbols, except searches over your entire project.
-                map("<leader>ws", require("telescope.builtin").lsp_dynamic_workspace_symbols, "[W]orkspace [S]ymbols")
-
-                -- Rename the variable under your cursor.
-                --  Most Language Servers support renaming across files, etc.
-                map("<leader>rn", vim.lsp.buf.rename, "[R]e[n]ame")
-
-                -- Execute a code action, usually your cursor needs to be on top of an error
-                -- or a suggestion from your LSP for this to activate.
-                map("<leader>ca", vim.lsp.buf.code_action, "[C]ode [A]ction")
-
-                -- Opens a popup that displays documentation about the word under your cursor
-                --  See `:help K` for why this keymap.
-                map("K", vim.lsp.buf.hover, "Hover Documentation")
-
-                -- WARN: This is not Goto Definition, this is Goto Declaration.
-                --  For example, in C this would take you to the header.
-                map("gD", vim.lsp.buf.declaration, "[G]oto [D]eclaration")
-
-                -- The following two autocommands are used to highlight references of the
-                -- word under your cursor when your cursor rests there for a little while.
-                local client = vim.lsp.get_client_by_id(event.data.client_id)
-                if client and client.server_capabilities.documentHighlightProvider then
-                    vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, {
-                        buffer = event.buf,
-                        callback = vim.lsp.buf.document_highlight,
-                    })
-
-                    vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, {
-                        buffer = event.buf,
-                        callback = vim.lsp.buf.clear_references,
-                    })
-                end
-            end,
-        })
     end,
 }

.config/nvim/lua/lilJ/plugins/mdx.lua

@@ -0,0 +1,5 @@
+return {
+    "davidmh/mdx.nvim",
+    config = true,
+    dependencies = { "nvim-treesitter/nvim-treesitter" },
+}

.config/nvim/lua/lilJ/plugins/mini.lua

@@ -1,41 +1,44 @@
 return {
     "echasnovski/mini.nvim",
+
     config = function()
-        -- Better Around/Inside textobjects
-        --
-        -- Examples:
-        --  - va)  - [V]isually select [A]round [)]paren
-        --  - yinq - [Y]ank [I]nside [N]ext [']quote
-        --  - ci'  - [C]hange [I]nside [']quote
-        require("mini.ai").setup { n_lines = 500 }
-
-        -- Add/delete/replace surroundings (brackets, quotes, etc.)
-        --
-        -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
-        -- - sd'   - [S]urround [D]elete [']quotes
-        -- - sr)'  - [S]urround [R]eplace [)] [']
-        require("mini.surround").setup()
-
         local statusline = require "mini.statusline"
         statusline.setup { use_icons = vim.g.have_nerd_font }
 
+        local function get_lsp_clients()
+            local clients = vim.lsp.get_clients()
+
+            if #clients == 0 then
+                return ""
+            end
+
+            local names = {}
+            for _, client in ipairs(clients) do
+                table.insert(names, client.name)
+            end
+
+            local lsp_string = table.concat(names, "|")
+            return " " .. lsp_string
+        end
+
         ---@diagnostic disable-next-line: duplicate-set-field
         statusline.active = function()
             local mode, mode_hl = statusline.section_mode { trunc_width = 120 }
-            local git = statusline.section_git {}
+            local diff = statusline.section_diff { trunc_width = 75 }
-            local diagnostics = statusline.section_diagnostics { trunc_width = 75 }
+            local git = statusline.section_git()
-            local filename = statusline.section_filename { trunc_width = 140 }
+            local diagnostics = statusline.section_diagnostics()
-            -- local fileinfo = statusline.section_fileinfo()
+            local fileinfo = MiniStatusline.section_fileinfo { trunc_width = 120 }
             local location = statusline.section_location()
+            local lsp = get_lsp_clients()
 
             return statusline.combine_groups {
                 { hl = mode_hl, strings = { mode } },
-                { hl = "MiniStatuslineDevinfo", strings = { diagnostics } },
+                { hl = "MiniStatuslineDevinfo", strings = { git, diff } },
                 "%<",
-                { hl = "MiniStatuslineFilename", strings = { filename } },
+                { hl = "MiniStatuslineFilename", strings = { fileinfo } },
                 "%=",
-                -- { hl = "MiniStatuslineFileinfo", strings = { fileinfo } },
+                { hl = "MiniStatuslineFilename", strings = { lsp } },
-                { hl = "MiniStatuslineDevinfo", strings = { git } },
+                { hl = "MiniStatuslineDevinfo", strings = { diagnostics } },
                 { hl = mode_hl, strings = { location } },
             }
         end
@@ -51,16 +54,16 @@ return {
 
             local diagnostics = {}
             if buffer_diagnostics.errors > 0 then
-                table.insert(diagnostics, string.format(":%d", buffer_diagnostics.errors))
+                table.insert(diagnostics, string.format(" :%d", buffer_diagnostics.errors))
             end
             if buffer_diagnostics.warnings > 0 then
-                table.insert(diagnostics, string.format(":%d", buffer_diagnostics.warnings))
+                table.insert(diagnostics, string.format(" :%d", buffer_diagnostics.warnings))
             end
             if buffer_diagnostics.info > 0 then
-                table.insert(diagnostics, string.format(":%d", buffer_diagnostics.info))
+                table.insert(diagnostics, string.format(" :%d", buffer_diagnostics.info))
             end
             if buffer_diagnostics.hints > 0 then
-                table.insert(diagnostics, string.format(":%d", buffer_diagnostics.hints))
+                table.insert(diagnostics, string.format(" :%d", buffer_diagnostics.hints))
             end
             return table.concat(diagnostics, " ")
         end

.config/nvim/lua/lilJ/plugins/tmux-navigator.lua

@@ -1,11 +1,7 @@
 return {
     "alexghergh/nvim-tmux-navigation",
-
-    lazy = false,
-
     config = function()
         local nvim_tmux_nav = require "nvim-tmux-navigation"
-
         nvim_tmux_nav.setup {
             disable_when_zoomed = true,
         }

.config/nvim/lua/lilJ/plugins/todo-comments.lua

@@ -1,6 +1,6 @@
 return {
     "folke/todo-comments.nvim",
-    event = "VimEnter",
+    event = "BufRead",
     dependencies = { "nvim-lua/plenary.nvim" },
     opts = { signs = false },
 }

.config/nvim/lua/lilJ/plugins/treesitter.lua

@@ -5,7 +5,7 @@ return {
         "nvim-treesitter/nvim-treesitter-textobjects",
     },
     opts = {
-        ensure_installed = { "c", "go", "html", "lua", "python", "typescript", "tsx" },
+        ensure_installed = { "go", "lua", "typescript" },
         auto_install = true,
         highlight = {
             enable = true,

.config/nvim/lua/lilJ/telescope.lua

@@ -38,7 +38,6 @@ vim.keymap.set("n", "<leader>sh", builtin.help_tags, { desc = "[S]earch [H]elp"
 vim.keymap.set("n", "<leader>sk", builtin.keymaps, { desc = "[S]earch [K]eymaps" })
 vim.keymap.set("n", "<leader>ss", builtin.builtin, { desc = "[S]earch [S]elect Telescope" })
 
--- IDK how to make grep work on my machine... (skill issues tbh)
 vim.keymap.set("n", "<leader>sw", builtin.grep_string, { desc = "[S]earch current [W]ord" })
 vim.keymap.set("n", "<leader>sg", builtin.live_grep, { desc = "[S]earch by [G]rep" })
 
@@ -50,7 +49,7 @@ vim.keymap.set("n", "<leader><leader>", builtin.buffers, { desc = "[ ] Find exis
 -- Slightly advanced example of overriding default behavior and theme
 vim.keymap.set("n", "<leader>/", function()
     builtin.current_buffer_fuzzy_find(require("telescope.themes").get_dropdown {
-        winblend = 50,
+        winblend = 10,
         previewer = false,
     })
 end, { desc = "[/] Fuzzily search in current buffer" })

.config/nvim/plugin/keymaps.lua

@@ -34,8 +34,14 @@ vim.opt.hlsearch = true
 set("n", "<Esc>", "<cmd>nohlsearch<CR>")
 
 -- Diagnostic keymaps
-set("n", "[d", vim.diagnostic.goto_prev, { desc = "Go to previous [D]iagnostic message" })
+set("n", "[d", function()
-set("n", "]d", vim.diagnostic.goto_next, { desc = "Go to next [D]iagnostic message" })
+    vim.diagnostic.jump { count = -1, float = true }
+end, { desc = "Go to previous [D]iagnostic message" })
+
+set("n", "]d", function()
+    vim.diagnostic.jump { count = 1, float = true }
+end, { desc = "Go to next [D]iagnostic message" })
+
 set("n", "<leader>q", vim.diagnostic.setloclist, { desc = "Open diagnostic [Q]uickfix list" })
 set("n", "<leader>e", vim.diagnostic.open_float, { desc = "Show diagnostic [E]rror messages" })
 
@@ -50,6 +56,6 @@ vim.api.nvim_create_autocmd("TextYankPost", {
     desc = "Highlight when yanking (copying) text",
     group = vim.api.nvim_create_augroup("highlight-yank", { clear = true }),
     callback = function()
-        vim.highlight.on_yank()
+        vim.hl.on_yank()
     end,
 })

.config/nvim/plugin/options.lua

@@ -1,7 +1,5 @@
 local opt = vim.opt
 
--- Use 4 space tabs
--- TODO: Change this back when no company work
 opt.tabstop = 4
 opt.softtabstop = 4
 opt.shiftwidth = 4
@@ -46,3 +44,4 @@ vim.o.linebreak = true
 vim.o.wrap = true
 vim.o.breakindent = true
 vim.o.showbreak = "↳ "
+-- vim.o.winborder = "rounded"

.config/rofi/config.rasi

@@ -0,0 +1,99 @@
+configuration{
+    modi: "drun,run,window";
+    icon-theme: "Papirus-Dark";
+    show-icons: true;
+    drun-display-format: "{icon} {name}";
+    location: 0;
+    disable-history: false;
+    hide-scrollbar: true;
+    display-drun: "   Apps ";
+    display-run: "   Run ";
+    display-window: "   Window";
+    display-Network: " 󰤨  Network";
+    sidebar-mode: true;
+}
+
+@theme "catpuccin-mocha"
+
+element-text, element-icon , mode-switcher {
+    background-color: inherit;
+    text-color:       inherit;
+}
+
+window {
+    height: 360px;
+    border: 3px;
+    border-color: @border-col;
+    background-color: @bg-col;
+}
+
+mainbox {
+    background-color: @bg-col;
+}
+
+inputbar {
+    children: [prompt,entry];
+    background-color: @bg-col;
+    border-radius: 5px;
+    padding: 2px;
+}
+
+prompt {
+    background-color: @blue;
+    padding: 6px;
+    text-color: @bg-col;
+    border-radius: 3px;
+    margin: 20px 0px 0px 20px;
+}
+
+textbox-prompt-colon {
+    expand: false;
+    str: ":";
+}
+
+entry {
+    padding: 6px;
+    margin: 20px 0px 0px 10px;
+    text-color: @fg-col;
+    background-color: @bg-col;
+}
+
+listview {
+    border: 0px 0px 0px;
+    padding: 6px 0px 0px;
+    margin: 10px 0px 0px 20px;
+    columns: 2;
+    background-color: @bg-col;
+}
+
+element {
+    padding: 5px;
+    background-color: @bg-col;
+    text-color: @fg-col  ;
+}
+
+element-icon {
+    size: 25px;
+}
+
+element selected {
+    background-color:  @selected-col ;
+    text-color: @fg-col2  ;
+}
+
+mode-switcher {
+    spacing: 0;
+  }
+
+button {
+    padding: 10px;
+    background-color: @bg-col-light;
+    text-color: @grey;
+    vertical-align: 0.5; 
+    horizontal-align: 0.5;
+}
+
+button selected {
+  background-color: @bg-col;
+  text-color: @blue;
+}

.config/rofi/themes/catpuccin-mocha.rasi

@@ -0,0 +1,13 @@
+* {
+    bg-col:  #1e1e2e;
+    bg-col-light: #1e1e2e;
+    border-col: #1e1e2e;
+    selected-col: #1e1e2e;
+    blue: #89b4fa;
+    fg-col: #cdd6f4;
+    fg-col2: #f38ba8;
+    grey: #6c7086;
+
+    width: 600;
+    font: "JetBrainsMono Nerd Font 14";
+}

.config/sketchybar/items/battery.sh

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-COLOR="$BLUE"
-
-sketchybar --add item battery right \
-	--set battery \
-	update_freq=60 \
-	icon.color="$COLOR" \
-	icon.padding_left=10 \
-	label.padding_right=10 \
-	label.color="$COLOR" \
-	background.height=21 \
-	background.corner_radius="$CORNER_RADIUS" \
-	background.padding_right=5 \
-	background.border_width="$BORDER_WIDTH" \
-	background.border_color="$COLOR" \
-	background.color="$BAR_COLOR" \
-	background.drawing=on \
-	script="$PLUGIN_DIR/power.sh" \
-	--subscribe battery power_source_change

.config/sketchybar/items/calendar.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-COLOR="$BLUE"
-
-sketchybar --add item calendar center\
-	--set calendar update_freq=15 \
-	icon.color="$COLOR" \
-	icon.padding_left=10 \
-	label.color="$COLOR" \
-	label.padding_right=10 \
-	background.height=21 \
-	background.corner_radius="$CORNER_RADIUS" \
-	background.padding_right=5 \
-	background.border_width="$BORDER_WIDTH" \
-	background.border_color="$COLOR" \
-	background.color="$BAR_COLOR" \
-	background.drawing=on \
-	script="$PLUGIN_DIR/calendar.sh"

.config/sketchybar/items/clock.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-COLOR="$BLUE"
-
-sketchybar --add item clock right \
-	--set clock update_freq=1 \
-	icon.padding_left=10 \
-	icon.color="$COLOR" \
-	icon="" \
-	label.color="$COLOR" \
-	label.width=54 \
-	label.padding_right=5 \
-	align=center \
-	background.height=21 \
-	background.corner_radius="$CORNER_RADIUS" \
-	background.padding_right=2 \
-	background.border_width="$BORDER_WIDTH" \
-	background.border_color="$COLOR" \
-	background.color="$BAR_COLOR" \
-	background.drawing=on \
-	script="$PLUGIN_DIR/clock.sh"

.config/sketchybar/items/front_app.sh

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-COLOR="$WHITE"
-
-sketchybar \
-	--add item front_app left \
-	--set front_app script="$PLUGIN_DIR/front_app.sh" \
-	icon.drawing=off \
-	background.height=21 \
-	background.padding_left=0 \
-	background.padding_right=10 \
-	background.border_width="$BORDER_WIDTH" \
-	background.border_color="$COLOR" \
-	background.corner_radius="$CORNER_RADIUS" \
-	background.color="$BAR_COLOR" \
-	label.color="$COLOR" \
-	label.padding_left=10 \
-	label.padding_right=10 \
-	associated_display=active \
-	--subscribe front_app front_app_switched

.config/sketchybar/items/spaces.sh

@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-
-source "$HOME/.config/sketchybar/variables.sh"
-
-sketchybar --add item spacer.1 left \
-	--set spacer.1 background.drawing=off \
-	label.drawing=off \
-	icon.drawing=off \
-	width=10
-
-for i in "${!SPACE_ICONS[@]}"; do
-	sid=$((i + 1))
-	sketchybar --add space space.$sid left \
-		--set space.$sid associated_space=$sid \
-		label.drawing=off \
-		icon.padding_left=10 \
-		icon.padding_right=10 \
-		background.padding_left=-5 \
-		background.padding_right=-5 \
-		script="$PLUGIN_DIR/space.sh"
-done
-
-sketchybar --add item spacer.2 left \
-	--set spacer.2 background.drawing=off \
-	label.drawing=off \
-	icon.drawing=off \
-	width=5
-
-sketchybar --add bracket spaces '/space.*/' \
-	--set spaces background.border_width="$BORDER_WIDTH" \
-	background.border_color="$BLUE" \
-	background.corner_radius="$CORNER_RADIUS" \
-	background.color="$BAR_COLOR" \
-	background.height=21 \
-	background.drawing=on
-
-sketchybar --add item separator left \
-	icon.font="$FONT:Regular:16.0" \
-	background.padding_left=26 \
-	background.padding_right=15 \
-	label.drawing=off \
-	associated_display=active \
-	icon.color="$YELLOW"

.config/sketchybar/plugins/calendar.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-sketchybar --set "$NAME" icon="󰸗" label="$(date '+%a, %d %b')"

.config/sketchybar/plugins/clock.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-LABEL=$(date '+%H:%M')
-sketchybar --set "$NAME" label="$LABEL"

.config/sketchybar/plugins/front_app.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-case "$SENDER" in
-"front_app_switched")
-	sketchybar --set "$NAME" label="$INFO"
-	;;
-esac

.config/sketchybar/plugins/power.sh

@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-PERCENTAGE=$(pmset -g batt | grep -Eo "\d+%" | cut -d% -f1)
-CHARGING=$(pmset -g batt | grep 'AC Power')
-
-if [ "$PERCENTAGE" = "" ]; then
-	exit 0
-fi
-
-case ${PERCENTAGE} in
-9[0-9] | 100)
-	ICON=""
-	;;
-[6-8][0-9])
-	ICON=""
-	;;
-[3-5][0-9])
-	ICON=""
-	;;
-[1-2][0-9])
-	ICON=""
-	;;
-*) ICON="" ;;
-esac
-
-if [ "$CHARGING" != "" ]; then
-	ICON=""
-fi
-
-sketchybar --set "$NAME" icon="$ICON" label="${PERCENTAGE}% "

.config/sketchybar/plugins/space.sh

@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-source "$HOME/.config/sketchybar/variables.sh" # Loads all defined colors
-
-SPACE_CLICK_SCRIPT="yabai -m space --focus $SID 2>/dev/null"
-
-if [ "$SELECTED" = "true" ]; then
-	sketchybar --animate tanh 5 --set "$NAME" \
-		icon.color="$BLUE" \
-		icon="${SPACE_ICONS[$SID - 1]}" \
-		click_script="$SPACE_CLICK_SCRIPT"
-else
-	sketchybar --animate tanh 5 --set "$NAME" \
-		icon.color="$COMMENT" \
-		icon="${SPACE_ICONS[$SID - 1]}" \
-		click_script="$SPACE_CLICK_SCRIPT"
-fi

.config/sketchybar/sketchybarrc

@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-
-source "$HOME/.config/sketchybar/variables.sh"
-
-sketchybar --bar height=27 \
-	color="$TRANSPARENT" \
-	shadow="$SHADOW" \
-	position=top \
-	y_offset=0 \
-	padding_right=11 \
-	padding_left=10 \
-	blur_radius=0 \
-	--default updates=when_shown \
-	icon.font="$FONT:Bold:13.5" \
-	icon.color="$ICON_COLOR" \
-	icon.padding_left="$PADDINGS" \
-	icon.padding_right="$PADDINGS" \
-	label.font="$FONT:Bold:13.0" \
-	label.color="$LABEL_COLOR" \
-	label.padding_left="$PADDINGS" \
-	label.padding_right="$PADDINGS" \
-	background.padding_right="$PADDINGS" \
-	background.padding_left="$PADDINGS" \
-    # corner_radius="$CORNER_RADIUS" \
-	# sticky=on \
-	# margin=5 \
-
-source "$ITEM_DIR/spaces.sh"
-source "$ITEM_DIR/front_app.sh"
-
-source "$ITEM_DIR/calendar.sh"
-
-source "$ITEM_DIR/clock.sh"
-source "$ITEM_DIR/battery.sh"
-
-sketchybar --hotload true
-
-sketchybar --update
-
-echo "sketchybar configuration loaded.."

.config/sketchybar/variables.sh

@@ -1,53 +0,0 @@
-#!/usr/bin/env sh
-
-# Color Palette
-# Tokyonight Night
-# BLACK=0xff24283b
-# WHITE=0xffa9b1d6
-# MAGENTA=0xffbb9af7
-# BLUE=0xff7aa2f7
-# CYAN=0xff7dcfff
-# GREEN=0xff9ece6a
-# YELLOW=0xffe0af68
-# ORANGE=0xffff9e64
-# RED=0xfff7768e
-# BAR_COLOR=0xff1a1b26
-# COMMENT=0xff565f89
-
-# Oxocarbon Theme
-BLACK=0xff161616
-WHITE=0xfff2f4f8
-MAGENTA=0xffbe95ff
-BLUE=0xff82cfff
-CYAN=0xff3ddbd9
-GREEN=0xff42be65
-YELLOW=0xffffe97b
-ORANGE=0xffff7eb6
-RED=0xff3ddbd9
-BAR_COLOR=0xff161616
-COMMENT=0xff525252
-
-# TRANSPARENT=0x110000cc
-TRANSPARENT=0x00ffffff
-
-ICON_COLOR=$WHITE
-LABEL_COLOR=$WHITE
-
-ITEM_DIR="$HOME/.config/sketchybar/items"
-PLUGIN_DIR="$HOME/.config/sketchybar/plugins"
-
-FONT="MesloLGS Nerd Font Mono"
-
-PADDINGS=3
-
-POPUP_BORDER_WIDTH=2
-POPUP_CORNER_RADIUS=11
-POPUP_BACKGROUND_COLOR=$BLACK
-POPUP_BORDER_COLOR=$COMMENT
-
-CORNER_RADIUS=15
-BORDER_WIDTH=1
-
-SHADOW=on
-
-SPACE_ICONS=("一" "二" "三" "四" "五" "六" "七" "八" "九" "十")

.config/skhd/skhdrc

@@ -1,75 +0,0 @@
-# OPEN IT, This too conflicts with some macos keybinds, fuck me
-# cmd - return : /Applications/kitty.app/Contents/MacOS/kitty --single-instance -d ~
-# cmd - return : /Applications/WezTerm.app/Contents/MacOS/wezterm start --cwd ~
-
-# focus window
-alt - h : yabai -m window --focus west
-alt - j : yabai -m window --focus south
-alt - k : yabai -m window --focus north
-alt - l : yabai -m window --focus east
-
-# swap managed window
-shift + alt - h : yabai -m window --swap west
-shift + alt - j : yabai -m window --swap south
-shift + alt - k : yabai -m window --swap north
-shift + alt - l : yabai -m window --swap east
-
-# move managed window
-# shift + cmd - h : yabai -m window --warp east
-
-# balance size of windows
-shift + alt - 0 : yabai -m space --balance
-
-# make floating window fill screen
-# shift + alt - up     : yabai -m window --grid 1:1:0:0:1:1
-
-# make floating window fill left-half of screen
-# shift + alt - left   : yabai -m window --grid 1:2:0:0:1:1
-
-# create desktop, move window and follow focus - uses jq for parsing json (brew install jq)
-# shift + cmd - n : yabai -m space --create && \
-#                   index="$(yabai -m query --spaces --display | jq 'map(select(."is-native-fullscreen" == false))[-1].index')" && \
-#                   yabai -m window --space "${index}" && \
-#                   yabai -m space --focus "${index}"
-
-# fast focus desktop
-# cmd + alt - x : yabai -m space --focus recent
-cmd + alt - 1 : yabai -m space --focus 1
-cmd + alt - 2 : yabai -m space --focus 2
-cmd + alt - 3 : yabai -m space --focus 3
-
-# shift + cmd overlaps with mac shortcut for screenshots... find a alternate for this
-# send window to desktop and follow focus
-# shift + cmd - z : yabai -m window --space next; yabai -m space --focus next
-# shift + cmd - 1 : yabai -m window --space  1; yabai -m space --focus 1
-# shift + cmd - 2 : yabai -m window --space  2; yabai -m space --focus 2
-# shift + cmd - 3 : yabai -m window --space  3; yabai -m space --focus 3
-
-# move floating window
-# shift + ctrl - a : yabai -m window --move rel:-20:0
-# shift + ctrl - s : yabai -m window --move rel:0:20
-
-# increase window size
-# shift + alt - a : yabai -m window --resize left:-20:0
-# cmd + alt - a : yabai -m window --resize left:-20:0
-# shift + alt - w : yabai -m window --resize top:0:-20
-
-# decrease window size
-# shift + cmd - s : yabai -m window --resize bottom:0:-20
-# shift + cmd - w : yabai -m window --resize top:0:20
-
-# set insertion point in focused container
-# ctrl + alt - h : yabai -m window --insert west
-
-# toggle window zoom
-# alt - d : yabai -m window --toggle zoom-parent
-# alt - f : yabai -m window --toggle zoom-fullscreen
-
-# toggle window split type
-alt - e : yabai -m window --toggle split
-
-# float / unfloat window and center on screen
-alt - t : yabai -m window --toggle float --grid 4:4:1:1:2:2
-
-# toggle sticky(+float), picture-in-picture
-# alt - p : yabai -m window --toggle sticky --toggle pip

.config/starship.toml

@@ -1,32 +1,15 @@
 "$schema" = 'https://starship.rs/config-schema.json'
 
-add_newline = true
+format = "$directory$bun$golang$python$git_branch$git_status$git_state[ ❯](bold yellow)[❯](bold mauve)[❯](bold sapphire)\n$character"
-continuation_prompt = '▶▶ '
-format = """$directory$all$character"""
 palette = "catppuccin_mocha"
 
-[aws]
-symbol = ""
-
-[aws.region_aliases]
-ap-southeast-1 = 'in'
-
-# [aws.profile_aliases]
-# Enterprise_Naming_Scheme-voidstars = 'void**'
-
 [bun]
-format = '[🍞 bun $version ](bold green)'
+format = '[bun ${version}](bold yellow)'
-version_format = '${major}.${minor}'
+version_format = 'v${major}.${minor}'
-
-[c]
-detect_extensions = ['c', 'cpp']
-format = '[$symbol $name-$version ]($style)'
-symbol = ""
-version_format = '${major}.${minor}'
 
 [character]
-success_symbol = "[➜](bold green)"
+success_symbol = "[➜](bold peach)"
-error_symbol = "[✗](bold red)"
+error_symbol = "[✗](bold maroon)"
 
 [cmd_duration]
 disabled = true
@@ -36,60 +19,33 @@ home_symbol= "󰊠 "
 truncation_length = 2
 truncate_to_repo = true
 truncation_symbol = "󰊠 "
-style = "bold blue"
+style = "bold lavender"
-
-[docker_context]
-format = 'in [$symbol$context]($style) '
 
 [git_branch]
-format='[ $symbol$branch :\($remote_branch\) ]($style)'
+format='[ $symbol$branch]($style)'
-style='bold purple'
+style='bold mauve'
 symbol=" "
-always_show_remote = true
 
 [git_state]
-cherry_pick = '[🍒 PICKING](bold red)'
+cherry_pick = '[🍒](bold maroon)'
-
-[git_metrics]
-# format = '[+$added]($added_style) [-$deleted]($deleted_style) '
-disabled = false
 
 [git_status]
-format = '([\[$all_status$ahead_behind\]]($style) )'
+format = '([\[$all_status$ahead_behind\]]($style))'
-up_to_date = '✓'
+style = 'peach'
+staged = '[++\($count\)](green)'
+up_to_date = '[✓](green)'
+untracked = '[ \($count\)](maroon)'
+modified = '[ \($count\)](yellow)'
+deleted = '[✘\($count\)](red)'
 ahead = '⇡${count}'
 diverged = '⇕⇡${ahead_count}⇣${behind_count}'
 behind = '⇣${count}'
-stashed = '📦'
+renamed = '»\($count\)'
-staged = '[++\($count\)](green)'
+stashed = '襁'
-
 
 [golang]
-format = '[ $version ](bold cyan)'
+format = '[ ${version}](bold $style)'
-version_format = '${major}.${minor}'
+version_format = 'v${major}.${minor}'
-
-[nodejs]
-detect_files = ['!bun.lockb']
-format = '[$symbol$version ]($style)'
-version_format = '${major}.${minor}'
-
-[package]
-format = '[pkg $symbol$version]($style) '
-disabled = false
-
-[palettes.carbonfox]
-red = "#ee5396"
-green = "#25be6a"
-purple = "#be95ff"
-yellow = "#08bdba"
-os_bg = "#7b7c7e"
-os_fg = "#0c0c0c"
-dir_bg = "#25be6a"
-dir_fg = "#161616"
-git_bg = "#08bdba"
-git_fg = "#252525"
-lang_bg = "#78a9ff"
-lang_fg = "#353535"
 
 [palettes.catppuccin_mocha]
 rosewater = "#f5e0dc"
@@ -121,10 +77,5 @@ crust = "#11111b"
 
 [python]
 symbol = " "
-format = '[(\($virtualenv\) )${symbol}(${version} )]($style)'
+format = '[(\($virtualenv\))${symbol}${version}]($style)'
-version_format = '${major}.${minor}'
+version_format = 'v${major}.${minor}'
-
-[sudo]
-format = '[ as sudo]($style)'	
-style = 'bold blue'
-disabled = false

.config/tmux/tmux.conf

@@ -13,10 +13,6 @@ set -g pane-base-index 1
 set-window-option -g pane-base-index 1
 set-option -g renumber-windows on
 
-set -g @plugin 'catppuccin/tmux#v1.0.1'
-
-set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'christoomey/vim-tmux-navigator'
 
 # Better split window keybind and same directory for new panes
@@ -30,39 +26,19 @@ bind -r j select-pane -D
 bind -r h select-pane -L
 bind -r l select-pane -R
 
-# Nightfox colors for Tmux
+set -g @plugin 'catppuccin/tmux'
-# Style: carbonfox
-# Upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/carbonfox/carbonfox.tmux
-# set -g mode-style "fg=#0c0c0c,bg=#b6b8bb"
-# set -g message-style "fg=#0c0c0c,bg=#b6b8bb"
-# set -g message-command-style "fg=#0c0c0c,bg=#b6b8bb"
-# set -g pane-border-style "fg=#b6b8bb"
-# set -g pane-active-border-style "fg=#78a9ff"
-# set -g status "on"
-# set -g status-justify "left"
-# set -g status-style "fg=#b5b8bb,bg=#0c0c0c"
-# set -g status-left-length "100"
-# set -g status-right-length "100"
-# set -g status-left-style NONE
-# set -g status-right-style NONE
-# set -g status-left ""
-# set -g status-right "#[fg=#0c0c0c,bg=#b6b8bb,,nobold,nounderscore,noitalics] #W #[fg=#0c0c0c,bg=#78a9ff,bold] #S "
-# setw -g window-status-activity-style "underscore,fg=#7b7c7e,bg=#0c0c0c"
-# setw -g window-status-separator ""
-# setw -g window-status-style "NONE,fg=#7b7c7e,bg=#0c0c0c"
-# setw -g window-status-format "#[fg=#0c0c0c,bg=#0c0c0c,nobold,nounderscore,noitalics]#[default] #I #{b:pane_current_path} "
-# setw -g window-status-current-format "#[fg=#0c0c0c,bg=#b6b8bb,bold] #I #{b:pane_current_path} "
-
 # Catpuccin Theme....
-set -g status-right "#{E:@catppuccin_status_application}#{E:@catppuccin_status_session}"
 set -g status-left ""
-set -g @catppuccin_pane_active_border_style "fg=#{@thm_peach}"
+set -g status-right "#{E:@catppuccin_status_application}"
-set -g @catppuccin_window_current_background "#{@thm_lavender}"
+set -ag status-right "#{E:@catppuccin_status_session}"
-set -g @catppuccin_window_status_style "basic"
+set -g @catppuccin_window_current_number_color "#{@thm_peach}"
 
-set -g @catppuccin_window_default_text " #W"
+set -ogq @catppuccin_window_text " #W"
-set -g @catppuccin_window_current_text " #W"
+set -ogq @catppuccin_window_current_text " #W"
-set -g @catppuccin_window_status "icon"
+set -ogq @catppuccin_status_left_separator "█"
-set -g @catppuccin_window_current_background "#{@thm_peach}"
+set -ogq @catppuccin_window_flags "icon"
 
+
+# RUN TPM
+set -g @plugin 'tmux-plugins/tpm'
 run '~/.config/tmux/plugins/tpm/tpm'

.config/waybar/config.jsonc

@@ -0,0 +1,120 @@
+{
+    "layer": "top",
+    "position": "top",
+    "height": 26,
+    "spacing": 0,
+    "margin-top": 4,
+    "margin-right": 4,
+    "margin-bottom": 0,
+    "margin-left": 4,
+    "modules-left": [
+        "custom/icon",
+        "hyprland/workspaces",
+        "hyprland/window"
+    ],
+    "modules-center": [
+        "clock"
+    ],
+    "modules-right": [
+        "tray",
+        "network",
+        "pulseaudio",
+        "memory",
+        "battery"
+        // "custom/lock"
+    ],
+    "custom/icon": {
+        "format": "󰣇",
+        // "on-click": "rofi -show drun",
+        "tooltip": false
+    },
+    "hyprland/workspaces": {
+        "on-click": "activate",
+        "format": "{icon}",
+        "format-icons": {
+            "urgent": "",
+            "active": "",
+            "default": ""
+        },
+        "persistent-workspaces": {
+            "*": 3
+        }
+    },
+    "hyprland/window": {
+        "format": " {class}",
+        "empty_format": "",
+        "rewrite": {
+            "(.*)zen(.*)": "󰈹 Zen Browser",
+            "(.*)ghostty(.*)": " Neovim"
+        }
+    },
+    "clock": {
+        "format": "<b>󰥔  {:%H:%M   󰃭  %d.%m}</b> ",
+        "tooltip-format": "<tt>{calendar}</tt>"
+    },
+    "tray": {
+        "icon-size": 14,
+        "spacing": 10
+    },
+    "network": {
+        "interval": 30,
+        "format-wifi": "󰤨 ",
+        "format-ethernet": "󰈀 Wired",
+        "fomat-disconnected": "󱚵  Disconnected",
+        "tooltip-format-wifi": "{essid} ({signalStrength}% | {bandwidthDownBits}, {bandwidthUpBits})",
+        "tooltip-format-ethernet": "{ifname} ",
+        "tooltip-format-disconnected": "Disconnected"
+    },
+    "memory": {
+        "interval": 30,
+        "format": "  {used:0.1f}G/{total:0.1f}G"
+    },
+    "pulseaudio": {
+        "format": "{icon} {volume}%",
+        "format-muted": " Muted",
+        "scroll-step": 1,
+        // "on-click": "pavucontrol",
+        "format-icons": {
+            "headphone": "",
+            "hands-free": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": [
+                "",
+                "",
+                "󰕾",
+                ""
+            ]
+        }
+    },
+    "battery": {
+        "states": {
+            "good": 95,
+            "warning": 30,
+            "critical": 20
+        },
+        "format": "{icon} {capacity}%",
+        "format-charging": " {capacity}%",
+        "format-plugged": " {capacity}%",
+        "format-alt": "{time} {icon}",
+        "format-icons": [
+            "󰂎",
+            "󰁺",
+            "󰁻",
+            "󰁼",
+            "󰁽",
+            "󰁾",
+            "󰁿",
+            "󰂀",
+            "󰂁",
+            "󰂂",
+            "󰁹"
+        ]
+    },
+    "custom/lock": {
+        "format": "",
+        "on-click": "wlogout"
+    }
+}

.config/waybar/mocha.css

@@ -0,0 +1,25 @@
+@define-color rosewater #f5e0dc;
+@define-color fl #f2cdcd;
+@define-color pink #f5c2e7;
+@define-color vl #cba6f7;
+@define-color red #eba0ac;
+@define-color peach #fab387;
+@define-color yellow #f9e2af;
+@define-color green #a6e3a1;
+@define-color teal #94e2d5;
+@define-color sky #89dceb;
+@define-color sapphire #74c7ec;
+@define-color blue #89b4fa;
+@define-color lavender #b4befe;
+@define-color fg #cdd6f4;
+@define-color subtext1 #bac2de;
+@define-color subtext0 #a6adc8;
+@define-color overlay2 #9399b2;
+@define-color overlay1 #7f849c;
+@define-color overlay0 #6c7086;
+@define-color surface2 #585b70;
+@define-color surface1 #45475a;
+@define-color surface0 #313244;
+@define-color bg #1e1e2e;
+@define-color bg2 #181825;
+@define-color crust #11111b;

.config/waybar/style.css

@@ -0,0 +1,116 @@
+@import "mocha.css";
+
+* {
+  font-family: "JetBrainsMono Nerd Font";
+  font-weight: bold;
+  font-size: 12px;
+}
+
+window#waybar {
+  color: @fg;
+  background-color: @bg2;
+  border-radius: 6px;
+}
+
+/* ------ Custom Modules ------ */
+#custom-icon {
+  font-size: 18px;
+  color: @blue;
+  padding: 0 10px;
+}
+
+/* Workspaces */
+#workspaces {
+  padding: 0px 3px;
+  margin: 5px;
+  font-family: JetBrainsMono Nerd Font;
+}
+
+#workspaces button {
+  padding: 0px 2px;
+  color: @peach;
+  background-color: transparent;
+  font-family: JetBrainsMono Nerd Font;
+}
+
+#workspaces button.active {
+  color: @fg;
+}
+
+#workspaces button.urgent {
+  color: @red;
+}
+
+/* ------ Window Title ------ */
+#window {
+  padding: 2px 8px;
+  color: @fg;
+}
+
+/* ------ Clock ------ */
+#clock {
+  padding: 2px 12px;
+  margin: 5px;
+  color: @lavender;
+  background-color: @bg;
+  border-radius: 8px;
+}
+
+/* ------ Tray ------ */
+#tray {
+  padding: 2px 12px;
+  margin: 5px;
+  background-color: @bg;
+  border-radius: 0px;
+}
+
+/* ------ Network ------ */
+#network {
+  padding: 2px 8px;
+  margin: 4px 2px;
+  color: @text;
+  background-color: @bg;
+}
+
+#pulseaudio {
+  padding: 2px 8px;
+  margin: 5px;
+  color: @yellow;
+  background-color: @bg;
+}
+
+#pulseaudio.muted {
+  color: @red;
+}
+
+#memory {
+  padding: 2px 8px;
+  margin: 5px;
+  color: @red;
+  background-color: @bg;
+  border-radius: 0px;
+}
+
+/* ------ Battery ------ */
+#battery {
+  padding: 2px 8px;
+  margin: 5px;
+  color: @green;
+  background-color: @bg;
+}
+
+/* #custom-power { */
+/*   color: @red; */
+/*   background-color: @surface1; */
+/*   padding: 2px 9px; */
+/*   margin: 4px 2px; */
+/*   font-size: 15px; */
+/* } */
+
+tooltip {
+  border: 1px solid @blue;
+  background: @bg2;
+  margin: 20px;
+  padding: 15px;
+  border-radius: 14px;
+}

.config/wezterm/wezterm.lua

@@ -1,29 +0,0 @@
-local wezterm = require("wezterm")
-
-local config = {
-	enable_tab_bar = false,
-	window_decorations = "RESIZE",
-	window_close_confirmation = "NeverPrompt",
-	font = wezterm.font("MesloLGS Nerd Font Mono"),
-	font_size = 14.0,
-	color_scheme = "Catppuccin Mocha",
-	-- color_scheme = "carbonfox",
-	window_background_opacity = 0.95,
-	window_padding = {
-		left = 0,
-		right = 0,
-		top = 0,
-		bottom = 0,
-	},
-	macos_window_background_blur = 10,
-}
-
--- uncomment this if not using with some wm
--- local mux = wezterm.mux
---
--- wezterm.on("gui-startup", function()
--- 	local _, _, window = mux.spawn_window({})
--- 	window:gui_window():maximize()
--- end)
-
-return config

.config/yabai/yabairc

@@ -1,49 +0,0 @@
-#!/usr/bin/env sh
-
-yabai -m signal --add event=dock_did_restart action="sudo yabai --load-sa"
-sudo yabai --load-sa
-
-# global settings
-yabai -m config                                 \
-    external_bar                 all:27:0       \
-    menubar_opacity              1.0            \
-    mouse_follows_focus          off            \
-    focus_follows_mouse          off            \
-    display_arrangement_order    default        \
-    window_origin_display        default        \
-    window_placement             second_child   \
-    window_zoom_persist          on             \
-    window_shadow                on             \
-    window_animation_duration    0.0            \
-    window_animation_easing      ease_out_circ  \
-    window_opacity               off            \
-    insert_feedback_color        0xffd75f5f     \
-    split_ratio                  0.50           \
-    split_type                   auto           \
-    auto_balance                 off            \
-    top_padding                  08             \
-    bottom_padding               08             \
-    left_padding                 08             \
-    right_padding                08             \
-    window_gap                   08             \
-    layout                       bsp            \
-    mouse_modifier               alt            \
-    mouse_action1                move           \
-    mouse_action2                resize         \
-    mouse_drop_action            swap
-
-
-yabai -m rule --add app="^System Settings$" manage=off
-yabai -m rule --add app="^Calculator$" manage=off
-yabai -m rule --add app="^Finder$" manage=off
-yabai -m rule --add app="^Preview$" manage=off
-yabai -m rule --add app="^Spotify$" manage=off
-yabai -m rule --add app="^Safari$" manage=off
-yabai -m rule --add app="^App Store$" manage=off
-yabai -m rule --add app="^Activity Monitor$" manage=off
-yabai -m rule --add label="Software Update" title="Software Update" manage=off
-yabai -m rule --add app="System Information" manage=off
-
-borders active_color=0xff82cfff inactive_color=0xff494d64 width=4.0 &
-
-echo "yabai configuration loaded.."

.gitignore

@@ -1,9 +1,16 @@
 *.DS_Store**
 
 # tmux plugin files etc
-*.config/tmux/**
+tmux/**
 **!tmux/tmux.conf
 
 # btop files
 *btop/**
 !btop/btop.conf
+
+procps
+pulse
+systemd
+yay
+lazygit
+dconf

.stow-local-ignore

@@ -19,10 +19,13 @@ _darcs
 \#.*\#       # emacs autosave files
 
 ^/README.*
+^/readme.*
 ^/LICENSE.*
 ^/COPYING
 
+# extra stuff not part of configs
 install.sh
 assets
-cool-icons
+
-readme.md
+.bashrc
+^/alacritty*

.zshrc

@@ -1,14 +1,6 @@
-# ---- homebrew ----
+# ---- Aliases ----
-eval "$(/opt/homebrew/bin/brew shellenv)"
-
-# ---- Git Aliases ----
-alias ga='git add'
-alias gaa='git add -A'
-alias gcm='git commit -m'
-alias gpsh='git push'
-alias gs='git status'
-
 alias ls='lsd'
+alias lg='lazygit'
 alias nv='nvim'
 alias neofetch="fastfetch"
 alias python='python3'
@@ -25,7 +17,5 @@ eval "$(zoxide init --cmd cd zsh)"
 # ---- fzf ----
 source <(fzf --zsh)
 
-# ---- Syntax Highlighting ----
+export EDITOR="nvim"
-source /nix/store/5vkzp4m7aazakijfaq579mk5i40j57x0-zsh-syntax-highlighting-0.8.0/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+export MANPAGER="nvim +Man!"
-
-eval "$(direnv hook zsh)"

install.sh

@@ -1,73 +1,21 @@
-#!/bin/zsh
+#!/bin/bash
 
 # ---- Terminal ----
+
 echo "Installing your Teminal and other thingies..."
-brew install fastfetch
+yay -S git ghostty starship neovim ttf-jetbrains-mono-nerd tmux fzf lsd ripgrep zoxide lazygit fastfetch stow btop
-brew install font-meslo-lg-nerd-font
-brew install fzf
-brew install git
-brew install kitty
-brew install lsd
-brew install neovim
-brew install ripgrep
-brew install starship
-brew install stow
-brew install tmux
-brew install zoxide
-brew install zsh-syntax-highlighting
 
 echo "Creating symlinks using GNU STOW"
 stow .
 
-echo "Sourcing zsh config It should work now atleast"
+echo "changing default shell to z-shell"
+sudo chsh -s $(which zsh)
 source ~/.zshrc
 
-# ---- Maybe sometimes idk ----
+yay -S bun-bin go node npm
-# brew install btop
-# brew install oven-sh/bun/bun
-# brew install go
-# brew install node
-# brew install pnpm
-# brew install wezterm
 
 # ---- Applications ----
 echo "Installing the Applications..."
-brew install --cask discord
+yay -S zen-browser-bin discord docker spotify
-brew install --cask docker
-brew install --cask google-chrome
-brew install --cask httpie
-# brew install --cask keka
-brew install --cask obsidian
-brew install --cask raycast
-brew install --cask spotify
-brew install --cask telegram
-
-
-yabai() {
-    brew install koekeishiya/formulae/yabai
-    brew install koekeishiya/formulae/skhd
-    brew install FelixKratz/formulae/borders
-    brew install FelixKratz/formulae/sketchybar
-    
-    yabai --start-service
-    skhd --start-service
-    brew services start borders
-    brew services start sketchybar
-}
-
-install_yabai=false
-
-for arg in "$@"; do
-    if [ "$arg" = "--yabai" ]; then
-        install_yabai=true
-        break
-    fi
-done
-
-if $install_yabai; then
-    echo "Installing yabaiiiiiiiii...."
-    yabai
-fi
 
 echo "setup complete...\n"
-echo "Install few apps from binaries,gfckin Ice installation method...\n"

readme.md

@@ -1,29 +1,10 @@
 <h2 align="center">
     <b style="font-size:24px;line-height:24px;vertical-align:middle;">
-        <i>JJs dotfiles</i>
+        <i>lilJs dotfiles</i>
     </b>
 </h2>
 
-![](./assets/kitty-cat.png)
+![](./assets/)
-
-![](./assets/nvim-cat.png)
-
-![](./assets/telescope-cat.png)
-
-![](./assets/home_.png)
-
-<details>
-    <summary>
-        <b>Yabai tiling wm</b>
-        <span style="font-size:14px;"></span>
-    </summary>
-
-
-![](./assets/yabai-fox.png)
-
-![](./assets/nvim-wez-fox.png)
-
-</details>
 
 ### 🚀 Installation
 
@@ -33,15 +14,14 @@
 git clone https://github.com/kulvirdotgg/dotFiles.git
 ```
 
-2. Run `install.sh` script. (provide `--yabai` flag to install **yabai** tiling window manager)
+2. Run `install.sh` script.
 
 ```sh
 cd dotFiles
 ./install.sh
 ```
 
-3. Install `tmux tpm` from their [repo](https://github.com/tmux-plugins/tpm) as it causes some conflicts with my config.
+3. Install `tmux tpm` from their [repo](https://github.com/tmux-plugins/tpm)
-
+```sh
-### Manual setup thingies (Ice age things)
+git clone https://github.com/tmux-plugins/tpm ~/.config/tmux/plugins/tpm
-- [Arc](https://arc.net)
+```
-- Use Cool icons for terminal (Aplications > {app} > Content > Resrouces)