updates

2023-11-21 22:08:12 -05:00 · 2023-11-21 22:08:12 -05:00 · a0880f22e9
commit a0880f22e9
parent 7f81c97591
12 changed files with 491 additions and 480 deletions
--- a/AppData/Local/external_nvim
+++ b/AppData/Local/external_nvim
@ -1 +1 @@
-Subproject commit 11c9abf47d291ebd42e1dd7563a73190effe2d10
+Subproject commit d3ec619e7d964038cfb480729ca389d714a1af6a
--- a/3
+++ b/3
@ -1,3 +0,0 @@
-[[ -f ~/.bashrc ]] && . ~/.bashrc
-
-source /home/mira/.config/broot/launcher/bash/br
--- a/127
+++ b/127
@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 # ~/.profile: executed by the command interpreter for login shells.
 # This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
 # exists.
@ -9,74 +9,87 @@
 # for ssh logins, install and configure the libpam-umask package.
 #umask 022

-# XDG Base Dirs
-XDG_DATA_HOME="$HOME/.local/share"
-XDG_CONFIG_HOME="$HOME/.config"
-XDG_STATE_HOME="$HOME/.local/state"
-XDG_CACHE_HOME="$HOME/.cache"
+#################
+# XDG Base Dirs #
+#################
+
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_STATE_HOME="$HOME/.local/state"
+export XDG_CACHE_HOME="$HOME/.cache"
+
+#################
+# XDG User Dirs #
+#################
 source "$XDG_CONFIG_HOME/user-dirs.dirs"
-EDITOR=nvim
-OPENER=xdg-open
-# [[ "$TERM_PROGRAM" = "vscode" ]] && . "$(code --locate-shell-integration-path $0)"

-# set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/bin" ]; then
-    PATH="$HOME/bin:$PATH"
-fi
+########################
+# Default file viewers #
+########################

-# set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/.local/bin" ]; then
-    PATH="$HOME/.local/bin:$PATH"
-fi
+export EDITOR=nvim
+export PAGER=moar
+export OPENER=xdg-open

-# Source Cargo Environment
-if [[ -f "$HOME/.cargo/env" ]]; then
-    . "$HOME/.cargo/env"
-elif [[ -f ~/.local/share/cargo/env ]]; then
-    source  ~/.local/share/cargo/env 
-fi
-# Source Nix Environment
-if [ -e "$HOME"/.nix-profile/etc/profile.d/nix.sh ]; then
-    . "$HOME"/.nix-profile/etc/profile.d/nix.sh
-    # else
-    #     echo "If this doesn't work, comment out this part of .zshenv"
-    #     sh <(curl -L https://nixos.org/nix/install) --no-daemon;
-fi
+#######
+# IME #
+#######

-# Add Ruby
-#[ "${PATH#*"$HOME"/.local/share/gem/ruby/*/bin:}" = "$PATH" ] && export PATH="$HOME/.local/share/gem/ruby/*/bin:$PATH"
+GTK_IM_MODULE=fcitx
+QT_IM_MODULE=fcitx
+XMODIFIERS=@im=fcitx

-# User bin folder
-[ "${PATH#*"$HOME"/.local/bin:}" = "$PATH" ] && export PATH="$HOME/.local/bin:$PATH"

-# add nodejs
-# [ "${PATH#*"$HOME"/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:}" = "$PATH" ] && export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
-
-# add go
-[ "${PATH#*"$HOME"/go/bin:}" = "$PATH" ] && export PATH="$HOME/go/bin:$PATH"
-
-# Set PATH, MANPATH, etc., for Homebrew.
-[ -e /home/linuxbrew/.linuxbrew/bin/brew ] && eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv)
-
-# pnpm
-export PNPM_HOME="$XDG_DATA_HOME/pnpm"
-[ "${PATH#*$PNPM_HOME:}" = "$PATH" ] && export PATH="$PNPM_HOME:$PATH"
-
-# npm
-export NPM_CONFIG_PREFIX="$XDG_DATA_HOME/npm-global"
-[ "${PATH#*$NPM_CONFIG_PREFIX/bin:}" = "$PATH" ] && export PATH="$NPM_CONFIG_PREFIX/bin:$PATH"
-
-# Make Cargo install to user bin directory
-export CARGO_HOME="$XDG_DATA_HOME/cargo"
-export CARGO_INSTALL_ROOT="$HOME/.local"
+################################
+# pls use the goddamn xdg dirs #
+################################

 export GNUPGHOME="$XDG_DATA_HOME/gnupg"
