diff --git a/config/hypr/monitors.conf b/config/hypr/monitors.conf index 6d79937..214142c 100644 --- a/config/hypr/monitors.conf +++ b/config/hypr/monitors.conf @@ -1,18 +1,18 @@ # Configure Monitor Setup for Hyprland # Assign Monitors -monitor=eDP-1,preferred,auto,1.5 +#monitor=DP-2,3440x1440@100,0x0,1 +#monitor=HDMI-A-1,1920x1080@60,3440x160,1 +#monitor=DP-3,disable + +# Set Default Workspaces +#workspace=HDMI-A-1,7 +#workspace=DP-2,1 + + +monitor=eDP-1,2256x1504@60,0x0,1.5 +#monitor=DP-2,1024x786,2256x0,1 workspace=eDP-1,1 -## CRT Fun ## -# Good Middle Ground -# monitor=DP-1,1280x1024@150,auto,1 - -# High Rez -# monitor=DP-1,2500x2000@30,auto,1 - -# Fast As FUK BOIZ - doesn't work well maybe adaptor -#monitor=DP-1,640x480@240,auto,1 - # Auto Monitor Rule monitor = , preferred, auto, 1 diff --git a/config/nvim/nvim.lua b/config/nvim/nvim.lua index 7cb760d..22a388a 100644 --- a/config/nvim/nvim.lua +++ b/config/nvim/nvim.lua @@ -113,11 +113,11 @@ cmp.setup { -- Funky plugins require("conform").setup({ formatters_by_ft = { - C = { "clang-format"}, css = { "prettier", }, html = { "prettier", }, javascript = { "prettier", }, python = { "black" }, + C = { "clang-format"}, typst = { "prettypst" } }, formatters = { diff --git a/config/zshrc b/config/zshrc index c6194f0..c056349 100755 --- a/config/zshrc +++ b/config/zshrc @@ -93,15 +93,13 @@ eval "$(zoxide init zsh)" export PATH="${PATH}:/home/flyingstitchman/.cargo/bin" # Clean Up -export MBSYNCRC=$XDG_CONFIG_HOME/mbsync/config -export PASSWORD_STORE_DIR=$XDG_CONFIG_HOME/password_store -export NOTMUCH_CONFIG=$XDG_CONFIG_HOME/notmuch/config +export MBSYNCRC=${XDG_CONFIG_HOME:-~/.config}/mbsync/config +export PASSWORD_STORE_DIR=${XDG_CONFIG_HOME:-~/.config}/password_store +export NOTMUCH_CONFIG=${XDG_CONFIG_HOME-~/.config}/notmuch/config export KDEHOME="$XDG_CONFIG_HOME"/kde export GRADLE_USER_HOME="$XDG_DATA_HOME"/gradle -export GNUPGHOME=$XDG_DATA_HOME/gnupg export GOPATH="$XDG_DATA_HOME" export GOMODCACHE="$XDG_CACHE_HOME" -export GPG_TTY=$(tty) export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java export WINEPREFIX="$XDG_DATA_HOME"/wineprefixes/default @@ -119,9 +117,6 @@ reconfig() { sudo nixos-rebuild --flake "/etc/nixos#$(cat /etc/hostname)" "$@" } -# Home Manager Variables -source ~/.local/state/nix/profiles/home-manager/home-path/etc/profile.d/hm-session-vars.sh - # Autostart Hyprland after all environmental Variables have been declared if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then exec Hyprland @@ -131,3 +126,6 @@ export QSYS_ROOTDIR="~/.cache/paru/clone/quartus-free/pkg/quartus-free-quartus/o # Nix Direnv Support eval "$(direnv hook zsh)" + +# Home Manager Variables +source ~/.local/state/nix/profiles/home-manager/home-path/etc/profile.d/hm-session-vars.sh