diff --git a/common/bin/install-user-chrome-css.fish b/common/bin/install-firefox-user-chrome-css.fish similarity index 91% rename from common/bin/install-user-chrome-css.fish rename to common/bin/install-firefox-user-chrome-css.fish index a81fea3..7df62e5 100755 --- a/common/bin/install-user-chrome-css.fish +++ b/common/bin/install-firefox-user-chrome-css.fish @@ -1,6 +1,6 @@ #!/usr/bin/env fish -set profile_dirs "$HOME/.mozilla/firefox/*.dev-edition-default" +set profile_dirs $HOME/.mozilla/firefox/*.dev-edition-default if test (uname) = Darwin set profile_dirs $HOME/Library/Application\ Support/Firefox/Profiles/*.dev-edition-default end diff --git a/common/firefox/userChrome.d.css b/common/firefox/userChrome.d.css index 7aba8a5..132abbc 100644 --- a/common/firefox/userChrome.d.css +++ b/common/firefox/userChrome.d.css @@ -1,3 +1,3 @@ -#webrtcIndiator { +#webrtcIndicator { display: none; } diff --git a/host/desktop/bin/reboot-to-windows b/host/desktop/bin/reboot-to-windows index 6e56140..690faba 100755 --- a/host/desktop/bin/reboot-to-windows +++ b/host/desktop/bin/reboot-to-windows @@ -1,4 +1,4 @@ #!/usr/bin/env sh # use `efibootmgr` to list boot entries -sudo efibootmgr -n 0002 +sudo efibootmgr -n 0001 sudo reboot diff --git a/host/desktop/config b/host/desktop/config new file mode 100644 index 0000000..643d35b --- /dev/null +++ b/host/desktop/config @@ -0,0 +1 @@ +exec output '"Dell Inc. DELL U2720Q CWTM623"' transform 270 scale 1.5 diff --git a/host/desktop/sway/config b/host/desktop/sway/config new file mode 100644 index 0000000..643d35b --- /dev/null +++ b/host/desktop/sway/config @@ -0,0 +1 @@ +exec output '"Dell Inc. DELL U2720Q CWTM623"' transform 270 scale 1.5 diff --git a/os/linux/arch/provision.d/20-install-packages.bash b/os/linux/arch/provision.d/20-install-packages.bash index d3f20bd..d41039b 100755 --- a/os/linux/arch/provision.d/20-install-packages.bash +++ b/os/linux/arch/provision.d/20-install-packages.bash @@ -29,7 +29,7 @@ paru -Sy --needed --noconfirm \ pass pass-otp `# Password Management` \ hexyl `# CLI Hex Viewer` \ rsync `# File Transfer` \ - neovim `# Text Editors` \ + neovim helix `# Text Editors` \ unzip `# Simple Unzipping` \ tmux `# Terminal Multiplexer` \ kitty-terminfo `# Almost Better Terminal Emulator` \ @@ -37,7 +37,7 @@ paru -Sy --needed --noconfirm \ w3m `# Terminal Browser` \ jq `# CLI for Interacting with JSON` \ xh `# New HTTP Utility` \ - age sops `# Simple Secretes Managements` \ + age sops `# Simple Secrets Managements` \ inotify-tools `# Watching` \ fish `# Shell` \ time `# GNU time` \ diff --git a/os/linux/kanshi/config b/os/linux/kanshi/config index 5d857f1..fd507ed 100644 --- a/os/linux/kanshi/config +++ b/os/linux/kanshi/config @@ -24,8 +24,8 @@ profile desktop-H-2x4kside2 { # } profile desktop-primary { - output "Dell Inc. DELL U2720Q CWTM623" enable mode 3840x2160@59.997Hz position 0,500 scale 1.5 transform 90 - output "Samsung Electric Company SyncMaster H1AK500000" enable mode 3840x2160@59.997Hz position 1440,0 scale 1.0 transform normal + output "Dell Inc. DELL U2720Q CWTM623" enable mode 3840x2160@60Hz position 0,500 scale 1.5 transform 90 + output "Samsung Electric Company SyncMaster H1AK500000" enable mode 3840x2160@60Hz position 1440,0 scale 1.0 transform normal } profile tv4k { diff --git a/os/linux/sway/config b/os/linux/sway/config index 3772d9c..13a5045 100644 --- a/os/linux/sway/config +++ b/os/linux/sway/config @@ -163,7 +163,7 @@ mode "resize" { for_window [app_id="floating_terminal"] floating enable for_window [class="floating_terminal"] floating enable for_window [app_id="zoom"] border none, floating enable -for_window [app_id="zoom" title="^zoom$"] border none, floating enable +for_window [title="^zoom$"] border none, floating enable bindsym $mod+shift+alt+f for_window [class=".*"] floating toggle for_window [class=".*"] layout floating enable for_window [class=".*"] layout splith @@ -177,8 +177,8 @@ bar { } exec mako -exec gammastep -t 6500:3500 -l 39.0:-94.5 -exec_always 'killall kanshi; kanshi' +# exec gammastep -t 6500:3500 -l 39.0:-94.5 +# exec_always 'killall kanshi; kanshi' # exec /usr/lib/kdeconnectd # exec sway-init-tmux # exec $term diff --git a/os/linux/waybar/config b/os/linux/waybar/config index 7f9a9e2..f261646 100644 --- a/os/linux/waybar/config +++ b/os/linux/waybar/config @@ -1,7 +1,7 @@ { "layer": "top", "position": "bottom", - "output": ["eDP-1", "DP-1"], + "output": ["eDP-1", "DP-3"], "height": 32, "modules-left": ["clock"], "modules-center": ["sway/workspaces"], diff --git a/readme.md b/readme.md index 239adf8..90dfb65 100644 --- a/readme.md +++ b/readme.md @@ -9,34 +9,40 @@ take what you like. # Basic Setup - curl -LO lyte.dev/df.sh && sh -i df.sh +```bash +curl -LO lyte.dev/df.sh && sh -i df.sh +``` ## Manual Setup - git clone https://git.lyte.dev/lytedev/dotfiles.git "$HOME/.config/lytedev-dotfiles" - "$HOME/.config/lytedev-dotfiles/common/bin/dotfiles-setup" +```bash +git clone https://git.lyte.dev/lytedev/dotfiles.git "$HOME/.config/lytedev-dotfiles" +"$HOME/.config/lytedev-dotfiles/common/bin/dotfiles-setup" +``` # Repo Structure My dotfiles are composed together by layering "environments" since I want my dotfiles to be flexible across servers, laptops, desktops, and even my phone (via Termux). - lytedev-dotfiles - |- common --- common to all hosts and operating systems - | |- bin ------- programs or scripts useful to all hosts/OSs - | |- data ------ shared storage for certain scripts - | `- {app...} -- configuration related to {app} - |- host ----- specific to specific hosts or types of hosts - | |- desktop --- for desktop-class machines - | |- headless -- for server-class machines with no display/GUI - | `- laptop ---- for portable, battery-having machines - `- os ------- specific to operating systems - |- linux ----- you alread know <3 - | |- desktop ------ for desktop-class machines - | |- headless ----- for server-class machines with no display/GUI - | |- bin ---------- programs/scripts useful to linux machines - | |- {distro...} -- configuration related to {distro} - | `- {app...} ----- linux-specific configuration related to {app} - `- macos ----- for those stupid macbooks work tries to make you use +``` +lytedev-dotfiles +|- common --- common to all hosts and operating systems +| |- bin ------- programs or scripts useful to all hosts/OSs +| |- data ------ shared storage for certain scripts +| '- {app...} -- configuration related to {app} +|- host ----- specific to specific hosts or types of hosts +| |- desktop --- for desktop-class machines +| |- headless -- for server-class machines with no display/GUI +| '- laptop ---- for portable, battery-having machines +'- os ------- specific to operating systems + |- linux ----- you alread know <3 + | |- desktop ------ for desktop-class machines + | |- headless ----- for server-class machines with no display/GUI + | |- bin ---------- programs/scripts useful to linux machines + | |- {distro...} -- configuration related to {distro} + | '- {app...} ----- linux-specific configuration related to {app} + '- macos ----- for those stupid macbooks work tries to make you use +``` Any environment should be able to extend the configuration of any application in some unique way. This isn't possible with all applications, of course, since @@ -46,7 +52,9 @@ globs or some other mechanism. One example of doing this well is with fish: - for s in $ENV_PATH/*/config.d.fish; source $s (dirname $s); end +```fish +for s in $ENV_PATH/*/config.d.fish; source $s (dirname $s); end +``` This way, if any environment (a dir in $ENV_PATH) has a `config.f.fish` script inside, it will be sourced by the main configuration file. @@ -69,31 +77,40 @@ applications configured for the host OS. There's a handy `fzf`-based script that makes this super easy (note that you can select multiple environments with TAB): - dotfiles-link-environments +```bash +dotfiles-link-environments You can also list the possible environments: - cat $DOTFILES_PATH/common/envs +```bash +cat $DOTFILES_PATH/common/envs +``` And then link them yourself (note that environments must be in $ENV_PATH and cannot be nested, so replacing slashes with dashes is a nice way to show what's going on): - ln -s (pwd)/os/linux $ENV_PATH/os-linux - ln -s (pwd)/os/linux/arch $ENV_PATH/os-linux-arch - ln -s (pwd)/host/laptop $ENV_PATH/host-laptop - ln -s (pwd)/host/laptop/third $ENV_PATH/os-laptop-third - # etc... +``` +ln -s (pwd)/os/linux $ENV_PATH/os-linux +ln -s (pwd)/os/linux/arch $ENV_PATH/os-linux-arch +ln -s (pwd)/host/laptop $ENV_PATH/host-laptop +ln -s (pwd)/host/laptop/third $ENV_PATH/os-laptop-third +# etc... +``` And run setup again once you've finished linking all related environments: - dotfiles-setup +```bash +dotfiles-setup +``` # Updating Fork this repo, update your origin to point to your fork, and commit changes: - git remote origin set-url $YOUR_REPO +```bash +git remote origin set-url $YOUR_REPO +``` Then you can just pull your changes down from wherever. @@ -104,12 +121,16 @@ machine. Remember about not using other people's dotfiles directly? But if you must, you can add an upstream remote to point to my repo: - git remote add upstream https://git.lyte.dev/lytedev/dotfiles.git +```bash +git remote add upstream https://git.lyte.dev/lytedev/dotfiles.git +``` Then you can fetch and merge in my changes whenever you want: - git fetch upstream - git merge upstream/master +```bash +git fetch upstream +git merge upstream/master +``` # Screenshots