-
 # If you use non-default GnuPG Home directory, you will need to edit all
 # socket files to use the values of gpgconf --list-dirs.
 # If you set your SSH_AUTH_SOCK manually, keep in mind that your socket
 # location may be different if you are using a custom GNUPGHOME

-export LESSHISTFILE="$XDG_STATE_HOME/less/history"
-
+export PNPM_HOME="$XDG_DATA_HOME/pnpm"
+export NPM_CONFIG_PREFIX="$XDG_DATA_HOME/npm-global"
+alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts"
+export CARGO_HOME="$XDG_DATA_HOME/cargo"
+export CARGO_INSTALL_ROOT="$HOME/.local"
+export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
 export INPUTRC="$XDG_CONFIG_HOME/readline/inputrc"
+export LESSHISTFILE="$XDG_STATE_HOME/less/history"
+export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
+export PARALLEL_HOME="$XDG_CONFIG_HOME"/parallel
+export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
+export WINEPREFIX="$XDG_DATA_HOME"/wine
+export XCURSOR_PATH=/usr/share/icons:$XDG_DATA_HOME/icons
+
+###############
+# SET UP PATH #
+###############
+# nix 
+if [ -e "$HOME"/.nix-profile/etc/profile.d/nix.sh ]; then
+    . "$HOME"/.nix-profile/etc/profile.d/nix.sh
+fi
+
+# User bin folder
+[ "${PATH#*"$HOME"/.local/bin:}" = "$PATH" ] && export PATH="$HOME/.local/bin:$PATH"
+
+# go
+[ "${PATH#*"$HOME"/go/bin:}" = "$PATH" ] && export PATH="$HOME/go/bin:$PATH"
+
+# homebrew 
+[ -e /home/linuxbrew/.linuxbrew/bin/brew ] && eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv)
+
+# pnpm
+[ "${PATH#*$PNPM_HOME:}" = "$PATH" ] && export PATH="$PNPM_HOME:$PATH"
+
+# npm
+[ "${PATH#*$NPM_CONFIG_PREFIX/bin:}" = "$PATH" ] && export PATH="$NPM_CONFIG_PREFIX/bin:$PATH"
+
+# cargo 
+if [[ -f "$CARGO_HOME/env" ]]; then
+    . "$CARGO_HOME/env"
+elif [[ -f ~/.local/share/cargo/env ]]; then
+    .  ~/.local/share/cargo/env 
+fi
--- a/2
+++ b/2
@ -6,4 +6,4 @@
 export ZSH_DISABLE_COMPFIX=true

 # Load .profile
-[[ -f ~/.env ]] && . ~/.env
+[[ -f ~/.profile ]] && . ~/.profile
--- a/private_dot_config/alacritty/alacritty.yml
+++ b/private_dot_config/alacritty/alacritty.yml
@ -131,7 +131,7 @@ font:
    #   - (macOS) Menlo
    #   - (Linux/BSD) monospace
    #   - (Windows) Consolas
-    family: "MonispaceNe NFP" 
+    family: "MonaspiceNe NF"

    # The `style` can be specified to pick a specific face.
    style: Regular
@ -200,8 +200,8 @@ font:
 colors:
  # Default colors
  primary:
-    background: '#010206'
-    foreground: '#EBF6FF'
+    background: "#010206"
+    foreground: "#EBF6FF"

    # Bright and dim foreground colors
    #
@ -209,8 +209,8 @@ colors:
    # present. If the bright foreground color is not set, or
    # `draw_bold_text_with_bright_colors` is `false`, the normal foreground
    # color will be used.
-    dim_foreground: '#BFBFC0'
-    bright_foreground: '#F0F2FF'
+    dim_foreground: "#BFBFC0"
+    bright_foreground: "#F0F2FF"

  # Cursor colors
  #
@ -279,8 +279,8 @@ colors:
  # hyperlink URI preview, etc.
  #
  footer_bar:
-    background: '#0B5393'
-    foreground: '#EBF6FF'
+    background: "#0B5393"
+    foreground: "#EBF6FF"

  # Selection colors
  #
