diff --git a/git/gitconfig b/git/gitconfig index aba4ed1..8704b68 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -10,6 +10,7 @@ compression = 9 # trade cpu for network fsync = none whitespace = error # threat incorrect whitespace as errors + editor = nano [advice] # disable advices addEmptyPathspec = false @@ -23,7 +24,6 @@ [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 @@ -38,10 +38,6 @@ 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 diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 2cf54aa..787c35a 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -1,10 +1,3 @@ - -# ####################################################################################### -# AUTOGENERATED HYPRLAND CONFIG. -# PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hyprland.conf AND EDIT IT, -# OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS. -# ####################################################################################### - # This is an example Hyprland config file. # Refer to the wiki for more information. # https://wiki.hyprland.org/Configuring/ @@ -20,7 +13,7 @@ ################ ### MONITORS ### ################ - +# XWayland.force_zero_scaling= # See https://wiki.hyprland.org/Configuring/Monitors/ monitor = eDP-1, disable # laptop built in screen @@ -49,7 +42,7 @@ $editor = ~/.local/bin/zed exec-once = waybar exec-once = $terminal exec-once = $editor -exec-once = [workspace 10 silent] Spotify (Launcher) +exec-once = [workspace 10 silent] spotify-launcher ############################# @@ -252,9 +245,9 @@ bindl = , XF86AudioPrev, exec, playerctl previous # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more # See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules -workspace = 10,monitor:DP-2 # Example windowrule -# windowrule = float,class:^(kitty)$,title:^(kitty)$ +# force Spotify and secondary monitor to use workspace 10 +workspace = 10,monitor:DP-2 windowrule = workspace 10, class:^(Spotify)$ # Ignore maximize requests from apps. You'll probably like this. diff --git a/sddm.conf b/sddm.conf new file mode 100644 index 0000000..6f026d8 --- /dev/null +++ b/sddm.conf @@ -0,0 +1,139 @@ +[Autologin] +# Whether sddm should automatically log back into sessions when they exit +Relogin=false + +# Name of session file for autologin session (if empty try last logged in) +Session= + +# Username for autologin session +User= + + +[General] +# Which display server should be used. +# Valid values are: x11, x11-user, wayland. Wayland support is experimental +DisplayServer=x11 + +# Comma-separated list of environment variables to be set +GreeterEnvironment= + +# Halt command +HaltCommand=/usr/bin/systemctl poweroff + +# Input method module +InputMethod=qtvirtualkeyboard + +# Comma-separated list of Linux namespaces for user session to enter +Namespaces= + +# Initial NumLock state. Can be on, off or none. +# If property is set to none, numlock won't be changed +# NOTE: Currently ignored if autologin is enabled. +Numlock=none + +# Reboot command +RebootCommand=/usr/bin/systemctl reboot + + +[Theme] +# Current theme name +Current= + +# Cursor size used in the greeter +CursorSize= + +# Cursor theme used in the greeter +CursorTheme= + +# Number of users to use as threshold +# above which avatars are disabled +# unless explicitly enabled with EnableAvatars +DisableAvatarsThreshold=7 + +# Enable display of custom user avatars +EnableAvatars=true + +# Global directory for user avatars +# The files should be named .face.icon +FacesDir=/usr/share/sddm/faces + +# Font used in the greeter +Font= + +# Theme directory path +ThemeDir=/usr/share/sddm/themes + + +[Users] +# Default $PATH for logged in users +DefaultPath=/usr/local/bin:/usr/bin:/bin + +# Comma-separated list of shells. +# Users with these shells as their default won't be listed +HideShells= + +# Comma-separated list of users that should not be listed +HideUsers= + +# Maximum user id for displayed users +MaximumUid=60513 + +# Minimum user id for displayed users +MinimumUid=1000 + +# Remember the session of the last successfully logged in user +RememberLastSession=true + +# Remember the last successfully logged in user +RememberLastUser=true + +# When logging in as the same user twice, restore the original session, rather than create a new one +ReuseSession=true + + +[Wayland] +# Path of the Wayland compositor to execute when starting the greeter +CompositorCommand=weston --shell=kiosk + +# Enable Qt's automatic high-DPI scaling +EnableHiDPI=true + +# Path to a script to execute when starting the desktop session +SessionCommand=/usr/share/sddm/scripts/wayland-session + +# Comma-separated list of directories containing available Wayland sessions +SessionDir=/usr/local/share/wayland-sessions,/usr/share/wayland-sessions + +# Path to the user session log file +SessionLogFile=.local/share/sddm/wayland-session.log + + +[X11] +# Path to a script to execute when starting the display server +DisplayCommand=/usr/share/sddm/scripts/Xsetup + +# Path to a script to execute when stopping the display server +DisplayStopCommand=/usr/share/sddm/scripts/Xstop + +# Enable Qt's automatic high-DPI scaling +EnableHiDPI=true + +# Arguments passed to the X server invocation +ServerArguments=-nolisten tcp + +# Path to X server binary +ServerPath=/usr/bin/X + +# Path to a script to execute when starting the desktop session +SessionCommand=/usr/share/sddm/scripts/Xsession + +# Comma-separated list of directories containing available X sessions +SessionDir=/usr/local/share/xsessions,/usr/share/xsessions + +# Path to the user session log file +SessionLogFile=.local/share/sddm/xorg-session.log + +# Path to Xephyr binary +XephyrPath=/usr/bin/Xephyr + + diff --git a/set_up_dev/install_me.sh b/set_up_dev/install_me.sh index 61591db..831933c 100755 --- a/set_up_dev/install_me.sh +++ b/set_up_dev/install_me.sh @@ -37,6 +37,7 @@ package_list=( "firefox" "spotify-launcher" "ollama" + "waybar" ) # Create a string of packages @@ -46,4 +47,8 @@ package_string=$(IFS=' ' ; echo "${package_list[@]}") echo "Attempting to install packages: $package_string" sudo pacman -S --needed --noconfirm $package_string +## UV for Python Dev +curl -LsSf https://astral.sh/uv/install.sh | sh + +## Linutil by CTT curl -fsSL https://christitus.com/linux | sh diff --git a/zsh/.histfile b/zsh/.histfile index f039072..4ff6b3c 100644 --- a/zsh/.histfile +++ b/zsh/.histfile @@ -260,3 +260,282 @@ sudo pacman -S ttf-font-awesome waybar ttf-jetbrains-mono-nerd ttf-nerd-fonts-sy : 1746726267:0;cd .. : 1746726269:0;gd : 1746726273:0;ga . +: 1746726281:0;gc -m 'updated' +: 1746726284:0;gp +: 1746726296:0;git diff +: 1746726330:0;gs +: 1746726355:0;git status +: 1746726440:0;shutdown -r now +: 1746727642:0;pacman -sYu steam +: 1746727657:0;pacman -Syu steam +: 1746727662:0;sudo pacman -Syu steam +: 1746727778:0;sudo nano /etc/pacman.conf +: 1746733776:0;sudo pacman -Syu steam +: 1746733861:0;steam +: 1746734417:0;btop +: 1746734441:0;htop +: 1746734443:0;top +: 1746734615:0;clear +: 1746734626:0;xrandr +: 1746734703:0;xrandr --output DP-1 --scale 1x1 +: 1746734749:0;xrandr --output DP-1 --scale 1 +: 1746734826:0;hyprcrl monitors +: 1746734835:0;hyprctrl monitors +: 1746734871:0;sudo pacman -S --needed --noconfirm hyprctl +: 1746734944:0;hyprctl monitors +: 1746734973:0;hyprctrl monitors +: 1746735118:0;xrandr --output DP-1 --scale 0 +: 1746735124:0;xrandr --output DP-1 --scale 1 +: 1746735623:0;yay bazecor +: 1746735865:0;lsub | grep Dygma +: 1746735922:0;cd /etc/udev/rules.d/ +: 1746735924:0;ls +: 1746735931:0;sudo nano 10-dygma.rules +: 1746736005:0;sudo udevadm control -reload-rules +: 1746736018:0;sudo udevadm control --reload-rules +: 1746736070:0;sudo usermof -a -G dialout $USER +: 1746736076:0;sudo usermod -a -G dialout $USER +: 1746736084:0;sudo usermod -a -G wheel $USER +: 1746736119:0;ls -la /dev | grep ttyACM0 +: 1746736136:0;sudo usermod -a -G uucp $USER +: 1746736339:0;sudo nano 10-dygma.rules +: 1746736631:0;sudo nano /etc/udev/rules.d/10-dygma.rules +: 1746736744:0;shutdown now +: 1746859364:0;shutdown -r now +: 1746860473:0;cd JPs_make_work_easier_area/my_codes/random_python +: 1746860474:0;ls +: 1746860486:0;ollama ps +: 1746860490:0;ollama list +: 1746860500:0;ollama run qwen +: 1746860508:0;ollama run qwen3:4b +: 1746860519:0;ollama ps +: 1746860532:0;cd JPs_make_work_easier_area +: 1746860536:0;git fetch +: 1746860540:0;gp +: 1746860563:0;git pull +: 1746860579:0;python ping_local_ai.py +: 1746860601:0;uv run ping_local_ai.py +: 1746860781:0;python -m pip install requests +: 1746860794:0;clear +: 1746860803:0;python -m pip3 install requests +: 1746860855:0;clear +: 1746860880:0;ollama run qwen3:4b +: 1746861228:0;sudo pacman -S python3-pip +: 1746861238:0;sudo pacman -Ss python3-pip +: 1746861243:0;sudo pacman -Ss pip +: 1746861374:0;sudo pacman -Syu +: 1746861396:0;sudo pacman -S python3-pip +: 1746861455:0;sudo pacman -S python-pip +: 1746861477:0;python -m pip3 install requests +: 1746861483:0;python -m pip install requests +: 1746861543:0;pacman -S python-requests +: 1746861548:0;sudo pacman -S python-requests +: 1746861561:0;python ping_local_ai.py +: 1746861604:0;ollama ps +: 1746861783:0;curl http://localhost:11434/api/generate -d '{\ + "model": "qwen3:4b",\ + "prompt": "Why is the sky blue?"\ +}' +: 1746861836:0;clear +: 1746861843:0;python ping_local_ai.py +: 1746861893:0;ollama list +: 1746861906:0;ollama stop qwen3:4b +: 1746861927:0;ollama run gemma3 +: 1746862058:0;ollama ps +: 1746862393:0;ollama stop qwen3:4b +: 1746862395:0;ollama run gemma3 +: 1746862408:0;ollama ps +: 1746862476:0;python ping_local_ai.py +: 1746862963:0;ollama run gemma3 +: 1746863031:0;clear +: 1746863038:0;cd ~ +: 1746863041:0;ls +: 1746863044:0;cd verity +: 1746863337:0;uv run verity.py +: 1746863664:0;clear +: 1746863699:0;rm -r utils +: 1746863704:0;gd +: 1746863770:0;ls -ls +: 1746863776:0;ls -la +: 1746863798:0;cd .config +: 1746863800:0;ls -la +: 1746863858:0;cd .. +: 1746863893:0;git config --global --edit +: 1746863999:0;gd HEAD +: 1746864021:0;cd verity +: 1746864025:0;gd HEAD +: 1746864086:0;gdc +: 1746864329:0;gds +: 1746864340:0;ruff check +: 1746864383:0;git fetch +: 1746864391:0;gd +: 1746864394:0;gds +: 1746864418:0;gd +: 1746864550:0;gs +: 1746864560:0;cd verity +: 1746864561:0;gs +: 1746864569:0;gd +: 1746864645:0;cd verity +: 1746864647:0;gd +: 1746864658:0;gl +: 1746864681:0;gd +: 1746864697:0;gc +: 1746864709:0;ga +: 1746864719:0;ga verity.py +: 1746864722:0;gc +: 1746864883:0;vd verity +: 1746864885:0;cd verity +: 1746864888:0;gc +: 1746864932:0;cd verity +: 1746864934:0;gc +: 1746864974:0;gp +: 1746865026:0;sudo pacman -S --needed noto-fonts-emoji +: 1746865084:0;ga . +: 1746865087:0;gc +: 1746865146:0;sudo pacman -S --needed noto-fonts-emoji-monochrome +: 1746865171:0;sudo pacman -S --needed ttf-noto-emoji-monochrome +: 1746865209:0;cd .config +: 1746865213:0;ls -la +: 1746865258:0;mkdir fontconfig +: 1746865259:0;ls +: 1746865264:0;cd fontconfig +: 1746865280:0;cd .. +: 1746865283:0;rm fontconfig +: 1746865289:0;rm -r fontconfig +: 1746865291:0;ls +: 1746865414:0;cd .. +: 1746865428:0;nano /etc/fonts/fonts.conf +: 1746865642:0;cd .. +: 1746865656:0;sudo pacman -S ttf-font-awesome +: 1746865730:0;nano /etc/sddm.conf.d +: 1746865785:0;nano /etc/sddm.conf +: 1746865810:0;clear +: 1746865838:0;ls -l /usr/share/sddm/themes +: 1746865843:0;ls -l /usr/share/sddm/ +: 1746865880:0;ls -l /etc/ +: 1746865982:0;sddm --example-config > /etc/sddm.conf +: 1746865988:0;sudo sddm --example-config > /etc/sddm.conf +: 1746866005:0;man sddm.conf +: 1746866070:0;sudo sddm --example-config >> /etc/sddm.conf +: 1746866113:0;ls +: 1746866140:0;ls ~/DocGen +: 1746866170:0;sudo sddm --example-config > ~/dotfiles/sddm.conf +: 1746868499:0;clear +: 1746869525:0;ollama ps +: 1746869529:0;ollama list +: 1746869543:0;ollama rm qwen3:4b +: 1746869547:0;ollama list +: 1746869969:0;ls -l +: 1746870028:0;git clone git@github.com:Jake-Pullen/PizzaApp.git +: 1746870984:0;cd src +: 1746870991:0;uv verity.py +: 1746870998:0;uv run verity.py +: 1746871416:0;rm -r logs +: 1746871420:0;uv run verity.py +: 1746871429:0;rm -r logs +: 1746871431:0;uv run verity.py +: 1746871512:0;rm -r logs +: 1746871514:0;uv run verity.py +: 1746871530:0;gd +: 1746871540:0;cd .. +: 1746871548:0;ga . +: 1746871551:0;gc +: 1746871604:0;gp +: 1746871638:0;ollama ps +: 1746871675:0;top +: 1746871826:0;clear +: 1746871847:0;shutdown -r now +: 1746871909:0;top +: 1746871928:0;shutdown +: 1746872747:0;btop +: 1746872756:0;sudo pacman -S btop +: 1746872764:0;btop +: 1746873614:0;tree +: 1746873620:0;ls -la +: 1746873813:0;nano .bashrc +: 1746873942:0;ls -la yay +: 1746874363:0;btop +: 1746876565:0;shutdown +: 1746882961:0;cd verity +: 1746883164:0;python src/verity.py +: 1746883173:0;uv run src/verity.py +: 1746883182:0;cd src +: 1746883188:0;uv run verity.py +: 1746883489:0;cd verity/src +: 1746883498:0;uv run verity.py +: 1746883908:0;cd ve +: 1746883910:0; cd verity +: 1746883915:0;ruff check +: 1746883922:0;ruff check --fix +: 1746884039:0;ruff check +: 1746884257:0;uv run verity.py +: 1746887769:0;cd .. +: 1746887770:0;gd +: 1746887779:0;ga . +: 1746887781:0;gc +: 1746887816:0;gp +: 1746887823:0;cd src +: 1746888069:0;uv run verity.py +: 1746888437:0; find . -name style.css\ + +: 1746888517:0;uv run verity.py +: 1746889736:0;clear +: 1746889780:0;cd verity +: 1746889784:0;cd src +: 1746889809:0;uv run verity.py +: 1746890672:0;ls -l verity/src/front/static +: 1746890763:0;uv run verity.py +: 1746890843:0;tree -d /verity +: 1746890852:0;sudo pacman -S tree +: 1746890859:0;tree -d /verity +: 1746890880:0;tree -d ~/verity +: 1746891083:0;uv run verity.py +: 1746891249:0;cd .. +: 1746891250:0;gd +: 1746891258:0;ga . +: 1746891260:0;gc +: 1746891289:0;gp +: 1746892261:0;sudo pacman -Syu +: 1746892707:0;shutdown -r now +: 1746892797:0;sudo pacman -S Syu +: 1746892807:0;sudo pacman -Syu +: 1746892829:0;steam +: 1746895513:0;git fetch +: 1746895517:0;cd verity +: 1746895519:0;git fetch +: 1746895548:0;gc feature/sqlite_migration +: 1746895558:0;git log +: 1746895561:0;gl +: 1746895635:0;gco origin/feature/sqlite_migration +: 1746895668:0;uv sync +: 1746895676:0;cd src +: 1746895683:0;uv run verity.py +: 1746895733:0;cd verity +: 1746895737:0;ruff check +: 1746895866:0;cd src +: 1746895871:0;uv run verity.py +: 1746895962:0;cd .. +: 1746895969:0;git fetch +: 1746895976:0;git pull +: 1746896004:0;gco main +: 1746896146:0;shutdown +: 1746945566:0;cd verity +: 1746945573:0;git log +: 1746945578:0;gl +: 1746945591:0;git fetch +: 1746945596:0;gl +: 1746945640:0;cd verity +: 1746945644:0;gs +: 1746945651:0;git status +: 1746945661:0;gu +: 1746945765:0;gn stage +: 1746945772:0;gp +: 1746945815:0;uv add pydantic +: 1746945910:0;ollama run gemma3 +: 1746946543:0;uv --version +: 1746946968:0;cd .. +: 1746946971:0;curl -LsSf https://astral.sh/uv/install.sh | sh +: 1746946987:0;cd verity +: 1746947105:0;cd ../dotfiles +: 1746947109:0;gs +: 1746947115:0;ga . diff --git a/zsh/.zshrc b/zsh/.zshrc index d795b5f..4fbc906 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -19,6 +19,7 @@ RPROMPT='%F{15}(%F{166}%D{%H:%M}%F{15})%f' export PATH=$PATH:$HOME/.local/bin export EDITOR=~/.local/bin/zed +export GIT_EDITOR=nano # Fixing zsh history problems on multiple terminals setopt inc_append_history @@ -35,7 +36,7 @@ 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 gd='git diff' 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"'