diff --git a/config/fastfetch/config.jsonc b/config/fastfetch/config.jsonc index 59ce6b6..5870f8a 100644 --- a/config/fastfetch/config.jsonc +++ b/config/fastfetch/config.jsonc @@ -1,22 +1,6 @@ { "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/master/doc/json_schema.json", - "display": { - "color": { - "keys": "38;2;255;255;255", - "title": "38;2;255;255;255", - "separator": "38;2;255;255;255" - } - }, - - "logo": { - "type": "file", - "source": "~/.config/fastfetch/maka.txt", - "color": { - "1": "38;2;255;255;255" - } - }, - "modules": [ "title", "separator", @@ -41,4 +25,4 @@ "break", "colors" ] -} \ No newline at end of file +} diff --git a/config/kitty/current-theme.conf b/config/kitty/current-theme.conf new file mode 100644 index 0000000..43fb2a3 --- /dev/null +++ b/config/kitty/current-theme.conf @@ -0,0 +1,29 @@ +background #000000 +foreground #ffffff +cursor #ffffff +selection_background #ffffff +color0 #000000 +color8 #545454 +color1 #ff5555 +color9 #ff5555 +color2 #55ff55 +color10 #55ff55 +color3 #ffff55 +color11 #ffff55 +color4 #5555ff +color12 #5555ff +color5 #ff55ff +color13 #ff55ff +color6 #55ffff +color14 #55ffff +color7 #bbbbbb +color15 #ffffff +selection_foreground #000000 + +# START_AUTOGENERATED_TAB_STYLE +# Feel free to update these colors manually and remove these comments. +active_tab_foreground #444444 +active_tab_background #b5d5ff +inactive_tab_foreground #ffffff +inactive_tab_background #000000 +# END_AUTOGENERATED_TAB_STYLE diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index bfaa626..7bd6421 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -1 +1,2 @@ paste_actions filter +include current-theme.conf diff --git a/config/nushell/config.nu b/config/nushell/config.nu index 20dc2de..86974bc 100644 --- a/config/nushell/config.nu +++ b/config/nushell/config.nu @@ -3,27 +3,27 @@ $env.PROMPT_COMMAND = { let host = (sys host | get hostname) let cwd = ($env.PWD | path expand | str replace $env.HOME "~") - $"(ansi white)($user)@($host)\n(ansi white)($cwd)(ansi reset)" + $"(ansi '#FFFFFF')($user)@($host)\n(ansi '#FFFFFF')($cwd)(ansi reset)" } -$env.PROMPT_INDICATOR = { $"(ansi white)$ (ansi reset)" } -$env.PROMPT_INDICATOR_VI_INSERT = { $"(ansi white)$ (ansi reset)" } -$env.PROMPT_INDICATOR_VI_NORMAL = { $"(ansi white)$ (ansi reset)" } +$env.PROMPT_INDICATOR = { $"(ansi '#FFFFFF')$ (ansi reset)" } +$env.PROMPT_INDICATOR_VI_INSERT = { $"(ansi '#FFFFFF')$ (ansi reset)" } +$env.PROMPT_INDICATOR_VI_NORMAL = { $"(ansi '#FFFFFF')$ (ansi reset)" } $env.LANG = "en_US.UTF-8" $env.LC_ALL = "en_US.UTF-8" $env.LC_CTYPE = "en_US.UTF-8" $env.config.color_config = { - text: light_white - shape_keyword: light_white + text: "#FFFFFF" + shape_keyword: "#FFFFFF" shape_string: light_green - shape_int: light_white - shape_float: light_white + shape_int: "#FFFFFF" + shape_float: "#FFFFFF" shape_bool: light_yellow - shape_operator: light_white - shape_variable: light_white - shape_flag: light_white - shape_external: light_white - shape_path: light_white + shape_operator: "#FFFFFF" + shape_variable: "#FFFFFF" + shape_flag: "#FFFFFF" + shape_external: "#FFFFFF" + shape_path: "#FFFFFF" shape_error: light_red } $env.config.show_banner = false diff --git a/config/nushell/env.nu b/config/nushell/env.nu index 22ee4a7..775f2fa 100644 --- a/config/nushell/env.nu +++ b/config/nushell/env.nu @@ -28,6 +28,6 @@ let flatpak_xdg = [ $env.XDG_DATA_DIRS = ($base_xdg | append $flatpak_xdg | str join ":") -$env.PATH = ( $env.PATH | split row (char env_sep) | prepend "/opt/bin") +$env.PATH = ( $env.PATH | split row (char env_sep) | prepend "~/.local/bin") alias sway = dbus-run-session sway \ No newline at end of file diff --git a/config/sway/config b/config/sway/config index 6a57a7c..47aea31 100755 --- a/config/sway/config +++ b/config/sway/config @@ -1,6 +1,7 @@ set $base ~/.config/sway/ xwayland enable -include ~/.config/mute/monitors.conf - -exec_always env BASE_SWAY=$base /usr/bin/python3 $base/main/boot.py \ No newline at end of file +exec_always env BASE_SWAY=$base XDG_DATA_DIRS=/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share:/usr/local/share:/usr/share /usr/bin/python3 $base/main/boot.py +include ~/.config/mute/* +seat seat0 xcursor_theme DMZ-Black 12 +exec_always env BASE_SWAY=$base /usr/bin/python3 $base/main/boot.py diff --git a/config/sway/main/swayconfig.py b/config/sway/main/swayconfig.py index d7bb322..4e68e89 100755 --- a/config/sway/main/swayconfig.py +++ b/config/sway/main/swayconfig.py @@ -110,7 +110,7 @@ def bind_keys(sway): def reload_sway(): return "reload" @assign_key(f"{mod}+Shift+f") - def record_screen(): return f"exec python {base}/main/moves.py record --fullscreen" + def record_screen(): return f"exec python3 {base}/main/moves.py record --fullscreen" @assign_key(f"{mod}+r") def open_menu(): return "exec wofi --show drun --width 400 --height 500 --layer overlay --location 1" @@ -138,8 +138,8 @@ def bind_keys(sway): for i in range(1, 11): num = 0 if i == 10 else i - sway.cmd(f"bindsym {mod}+{num} exec python {base}/main/swayworkspace.py focus {i}") - sway.cmd(f"bindsym {mod}+Shift+{num} exec python {base}/main/swayworkspace.py move {i}") + sway.cmd(f"bindsym {mod}+{num} exec python3 {base}/main/swayworkspace.py focus {i}") + sway.cmd(f"bindsym {mod}+Shift+{num} exec python3 {base}/main/swayworkspace.py move {i}") return binding_actions diff --git a/justfile b/justfile index 8b867d5..38d1ae5 100644 --- a/justfile +++ b/justfile @@ -1,7 +1,16 @@ default: just --list +# inits init-arch: install-arch stow build-wayfreeze +init-debian: install-debian stow build-wayfreeze + +install-debian: + @echo "installing pkgs" + wget -qO- https://apt.fury.io/nushell/gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/fury-nushell.gpg + echo "deb [signed-by=/etc/apt/keyrings/fury-nushell.gpg] https://apt.fury.io/nushell/ /" | sudo tee /etc/apt/sources.list.d/fury-nushell.list + sudo apt update + xargs -a packages-debian doas apt install -y install-arch: @echo "installing pkgs" @@ -13,9 +22,11 @@ install-aur: git clone https://aur.archlinux.org/yay.git /tmp/yay cd /tmp/yay && makepkg -si +# my apps install-stabs-apps: + sudo flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo @echo "installing my apps" - flatpak install -y org.vinegarhq.Sober dev.vencord.Vesktop com.valvesoftware.Steam io.gitlab.librewolf-community org.gajim.Gajim + sudo flatpak install -y dev.vencord.Vesktop com.valvesoftware.Steam io.gitlab.librewolf-community org.gajim.Gajim @echo "Permissionizing..." flatpak override --user --filesystem=home io.gitlab.librewolf-community @@ -24,6 +35,7 @@ install-stabs-apps: flatpak override --user --filesystem=home org.gajim.Gajim stow: + mkdir -p ~/.config/ stow -t ~/.config config @echo "Stoweed" @@ -31,8 +43,9 @@ unstow: stow -D -t ~/.config config setup-displays: - python init/swaysetupmonitors.py - mv mute ~/.config/ + mkdir -p ~/.config/mute/ + python3 init/swaysetupmonitors.py + mv mute/monitors.conf ~/.config/mute/ restow: stow -R -t ~/.config config @@ -43,4 +56,5 @@ build-wayfreeze: rm -rf /tmp/wayfreeze git clone https://github.com/Jappie3/wayfreeze.git /tmp/wayfreeze cd /tmp/wayfreeze && cargo build --release - sudo mv /tmp/wayfreeze/target/release/wayfreeze /opt/bin/wayfreeze \ No newline at end of file + mkdir -p ~/.local/bin + mv /tmp/wayfreeze/target/release/wayfreeze ~/.local/bin/wayfreeze diff --git a/packages-arch b/packages-arch index 9ed3b10..c3c4f74 100644 --- a/packages-arch +++ b/packages-arch @@ -17,7 +17,6 @@ thunar noto-fonts blueman python-pyqt5 -xdg-desktop-portal-gnome xdg-desktop-portal-wlr base-devel git @@ -30,4 +29,5 @@ python just git gvim -kdeconnect \ No newline at end of file +kdeconnect +cargo \ No newline at end of file diff --git a/packages-debian b/packages-debian new file mode 100644 index 0000000..72436c7 --- /dev/null +++ b/packages-debian @@ -0,0 +1,31 @@ +sway +swaybg +wofi +grim +slurp +wl-clipboard +wf-recorder +pamixer +blueman +gnome-keyring +xdg-desktop-portal-wlr +procps +thunar +thunar-archive-plugin +libglib2.0-0t64 +python3-dbus +python3-pyqt5 +python3 +fonts-noto-core +build-essential +git +curl +jq +stow +just +vim-gtk3 +xpad +kitty +nushell +libxkbcommon-dev +cargo \ No newline at end of file