diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml index 70f9f5a..7a150c8 100644 --- a/alacritty/alacritty.toml +++ b/alacritty/alacritty.toml @@ -3,9 +3,9 @@ live_config_reload = true working_directory = "None" # Themes -- -import = [ - "~/.config/alacritty/nordic.toml", - "~/.config/alacritty/keybinds.toml" +import = [ + "~/.config/alacritty/nordic.toml", + "~/.config/alacritty/keybinds.toml", ] [window] @@ -21,26 +21,76 @@ columns = 160 lines = 80 [cursor.style] -shape= "Beam" +shape = "Beam" blinking = "Never" -[colors] -#transparent_background_colors = true -draw_bold_text_with_bright_colors = true +# [colors] +# #transparent_background_colors = true +# draw_bold_text_with_bright_colors = true + +# [env] +# TERM = "xterm-256color" + +# [font] +# #glyph_offset = { x = 1, y = 0 } +# normal.family = "MesloLGS Nerd Font Mono" +# normal.style = "Regular" +# size = 16.0 + +# [font.bold] +# family = "MesloLGS Nerd Font Mono" +# style = "Bold" + +# [font.italic] +# family = "MesloLGS Nerd Font Mono" +# style = "Italic" -[env] -TERM = "xterm-256color" [font] -#glyph_offset = { x = 1, y = 0 } -normal.family = "MesloLGS Nerd Font Mono" -normal.style = "Regular" -size = 16.0 +size = 14 + +[font.normal] +family = "Inconsolata Nerd Font" +style = "Regular" [font.bold] -family = "MesloLGS Nerd Font Mono" +family = "Inconsolata Nerd Font" style = "Bold" [font.italic] -family = "MesloLGS Nerd Font Mono" +family = "Inconsolata Nerd Font" style = "Italic" + +[font.bold_italic] +family = "Inconsolata Nerd Font" +style = "Bold Italic" + +[colors.primary] +background = "#10131c" +foreground = "#bbc2cf" + +[colors.normal] +black = "#32344a" +red = "#f7768e" +green = "#9ece6a" +yellow = "#e0af68" +blue = "#7aa2f7" +magenta = "#ad8ee6" +cyan = "#449dab" +white = "#787c99" + +[colors.bright] +black = "#444b6a" +red = "#ff7a93" +green = "#b9f27c" +yellow = "#ff9e64" +blue = "#7da6ff" +magenta = "#bb9af7" +cyan = "#0db9d7" +white = "#acb0d0" + +[selection] +save_to_clipboard = false + +[terminal.shell] +program = "/usr/bin/zsh" diff --git a/git/gitconfig b/git/gitconfig new file mode 100644 index 0000000..782b478 --- /dev/null +++ b/git/gitconfig @@ -0,0 +1,82 @@ +[user] + email = Jake.Pullen333@gmail.com + name = Jake Pullen + +[commit] + template = ~/.config/git/template + +[core] + autocrlf = input # keep newlines as in input + compression = 9 # trade cpu for network + fsync = none + whitespace = error # threat incorrect whitespace as errors + +[advice] # disable advices + addEmptyPathspec = false + pushNonFastForward = false + statusHints = false + +[blame] + coloring = highlightRecent + date = relative + +[diff] + context = 3 # less context in diffs + renames = copies # detect copies as renames in diffs + interHunkContext = 10 # merge near hunks in diffs + +[init] + defaultBranch = main + +[log] + abbrevCommit = true # short commits + graphColors = blue,yellow,cyan,magenta,green,red + +[status] + branch = true + short = true + showStash = true + showUntrackedFiles = all # show individual untracked files + +[pager] + branch = false # no need to use pager for git branch + diff = diff-so-fancy | $PAGER # diff-so-fancy as diff pager + +[push] + autoSetupRemote = true # easier to push new branches + default = current # push only current branch by default + followTags = true # push also tags + gpgSign = false # my remotes doesn't support sign pushes + +[pull] + rebase = true + +[submodule] + fetchJobs = 16 + +[rebase] + autoStash = true + +# Colors +[color "blame"] + highlightRecent = black bold,1 year ago,white,1 month ago,default,7 days ago,blue + +[color "branch"] + current = magenta + local = default + remote = yellow + upstream = green + plain = blue + +[color "diff"] + meta = black bold + frag = magenta + context = white + whitespace = yellow reverse + +[interactive] + singlekey = true + +# URL shortcuts +[url "git@github.com:"] + insteadOf = "gh:" diff --git a/git/template b/git/template new file mode 100644 index 0000000..75c8861 --- /dev/null +++ b/git/template @@ -0,0 +1,34 @@ +# feat: โœจ +# feat: ๐Ÿ” +# feat: ๐Ÿ”— +# feat: ๐Ÿ”’ + +# fix: ๐Ÿ› +# fix: ๐Ÿž +# fix: ๐Ÿฉน +# fix: ๐Ÿš‘๏ธ + +# style: ๐Ÿ’… +# style: ๐ŸŽจ +# style: ๐Ÿ’„ + +# ci: ๐ŸฆŠ +# ci: ๐Ÿ“ฆ + +# deploy: ๐Ÿš€ +# deploy: ๐Ÿ“ฆ + +# chore: ๐Ÿงน +# chore: ๐Ÿ”ง +# chore: โš™๏ธ +# docs: ๐Ÿ“œ + +# refactor: ๐Ÿ”จ +# perf: ๐Ÿš€ + +# test: ๐Ÿšฆ +# debug: ๐Ÿงช + +# BREAKING CHANGE: ๐Ÿšจ +# BREAKING CHANGE: ๐Ÿ’ฅ +# BREAKING CHANGE: ๐Ÿ’ฃ diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 436b042..bdb3289 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -25,7 +25,7 @@ monitor = eDP-1, disable # laptop built in screen monitor = DP-1, preferred, 0x0, 1 # AOC 4k -monitor = DP-2, preferred, auto, 1 # LG DualUp +monitor = DP-2, preferred, auto, 1 # LG DualUpw ################### ### MY PROGRAMS ### @@ -46,9 +46,8 @@ $editor = ~/.local/bin/zed # Autostart necessary processes (like notifications daemons, status bars, etc.) # Or execute your favorite apps at launch like this: -exec-once = $terminal -# exec-once = nm-applet & exec-once = waybar +exec-once = $terminal exec-once = $editor @@ -70,7 +69,7 @@ env = HYPRCURSOR_SIZE,24 # https://wiki.hyprland.org/Configuring/Variables/#general general { - gaps_in = 0 + gaps_in = 2 gaps_out = 1 border_size = 1 @@ -290,6 +289,7 @@ bindl = , XF86AudioPrev, exec, playerctl previous workspace = 10,monitor:DP-2 # Example windowrule # windowrule = float,class:^(kitty)$,title:^(kitty)$ +windowrule = workspace 10, class:^(Spotify)$ # Ignore maximize requests from apps. You'll probably like this. windowrule = suppressevent maximize, class:.* diff --git a/rofi/comfig-drun.rasi b/rofi/comfig-drun.rasi new file mode 100644 index 0000000..d4c969f --- /dev/null +++ b/rofi/comfig-drun.rasi @@ -0,0 +1,83 @@ +configuration { + display-drun: "Applications:"; + display-window: "Windows:"; + drun-display-format: "{name}"; + font: "Inconsolata Nerd Font Mono Regular 11"; + modi: "drun"; + show-icons: true; + icon-theme: "Papirus"; +} + +@theme "/dev/null" + +* { + bg: #11121D00; + bg-alt: #444b6a; + bg-selected: #31324466; + + fg: #FFFFFF; + fg-alt: #787c99; + + + border: 0; + margin: 0; + padding: 0; + spacing: 0; +} + +window { + width:40%; + background-color: #0A0D0DB3 ; +} + +element { + padding: 8 12; + background-color: transparent; + text-color: @fg-alt; +} + +element selected { + text-color: @fg; + background-color: @bg-selected; +} + +element-text { + background-color: transparent; + text-color: inherit; + vertical-align: 0.5; +} + +element-icon { + size: 30; + padding: 0 10 0 0; + background-color: transparent; +} + +entry { + padding: 12; + background-color: @bg-alt; + text-color: @fg; +} + +inputbar { + children: [prompt, entry]; + background-color: @bg; +} + +listview { + background-color: @bg; + columns: 1; + lines: 8; +} + +mainbox { + children: [inputbar, listview]; + background-color: @bg; +} + +prompt { + enabled: true; + padding: 12 0 0 12; + background-color: @bg-alt; + text-color: @fg; +} diff --git a/wofi/style.css b/wofi/style.css new file mode 100644 index 0000000..0ef36a6 --- /dev/null +++ b/wofi/style.css @@ -0,0 +1,51 @@ +window { + font-family: "DejaVu Sans", "Font Awesome 5 Free"; + margin: 0px; + border: 1px solid rgba(0, 0, 0, 0.9); + background-color: rgba(29, 31, 33, 0.95); + border-radius: 10px; +} + +#input { + margin: 5px; + border: none; + color: #f8f8f2; + background-color: rgba(55, 59, 65, 0.95); +} + +#inner-box { + margin: 5px; + border: none; + background-color: transparent; +} + +#outer-box { + margin: 5px; + border: none; + background-color: transparent; +} + +#scroll { + margin: 0px; + border: none; +} + +#text { + margin: 5px; + border: none; + color: #c5c8c6; +} + +#entry { + border: none; +} + +#entry:focus { + border: none; +} + +#entry:selected { + background-color: rgba(55, 59, 65, 0.95); + border-radius: 5px; + border: none; +} diff --git a/zed/settings.json b/zed/settings.json index 1e362c8..4df519e 100644 --- a/zed/settings.json +++ b/zed/settings.json @@ -7,6 +7,13 @@ // custom settings, run `zed: open default settings` from the // command palette (cmd-shift-p / ctrl-shift-p) { + "assistant": { + "default_model": { + "provider": "ollama", + "model": "gemma3:latest" + }, + "version": "2" + }, "ui_font_size": 16, "buffer_font_size": 16, "theme": { diff --git a/zsh/.histfile b/zsh/.histfile index f70666b..4a507dc 100644 --- a/zsh/.histfile +++ b/zsh/.histfile @@ -8,3 +8,158 @@ cd .. : 1746362165:0;git push origin main : 1746362181:0;cd dotfiles : 1746362184:0;git add . +: 1746362188:0;git commit +: 1746362220:0;git commit -m "a" +: 1746362228:0;git push origin main +: 1746362418:0;clear +: 1746362675:0;man wofi +: 1746362813:0;cd ../verity +: 1746362816:0;ls +: 1746362825:0;uv run main.py +: 1746363568:0;uv run testing_limbo.py +: 1746364628:0;uv add pyyaml +: 1746364632:0;uv run testing_limbo.py +: 1746365156:0;git clone git@github.com:Jake-Pullen/JPs_make_work_easier_area.git +: 1746365969:0;uv run testing_limbo.py +: 1746366331:0;git add . +: 1746366352:0;git commit -m 'started the creation of the local db' +: 1746366495:0;cd verity +: 1746366498:0;git add . +: 1746366520:0;git commit -m 'updating git ignore for the database' +: 1746366530:0;git push origin main +: 1746366540:0;clear +: 1746366625:0;git add . +: 1746366629:0;git commit -m 'updating git ignore for the database' +: 1746366634:0;git push origin main +: 1746366847:0;uv run testing_limbo.py +: 1746367128:0;ollama run gemma3 +: 1746367450:0;uv run testing_limbo.py +: 1746368276:0;cd JPs_make_work_easier_area +: 1746368288:0;cd my_codes/random_python +: 1746368295:0;python finding_primes.py +: 1746369260:0;git clone git@github.com:Jake-Pullen/DocGen.git +: 1746370848:0;uv run testing_limbo.py +: 1746371326:0;cd DocGen +: 1746371329:0;uv init +: 1746371347:0;uv add pyyaml +: 1746371360:0;uv run example_use.py +: 1746372047:0;uv run main.py +: 1746372139:0;clear +: 1746372142:0;uv run main.py +: 1746372220:0;ollama run gemma3 +: 1746372315:0;git clone git@github.com:Jake-Pullen/data_pipeline_for_YNAB.git +: 1746372434:0;uv run main.py +: 1746373971:0;clear +: 1746374002:0;ollama run gemma3 +: 1746374965:0;uv run main.py +: 1746374974:0;uv run testing_limbo.py +: 1746375092:0;cd verity +: 1746375094:0;uv run testing_limbo.py +: 1746375420:0;clear +: 1746376229:0;ollama run gemma3 +: 1746377101:0;uv ruff +: 1746377177:0;which ruff +: 1746377185:0;uv tool install ruff +: 1746377193:0;ruff check +: 1746377220:0;clear +: 1746377223:0;cd verity +: 1746377226:0;ruff check +: 1746377324:0;uv run main.py +: 1746377524:0;git add . +: 1746377561:0;git commit -m 'Database schema in good shape and database class created' +: 1746377567:0;git push origin main +: 1746377938:0;shutdown +: 1746430194:0;linutil +: 1746430357:0;sudo pacman -S spotify-launcher +: 1746432964:0;cd verity +: 1746432972:0;uv run main.py +: 1746433974:0;ollama run gemma3 +: 1746434121:0;cd verity +: 1746434276:0;uv run main.py +: 1746434350:0;ruff check +: 1746434389:0;uv run main.py +: 1746434749:0;uv run verity.py +: 1746436127:0;ollama run gemma3 +: 1746436526:0;uv run verity.py +: 1746436997:0;git add . +: 1746437024:0;git commit -m 'slightly messy implementation, but logging is in' +: 1746437116:0;uv run verity.py +: 1746437883:0;rm verity.db +: 1746437887:0;uv run verity.py +: 1746437893:0;rm verity.db +: 1746437910:0;uv run verity.py +: 1746438154:0;git add . +: 1746438156:0;git diff +: 1746439422:0;ruff check +: 1746439752:0;which python +: 1746439757:0;python -v +: 1746439812:0;python -V +: 1746440829:0;ollama run gemma3 +: 1746440924:0;uv run verity.py +: 1746440953:0;ruff check +: 1746440968:0;ruff check --fix +: 1746440992:0;uv run verity.py +: 1746441239:0;ruff check +: 1746441621:0;uv run verity.py +: 1746442256:0;git diff +: 1746442291:0;git add . +: 1746442306:0;git commit -m 'started a config class' +: 1746442313:0;reboot +: 1746479413:0;cd verity +: 1746479418:0;git push origin main +: 1746479423:0;shutdown +: 1746515463:0;fdisk -l +: 1746515471:0;sudo fdisk -l +: 1746517282:0;reboot +: 1746518140:0;sudo fsdisk -l +: 1746518156:0;sudo fdisk -l +: 1746518262:0;sudo fdisk /dev/nvme0n1 +: 1746518679:0;sudo cfdisk +: 1746518717:0;sudo cfdisk /dev/nvme0n1 +: 1746519030:0;systemctl shutdown +: 1746519034:0;shutdown +: 1746522575:0;sudo cfdisk /dev/nvme0n1 +: 1746522838:0;shutdown +: 1746524731:0;non /boot/grub/grub.cfg +: 1746524742:0;nano /boot/grub/grub.cfg +: 1746524757:0;sudo nano /boot/grub/grub.cfg +: 1746524979:0;sudo cp /boot/grub/grub.cfg /boot/grub/grub_cfg.bak +: 1746525009:0;sudo grub-mkconfig -o /boot/grub/grub.cfg +: 1746525020:0;reboot +: 1746525362:0;shutdown +: 1746552645:0;neofetch +: 1746552657:0;fastfetch +: 1746552965:0;which rofi +: 1746552971:0;which wofi +: 1746553120:0;wofi -c /.config/wofi/wofi.conf +: 1746553133:0;wofi --conf /.config/wofi/wofi.conf +: 1746553693:0;zed +: 1746554154:0;clear +: 1746554159:0;fastfetch +: 1746554422:0;spotify +: 1746565310:0;shutdown +: 1746596287:0;cd verity +: 1746596421:0;git config --global --edit +: 1746596519:0;git config --list --show-origin +: 1746596594:0;ls -la +: 1746596769:0;clear +: 1746596974:0;cd verity +: 1746597318:0;gds +: 1746597324:0;gl +: 1746597352:0;gp +: 1746597389:0;cd dotfiles +: 1746597400:0;gd +: 1746597440:0;gc -m 'updating dotfiles' +: 1746597612:0;git config --list --show-origin --show-scope +git config --global user.name 'Jake Pullen' +echo $XDG_CONFIG_HOME +: 1746598211:0;git config --global user.name 'Jake Pullen' +: 1746598245:0;git config --global user.name 'Jake R Pullen' +: 1746598285:0;export XDG_CONFIG_HOME="$HOME/.config" +: 1746598291:0;git config --global user.name 'Jake R Pullen' +: 1746598339:0;cd dotfiles +: 1746598342:0;gd +: 1746598393:0;sudo pacman -S diff-so-fancy +: 1746598402:0;gd +: 1746598423:0;gc +: 1746598470:0;ga . diff --git a/zsh/.zshrc b/zsh/.zshrc index 7c821c7..1373ef0 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -18,3 +18,24 @@ export EDITOR=zed setopt inc_append_history setopt share_history setopt histignorealldups + +# Aliases: git +alias ga='git add' +alias gap='ga --patch' +alias gb='git branch' +alias gba='gb --all' +alias gc='git commit' +alias gca='gc --amend --no-edit' +alias gce='gc --amend' +alias gco='git checkout' +alias gcl='git clone --recursive' +alias gd='git diff --output-indicator-new=" " --output-indicator-old=" "' +alias gds='gd --staged' +alias gi='git init' +alias gl='git log --graph --all --pretty=format:"%C(magenta)%h %C(white) %an %ar%C(blue) %D%n%s%n"' +alias gm='git merge' +alias gn='git checkout -b' # new branch +alias gp='git push' +alias gr='git reset' +alias gs='git status --short' +alias gu='git pull'