Compare commits

..

No commits in common. "55a65eef2d91f6320c68bd7887d230a61d14e7f9" and "392a488bf2a6cc27da63993f3bc5d08a83fb32b8" have entirely different histories.

6 changed files with 14 additions and 105 deletions

View File

@ -3,8 +3,8 @@
"editor.insertSpaces": true, "editor.insertSpaces": true,
"editor.formatOnSave": true, "editor.formatOnSave": true,
"editor.fontFamily": "'FiraCode Nerd Font Mono', Consolas, 'Courier New', monospace", "editor.fontFamily": "'FiraCode Nerd Font Mono', Consolas, 'Courier New', monospace",
"editor.fontSize": 16, "editor.fontSize": 14,
"editor.minimap.enabled": true, "editor.minimap.enabled": false,
"editor.scrollbar.vertical": "auto", "editor.scrollbar.vertical": "auto",
"editor.scrollbar.horizontal": "auto", "editor.scrollbar.horizontal": "auto",
"window.titleBarStyle": "custom", "window.titleBarStyle": "custom",
@ -12,7 +12,7 @@
"workbench.iconTheme": "catppuccin-mocha", "workbench.iconTheme": "catppuccin-mocha",
"terminal.integrated.defaultProfile.windows": "PowerShell", "terminal.integrated.defaultProfile.windows": "PowerShell",
"terminal.integrated.fontFamily": "'FiraCode Nerd Font Mono', monospace", "terminal.integrated.fontFamily": "'FiraCode Nerd Font Mono', monospace",
"terminal.integrated.fontSize": 16, "terminal.integrated.fontSize": 14,
"go.addTags": { "go.addTags": {
"options": "", "options": "",
"promptForTags": true, "promptForTags": true,
@ -23,7 +23,7 @@
"commands": [ "commands": [
{ {
"match": "\\.go$", "match": "\\.go$",
"cmd": "golines ${file} -w --base-formatter goimports-reviser -m 80 -t 2" "cmd": "golines ${file} -w --base-formatter goimports-reviser -m 120 -t 2"
} }
] ]
}, },
@ -43,10 +43,9 @@
"[typescript]": { "[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
}, },
"workbench.tree.indent": 30, "workbench.tree.indent": 14,
"workbench.tree.renderIndentGuides": "always", "workbench.tree.renderIndentGuides": "always",
"workbench.tree.enableStickyScroll": true, "workbench.tree.enableStickyScroll": true,
"workbench.tree.stickyScrollMaxItemCount": 10,
"explorer.confirmDelete": false, "explorer.confirmDelete": false,
"[jsonc]": { "[jsonc]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
@ -68,13 +67,9 @@
}, },
"cursor.chat.smoothStreaming": true, "cursor.chat.smoothStreaming": true,
"debug.console.fontFamily": "FiraCode Nerd Font Mono", "debug.console.fontFamily": "FiraCode Nerd Font Mono",
"debug.console.fontSize": 16,
"git.openRepositoryInParentFolders": "never", "git.openRepositoryInParentFolders": "never",
"typescript.updateImportsOnFileMove.enabled": "always", "typescript.updateImportsOnFileMove.enabled": "always",
"evenBetterToml.formatter.indentEntries": true, "evenBetterToml.formatter.indentEntries": true,
"evenBetterToml.formatter.indentTables": true, "evenBetterToml.formatter.indentTables": true,
"evenBetterToml.formatter.trailingNewline": true, "evenBetterToml.formatter.trailingNewline": true
"window.customTitleBarVisibility": "auto",
"workbench.editor.showTabs": "single",
"cursor.cpp.enablePartialAccepts": true
} }

View File

@ -82,7 +82,7 @@ floating_modifier $mod
tiling_drag modifier titlebar tiling_drag modifier titlebar
# start a terminal # start a terminal
bindsym $mod+Return exec kitty bindsym $mod+Return exec alacritty
# kill focused window # kill focused window
bindsym $mod+a kill bindsym $mod+a kill
@ -148,7 +148,7 @@ workspace $ws6 output DP-2
workspace $ws7 output DP-1-3 workspace $ws7 output DP-1-3
workspace $ws8 output DP-1-3 workspace $ws8 output DP-1-3
workspace $ws9 output DP-1-3 workspace $ws9 output DP-1-3
workspace $ws10 output DP-1-3 workspace $ws10 output DP-0
bindsym $mod+1 workspace number $ws1 bindsym $mod+1 workspace number $ws1
bindsym $mod+2 workspace number $ws2 bindsym $mod+2 workspace number $ws2
@ -195,6 +195,4 @@ mode "resize" {
exec --no-startup-id ~/.config/i3/startup_apps.sh exec --no-startup-id ~/.config/i3/startup_apps.sh
exec --no-startup-id deadd-notification-center exec --no-startup-id deadd-notification-center
bindsym $mod+p --release exec scrot -s ~/Pictures/Screenshots/scrot_%F.png -e 'xclip -selection clipboard -t image/png -i $f'

View File

@ -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

View File

@ -1,8 +0,0 @@
include current-theme.conf
font_family FiraCode Nerd Font Mono
bold_font auto
italic_font auto
bold_italic_font auto
font_size 12.0

View File

@ -79,7 +79,7 @@ font-0 = FiraCode Nerd Font Mono;2
font-1 = Symbols Nerd Font;2 font-1 = Symbols Nerd Font;2
modules-left = xworkspaces modules-left = xworkspaces
modules-right = filesystem pulseaudio-control-output memory cpu wlan systray powermenu date modules-right = filesystem pulseaudio-control-output memory cpu wlan qalculate systray powermenu date
cursor-click = pointer cursor-click = pointer
cursor-scroll = ns-resize cursor-scroll = ns-resize
@ -93,6 +93,11 @@ enable-ipc = true
; override-redirect = true ; override-redirect = true
[module/qalculate]
type = custom/script
exec = echo "%{T2}%{A1:qalculate-qt &:}%{A}%{T-}"
interval = once
[module/powermenu] [module/powermenu]

View File

@ -96,4 +96,3 @@ bindkey ^l _sgpt_zsh
# bun # bun
export BUN_INSTALL="$HOME/.bun" export BUN_INSTALL="$HOME/.bun"
export PATH="$HOME/go/bin:$BUN_INSTALL/bin:$HOME/.local/bin:$PATH" export PATH="$HOME/go/bin:$BUN_INSTALL/bin:$HOME/.local/bin:$PATH"
export TERM=xterm-256color