diff --git a/bash/.bashrc b/.bashrc
similarity index 65%
rename from bash/.bashrc
rename to .bashrc
index 6de642e..684a745 100644
--- a/bash/.bashrc
+++ b/.bashrc
@@ -1,7 +1,11 @@
-#fortune | cowsay -f tux "ara ara kulvir kun"
+# homebrew
+eval "$(/opt/homebrew/bin/brew shellenv)"
+
+# ---- zoxide ----
+eval "$(zoxide init --cmd cd bash)"
# ----------------------
-# Git Aliases
+# Aliases
# ----------------------
alias ga='git add'
alias gaa='git add -A'
@@ -11,25 +15,22 @@ alias gpl='git pull'
alias gp='git push'
alias gs='git status'
+alias ls='lsd'
+alias cd='z'
+alias nv='nvim'
+alias neofetch="fastfetch"
alias python='python3'
-alias nv='nvim'
-
-# Air for GO hot reload
+# ---- Air for GO ----
alias air="~/go/bin/air"
-# homebrew
-eval "$(/opt/homebrew/bin/brew shellenv)"
-
-# cool to use tools (if ever wanted to)
-alias neofetch="macchina"
-# neofetch
-
-# bun
+# ---- bun ----
export BUN_INSTALL="$HOME/.bun"
export PATH="$BUN_INSTALL/bin:$PATH"
-
-# bun completions
[ -s "/Users/kulvir/.bun/_bun" ] && source "/Users/kulvir/.bun/_bun"
+# ---- starship ----
eval "$(starship init bash)"
+
+# ---- node wtf idk but fine ----
+export PATH="/opt/homebrew/opt/node@20/bin:$PATH"
diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..10b2a46
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,245 @@
+---
+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
+...
diff --git a/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml
similarity index 100%
rename from alacritty/alacritty.toml
rename to .config/alacritty/alacritty.toml
diff --git a/alacritty/themes/catppuccin-mocha.toml b/.config/alacritty/themes/catppuccin-mocha.toml
similarity index 100%
rename from alacritty/themes/catppuccin-mocha.toml
rename to .config/alacritty/themes/catppuccin-mocha.toml
diff --git a/alacritty/themes/rose-pine.toml b/.config/alacritty/themes/rose-pine.toml
similarity index 100%
rename from alacritty/themes/rose-pine.toml
rename to .config/alacritty/themes/rose-pine.toml
diff --git a/btop/btop.conf b/.config/btop/btop.conf
similarity index 99%
rename from btop/btop.conf
rename to .config/btop/btop.conf
index 2ce5170..d1f1fc9 100644
--- a/btop/btop.conf
+++ b/.config/btop/btop.conf
@@ -1,4 +1,4 @@
-#? Config file for btop v. 1.3.2
+#? Config file for btop v. 1.4.0
#* 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"
diff --git a/fastfetch/config.jsonc b/.config/fastfetch/config.jsonc
similarity index 100%
rename from fastfetch/config.jsonc
rename to .config/fastfetch/config.jsonc
diff --git a/git/config b/.config/git/config
similarity index 100%
rename from git/config
rename to .config/git/config
diff --git a/kitty/kitty-dark.icns b/.config/kitty/kitty-dark.icns
similarity index 100%
rename from kitty/kitty-dark.icns
rename to .config/kitty/kitty-dark.icns
diff --git a/kitty/kitty.conf b/.config/kitty/kitty.conf
similarity index 100%
rename from kitty/kitty.conf
rename to .config/kitty/kitty.conf
diff --git a/kitty/themes/Catppuccin_Mocha.conf b/.config/kitty/themes/Catppuccin_Mocha.conf
similarity index 100%
rename from kitty/themes/Catppuccin_Mocha.conf
rename to .config/kitty/themes/Catppuccin_Mocha.conf
diff --git a/kitty/themes/Gruvbox_Dark_Hard.conf b/.config/kitty/themes/Gruvbox_Dark_Hard.conf
similarity index 100%
rename from kitty/themes/Gruvbox_Dark_Hard.conf
rename to .config/kitty/themes/Gruvbox_Dark_Hard.conf
diff --git a/kitty/themes/Rose_Pine.conf b/.config/kitty/themes/Rose_Pine.conf
similarity index 100%
rename from kitty/themes/Rose_Pine.conf
rename to .config/kitty/themes/Rose_Pine.conf
diff --git a/kitty/themes/carbonfox.conf b/.config/kitty/themes/carbonfox.conf
similarity index 100%
rename from kitty/themes/carbonfox.conf
rename to .config/kitty/themes/carbonfox.conf
diff --git a/nvim/init.lua b/.config/nvim/init.lua
similarity index 100%
rename from nvim/init.lua
rename to .config/nvim/init.lua
diff --git a/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
similarity index 100%
rename from nvim/lazy-lock.json
rename to .config/nvim/lazy-lock.json
diff --git a/nvim/lua/lilJ/completions.lua b/.config/nvim/lua/lilJ/completions.lua
similarity index 100%
rename from nvim/lua/lilJ/completions.lua
rename to .config/nvim/lua/lilJ/completions.lua
diff --git a/nvim/lua/lilJ/health.lua b/.config/nvim/lua/lilJ/health.lua
similarity index 100%
rename from nvim/lua/lilJ/health.lua
rename to .config/nvim/lua/lilJ/health.lua
diff --git a/nvim/lua/lilJ/plugins/carbonfox.lua b/.config/nvim/lua/lilJ/plugins/carbonfox.lua
similarity index 100%
rename from nvim/lua/lilJ/plugins/carbonfox.lua
rename to .config/nvim/lua/lilJ/plugins/carbonfox.lua
diff --git a/nvim/lua/lilJ/plugins/catppuccin.lua b/.config/nvim/lua/lilJ/plugins/catppuccin.lua
similarity index 100%
rename from nvim/lua/lilJ/plugins/catppuccin.lua
rename to .config/nvim/lua/lilJ/plugins/catppuccin.lua
diff --git a/nvim/lua/lilJ/plugins/comment.lua b/.config/nvim/lua/lilJ/plugins/comment.lua
similarity index 100%
rename from nvim/lua/lilJ/plugins/comment.lua
rename to .config/nvim/lua/lilJ/plugins/comment.lua
diff --git a/nvim/lua/lilJ/plugins/completions.lua b/.config/nvim/lua/lilJ/plugins/completions.lua
similarity index 100%
rename from nvim/lua/lilJ/plugins/completions.lua
rename to .config/nvim/lua/lilJ/plugins/completions.lua
diff --git a/nvim/lua/lilJ/plugins/conform.lua b/.config/nvim/lua/lilJ/plugins/conform.lua
similarity index 100%
rename from nvim/lua/lilJ/plugins/conform.lua
rename to .config/nvim/lua/lilJ/plugins/conform.lua
diff --git a/nvim/lua/lilJ/plugins/dadbod.lua b/.config/nvim/lua/lilJ/plugins/dadbod.lua
similarity index 100%
rename from nvim/lua/lilJ/plugins/dadbod.lua
rename to .config/nvim/lua/lilJ/plugins/dadbod.lua
diff --git a/nvim/lua/lilJ/plugins/debug.lua b/.config/nvim/lua/lilJ/plugins/debug.lua
similarity index 100%
rename from nvim/lua/lilJ/plugins/debug.lua
rename to .config/nvim/lua/lilJ/plugins/debug.lua
diff --git a/nvim/lua/lilJ/plugins/gitsigns.lua b/.config/nvim/lua/lilJ/plugins/gitsigns.lua
similarity index 100%
rename from nvim/lua/lilJ/plugins/gitsigns.lua
rename to .config/nvim/lua/lilJ/plugins/gitsigns.lua
diff --git a/nvim/lua/lilJ/plugins/indent_line.lua b/.config/nvim/lua/lilJ/plugins/indent_line.lua
similarity index 100%
rename from nvim/lua/lilJ/plugins/indent_line.lua
rename to .config/nvim/lua/lilJ/plugins/indent_line.lua
diff --git a/nvim/lua/lilJ/plugins/lint.lua b/.config/nvim/lua/lilJ/plugins/lint.lua
similarity index 100%
rename from nvim/lua/lilJ/plugins/lint.lua
rename to .config/nvim/lua/lilJ/plugins/lint.lua
diff --git a/nvim/lua/lilJ/plugins/lsp.lua b/.config/nvim/lua/lilJ/plugins/lsp.lua
similarity index 100%
rename from nvim/lua/lilJ/plugins/lsp.lua
rename to .config/nvim/lua/lilJ/plugins/lsp.lua
diff --git a/nvim/lua/lilJ/plugins/mini.lua b/.config/nvim/lua/lilJ/plugins/mini.lua
similarity index 100%
rename from nvim/lua/lilJ/plugins/mini.lua
rename to .config/nvim/lua/lilJ/plugins/mini.lua
diff --git a/nvim/lua/lilJ/plugins/telescope.lua b/.config/nvim/lua/lilJ/plugins/telescope.lua
similarity index 100%
rename from nvim/lua/lilJ/plugins/telescope.lua
rename to .config/nvim/lua/lilJ/plugins/telescope.lua
diff --git a/nvim/lua/lilJ/plugins/tmux-navigator.lua b/.config/nvim/lua/lilJ/plugins/tmux-navigator.lua
similarity index 100%
rename from nvim/lua/lilJ/plugins/tmux-navigator.lua
rename to .config/nvim/lua/lilJ/plugins/tmux-navigator.lua
diff --git a/nvim/lua/lilJ/plugins/todo-comments.lua b/.config/nvim/lua/lilJ/plugins/todo-comments.lua
similarity index 100%
rename from nvim/lua/lilJ/plugins/todo-comments.lua
rename to .config/nvim/lua/lilJ/plugins/todo-comments.lua
diff --git a/nvim/lua/lilJ/plugins/treesitter.lua b/.config/nvim/lua/lilJ/plugins/treesitter.lua
similarity index 100%
rename from nvim/lua/lilJ/plugins/treesitter.lua
rename to .config/nvim/lua/lilJ/plugins/treesitter.lua
diff --git a/nvim/lua/lilJ/telescope.lua b/.config/nvim/lua/lilJ/telescope.lua
similarity index 100%
rename from nvim/lua/lilJ/telescope.lua
rename to .config/nvim/lua/lilJ/telescope.lua
diff --git a/nvim/plugin/keymaps.lua b/.config/nvim/plugin/keymaps.lua
similarity index 100%
rename from nvim/plugin/keymaps.lua
rename to .config/nvim/plugin/keymaps.lua
diff --git a/nvim/plugin/options.lua b/.config/nvim/plugin/options.lua
similarity index 100%
rename from nvim/plugin/options.lua
rename to .config/nvim/plugin/options.lua
diff --git a/nvim/plugin/terminal.lua b/.config/nvim/plugin/terminal.lua
similarity index 100%
rename from nvim/plugin/terminal.lua
rename to .config/nvim/plugin/terminal.lua
diff --git a/nvim/stylua.toml b/.config/nvim/stylua.toml
similarity index 100%
rename from nvim/stylua.toml
rename to .config/nvim/stylua.toml
diff --git a/sketchybar/items/battery.sh b/.config/sketchybar/items/battery.sh
similarity index 100%
rename from sketchybar/items/battery.sh
rename to .config/sketchybar/items/battery.sh
diff --git a/sketchybar/items/calendar.sh b/.config/sketchybar/items/calendar.sh
similarity index 100%
rename from sketchybar/items/calendar.sh
rename to .config/sketchybar/items/calendar.sh
diff --git a/sketchybar/items/clock.sh b/.config/sketchybar/items/clock.sh
similarity index 100%
rename from sketchybar/items/clock.sh
rename to .config/sketchybar/items/clock.sh
diff --git a/sketchybar/items/front_app.sh b/.config/sketchybar/items/front_app.sh
similarity index 100%
rename from sketchybar/items/front_app.sh
rename to .config/sketchybar/items/front_app.sh
diff --git a/sketchybar/items/spaces.sh b/.config/sketchybar/items/spaces.sh
similarity index 100%
rename from sketchybar/items/spaces.sh
rename to .config/sketchybar/items/spaces.sh
diff --git a/sketchybar/plugins/calendar.sh b/.config/sketchybar/plugins/calendar.sh
similarity index 100%
rename from sketchybar/plugins/calendar.sh
rename to .config/sketchybar/plugins/calendar.sh
diff --git a/sketchybar/plugins/clock.sh b/.config/sketchybar/plugins/clock.sh
similarity index 100%
rename from sketchybar/plugins/clock.sh
rename to .config/sketchybar/plugins/clock.sh
diff --git a/sketchybar/plugins/front_app.sh b/.config/sketchybar/plugins/front_app.sh
similarity index 100%
rename from sketchybar/plugins/front_app.sh
rename to .config/sketchybar/plugins/front_app.sh
diff --git a/sketchybar/plugins/power.sh b/.config/sketchybar/plugins/power.sh
similarity index 100%
rename from sketchybar/plugins/power.sh
rename to .config/sketchybar/plugins/power.sh
diff --git a/sketchybar/plugins/space.sh b/.config/sketchybar/plugins/space.sh
similarity index 100%
rename from sketchybar/plugins/space.sh
rename to .config/sketchybar/plugins/space.sh
diff --git a/sketchybar/sketchybarrc b/.config/sketchybar/sketchybarrc
similarity index 100%
rename from sketchybar/sketchybarrc
rename to .config/sketchybar/sketchybarrc
diff --git a/sketchybar/variables.sh b/.config/sketchybar/variables.sh
similarity index 100%
rename from sketchybar/variables.sh
rename to .config/sketchybar/variables.sh
diff --git a/skhd/skhdrc b/.config/skhd/skhdrc
similarity index 86%
rename from skhd/skhdrc
rename to .config/skhd/skhdrc
index c65f1af..a91582b 100755
--- a/skhd/skhdrc
+++ b/.config/skhd/skhdrc
@@ -1,4 +1,4 @@
-# OPEN IT
+# 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 ~
@@ -38,10 +38,11 @@ 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 - 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
@@ -49,9 +50,9 @@ shift + cmd - 2 : yabai -m window --space 2; yabai -m space --focus 2
# shift + ctrl - s : yabai -m window --move rel:0:20
# increase window size
-shift + alt - a : yabai -m window --resize left:-20:0
+# 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
+# shift + alt - w : yabai -m window --resize top:0:-20
# decrease window size
# shift + cmd - s : yabai -m window --resize bottom:0:-20
diff --git a/starship.toml b/.config/starship.toml
similarity index 90%
rename from starship.toml
rename to .config/starship.toml
index 3b483a9..e55d071 100644
--- a/starship.toml
+++ b/.config/starship.toml
@@ -15,10 +15,11 @@ ap-southeast-1 = 'in'
# Enterprise_Naming_Scheme-voidstars = 'void**'
[bun]
-format = '[🍞bun $version ](bold green)'
+format = '[🍞 bun $version ](bold green)'
version_format = '${major}.${minor}'
[c]
+detect_extensions = ['c', 'cpp']
format = '[$symbol $name-$version ]($style)'
symbol = ""
version_format = '${major}.${minor}'
@@ -68,10 +69,13 @@ format = '[ $version ](bold cyan)'
version_format = '${major}.${minor}'
[nodejs]
-disabled = true
+detect_files = ['!bun.lockb']
+format = '[$symbol$version ]($style)'
+version_format = '${major}.${minor}'
[package]
-disabled = true
+format = '[pkg $symbol$version]($style) '
+disabled = false
[palettes.carbonfox]
red = "#ee5396"
diff --git a/.config/tmux/plugins/tmux b/.config/tmux/plugins/tmux
new file mode 160000
index 0000000..c43c10f
--- /dev/null
+++ b/.config/tmux/plugins/tmux
@@ -0,0 +1 @@
+Subproject commit c43c10fe94862410e5c82e8ef8f21d9776faf351
diff --git a/.config/tmux/plugins/tpm b/.config/tmux/plugins/tpm
new file mode 160000
index 0000000..99469c4
--- /dev/null
+++ b/.config/tmux/plugins/tpm
@@ -0,0 +1 @@
+Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946
diff --git a/.config/tmux/plugins/vim-tmux-navigator b/.config/tmux/plugins/vim-tmux-navigator
new file mode 160000
index 0000000..a9b52e7
--- /dev/null
+++ b/.config/tmux/plugins/vim-tmux-navigator
@@ -0,0 +1 @@
+Subproject commit a9b52e7d36114d40350099f254b5f299a35df978
diff --git a/tmux/tmux.conf b/.config/tmux/tmux.conf
similarity index 99%
rename from tmux/tmux.conf
rename to .config/tmux/tmux.conf
index 6867e34..c5137d6 100644
--- a/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -1,26 +1,4 @@
#!/usr/bin/env bash
-# Nightfox colors for 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} "
set-option -sa terminal-overrides ",xterm*:Tc"
set -g mouse on
@@ -52,4 +30,28 @@ bind -r j select-pane -D
bind -r h select-pane -L
bind -r l select-pane -R
+# Nightfox colors for 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} "
+
+
run '~/.config/tmux/plugins/tpm/tpm'
diff --git a/wezterm/wezterm.lua b/.config/wezterm/wezterm.lua
similarity index 51%
rename from wezterm/wezterm.lua
rename to .config/wezterm/wezterm.lua
index 8b1f1c0..811022f 100644
--- a/wezterm/wezterm.lua
+++ b/.config/wezterm/wezterm.lua
@@ -18,26 +18,12 @@ local config = {
macos_window_background_blur = 10,
}
-config.leader = { key = "d", mods = "CTRL", timeout_milliseconds = 1000 }
-config.keys = {
- {
- key = "|",
- mods = "LEADER",
- action = wezterm.action.SplitHorizontal({ domain = "CurrentPaneDomain" }),
- },
- {
- key = "-",
- mods = "LEADER",
- action = wezterm.action.SplitVertical({ domain = "CurrentPaneDomain" }),
- },
-}
-
-- 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)
+-- local mux = wezterm.mux
+--
+-- wezterm.on("gui-startup", function()
+-- local _, _, window = mux.spawn_window({})
+-- window:gui_window():maximize()
+-- end)
return config
diff --git a/yabai/yabairc b/.config/yabai/yabairc
similarity index 83%
rename from yabai/yabairc
rename to .config/yabai/yabairc
index fb05f7e..cf4829f 100755
--- a/yabai/yabairc
+++ b/.config/yabai/yabairc
@@ -16,14 +16,6 @@ yabai -m config \
window_shadow on \
window_animation_duration 0.0 \
window_animation_easing ease_out_circ \
- window_opacity_duration 0.0 \
- window_border on \
- window_border on \
- window_border_width 6 \
- active_window_border_color 0xE032CD32 \
- normal_window_border_color 0xE02d74da \
- active_window_opacity 1.0 \
- normal_window_opacity 0.90 \
window_opacity off \
insert_feedback_color 0xffd75f5f \
split_ratio 0.50 \
@@ -44,6 +36,7 @@ yabai -m config \
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
diff --git a/.gitignore b/.gitignore
index 9805436..d6c5ef2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,8 @@
*.DS_Store**
# tmux plugin files etc
-*tmux/**
-!tmux/tmux.conf
-
-# zsh history file
-*zsh/**
-!zsh/.zshrc
-
-*zed/**
+*.config/tmux/**
+**!tmux/tmux.conf
# btop files
*btop/**
diff --git a/.stow-local-ignore b/.stow-local-ignore
new file mode 100644
index 0000000..559de4b
--- /dev/null
+++ b/.stow-local-ignore
@@ -0,0 +1,26 @@
+# Comments and blank lines are allowed.
+
+RCS
+.+,v
+
+CVS
+\.\#.+ # CVS conflict files / emacs lock files
+\.cvsignore
+
+\.svn
+_darcs
+\.hg
+
+\.git
+\.gitignore
+\.gitmodules
+
+.+~ # emacs backup files
+\#.*\# # emacs autosave files
+
+^/README.*
+^/LICENSE.*
+^/COPYING
+
+install.sh
+assets
diff --git a/zsh/.zshrc b/.zshrc
similarity index 86%
rename from zsh/.zshrc
rename to .zshrc
index fe80af1..45c7a2a 100644
--- a/zsh/.zshrc
+++ b/.zshrc
@@ -1,6 +1,12 @@
+# ---- homebrew ----
+eval "$(/opt/homebrew/bin/brew shellenv)"
+
### ---- Syntax Highlighting ----
source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+# ---- zoxide ----
+eval "$(zoxide init --cmd cd zsh)"
+
# ---- Git Aliases ----
alias ga='git add'
alias gaa='git add -A'
@@ -9,16 +15,10 @@ alias gp='git pull'
alias gpsh='git push'
alias gs='git status'
-alias python='python3'
-
alias ls='lsd'
alias nv='nvim'
-
-# cool to use tools (if ever wanted to)
alias neofetch="fastfetch"
-
-# ---- homebrew ----
-eval "$(/opt/homebrew/bin/brew shellenv)"
+alias python='python3'
# ---- Air GO hot reload ----
alias air="~/go/bin/air"
@@ -27,10 +27,10 @@ alias air="~/go/bin/air"
export BUN_INSTALL="$HOME/.bun"
export PATH="$BUN_INSTALL/bin:$PATH"
-# bun completions
[ -s "/Users/kulvir/.bun/_bun" ] && source "/Users/kulvir/.bun/_bun"
+# ---- startship ----
eval "$(starship init zsh)"
-export PATH="/opt/homebrew/opt/node@20/bin:$PATH"
-source <(fzf --zsh)
+# ---- node wtf idk but fine ----
+export PATH="/opt/homebrew/opt/node@20/bin:$PATH"
diff --git a/__sketchybar/app_icons.lua b/__sketchybar/app_icons.lua
deleted file mode 100644
index 3487782..0000000
--- a/__sketchybar/app_icons.lua
+++ /dev/null
@@ -1,210 +0,0 @@
-return {
- ["Typora"] = ":text:",
- ["Orion"] = ":orion:",
- ["Orion RC"] = ":orion:",
- ["Grammarly Editor"] = ":grammarly:",
- ["kitty"] = ":kitty:",
- ["ClickUp"] = ":click_up:",
- ["Iris"] = ":iris:",
- ["PomoDone App"] = ":pomodone:",
- ["qutebrowser"] = ":qute_browser:",
- ["Raindrop.io"] = ":raindrop_io:",
- ["Airmail"] = ":airmail:",
- ["Affinity Publisher 2"] = ":affinity_publisher_2:",
- ["Calendar"] = ":calendar:",
- ["日历"] = ":calendar:",
- ["Fantastical"] = ":calendar:",
- ["Cron"] = ":calendar:",
- ["Amie"] = ":calendar:",
- ["Figma"] = ":figma:",
- ["Element"] = ":element:",
- ["Signal"] = ":signal:",
- ["Mattermost"] = ":mattermost:",
- ["Caprine"] = ":caprine:",
- ["Microsoft To Do"] = ":things:",
- ["Things"] = ":things:",
- ["Godot"] = ":godot:",
- ["Android Messages"] = ":android_messages:",
- ["Zed"] = ":zed:",
- ["Anytype"] = ":anytype:",
- ["TeamSpeak 3"] = ":team_speak:",
- ["LibreWolf"] = ":libre_wolf:",
- ["neovide"] = ":neovide:",
- ["Spotlight"] = ":spotlight:",
- ["微信"] = ":wechat:",
- ["Dropbox"] = ":dropbox:",
- ["Transmit"] = ":transmit:",
- ["TickTick"] = ":tick_tick:",
- ["Parallels Desktop"] = ":parallels:",
- ["Audacity"] = ":audacity:",
- ["Rider"] = ":rider:",
- ["JetBrains Rider"] = ":rider:",
- ["DEVONthink 3"] = ":devonthink3:",
- ["Docker"] = ":docker:",
- ["Docker Desktop"] = ":docker:",
- ["Matlab"] = ":matlab:",
- ["VLC"] = ":vlc:",
- ["Alacritty"] = ":alacritty:",
- ["Pages"] = ":pages:",
- ["Pages 文稿"] = ":pages:",
- ["Bear"] = ":bear:",
- ["Pine"] = ":pine:",
- ["Affinity Designer 2"] = ":affinity_designer_2:",
- ["Keyboard Maestro"] = ":keyboard_maestro:",
- ["Joplin"] = ":joplin:",
- ["mpv"] = ":mpv:",
- ["zoom.us"] = ":zoom:",
- ["Affinity Photo 2"] = ":affinity_photo_2:",
- ["Music"] = ":music:",
- ["音乐"] = ":music:",
- ["League of Legends"] = ":league_of_legends:",
- ["Tor Browser"] = ":tor_browser:",
- ["Hyper"] = ":hyper:",
- ["WhatsApp"] = ":whats_app:",
- ["카카오톡"] = ":kakaotalk:",
- ["Discord"] = ":discord:",
- ["Discord Canary"] = ":discord:",
- ["Discord PTB"] = ":discord:",
- ["Neovide"] = ":vim:",
- ["MacVim"] = ":vim:",
- ["Vim"] = ":vim:",
- ["VimR"] = ":vim:",
- ["Keynote"] = ":keynote:",
- ["Keynote 讲演"] = ":keynote:",
- ["iTerm"] = ":iterm:",
- ["IntelliJ IDEA"] = ":idea:",
- ["Finder"] = ":finder:",
- ["访达"] = ":finder:",
- ["Xcode"] = ":xcode:",
- ["GoLand"] = ":goland:",
- ["Android Studio"] = ":android_studio:",
- ["MoneyMoney"] = ":bank:",
- ["Spotify"] = ":spotify:",
- ["KeePassXC"] = ":kee_pass_x_c:",
- ["Alfred"] = ":alfred:",
- ["Color Picker"] = ":color_picker:",
- ["数码测色计"] = ":color_picker:",
- ["Microsoft Word"] = ":microsoft_word:",
- ["Microsoft PowerPoint"] = ":microsoft_power_point:",
- ["Notes"] = ":notes:",
- ["备忘录"] = ":notes:",
- ["Microsoft Edge"] = ":microsoft_edge:",
- ["Sublime Text"] = ":sublime_text:",
- ["Sequel Ace"] = ":sequel_ace:",
- ["Folx"] = ":folx:",
- ["DingTalk"] = ":dingtalk:",
- ["钉钉"] = ":dingtalk:",
- ["阿里钉"] = ":dingtalk:",
- ["WebStorm"] = ":web_storm:",
- ["Sequel Pro"] = ":sequel_pro:",
- ["Skype"] = ":skype:",
- ["网易云音乐"] = ":netease_music:",
- ["PyCharm"] = ":pycharm:",
- ["Canary Mail"] = ":mail:",
- ["HEY"] = ":mail:",
- ["Mail"] = ":mail:",
- ["Mailspring"] = ":mail:",
- ["MailMate"] = ":mail:",
- ["邮件"] = ":mail:",
- ["Default"] = ":default:",
- ["App Store"] = ":app_store:",
- ["Calibre"] = ":book:",
- ["Todoist"] = ":todoist:",
- ["Emacs"] = ":emacs:",
- ["Messenger"] = ":messenger:",
- ["Tower"] = ":tower:",
- ["VSCodium"] = ":vscodium:",
- ["Drafts"] = ":drafts:",
- ["Cypress"] = ":cypress:",
- ["GitHub Desktop"] = ":git_hub:",
- ["Telegram"] = ":telegram:",
- ["Firefox Developer Edition"] = ":firefox_developer_edition:",
- ["Firefox Nightly"] = ":firefox_developer_edition:",
- ["Min"] = ":min_browser:",
- ["Sketch"] = ":sketch:",
- ["Affinity Photo"] = ":affinity_photo:",
- ["MAMP"] = ":mamp:",
- ["MAMP PRO"] = ":mamp:",
- ["Insomnia"] = ":insomnia:",
- ["Bitwarden"] = ":bit_warden:",
- ["Warp"] = ":warp:",
- ["System Preferences"] = ":gear:",
- ["System Settings"] = ":gear:",
- ["系统设置"] = ":gear:",
- ["Affinity Designer"] = ":affinity_designer:",
- ["Live"] = ":ableton:",
- ["Arc"] = ":arc:",
- ["Chromium"] = ":google_chrome:",
- ["Google Chrome"] = ":google_chrome:",
- ["Google Chrome Canary"] = ":google_chrome:",
- ["Jellyfin Media Player"] = ":jellyfin:",
- ["Zulip"] = ":zulip:",
- ["1Password"] = ":one_password:",
- ["FaceTime"] = ":face_time:",
- ["FaceTime 通话"] = ":face_time:",
- ["Citrix Workspace"] = ":citrix:",
- ["Citrix Viewer"] = ":citrix:",
- ["Logseq"] = ":logseq:",
- ["Reeder"] = ":reeder5:",
- ["Code"] = ":code:",
- ["Code - Insiders"] = ":code:",
- ["Notion"] = ":notion:",
- ["Final Cut Pro"] = ":final_cut_pro:",
- ["Zotero"] = ":zotero:",
- ["Safari"] = ":safari:",
- ["Safari浏览器"] = ":safari:",
- ["Safari Technology Preview"] = ":safari:",
- ["Blender"] = ":blender:",
- ["Affinity Publisher"] = ":affinity_publisher:",
- ["Spark Desktop"] = ":spark:",
- ["Zeplin"] = ":zeplin:",
- ["Replit"] = ":replit:",
- ["Podcasts"] = ":podcasts:",
- ["播客"] = ":podcasts:",
- ["NordVPN"] = ":nord_vpn:",
- ["Notability"] = ":notability:",
- ["Numbers"] = ":numbers:",
- ["Numbers 表格"] = ":numbers:",
- ["Nova"] = ":nova:",
- ["Microsoft Excel"] = ":microsoft_excel:",
- ["Trello"] = ":trello:",
- ["Pi-hole Remote"] = ":pihole:",
- ["Linear"] = ":linear:",
- ["CleanMyMac X"] = ":desktop:",
- ["GrandTotal"] = ":dollar:",
- ["Receipts"] = ":dollar:",
- ["Evernote Legacy"] = ":evernote_legacy:",
- ["OmniFocus"] = ":omni_focus:",
- ["Terminal"] = ":terminal:",
- ["终端"] = ":terminal:",
- ["Atom"] = ":atom:",
- ["Kakoune"] = ":kakoune:",
- ["Reminders"] = ":reminders:",
- ["提醒事项"] = ":reminders:",
- ["Tana"] = ":tana:",
- ["OBS"] = ":obsstudio:",
- ["VMware Fusion"] = ":vmware_fusion:",
- ["Tweetbot"] = ":twitter:",
- ["Twitter"] = ":twitter:",
- ["Microsoft Teams"] = ":microsoft_teams:",
- ["Yuque"] = ":yuque:",
- ["语雀"] = ":yuque:",
- ["Slack"] = ":slack:",
- ["Vivaldi"] = ":vivaldi:",
- ["Setapp"] = ":setapp:",
- ["TIDAL"] = ":tidal:",
- ["Miro"] = ":miro:",
- ["Messages"] = ":messages:",
- ["信息"] = ":messages:",
- ["Nachrichten"] = ":messages:",
- ["Brave Browser"] = ":brave_browser:",
- ["Preview"] = ":pdf:",
- ["预览"] = ":pdf:",
- ["Skim"] = ":pdf:",
- ["zathura"] = ":pdf:",
- ["Obsidian"] = ":obsidian:",
- ["Thunderbird"] = ":thunderbird:",
- ["Firefox"] = ":firefox:",
- ["WezTerm"] = ":wezterm:",
- ["default"] = ":default:",
-}
diff --git a/__sketchybar/bar.lua b/__sketchybar/bar.lua
deleted file mode 100644
index 6672647..0000000
--- a/__sketchybar/bar.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-local colors = require("colors")
-
-sbar.bar({
- topmost = "window",
- height = 30,
- color = colors.bar.bg,
- padding_right = 2,
- padding_left = 2,
-})
diff --git a/__sketchybar/colors.lua b/__sketchybar/colors.lua
deleted file mode 100644
index c9e043c..0000000
--- a/__sketchybar/colors.lua
+++ /dev/null
@@ -1,30 +0,0 @@
-return {
- black = 0xff181819,
- white = 0xffe2e2e3,
- red = 0xfffc5d7c,
- green = 0xff9ed072,
- blue = 0xff76cce0,
- yellow = 0xffe7c664,
- orange = 0xfff39660,
- magenta = 0xffb39df3,
- grey = 0xff7f8490,
- transparent = 0x00000000,
-
- bar = {
- bg = 0xf02c2e34,
- border = 0xff2c2e34,
- },
- popup = {
- bg = 0xc02c2e34,
- border = 0xff7f8490,
- },
- bg1 = 0xff363944,
- bg2 = 0xff414550,
-
- with_alpha = function(color, alpha)
- if alpha > 1.0 or alpha < 0.0 then
- return color
- end
- return (color & 0x00ffffff) | (math.floor(alpha * 255.0) << 24)
- end,
-}
diff --git a/__sketchybar/default.lua b/__sketchybar/default.lua
deleted file mode 100644
index d919def..0000000
--- a/__sketchybar/default.lua
+++ /dev/null
@@ -1,52 +0,0 @@
-local settings = require("settings")
-local colors = require("colors")
-
--- Equivalent to the --default domain
-sbar.default({
- updates = "when_shown",
- icon = {
- font = {
- family = settings.font.text,
- style = settings.font.style_map["Bold"],
- size = 14.0,
- },
- color = colors.white,
- padding_left = settings.paddings,
- padding_right = settings.paddings,
- background = { image = { corner_radius = 9 } },
- },
- label = {
- font = {
- family = settings.font.text,
- style = settings.font.style_map["Semibold"],
- size = 13.0,
- },
- color = colors.white,
- padding_left = settings.paddings,
- padding_right = settings.paddings,
- },
- background = {
- height = 21,
- corner_radius = 9,
- border_width = 2,
- border_color = colors.bg2,
- image = {
- corner_radius = 9,
- border_color = colors.grey,
- border_width = 1,
- },
- },
- popup = {
- background = {
- border_width = 2,
- corner_radius = 9,
- border_color = colors.popup.border,
- color = colors.popup.bg,
- shadow = { drawing = true },
- },
- blur_radius = 50,
- },
- padding_left = 5,
- padding_right = 5,
- scroll_texts = true,
-})
diff --git a/__sketchybar/helpers/init.lua b/__sketchybar/helpers/init.lua
deleted file mode 100644
index 2b466d3..0000000
--- a/__sketchybar/helpers/init.lua
+++ /dev/null
@@ -1,4 +0,0 @@
--- Add the sketchybar module to the package cpath
-package.cpath = package.cpath .. ";/Users/" .. os.getenv("USER") .. "/.local/share/sketchybar_lua/?.so"
-
--- os.execute("(cd helpers && make)")
diff --git a/__sketchybar/helpers/makefile b/__sketchybar/helpers/makefile
deleted file mode 100644
index fd0bf44..0000000
--- a/__sketchybar/helpers/makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-all:
- ($(MAKE)) >/dev/null
- ($(MAKE)) >/dev/null
diff --git a/__sketchybar/icons.lua b/__sketchybar/icons.lua
deleted file mode 100644
index c1ece24..0000000
--- a/__sketchybar/icons.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-local icons = {
- nerdfont = {
- battery = {
- _100 = "",
- _75 = "",
- _50 = "",
- _25 = "",
- _0 = "",
- charging = "",
- },
- },
-}
-
-return icons.nerdfont
diff --git a/__sketchybar/init.lua b/__sketchybar/init.lua
deleted file mode 100644
index 72b8c21..0000000
--- a/__sketchybar/init.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-sbar = require("sketchybar")
-
-sbar.begin_config()
-require("bar")
-require("default")
-require("items")
-sbar.end_config()
-
-sbar.event_loop()
diff --git a/__sketchybar/items/battery.lua b/__sketchybar/items/battery.lua
deleted file mode 100644
index 457437e..0000000
--- a/__sketchybar/items/battery.lua
+++ /dev/null
@@ -1,72 +0,0 @@
-local icons = require("icons")
-local colors = require("colors")
-local settings = require("settings")
-
-local battery = sbar.add("item", "widgets.battery", {
- position = "right",
- icon = {
- font = {
- style = settings.font.style_map["Regular"],
- size = 14.0,
- },
- },
- label = { font = { family = settings.font.numbers } },
- update_freq = 180,
- popup = { align = "center" },
-})
-
-battery:subscribe({ "routine", "power_source_change", "system_woke" }, function()
- sbar.exec("pmset -g batt", function(batt_info)
- local icon = "!"
- local label = "?"
-
- local found, _, charge = batt_info:find("(%d+)%%")
- if found then
- charge = tonumber(charge)
- label = charge .. "%"
- end
-
- local color = colors.green
- local charging, _, _ = batt_info:find("AC Power")
-
- if charging then
- icon = icons.battery.charging
- else
- if found and charge > 80 then
- icon = icons.battery._100
- elseif found and charge > 60 then
- icon = icons.battery._75
- elseif found and charge > 40 then
- icon = icons.battery._50
- elseif found and charge > 20 then
- icon = icons.battery._25
- color = colors.orange
- else
- icon = icons.battery._0
- color = colors.red
- end
- end
-
- local lead = ""
- if found and charge < 10 then
- lead = "0"
- end
-
- battery:set({
- icon = {
- string = icon,
- color = color,
- },
- label = { string = lead .. label },
- })
- end)
-end)
-
-sbar.add("bracket", "widgets.battery.bracket", { battery.name }, {
- background = { color = colors.bg1 },
-})
-
-sbar.add("item", "widgets.battery.padding", {
- position = "right",
- width = settings.group_paddings,
-})
diff --git a/__sketchybar/items/calendar.lua b/__sketchybar/items/calendar.lua
deleted file mode 100644
index 6532ad9..0000000
--- a/__sketchybar/items/calendar.lua
+++ /dev/null
@@ -1,35 +0,0 @@
-local settings = require("settings")
-local colors = require("colors")
-
-sbar.add("item", { position = "right", width = settings.group_paddings })
-
-local cal = sbar.add("item", {
- icon = {
- color = colors.white,
- padding_left = 8,
- font = {
- style = settings.font.style_map["Black"],
- size = 12.0,
- },
- },
- label = {
- color = colors.white,
- padding_right = 8,
- width = 49,
- align = "right",
- font = { family = settings.font.numbers },
- },
- position = "right",
- update_freq = 30,
- padding_left = 1,
- padding_right = 1,
- background = {
- color = colors.bg1,
- },
-})
-
-sbar.add("item", { position = "right", width = settings.group_paddings })
-
-cal:subscribe({ "forced", "routine", "system_woke" }, function(env)
- cal:set({ icon = os.date("%a %d %b"), label = os.date("%H:%M") })
-end)
diff --git a/__sketchybar/items/front_app.lua b/__sketchybar/items/front_app.lua
deleted file mode 100644
index df1bcc4..0000000
--- a/__sketchybar/items/front_app.lua
+++ /dev/null
@@ -1,21 +0,0 @@
-local settings = require("settings")
-
-local front_app = sbar.add("item", "front_app", {
- display = "active",
- icon = { drawing = false },
- label = {
- font = {
- style = settings.font.style_map["Bold"],
- size = 13.0,
- },
- },
- updates = true,
-})
-
-front_app:subscribe("front_app_switched", function(env)
- front_app:set({ label = { string = env.INFO } })
-end)
-
-front_app:subscribe("mouse.clicked", function(env)
- sbar.trigger("swap_menus_and_spaces")
-end)
diff --git a/__sketchybar/items/init.lua b/__sketchybar/items/init.lua
deleted file mode 100644
index 933e287..0000000
--- a/__sketchybar/items/init.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-require("items.spaces")
-require("items.front_app")
-require("items.calendar")
-require("items.battery")
diff --git a/__sketchybar/items/spaces.lua b/__sketchybar/items/spaces.lua
deleted file mode 100644
index aedb663..0000000
--- a/__sketchybar/items/spaces.lua
+++ /dev/null
@@ -1,103 +0,0 @@
-local colors = require("colors")
-local settings = require("settings")
-local app_icons = require("app_icons")
-
-local spaces = {}
-
-for i = 1, 10, 1 do
- local space = sbar.add("space", "space." .. i, {
- space = i,
- icon = {
- font = { family = settings.font.numbers },
- string = i,
- padding_left = 15,
- padding_right = 8,
- color = colors.white,
- highlight_color = colors.red,
- },
- label = {
- padding_right = 20,
- color = colors.grey,
- highlight_color = colors.white,
- font = "sketchybar-app-font:Regular:15.0",
- y_offset = -1,
- },
- padding_right = 1,
- padding_left = 1,
- background = {
- color = colors.bg1,
- border_width = 1,
- height = 21,
- border_color = colors.black,
- },
- popup = { background = { border_width = 5, border_color = colors.black } },
- })
-
- spaces[i] = space
-
- -- Single item bracket for space items to achieve double border on highlight
- local space_bracket = sbar.add("bracket", { space.name }, {
- background = {
- color = colors.transparent,
- border_color = colors.bg2,
- height = 24,
- border_width = 3,
- },
- })
-
- -- Padding space
- sbar.add("space", "space.padding." .. i, {
- space = i,
- script = "",
- width = settings.group_paddings,
- })
-
- --[[ local space_popup = sbar.add("item", {
- position = "popup." .. space.name,
- padding_left = 5,
- padding_right = 0,
- background = {
- drawing = true,
- image = {
- corner_radius = 9,
- scale = 0.2,
- },
- },
- }) ]]
-
- space:subscribe("space_change", function(env)
- local selected = env.SELECTED == "true"
- -- local color = selected and colors.grey or colors.bg2
- space:set({
- icon = { highlight = selected },
- label = { highlight = selected },
- background = { border_color = selected and colors.black or colors.bg2 },
- })
- space_bracket:set({
- background = { border_color = selected and colors.grey or colors.bg2 },
- })
- end)
-end
-
-local space_window_observer = sbar.add("item", {
- drawing = false,
- updates = true,
-})
-
-space_window_observer:subscribe("space_windows_change", function(env)
- local icon_line = ""
- local no_app = true
- for app, _ in pairs(env.INFO.apps) do
- no_app = false
- local lookup = app_icons[app]
- local icon = ((lookup == nil) and app_icons["default"] or lookup)
- icon_line = icon_line .. " " .. icon
- end
-
- if no_app then
- icon_line = " —"
- end
- sbar.animate("tanh", 10, function()
- spaces[env.INFO.space]:set({ label = icon_line })
- end)
-end)
diff --git a/__sketchybar/settings.lua b/__sketchybar/settings.lua
deleted file mode 100644
index e0778c0..0000000
--- a/__sketchybar/settings.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-return {
- paddings = 3,
- group_paddings = 5,
-
- icons = "NerdFont",
-
- font = {
- text = "MesloLGS Nerd Font Mono",
- numbers = "MesloLGS Nerd Font Mono",
-
- style_map = {
- ["Regular"] = "Regular",
- ["Semibold"] = "Semibold",
- ["Bold"] = "Bold",
- ["Heavy"] = "Heavy",
- ["Black"] = "Black",
- },
- },
-}
diff --git a/__sketchybar/sketchybarrc b/__sketchybar/sketchybarrc
deleted file mode 100755
index cdce05b..0000000
--- a/__sketchybar/sketchybarrc
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env lua
-
-require("helpers")
-require("init")
diff --git a/assets/nvim.png b/assets/nvim.png
new file mode 100644
index 0000000..36116b0
Binary files /dev/null and b/assets/nvim.png differ
diff --git a/assets/yabai.png b/assets/yabai.png
new file mode 100644
index 0000000..e25e47c
Binary files /dev/null and b/assets/yabai.png differ
diff --git a/install.sh b/install.sh
new file mode 100755
index 0000000..455fffe
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,76 @@
+#!bin/zsh
+
+echo "Installing commandline tools..."
+xcode-select --install
+
+echo "Installing Brew..."
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+brew analytics off
+
+# ---- Terminal ----
+echo "Installing your Teminal and other thingies..."
+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 wezterm
+brew install zoxide
+brew install zsh-fast-syntax-highlighting
+
+(cd dotFiles && stow .)
+
+echo "Installing tmux package manager...."
+git clone https://github.com/tmux-plugins/tpm ~/.config/tmux/plugins/tpm
+
+# ---- Essentials ----
+brew install btop
+brew install oven-sh/bun/bun
+brew install fastfetch
+brew install font-meslo-lg-nerd-font
+brew install go
+brew install node
+brew install pnpm
+
+# ---- Applications ----
+echo "Installing the Applications..."
+brew install --cask discord
+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 sketchybar
+
+ yabai --restart-service
+ skhd --restart-service
+ brew services start borders
+}
+
+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, fckin Ice installation method...\n"
diff --git a/readme.md b/readme.md
index 4326453..7535be5 100644
--- a/readme.md
+++ b/readme.md
@@ -1,12 +1,34 @@
-# Every week
+
+
+ JJs dotfiles
+
+
-```bash
-brew install --cask alacritty discord font-hack-nerd-font font-meslo-lg-nerd-font google-chrome httpie keka kitty obsidian raycast spotify stats telegram
+### ScreenShot
+
+
+
+
+
+
+ Catpuccin Theme Setup
+ (expand)
+
+
+
+
+
+
+### 🚀 Installation
+
+1.Clone this repository.
+
+```
+git clone https://github.com/kulvirdotgg/dotFiles.git
```
-```bash
-brew install btop fastfetch fzf git go neovim node ripgrep starship tmux zoxide zsh-syntax-highlighting
-```
+2.Run `install.sh` script. (provide `--yabai` flag to install **yabai** tiling window manager)
-## won't work unless you do it
-- [tmux/tpm](https://github.com/tmux-plugins/tpm)
+```
+./install.sh
+```