@ -294,25 +294,25 @@ colors:

  # Normal colors
  normal:
-    black:   '#1E1B30'
-    red:     '#A04558'
-    green:   '#6FA47E'
-    yellow:  '#CCB700'
-    blue:    '#334773'
-    magenta: '#a34a78'
-    cyan:    '#2A98B1'
-    white:   '#808082'
+    black: "#1E1B30"
+    red: "#A04558"
+    green: "#6FA47E"
+    yellow: "#CCB700"
+    blue: "#334773"
+    magenta: "#a34a78"
+    cyan: "#2A98B1"
+    white: "#808082"

  # Bright colors
  bright:
-    black:   '#2a2644'
-    red:     '#f5a9b8'
-    green:   '#98db95'
-    yellow:  '#ffe70a'
-    blue:    '#445f9b'
-    magenta: '#ee5e95'
-    cyan:    '#5bcefa'
-    white:   '#bfbfc0'
+    black: "#2a2644"
+    red: "#f5a9b8"
+    green: "#98db95"
+    yellow: "#ffe70a"
+    blue: "#445f9b"
+    magenta: "#ee5e95"
+    cyan: "#5bcefa"
+    white: "#bfbfc0"

  # Dim colors
  #
@ -344,7 +344,6 @@ colors:
  # the default background. When set to `true` all cells will be transparent
  # regardless of their background color.
  #transparent_background_colors: false
-
 # Bell
 #
 # The bell is rung every time the BEL control character is received.
--- a/private_dot_config/dunst/dunstrc
+++ b/private_dot_config/dunst/dunstrc
@ -320,7 +320,7 @@
    #default_icon = /path/to/icon

 [urgency_normal]
-    background = "#1E1B30"
+    background = "#1E1B30BF"
    foreground = "#EBF6ff"
    timeout = 10
    # Icon for notifications with normal urgency, uncomment to enable
--- a/private_dot_config/external_nvim
+++ b/private_dot_config/external_nvim
@ -1 +1 @@
-Subproject commit a1fadfc52546b6b295d9e439a17d54da460e818b
+Subproject commit c40f0d7ada08c1219f52c294b3d9024feed83c93
--- a/private_dot_config/lf/lfrc
+++ b/private_dot_config/lf/lfrc
@ -12,7 +12,7 @@ cmd open ${{

 # trash 
 cmd trash %trash-put $fx
-map dd trash
+map x trash
 map DD delete


--- a/private_dot_config/rofi/symlink_wal.rasi
+++ b/private_dot_config/rofi/symlink_wal.rasi
@ -1 +0,0 @@
-/home/ajay/.cache/wal/colors-rofi-dark.rasi
--- a/private_dot_config/sway/config
+++ b/private_dot_config/sway/config
@ -45,3 +45,6 @@ exec_always --no-startup-id /usr/bin/lxqt-policykit-agent
 #notif daemon
 exec_always swhks & 
 exec_always dunst &
+
+exec nm-tray
+exec fcitx5
--- a/private_dot_config/sway/theme
+++ b/private_dot_config/sway/theme
@ -15,7 +15,7 @@ font pango:Atkinson Hyperlegible bold 9

 bar {
  status_command i3blocks -c /home/mira/.config/sway/i3blocks.conf
-    font pango:Monaspace Neon, CommitMono Nerd Font, FontAwesome 9
+    font pango:MonaspiceNe NF, CommitMono Nerd Font, FontAwesome 9
 #mode hide
    colors {
      background $inactive 
--- a/private_dot_config/swhkd/swhkdrc
+++ b/private_dot_config/swhkd/swhkdrc
@ -40,10 +40,10 @@ super + tab
  rofi -show window -show-icons -theme lunar-witch

 print
-  flameshot full -c -p "$XDG_PICTURES_DIR/screenshots/"
+  flameshot full -c -p "/home/mira/Pictures/screenshots/"

 shift + print
-  flameshot gui -s -c -p "$XDG_PICTURES_DIR/screenshots/"
+  flameshot gui -s -c -p "/home/mira/Pictures/screenshots/"

 ctrl + print
-  flameshot gui -c -p "$XDG_PICTURES_DIR/screenshots/"
+  flameshot gui -c -p "/home/mira/Pictures/screenshots/"