diff --git a/.bash_profile b/.bash_profile deleted file mode 100644 index 8abeeec..0000000 --- a/.bash_profile +++ /dev/null @@ -1,28 +0,0 @@ -# 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" - -# ---- starship ---- -eval "$(starship init bash)" - -# ---- zoxide ---- -eval "$(zoxide init --cmd cd bash)" - -# ---- fzf ---- -eval "$(fzf --bash)" diff --git a/.clang-format b/.clang-format deleted file mode 100644 index 10b2a46..0000000 --- a/.clang-format +++ /dev/null @@ -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 -... diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml deleted file mode 100644 index eb950cb..0000000 --- a/.config/alacritty/alacritty.toml +++ /dev/null @@ -1,78 +0,0 @@ -import = ["~/.config/alacritty/themes/rose-pine.toml"] - -[env] -TERM = "xterm-256color" - -[font] -size = 16.0 - -[font.bold] -style = "Bold" - -[font.glyph_offset] -x = 0 -y = 1 - -[font.normal] -family = "MesloLGS Nerd Font Mono" - -[font.italic] -style = "Italic" - -[mouse] -hide_when_typing = true - -[cursor] -style = "Beam" - -[scrolling] -history = 1000 - -[window] -decorations = "none" -opacity = 0.95 - -[window.dimensions] -columns = 98 -lines = 28 - -[window.padding] -x = 0 -y = 0 - -# macOS copy/paste -[[keyboard.bindings]] -action = "Paste" -key = "v" -mods = "Command" - -[[keyboard.bindings]] -action = "Copy" -key = "c" -mods = "Command" - -[[keyboard.bindings]] -action = "ToggleFullscreen" -key = "Return" -mods = "Control" - -[[keyboard.bindings]] -chars = "\u001B[1;5C" -key = "Right" -mods = "Option" - -[[keyboard.bindings]] -chars = "\u001B[1;5D" -key = "Left" -mods = "Option" - -[[keyboard.bindings]] -chars = "\u0015" -key = "Backspace" -mods = "Command" - -[[keyboard.bindings]] -key = "K" -mods = "Command" -mode = "~Vi|~Search" -action = "ClearHistory" diff --git a/.config/alacritty/themes/catppuccin-mocha.toml b/.config/alacritty/themes/catppuccin-mocha.toml deleted file mode 100644 index 1dfe857..0000000 --- a/.config/alacritty/themes/catppuccin-mocha.toml +++ /dev/null @@ -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" diff --git a/.config/alacritty/themes/rose-pine.toml b/.config/alacritty/themes/rose-pine.toml deleted file mode 100644 index ff757b2..0000000 --- a/.config/alacritty/themes/rose-pine.toml +++ /dev/null @@ -1,75 +0,0 @@ -# Colors section of "Alacritty - TOML configuration file format" -# https://github.com/alacritty/alacritty/blob/master/extra/man/alacritty.5.scd#colors - -[colors.primary] -foreground = "#e0def4" -background = "#191724" -dim_foreground = "#908caa" -bright_foreground = "#e0def4" - -[colors.cursor] -text = "#e0def4" -cursor = "#524f67" - -[colors.vi_mode_cursor] -text = "#e0def4" -cursor = "#524f67" - -[colors.search.matches] -foreground = "#908caa" -background = "#26233a" - -[colors.search.focused_match] -foreground = "#191724" -background = "#ebbcba" - -[colors.hints.start] -foreground = "#908caa" -background = "#1f1d2e" - -[colors.hints.end] -foreground = "#6e6a86" -background = "#1f1d2e" - -[colors.line_indicator] -foreground = "None" -background = "None" - -[colors.footer_bar] -foreground = "#e0def4" -background = "#1f1d2e" - -[colors.selection] -text = "#e0def4" -background = "#403d52" - -[colors.normal] -black = "#26233a" -red = "#eb6f92" -green = "#31748f" -yellow = "#f6c177" -blue = "#9ccfd8" -magenta = "#c4a7e7" -cyan = "#ebbcba" -white = "#e0def4" - -[colors.bright] -black = "#6e6a86" -red = "#eb6f92" -green = "#31748f" -yellow = "#f6c177" -blue = "#9ccfd8" -magenta = "#c4a7e7" -cyan = "#ebbcba" -white = "#e0def4" - -[colors.dim] -black = "#6e6a86" -red = "#eb6f92" -green = "#31748f" -yellow = "#f6c177" -blue = "#9ccfd8" -magenta = "#c4a7e7" -cyan = "#ebbcba" -white = "#e0def4" - diff --git a/.config/btop/btop.conf b/.config/btop/btop.conf deleted file mode 100644 index 2e3cb5e..0000000 --- a/.config/btop/btop.conf +++ /dev/null @@ -1,218 +0,0 @@ -#? 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" -color_theme = "Default" - -#* If the theme set background should be shown, set to False if you want terminal background transparency. -theme_background = False - -#* Sets if 24-bit truecolor should be used, will convert 24-bit colors to 256 color (6x6x6 color cube) if false. -truecolor = True - -#* Set to true to force tty mode regardless if a real tty has been detected or not. -#* Will force 16-color mode and TTY theme, set all graph symbols to "tty" and swap out other non tty friendly symbols. -force_tty = False - -#* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets. -#* 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" - -#* 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. -vim_keys = True - -#* Rounded corners on boxes, is ignored if TTY mode is ON. -rounded_corners = True - -#* Default symbols to use for graph creation, "braille", "block" or "tty". -#* "braille" offers the highest resolution but might not be included in all fonts. -#* "block" has half the resolution of braille but uses more common characters. -#* "tty" uses only 3 different symbols but will work with most fonts and should work in a real TTY. -#* Note that "tty" only has half the horizontal resolution of the other two, so will show a shorter historical view. -graph_symbol = "braille" - -# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". -graph_symbol_cpu = "default" - -# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". -graph_symbol_mem = "default" - -# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". -graph_symbol_net = "default" - -# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". -graph_symbol_proc = "default" - -#* Manually set which boxes to show. Available values are "cpu mem net proc" and "gpu0" through "gpu5", separate values with whitespace. -shown_boxes = "cpu mem net proc" - -#* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs. -update_ms = 2000 - -#* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct", -#* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly. -proc_sorting = "memory" - -#* Reverse sorting order, True or False. -proc_reversed = True - -#* Show processes as a tree. -proc_tree = True - -#* Use the cpu graph colors in the process list. -proc_colors = True - -#* Use a darkening gradient in the process list. -proc_gradient = True - -#* If process cpu usage should be of the core it's running on or usage of the total available cpu power. -proc_per_core = False - -#* Show process memory as bytes instead of percent. -proc_mem_bytes = True - -#* Show cpu graph for each process. -proc_cpu_graphs = True - -#* Use /proc/[pid]/smaps for memory information in the process info box (very slow but more accurate) -proc_info_smaps = False - -#* Show proc box on left side of screen instead of right. -proc_left = False - -#* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop). -proc_filter_kernel = False - -#* In tree-view, always accumulate child process resources in the parent process. -proc_aggregate = False - -#* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available. -#* Select from a list of detected attributes from the options menu. -cpu_graph_upper = "Auto" - -#* Sets the CPU stat shown in lower half of the CPU graph, "total" is always available. -#* Select from a list of detected attributes from the options menu. -cpu_graph_lower = "Auto" - -#* Toggles if the lower CPU graph should be inverted. -cpu_invert_lower = True - -#* Set to True to completely disable the lower CPU graph. -cpu_single_graph = False - -#* Show cpu box at bottom of screen instead of top. -cpu_bottom = False - -#* Shows the system uptime in the CPU box. -show_uptime = True - -#* Show cpu temperature. -check_temp = True - -#* Which sensor to use for cpu temperature, use options menu to select from list of available sensors. -cpu_sensor = "Auto" - -#* Show temperatures for cpu cores also if check_temp is True and sensors has been found. -show_coretemp = True - -#* Set a custom mapping between core and coretemp, can be needed on certain cpus to get correct temperature for correct core. -#* Use lm-sensors or similar to see which cores are reporting temperatures on your machine. -#* Format "x:y" x=core with wrong temp, y=core with correct temp, use space as separator between multiple entries. -#* Example: "4:0 5:1 6:3" -cpu_core_map = "" - -#* Which temperature scale to use, available values: "celsius", "fahrenheit", "kelvin" and "rankine". -temp_scale = "celsius" - -#* Use base 10 for bits/bytes sizes, KB = 1000 instead of KiB = 1024. -base_10_sizes = True - -#* Show CPU frequency. -show_cpu_freq = True - -#* Draw a clock at top of screen, formatting according to strftime, empty string to disable. -#* Special formatting: /host = hostname | /user = username | /uptime = system uptime -clock_format = "%X" - -#* Update main ui in background when menus are showing, set this to false if the menus is flickering too much for comfort. -background_update = True - -#* Custom cpu model name, empty string to disable. -custom_cpu_name = "" - -#* Optional filter for shown disks, should be full path of a mountpoint, separate multiple values with whitespace " ". -#* Begin line with "exclude=" to change to exclude filter, otherwise defaults to "most include" filter. Example: disks_filter="exclude=/boot /home/user". -disks_filter = "" - -#* Show graphs instead of meters for memory values. -mem_graphs = True - -#* Show mem box below net box instead of above. -mem_below_net = False - -#* Count ZFS ARC in cached and available memory. -zfs_arc_cached = True - -#* If swap memory should be shown in memory box. -show_swap = True - -#* Show swap as a disk, ignores show_swap value above, inserts itself after first disk. -swap_disk = False - -#* 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 - -#* Read disks list from /etc/fstab. This also disables only_physical. -use_fstab = True - -#* Setting this to True will hide all datasets, and only show ZFS pools. (IO stats will be calculated per-pool) -zfs_hide_datasets = False - -#* Set to true to show available disk space for privileged users. -disk_free_priv = False - -#* Toggles if io activity % (disk busy time) should be shown in regular disk usage view. -show_io_stat = True - -#* Toggles io mode for disks, showing big graphs for disk read/write speeds. -io_mode = False - -#* Set to True to show combined read/write io graphs in io mode. -io_graph_combined = False - -#* Set the top speed for the io graphs in MiB/s (100 by default), use format "mountpoint:speed" separate disks with whitespace " ". -#* Example: "/mnt/media:100 /:20 /boot:1". -io_graph_speeds = "" - -#* Set fixed values for network graphs in Mebibits. Is only used if net_auto is also set to False. -net_download = 100 - -net_upload = 100 - -#* Use network graphs auto rescaling mode, ignores any values set above and rescales down to 10 Kibibytes at the lowest. -net_auto = True - -#* Sync the auto scaling for download and upload to whichever currently has the highest scale. -net_sync = True - -#* Starts with the Network Interface specified here. -net_iface = "" - -#* Show battery stats in top right if battery is present. -show_battery = False - -#* Which battery to use if multiple are present. "Auto" for auto detection. -selected_battery = "Auto" - -#* Show power stats of battery next to charge indicator. -show_battery_watts = True - -#* Set loglevel for "~/.config/btop/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG". -#* The level set includes all lower levels, i.e. "DEBUG" will show all logging info. -log_level = "WARNING" diff --git a/.config/fastfetch/config.jsonc b/.config/fastfetch/config.jsonc deleted file mode 100644 index a834993..0000000 --- a/.config/fastfetch/config.jsonc +++ /dev/null @@ -1,108 +0,0 @@ -{ - "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", - "logo": { - "padding": { - "top": 2 - } - }, - "display": { - "separator": " ➜ " - }, - "modules": [ - "break", - "break", - "break", - { - "type": "os", - "key": "OS ", - "keyColor": "red" - }, - { - "type": "kernel", - "key": " ├  ", - "keyColor": "red" - }, - { - "type": "shell", - "key": " └  ", - "keyColor": "red" - }, - "break", - { - "type": "wm", - "key": "WM ", - "keyColor": "green" - }, - { - "type": "wmtheme", - "key": " ├ 󰉼 ", - "keyColor": "green" - }, - { - "type": "icons", - "key": " ├ 󰀻 ", - "keyColor": "green" - }, - { - "type": "cursor", - "key": " ├  ", - "keyColor": "green" - }, - { - "type": "terminal", - "key": " ├  ", - "keyColor": "green" - }, - { - "type": "terminalfont", - "key": " └  ", - "keyColor": "green" - }, - "break", - { - "type": "host", - "format": "{5} {1} Type {2}", - "key": "PC ", - "keyColor": "yellow" - }, - { - "type": "cpu", - "format": "{1} ({3}) @ {7} GHz", - "key": " ├  ", - "keyColor": "yellow" - }, - { - "type": "gpu", - "format": "{1} {2} @ {12} GHz", - "key": " ├ 󰢮 ", - "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" - ] -} diff --git a/.config/ghostty/config b/.config/ghostty/config deleted file mode 100644 index 0aa3769..0000000 --- a/.config/ghostty/config +++ /dev/null @@ -1,37 +0,0 @@ -theme = "catppuccin-mocha" - -font-size = 14 -font-family = "MesloLGS Nerd Font Mono" -font-thicken = true - -cursor-style = block -cursor-style-blink = false - -background-opacity = 0.95 -background-blur-radius = 8 - -mouse-hide-while-typing = true - -clipboard-read = allow -clipboard-write = allow -copy-on-select = clipboard -clipboard-trim-trailing-spaces = true -clipboard-paste-protection = true - -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 = 43 - -# 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 diff --git a/.config/git/config b/.config/git/config deleted file mode 100644 index a7b40cc..0000000 --- a/.config/git/config +++ /dev/null @@ -1,7 +0,0 @@ -[credential] - helper = cache -[user] - name = Kulvir Singh - email = kulvirs734@gmail.com -[init] - defaultBranch = trunk diff --git a/.config/kitty/kitty-dark.icns b/.config/kitty/kitty-dark.icns deleted file mode 100644 index 57e2982..0000000 Binary files a/.config/kitty/kitty-dark.icns and /dev/null differ diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf deleted file mode 100644 index f792e57..0000000 --- a/.config/kitty/kitty.conf +++ /dev/null @@ -1,49 +0,0 @@ -include themes/Catppuccin_Mocha.conf -# include themes/carbonfox.conf - -font_family MesloLGS Nerd Font Mono - -font_size 14.0 - -cursor_shape beam - -background_opacity 0.95 -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 -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 diff --git a/.config/kitty/themes/Catppuccin_Mocha.conf b/.config/kitty/themes/Catppuccin_Mocha.conf deleted file mode 100644 index 2533db7..0000000 --- a/.config/kitty/themes/Catppuccin_Mocha.conf +++ /dev/null @@ -1,80 +0,0 @@ -# vim:ft=kitty - -## name: Catppuccin-Mocha -## author: Pocco81 (https://github.com/Pocco81) -## license: MIT -## upstream: https://github.com/catppuccin/kitty/blob/main/mocha.conf -## blurb: Soothing pastel theme for the high-spirited! - - - -# The basic colors -foreground #CDD6F4 -background #1E1E2E -selection_foreground #1E1E2E -selection_background #F5E0DC - -# Cursor colors -cursor #F5E0DC -cursor_text_color #1E1E2E - -# URL underline color when hovering with mouse -url_color #F5E0DC - -# Kitty window border colors -active_border_color #B4BEFE -inactive_border_color #6C7086 -bell_border_color #F9E2AF - -# OS Window titlebar colors -wayland_titlebar_color system -macos_titlebar_color system - -# Tab bar colors -active_tab_foreground #11111B -active_tab_background #CBA6F7 -inactive_tab_foreground #CDD6F4 -inactive_tab_background #181825 -tab_bar_background #11111B - -# Colors for marks (marked text in the terminal) -mark1_foreground #1E1E2E -mark1_background #B4BEFE -mark2_foreground #1E1E2E -mark2_background #CBA6F7 -mark3_foreground #1E1E2E -mark3_background #74C7EC - -# The 16 terminal colors - -# black -color0 #45475A -color8 #585B70 - -# red -color1 #F38BA8 -color9 #F38BA8 - -# green -color2 #A6E3A1 -color10 #A6E3A1 - -# yellow -color3 #F9E2AF -color11 #F9E2AF - -# blue -color4 #89B4FA -color12 #89B4FA - -# magenta -color5 #F5C2E7 -color13 #F5C2E7 - -# cyan -color6 #94E2D5 -color14 #94E2D5 - -# white -color7 #BAC2DE -color15 #A6ADC8 diff --git a/.config/kitty/themes/Gruvbox_Dark_Hard.conf b/.config/kitty/themes/Gruvbox_Dark_Hard.conf deleted file mode 100644 index 649473f..0000000 --- a/.config/kitty/themes/Gruvbox_Dark_Hard.conf +++ /dev/null @@ -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 diff --git a/.config/kitty/themes/Rose_Pine.conf b/.config/kitty/themes/Rose_Pine.conf deleted file mode 100644 index fca9531..0000000 --- a/.config/kitty/themes/Rose_Pine.conf +++ /dev/null @@ -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 - diff --git a/.config/kitty/themes/carbonfox.conf b/.config/kitty/themes/carbonfox.conf deleted file mode 100644 index f601208..0000000 --- a/.config/kitty/themes/carbonfox.conf +++ /dev/null @@ -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 diff --git a/.config/sketchybar/items/battery.sh b/.config/sketchybar/items/battery.sh deleted file mode 100644 index b31f0b0..0000000 --- a/.config/sketchybar/items/battery.sh +++ /dev/null @@ -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 diff --git a/.config/sketchybar/items/calendar.sh b/.config/sketchybar/items/calendar.sh deleted file mode 100644 index 7ec9afb..0000000 --- a/.config/sketchybar/items/calendar.sh +++ /dev/null @@ -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" diff --git a/.config/sketchybar/items/clock.sh b/.config/sketchybar/items/clock.sh deleted file mode 100644 index 6dd350d..0000000 --- a/.config/sketchybar/items/clock.sh +++ /dev/null @@ -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" diff --git a/.config/sketchybar/items/front_app.sh b/.config/sketchybar/items/front_app.sh deleted file mode 100644 index 85a5145..0000000 --- a/.config/sketchybar/items/front_app.sh +++ /dev/null @@ -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 diff --git a/.config/sketchybar/items/spaces.sh b/.config/sketchybar/items/spaces.sh deleted file mode 100644 index 1462329..0000000 --- a/.config/sketchybar/items/spaces.sh +++ /dev/null @@ -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" diff --git a/.config/sketchybar/plugins/calendar.sh b/.config/sketchybar/plugins/calendar.sh deleted file mode 100755 index 32986e4..0000000 --- a/.config/sketchybar/plugins/calendar.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -sketchybar --set "$NAME" icon="󰸗" label="$(date '+%a, %d %b')" diff --git a/.config/sketchybar/plugins/clock.sh b/.config/sketchybar/plugins/clock.sh deleted file mode 100755 index 397dd9c..0000000 --- a/.config/sketchybar/plugins/clock.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -LABEL=$(date '+%H:%M') -sketchybar --set "$NAME" label="$LABEL" diff --git a/.config/sketchybar/plugins/front_app.sh b/.config/sketchybar/plugins/front_app.sh deleted file mode 100755 index 8f446a3..0000000 --- a/.config/sketchybar/plugins/front_app.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -case "$SENDER" in -"front_app_switched") - sketchybar --set "$NAME" label="$INFO" - ;; -esac diff --git a/.config/sketchybar/plugins/power.sh b/.config/sketchybar/plugins/power.sh deleted file mode 100755 index f6dca36..0000000 --- a/.config/sketchybar/plugins/power.sh +++ /dev/null @@ -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}% " diff --git a/.config/sketchybar/plugins/space.sh b/.config/sketchybar/plugins/space.sh deleted file mode 100755 index 152f892..0000000 --- a/.config/sketchybar/plugins/space.sh +++ /dev/null @@ -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 diff --git a/.config/sketchybar/sketchybarrc b/.config/sketchybar/sketchybarrc deleted file mode 100755 index ed20c96..0000000 --- a/.config/sketchybar/sketchybarrc +++ /dev/null @@ -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.." diff --git a/.config/sketchybar/variables.sh b/.config/sketchybar/variables.sh deleted file mode 100644 index 4994057..0000000 --- a/.config/sketchybar/variables.sh +++ /dev/null @@ -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=("一" "二" "三" "四" "五" "六" "七" "八" "九" "十") diff --git a/.config/skhd/skhdrc b/.config/skhd/skhdrc deleted file mode 100755 index a91582b..0000000 --- a/.config/skhd/skhdrc +++ /dev/null @@ -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 diff --git a/.config/starship.toml b/.config/starship.toml deleted file mode 100644 index debd375..0000000 --- a/.config/starship.toml +++ /dev/null @@ -1,130 +0,0 @@ -"$schema" = 'https://starship.rs/config-schema.json' - -add_newline = true -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)' -version_format = '${major}.${minor}' - -[c] -detect_extensions = ['c', 'cpp'] -format = '[$symbol $name-$version ]($style)' -symbol = "" -version_format = '${major}.${minor}' - -[character] -success_symbol = "[➜](bold green)" -error_symbol = "[✗](bold red)" - -[cmd_duration] -disabled = true - -[directory] -home_symbol= "󰊠 " -truncation_length = 2 -truncate_to_repo = true -truncation_symbol = "󰊠 " -style = "bold blue" - -[docker_context] -format = 'in [$symbol$context]($style) ' - -[git_branch] -format='[ $symbol$branch :\($remote_branch\) ]($style)' -style='bold purple' -symbol=" " -always_show_remote = true - -[git_state] -cherry_pick = '[🍒 PICKING](bold red)' - -[git_metrics] -# format = '[+$added]($added_style) [-$deleted]($deleted_style) ' -disabled = false - -[git_status] -format = '([\[$all_status$ahead_behind\]]($style) )' -up_to_date = '✓' -ahead = '⇡${count}' -diverged = '⇕⇡${ahead_count}⇣${behind_count}' -behind = '⇣${count}' -stashed = '📦' -staged = '[++\($count\)](green)' - - -[golang] -format = '[ $version ](bold cyan)' -version_format = '${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" -flamingo = "#f2cdcd" -pink = "#f5c2e7" -mauve = "#cba6f7" -red = "#f38ba8" -maroon = "#eba0ac" -peach = "#fab387" -yellow = "#f9e2af" -green = "#a6e3a1" -teal = "#94e2d5" -sky = "#89dceb" -sapphire = "#74c7ec" -blue = "#89b4fa" -lavender = "#b4befe" -text = "#cdd6f4" -subtext1 = "#bac2de" -subtext0 = "#a6adc8" -overlay2 = "#9399b2" -overlay1 = "#7f849c" -overlay0 = "#6c7086" -surface2 = "#585b70" -surface1 = "#45475a" -surface0 = "#313244" -base = "#1e1e2e" -mantle = "#181825" -crust = "#11111b" - -[python] -symbol = " " -format = '[(\($virtualenv\) )${symbol}(${version} )]($style)' -version_format = '${major}.${minor}' - -[sudo] -format = '[ as sudo]($style)' -style = 'bold blue' -disabled = false diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf deleted file mode 100644 index afb1069..0000000 --- a/.config/tmux/tmux.conf +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/env bash - -set-option -sa terminal-overrides ",xterm*:Tc" -set -g mouse on - -unbind C-b -set -g prefix C-x -bind C-x send-prefix - -# Start windows and panes at 1, not 0 -set -g base-index 1 -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 -unbind '"' -unbind % -bind - split-window -v -c "#{pane_current_path}" -bind _ split-window -h -c "#{pane_current_path}" - -bind -r k select-pane -U -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} " - -# 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 @catppuccin_window_current_background "#{@thm_lavender}" -set -g @catppuccin_window_status_style "basic" - -set -g @catppuccin_window_default_text " #W" -set -g @catppuccin_window_current_text " #W" -set -g @catppuccin_window_status "icon" -set -g @catppuccin_window_current_background "#{@thm_peach}" - -run '~/.config/tmux/plugins/tpm/tpm' diff --git a/.config/wezterm/wezterm.lua b/.config/wezterm/wezterm.lua deleted file mode 100644 index f2430b9..0000000 --- a/.config/wezterm/wezterm.lua +++ /dev/null @@ -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 diff --git a/.config/yabai/yabairc b/.config/yabai/yabairc deleted file mode 100755 index cf4829f..0000000 --- a/.config/yabai/yabairc +++ /dev/null @@ -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.." diff --git a/.gitignore b/.gitignore deleted file mode 100644 index d6c5ef2..0000000 --- a/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -*.DS_Store** - -# tmux plugin files etc -*.config/tmux/** -**!tmux/tmux.conf - -# btop files -*btop/** -!btop/btop.conf diff --git a/.stow-local-ignore b/.stow-local-ignore deleted file mode 100644 index fcbfa76..0000000 --- a/.stow-local-ignore +++ /dev/null @@ -1,28 +0,0 @@ -# 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 -cool-icons -readme.md diff --git a/.zshrc b/.zshrc deleted file mode 100644 index 4a3628e..0000000 --- a/.zshrc +++ /dev/null @@ -1,26 +0,0 @@ -# ---- homebrew ---- -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 nv='nvim' -alias neofetch="fastfetch" -alias python='python3' - -# ---- Air GO hot reload ---- -alias air="~/go/bin/air" - -# ---- starship ---- -eval "$(starship init zsh)" - -# ---- zoxide ---- -eval "$(zoxide init --cmd cd zsh)" - -# ---- fzf ---- -source <(fzf --zsh) diff --git a/assets/home_.png b/assets/home_.png deleted file mode 100644 index bb59e0f..0000000 Binary files a/assets/home_.png and /dev/null differ diff --git a/assets/kitty-cat.png b/assets/kitty-cat.png deleted file mode 100644 index 6ebce7e..0000000 Binary files a/assets/kitty-cat.png and /dev/null differ diff --git a/assets/nvim-cat.png b/assets/nvim-cat.png deleted file mode 100644 index 42561b4..0000000 Binary files a/assets/nvim-cat.png and /dev/null differ diff --git a/assets/nvim-wez-fox.png b/assets/nvim-wez-fox.png deleted file mode 100644 index 012e1ad..0000000 Binary files a/assets/nvim-wez-fox.png and /dev/null differ diff --git a/assets/telescope-cat.png b/assets/telescope-cat.png deleted file mode 100644 index f0438bb..0000000 Binary files a/assets/telescope-cat.png and /dev/null differ diff --git a/assets/yabai-fox.png b/assets/yabai-fox.png deleted file mode 100644 index e25e47c..0000000 Binary files a/assets/yabai-fox.png and /dev/null differ diff --git a/cool-icons/kitty.icns b/cool-icons/kitty.icns deleted file mode 100644 index 57e2982..0000000 Binary files a/cool-icons/kitty.icns and /dev/null differ diff --git a/cool-icons/terminal.icns b/cool-icons/terminal.icns deleted file mode 100644 index 3a9a4f1..0000000 Binary files a/cool-icons/terminal.icns and /dev/null differ diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..ae90403 --- /dev/null +++ b/flake.lock @@ -0,0 +1,69 @@ +{ + "nodes": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735979091, + "narHash": "sha256-WpFjt6+8UD81EP386c269ZTqpEmlGJgcPw+OB4b7EBs=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "11ab08541e61ac3bbf2ab27229f68622629401df", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1736002328, + "narHash": "sha256-anoVvML2D+nLfHlBfhEcCMjTou/9SRrrlqQN+Ug39ws=", + "owner": "LnL7", + "repo": "nix-darwin", + "rev": "a464e5ba8cfb10a81599dbd422f30f5d37997916", + "type": "github" + }, + "original": { + "owner": "LnL7", + "repo": "nix-darwin", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1735915915, + "narHash": "sha256-Q4HuFAvoKAIiTRZTUxJ0ZXeTC7lLfC9/dggGHNXNlCw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a27871180d30ebee8aa6b11bf7fef8a52f024733", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "nix-darwin": "nix-darwin", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..84da316 --- /dev/null +++ b/flake.nix @@ -0,0 +1,67 @@ +{ + description = "lilJ's nix-config"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-darwin = { + url = "github:LnL7/nix-darwin"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + + outputs = inputs @ { + self, + nixpkgs, + nix-darwin, + home-manager, + ... + }: let + username = "lilj"; + email = "kulvir@duck.com"; + + system = "aarch64-darwin"; # apple target arch + forAllSystems = nixpkgs.lib.genAttrs [ + "aarch64-darwin" + "aarch64-linux" + ]; + inherit (self) outputs; + in { + # Custom packages and modifications + packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); + + overlays = import ./overlays {inherit inputs;}; + + # darwin-rebuild switch --flake .#mba + darwinConfigurations."mba" = nix-darwin.lib.darwinSystem { + specialArgs = {inherit inputs username email outputs system;}; + modules = [ + ./hosts/mba + + home-manager.darwinModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.lilj = import ./hosts/mba/home.nix; + home-manager.extraSpecialArgs = {inherit username email outputs;}; + } + ]; + }; + + # darwin-rebuild switch --flake .#vps + nixosConfigurations = forAllSystems (system: { + "vps" = nixpkgs.lib.nixosSystem { + inherit system; + specialArgs = {inherit inputs username email outputs system;}; + modules = [ + ./hosts/mba + ]; + }; + }); + + formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); + }; +} diff --git a/home-modules/alacritty.nix b/home-modules/alacritty.nix new file mode 100644 index 0000000..7dddc8d --- /dev/null +++ b/home-modules/alacritty.nix @@ -0,0 +1,117 @@ +{config, ...}: { + programs.alacritty = { + enable = true; + settings = { + env = { + TERM = "xterm-256color"; + }; + + cursor = { + style = "Beam"; + }; + + font = { + normal.family = "JetBrainsMono Nerd Font"; + bold.family = "JetBrainsMono Nerd Font"; + italic.family = "JetBrainsMono Nerd Font"; + bold_italic.family = "JetBrainsMono Nerd Font"; + size = 16; + }; + + general.live_config_reload = true; + + mouse.hide_when_typing = true; + + selection.save_to_clipboard = true; + + window = { + decorations = "none"; + opacity = 0.95; + padding = { + x = 2; + y = 2; + }; + }; + + # ROSE-PINE theme + colors = { + primary = { + foreground = "#e0def4"; + background = "#191724"; + dim_foreground = "#908caa"; + bright_foreground = "#e0def4"; + }; + cursor = { + text = "#e0def4"; + cursor = "#524f67"; + }; + vi_mode_cursor = { + text = "#e0def4"; + cursor = "#524f67"; + }; + search = { + matches = { + foreground = "#908caa"; + background = "#26233a"; + }; + focused_match = { + foreground = "#191724"; + background = "#ebbcba"; + }; + }; + hints = { + start = { + foreground = "#908caa"; + background = "#1f1d2e"; + }; + end = { + foreground = "#6e6a86"; + background = "#1f1d2e"; + }; + }; + line_indicator = { + foreground = "None"; + background = "None"; + }; + footer_bar = { + foreground = "#e0def4"; + background = "#1f1d2e"; + }; + selection = { + text = "#e0def4"; + background = "#403d52"; + }; + normal = { + black = "#26233a"; + red = "#eb6f92"; + green = "#31748f"; + yellow = "#f6c177"; + blue = "#9ccfd8"; + magenta = "#c4a7e7"; + cyan = "#ebbcba"; + white = "#e0def4"; + }; + bright = { + black = "#6e6a86"; + red = "#eb6f92"; + green = "#31748f"; + yellow = "#f6c177"; + blue = "#9ccfd8"; + magenta = "#c4a7e7"; + cyan = "#ebbcba"; + white = "#e0def4"; + }; + dim = { + black = "#6e6a86"; + red = "#eb6f92"; + green = "#31748f"; + yellow = "#f6c177"; + blue = "#9ccfd8"; + magenta = "#c4a7e7"; + cyan = "#ebbcba"; + white = "#e0def4"; + }; + }; + }; + }; +} diff --git a/home-modules/git.nix b/home-modules/git.nix new file mode 100644 index 0000000..4e0abe5 --- /dev/null +++ b/home-modules/git.nix @@ -0,0 +1,38 @@ +{ + lib, + username, + email, + ... +}: { + programs.git = { + enable = true; + + userName = "${username}"; + userEmail = "${email}"; + + aliases = { + cm = "commit -m"; + amend = "commit --amend"; + }; + + ignores = [ + ".DS_Store" + ".env" + ]; + + # includes = [ + # { + # path = "~/corpo/.gitconfig"; + # condition = "gitdir:~/path/corpo/"; + # } + # ]; + + lfs.enable = true; # make ptr to large files(audio/video) locally + + extraConfig = { + init.defaultBranch = "trunk"; + credential.helper = "cache"; + push.autoSetupRemote = true; + }; + }; +} diff --git a/home-modules/kitty.nix b/home-modules/kitty.nix new file mode 100644 index 0000000..b27707a --- /dev/null +++ b/home-modules/kitty.nix @@ -0,0 +1,56 @@ +{...}: { + programs.kitty = { + enable = true; + + font = { + name = "JetBrainsMono Nerd Font"; + size = 14.0; + }; + + keybindings = { + "kitty_mod+enter" = "no_op"; + "cmd+enter" = "no_op"; + "cmd+t" = "new_tab_with_cwd"; + + "cmd+1" = "goto_tab 1"; + "cmd+2" = "goto_tab 2"; + "cmd+3" = "goto_tab 3"; + "cmd+4" = "goto_tab 4"; + "cmd+5" = "goto_tab 5"; + "cmd+6" = "goto_tab 6"; + "cmd+7" = "goto_tab 7"; + "cmd+8" = "goto_tab 8"; + "cmd+9" = "goto_tab 9"; + }; + + shellIntegration.enableZshIntegration = true; + + themeFile = "Catppuccin-Mocha"; + + extraConfig = '' + cursor_shape beam + + background_opacity 0.95 + background_blur 12 + + macos_quit_when_last_window_closed yes + macos_show_window_title_in none + + enable_audio_bell no + hide_window_decorations yes + + # tab bar at bottom stlying + tab_bar_style powerline + tab_bar_min_tabs 2 + tab_title_template "{index}" + active_tab_title_template "{index}" + tab_bar_background none + + # macOS - 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 + ''; + }; +} diff --git a/home-modules/nvim.nix b/home-modules/nvim.nix new file mode 100644 index 0000000..853c5bd --- /dev/null +++ b/home-modules/nvim.nix @@ -0,0 +1,16 @@ +{pkgs, ...}: { + home.file = { + ".config/nvim" = { + recursive = true; + source = "${pkgs.lilj-nvim-config}"; + }; + }; + + programs = { + neovim = { + enable = true; + defaultEditor = true; + vimAlias = true; + }; + }; +} diff --git a/home-modules/shell.nix b/home-modules/shell.nix new file mode 100644 index 0000000..e1a3439 --- /dev/null +++ b/home-modules/shell.nix @@ -0,0 +1,45 @@ +{pkgs, ...}: { + programs = { + zsh = { + enable = true; + shellAliases = { + ls = "lsd"; + neofetch = "fastfetch"; + nv = "nvim"; + python = "python3"; + }; + syntaxHighlighting.enable = true; + }; + + btop = { + enable = true; + settings = { + theme_background = false; + presets = "cpu:0:default mem:0:default net:0:default"; + proc_sorting = "memory"; + update_ms = 1000; + vim_keys = true; + }; + }; + + fzf = { + enable = true; + enableZshIntegration = true; + }; + + lazygit.enable = true; + + ripgrep.enable = true; + + zoxide = { + enable = true; + options = ["--cmd cd"]; + }; + }; + + # environment.sessionVariables = {}; + + home.packages = [ + pkgs.lsd + ]; +} diff --git a/home-modules/starship.nix b/home-modules/starship.nix new file mode 100644 index 0000000..395c176 --- /dev/null +++ b/home-modules/starship.nix @@ -0,0 +1,112 @@ +{pkgs, ...}: { + programs.starship = { + enable = true; + settings = { + add_newline = true; + continuation_prompt = "▶▶ "; + format = ''$directory$all$character''; + palette = "catppuccin_mocha"; + scan_timeout = 120; + + bun = { + format = "[🍞 bun $version ](bold green)"; + version_format = "\${major}.\${minor}"; + }; + + c = { + detect_extensions = ["c" "cpp"]; + format = "[$symbol $name-$version ]($style)"; + symbol = ""; + version_format = "\${major}.\${minor}"; + }; + + character = { + success_symbol = "[➜](bold green)"; + error_symbol = "[✗](bold red)"; + }; + + cmd_duration = { + disabled = true; + }; + + directory = { + home_symbol = "󰊠 "; + truncation_length = 2; + truncate_to_repo = true; + truncation_symbol = "󰊠 "; + style = "bold blue"; + }; + + git_branch = { + format = "[ $symbol$branch ]($style)"; + style = "bold purple"; + symbol = " "; + always_show_remote = true; + }; + + # git_status = { + # format = "([$all_status$ahead_behind]($style))"; + # up_to_date = "✓"; + # ahead = "⇡\${count}"; + # diverged = "⇕⇡\${ahead_count}⇣\${behind_count}"; + # behind = "⇣\${count}"; + # stashed = "📦 "; + # staged = "[++($count)](green)"; + # }; + + golang = { + format = "[$symbol $version ](bold cyan)"; + version_format = "\${major}.\${minor}"; + symbol = " "; + }; + + hostname = { + ssh_only = true; + format = "[$ssh_symbol$hostname]($style)"; + style = "bold green"; + ssh_symbol = "󰇧 "; + disabled = false; + }; + + nodejs = { + detect_files = ["!bun.lockb"]; + format = "[$symbol$version ]($style)"; + version_format = "\${major}.\${minor}"; + }; + + package = { + format = "[pkg $symbol$version]($style) "; + disabled = true; + }; + + palettes.catppuccin_mocha = { + rosewater = "#f5e0dc"; + flamingo = "#f2cdcd"; + pink = "#f5c2e7"; + mauve = "#cba6f7"; + red = "#f38ba8"; + maroon = "#eba0ac"; + peach = "#fab387"; + yellow = "#f9e2af"; + green = "#a6e3a1"; + teal = "#94e2d5"; + sky = "#89dceb"; + sapphire = "#74c7ec"; + blue = "#89b4fa"; + lavender = "#b4befe"; + text = "#cdd6f4"; + subtext1 = "#bac2de"; + subtext0 = "#a6adc8"; + overlay2 = "#9399b2"; + overlay1 = "#7f849c"; + overlay0 = "#6c7086"; + surface2 = "#585b70"; + surface1 = "#45475a"; + surface0 = "#313244"; + base = "#1e1e2e"; + mantle = "#181825"; + crust = "#11111b"; + }; + }; + }; +} diff --git a/home-modules/tmux.nix b/home-modules/tmux.nix new file mode 100644 index 0000000..3c594ba --- /dev/null +++ b/home-modules/tmux.nix @@ -0,0 +1,37 @@ +{pkgs, ...}: { + programs.tmux = { + enable = true; + + baseIndex = 1; + + historyLimit = 10000; + + mouse = true; + + prefix = "C-x"; + + plugins = [ + pkgs.tmuxPlugins.vim-tmux-navigator + { + plugin = pkgs.tmuxPlugins.catppuccin; + } + ]; + + extraConfig = " + set-option -sa terminal-overrides \",xterm*:Tc\" + + set -s escape-time 0 + + # split panes using | and - + unbind '\"' + unbind % + bind _ split-window -h + bind - split-window -v + + bind -r k select-pane -U + bind -r j select-pane -D + bind -r h select-pane -L + bind -r l select-pane -R + "; + }; +} diff --git a/hosts/mba/configuration.nix b/hosts/mba/configuration.nix new file mode 100644 index 0000000..d5f8c39 --- /dev/null +++ b/hosts/mba/configuration.nix @@ -0,0 +1,86 @@ +{ + pkgs, + inputs, + ... +}: { + security.pam.enableSudoTouchIdAuth = true; + + # Set Git commit hash for darwin-version. + system.configurationRevision = inputs.self.rev or inputs.self.dirtyRev or null; + + system.defaults = { + controlcenter = { + BatteryShowPercentage = true; + NowPlaying = false; + }; + dock = { + autohide = false; + tilesize = 22; + mineffect = "genie"; + largesize = 32; + mru-spaces = true; + show-recents = false; + + # don't ned hotcorners + wvous-bl-corner = null; + wvous-br-corner = null; + wvous-tl-corner = null; + wvous-tr-corner = null; + }; + finder = { + CreateDesktop = false; + FXDefaultSearchScope = "SCcf"; + FXPreferredViewStyle = "Nlsv"; + NewWindowTarget = "Other"; + NewWindowTargetPath = "file:///Users/lilj/Downloads"; + QuitMenuItem = true; + ShowPathbar = true; + ShowStatusBar = true; + ShowRemovableMediaOnDesktop = false; + }; + menuExtraClock = { + Show24Hour = false; + ShowAMPM = false; + ShowSeconds = false; + ShowDate = 1; + ShowDayOfWeek = true; + }; + NSGlobalDomain = { + AppleInterfaceStyle = "Dark"; + AppleICUForce24HourTime = false; + AppleSpacesSwitchOnActivate = true; # Switch to other workspace when switching application + "com.apple.keyboard.fnState" = false; + "com.apple.sound.beep.feedback" = 0; + "com.apple.sound.beep.volume" = 0.7788008; + "com.apple.swipescrolldirection" = true; + "com.apple.trackpad.scaling" = 1.35; + InitialKeyRepeat = 15; + KeyRepeat = 3; + + NSAutomaticCapitalizationEnabled = false; + NSAutomaticDashSubstitutionEnabled = false; + NSAutomaticSpellingCorrectionEnabled = false; + NSAutomaticWindowAnimationsEnabled = true; + NSScrollAnimationEnabled = true; + NSTableViewDefaultSizeMode = 2; # finder sidebar icons size + }; + screencapture = { + include-date = false; + location = "~/Documents/screenshots"; + type = "png"; + }; + trackpad = { + ActuationStrength = 0; + Clicking = true; + TrackpadRightClick = true; + }; + WindowManager = { + EnableStandardClickToShowDesktop = true; + EnableTiledWindowMargins = true; + }; + }; + + system.stateVersion = 4; + + time.timeZone = "Asia/Calcutta"; +} diff --git a/hosts/mba/default.nix b/hosts/mba/default.nix new file mode 100644 index 0000000..d82ce49 --- /dev/null +++ b/hosts/mba/default.nix @@ -0,0 +1,16 @@ +{outputs, ...}: { + imports = [ + ./configuration.nix + ./mac-apps.nix + ./nix.nix + ./users.nix + ]; + nixpkgs = { + overlays = [ + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.stable-packages + # outputs.overlays.nur + ]; + }; +} diff --git a/hosts/mba/home.nix b/hosts/mba/home.nix new file mode 100644 index 0000000..7e04e5f --- /dev/null +++ b/hosts/mba/home.nix @@ -0,0 +1,38 @@ +{ + pkgs, + username, + email, + outputs, + ... +}: { + imports = [ + # ../../modules/alacritty.nix + ../../home-modules/git.nix + ../../home-modules/kitty.nix + ../../home-modules/nvim.nix + ../../home-modules/shell.nix + ../../home-modules/starship.nix + ../../home-modules/tmux.nix + ]; + + home.packages = [ + pkgs.air + pkgs.bun + pkgs.go + pkgs.nodejs_23 + pkgs.pnpm + ]; + + nixpkgs = { + overlays = [ + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.stable-packages + # outputs.overlays.nur + ]; + }; + + home.stateVersion = "24.11"; + + programs.home-manager.enable = true; +} diff --git a/hosts/mba/mac-apps.nix b/hosts/mba/mac-apps.nix new file mode 100644 index 0000000..5dc43c7 --- /dev/null +++ b/hosts/mba/mac-apps.nix @@ -0,0 +1,50 @@ +{ + pkgs, + config, + ... +}: { + environment.systemPackages = [ + pkgs.fastfetch + ]; + + environment.variables = { + MANPAGER = "nvim +Man!"; + }; + + # Enable alternative shell support in nix-darwin. + # environment.shells = [ + # pkgs.fish + # ]; + + fonts.packages = [ + pkgs.nerd-fonts.jetbrains-mono + # Alternate Fonts + # pkgs.nerd-fonts.caskaydia-mono + # pkgs.nerd-fonts.iosevka + ]; + + homebrew = { + enable = true; + + onActivation = { + autoUpdate = true; + upgrade = true; + cleanup = "zap"; + }; + + brews = []; + casks = [ + "discord" + "obsidian" + "raycast" + "spotify" + "telegram-desktop" + + # CORPO + "mongodb-compass" + "postman" + "slack" + "zoom" + ]; + }; +} diff --git a/hosts/mba/nix.nix b/hosts/mba/nix.nix new file mode 100644 index 0000000..14bfdb4 --- /dev/null +++ b/hosts/mba/nix.nix @@ -0,0 +1,31 @@ +# This file seems like generic nix config options could be moved to common in future +{ + pkgs, + lib, + system, + ... +}: { + nixpkgs.config.allowUnfree = true; + + # Cross-compile GNU/Linux binaries, or even full GNU/Linux system images + # from someone's config, could be useful but idk + # nix.linux-builder.enable = true; + + nix.settings.experimental-features = "nix-command flakes"; + + nixpkgs.hostPlatform = "${system}"; + + services.nix-daemon.enable = true; + + nix.gc = { + user = "root"; + automatic = lib.mkDefault true; + options = lib.mkDefault "--delete-older-than 7d"; + }; + + # Disable auto-optimise-store because of this issue: + # https://github.com/NixOS/nix/issues/7273 + # nix.settings = { + # auto-optimise-store = false; + # }; +} diff --git a/hosts/mba/users.nix b/hosts/mba/users.nix new file mode 100644 index 0000000..6274c5c --- /dev/null +++ b/hosts/mba/users.nix @@ -0,0 +1,11 @@ +# same as nix.nix file, could be moved to common +{username, ...}: { + system.defaults.smb.NetBIOSName = "lilJ's mba"; + + users.users."${username}" = { + name = "${username}"; + home = "/Users/${username}"; + }; + + nix.settings.trusted-users = [username]; +} diff --git a/install.sh b/install.sh deleted file mode 100755 index eb7733c..0000000 --- a/install.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/zsh - -# ---- Terminal ---- -echo "Installing your Teminal and other thingies..." -brew install fastfetch -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" -source ~/.zshrc - -# ---- Maybe sometimes idk ---- -# 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 -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" diff --git a/overlays/default.nix b/overlays/default.nix new file mode 100644 index 0000000..6717c24 --- /dev/null +++ b/overlays/default.nix @@ -0,0 +1,22 @@ +{inputs, ...}: { + additions = final: _prev: import ../pkgs {pkgs = final;}; + + modifications = final: prev: { + # ghostty = inputs.ghostty.packages.aarch64-darwin.default; + + discord = prev.discord.override { + withOpenASAR = true; + withVencord = true; + }; + }; + + # The stable nixpkgs set (declared in the flake inputs) will be accessible through 'pkgs.stable' + stable-packages = final: _prev: { + stable = import inputs.nixpkgs-stable { + system = final.system; + config.allowUnfree = true; + }; + }; + + # nur = inputs.nur.overlays.default; +} diff --git a/pkgs/default.nix b/pkgs/default.nix new file mode 100644 index 0000000..41265fa --- /dev/null +++ b/pkgs/default.nix @@ -0,0 +1,4 @@ +{pkgs, ...}: { + lilj-nvim-config = pkgs.callPackage ./nvim-conf {}; + # firefox = pkgs.callPackage ./firefox-mod-blur {}; +} diff --git a/pkgs/nvim-conf/default.nix b/pkgs/nvim-conf/default.nix new file mode 100644 index 0000000..dc2ea91 --- /dev/null +++ b/pkgs/nvim-conf/default.nix @@ -0,0 +1,22 @@ +{ + stdenv, + lib, +}: let + nvim = ./nvim; +in + stdenv.mkDerivation { + pname = "lilj-nvim-config"; + version = "1.0.0"; + + buildCommand = '' + mkdir -p $out + cp -r ${nvim}/* "$out/" + ''; + + meta = with lib; { + description = "lilJ's nvim config"; + homepage = "https://kulvir.gg"; + platforms = platforms.all; + license = licenses.gpl3; + }; + } diff --git a/.config/nvim/init.lua b/pkgs/nvim-conf/nvim/init.lua similarity index 100% rename from .config/nvim/init.lua rename to pkgs/nvim-conf/nvim/init.lua diff --git a/.config/nvim/lazy-lock.json b/pkgs/nvim-conf/nvim/lazy-lock.json similarity index 100% rename from .config/nvim/lazy-lock.json rename to pkgs/nvim-conf/nvim/lazy-lock.json diff --git a/.config/nvim/lua/lilJ/completions.lua b/pkgs/nvim-conf/nvim/lua/lilJ/completions.lua similarity index 100% rename from .config/nvim/lua/lilJ/completions.lua rename to pkgs/nvim-conf/nvim/lua/lilJ/completions.lua diff --git a/.config/nvim/lua/lilJ/health.lua b/pkgs/nvim-conf/nvim/lua/lilJ/health.lua similarity index 100% rename from .config/nvim/lua/lilJ/health.lua rename to pkgs/nvim-conf/nvim/lua/lilJ/health.lua diff --git a/.config/nvim/lua/lilJ/plugins/carbonfox.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/carbonfox.lua similarity index 100% rename from .config/nvim/lua/lilJ/plugins/carbonfox.lua rename to pkgs/nvim-conf/nvim/lua/lilJ/plugins/carbonfox.lua diff --git a/.config/nvim/lua/lilJ/plugins/catppuccin.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/catppuccin.lua similarity index 100% rename from .config/nvim/lua/lilJ/plugins/catppuccin.lua rename to pkgs/nvim-conf/nvim/lua/lilJ/plugins/catppuccin.lua diff --git a/.config/nvim/lua/lilJ/plugins/comment.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/comment.lua similarity index 100% rename from .config/nvim/lua/lilJ/plugins/comment.lua rename to pkgs/nvim-conf/nvim/lua/lilJ/plugins/comment.lua diff --git a/.config/nvim/lua/lilJ/plugins/completions.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/completions.lua similarity index 100% rename from .config/nvim/lua/lilJ/plugins/completions.lua rename to pkgs/nvim-conf/nvim/lua/lilJ/plugins/completions.lua diff --git a/.config/nvim/lua/lilJ/plugins/conform.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/conform.lua similarity index 100% rename from .config/nvim/lua/lilJ/plugins/conform.lua rename to pkgs/nvim-conf/nvim/lua/lilJ/plugins/conform.lua diff --git a/.config/nvim/lua/lilJ/plugins/dadbod.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/dadbod.lua similarity index 100% rename from .config/nvim/lua/lilJ/plugins/dadbod.lua rename to pkgs/nvim-conf/nvim/lua/lilJ/plugins/dadbod.lua diff --git a/.config/nvim/lua/lilJ/plugins/debug.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/debug.lua similarity index 100% rename from .config/nvim/lua/lilJ/plugins/debug.lua rename to pkgs/nvim-conf/nvim/lua/lilJ/plugins/debug.lua diff --git a/.config/nvim/lua/lilJ/plugins/gitsigns.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/gitsigns.lua similarity index 100% rename from .config/nvim/lua/lilJ/plugins/gitsigns.lua rename to pkgs/nvim-conf/nvim/lua/lilJ/plugins/gitsigns.lua diff --git a/.config/nvim/lua/lilJ/plugins/indent_line.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/indent_line.lua similarity index 100% rename from .config/nvim/lua/lilJ/plugins/indent_line.lua rename to pkgs/nvim-conf/nvim/lua/lilJ/plugins/indent_line.lua diff --git a/.config/nvim/lua/lilJ/plugins/lint.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/lint.lua similarity index 100% rename from .config/nvim/lua/lilJ/plugins/lint.lua rename to pkgs/nvim-conf/nvim/lua/lilJ/plugins/lint.lua diff --git a/.config/nvim/lua/lilJ/plugins/lsp.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/lsp.lua similarity index 100% rename from .config/nvim/lua/lilJ/plugins/lsp.lua rename to pkgs/nvim-conf/nvim/lua/lilJ/plugins/lsp.lua diff --git a/.config/nvim/lua/lilJ/plugins/mini.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/mini.lua similarity index 100% rename from .config/nvim/lua/lilJ/plugins/mini.lua rename to pkgs/nvim-conf/nvim/lua/lilJ/plugins/mini.lua diff --git a/.config/nvim/lua/lilJ/plugins/telescope.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/telescope.lua similarity index 100% rename from .config/nvim/lua/lilJ/plugins/telescope.lua rename to pkgs/nvim-conf/nvim/lua/lilJ/plugins/telescope.lua diff --git a/.config/nvim/lua/lilJ/plugins/tmux-navigator.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/tmux-navigator.lua similarity index 100% rename from .config/nvim/lua/lilJ/plugins/tmux-navigator.lua rename to pkgs/nvim-conf/nvim/lua/lilJ/plugins/tmux-navigator.lua diff --git a/.config/nvim/lua/lilJ/plugins/todo-comments.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/todo-comments.lua similarity index 100% rename from .config/nvim/lua/lilJ/plugins/todo-comments.lua rename to pkgs/nvim-conf/nvim/lua/lilJ/plugins/todo-comments.lua diff --git a/.config/nvim/lua/lilJ/plugins/treesitter.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/treesitter.lua similarity index 100% rename from .config/nvim/lua/lilJ/plugins/treesitter.lua rename to pkgs/nvim-conf/nvim/lua/lilJ/plugins/treesitter.lua diff --git a/.config/nvim/lua/lilJ/telescope.lua b/pkgs/nvim-conf/nvim/lua/lilJ/telescope.lua similarity index 100% rename from .config/nvim/lua/lilJ/telescope.lua rename to pkgs/nvim-conf/nvim/lua/lilJ/telescope.lua diff --git a/.config/nvim/plugin/keymaps.lua b/pkgs/nvim-conf/nvim/plugin/keymaps.lua similarity index 100% rename from .config/nvim/plugin/keymaps.lua rename to pkgs/nvim-conf/nvim/plugin/keymaps.lua diff --git a/.config/nvim/plugin/options.lua b/pkgs/nvim-conf/nvim/plugin/options.lua similarity index 100% rename from .config/nvim/plugin/options.lua rename to pkgs/nvim-conf/nvim/plugin/options.lua diff --git a/.config/nvim/plugin/terminal.lua b/pkgs/nvim-conf/nvim/plugin/terminal.lua similarity index 100% rename from .config/nvim/plugin/terminal.lua rename to pkgs/nvim-conf/nvim/plugin/terminal.lua diff --git a/.config/nvim/stylua.toml b/pkgs/nvim-conf/nvim/stylua.toml similarity index 100% rename from .config/nvim/stylua.toml rename to pkgs/nvim-conf/nvim/stylua.toml diff --git a/readme.md b/readme.md index f7d18bb..b8b6c4d 100644 --- a/readme.md +++ b/readme.md @@ -1,47 +1 @@ -

- - JJs dotfiles - -

- -![](./assets/kitty-cat.png) - -![](./assets/nvim-cat.png) - -![](./assets/telescope-cat.png) - -![](./assets/home_.png) - -
- - Yabai tiling wm - - - - -![](./assets/yabai-fox.png) - -![](./assets/nvim-wez-fox.png) - -
- -### 🚀 Installation - -1. Clone this repository. - -```sh -git clone https://github.com/kulvirdotgg/dotFiles.git -``` - -2. Run `install.sh` script. (provide `--yabai` flag to install **yabai** tiling window manager) - -```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. - -### Manual setup thingies (Ice age things) -- [Arc](https://arc.net) -- Use Cool icons for terminal (Aplications > {app} > Content > Resrouces) +# lilJ Nix configs