From 8995b259d6b0193d04c1970cf432142c934e3e4e Mon Sep 17 00:00:00 2001 From: voidarclabs Date: Sun, 4 Jan 2026 14:21:55 +0000 Subject: [PATCH] migrating to doot --- .config/hypr/windows.conf | 7 ---- .config/scripts/screenshot.sh | 63 ------------------------------ .nixos | 2 +- .stow-local-ignore | 26 ------------ .stowrc | 1 - .zshrc | 9 ++--- doot/config.toml | 38 ++++++++++++++++++ laptop-files/.zshrc-local | 3 ++ pc-files/.config/hypr/windows.conf | 7 ++++ pc-files/.zshrc-local | 3 ++ 10 files changed, 56 insertions(+), 103 deletions(-) delete mode 100755 .config/scripts/screenshot.sh delete mode 100644 .stow-local-ignore delete mode 100644 .stowrc create mode 100644 doot/config.toml create mode 100644 laptop-files/.zshrc-local create mode 100644 pc-files/.config/hypr/windows.conf create mode 100644 pc-files/.zshrc-local diff --git a/.config/hypr/windows.conf b/.config/hypr/windows.conf index 526bcee3..ddc927d9 100644 --- a/.config/hypr/windows.conf +++ b/.config/hypr/windows.conf @@ -1,8 +1 @@ -monitor = DP-1, 1920x1080@60, 0x0, 1 -monitor = DP-3, 1920x1080@60, 1920x0, 1 -monitor = HDMI-A-1, 1920x1080@60, -1920x0, 1 monitor = , preferred, auto, 1.2 - -workspace = 2, monitor:HDMI-A-1, default:true -workspace = 3, monitor:DP-3, default:true -workspace = 1, monitor:DP-1, default:true diff --git a/.config/scripts/screenshot.sh b/.config/scripts/screenshot.sh deleted file mode 100755 index 82f2b2b8..00000000 --- a/.config/scripts/screenshot.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/usr/bin/env sh - -# Restores the shader after screenhot has been taken -restore_shader() { - if [ -n "$shader" ]; then - hyprshade on "$shader" - fi -} - -# Saves the current shader and turns it off -save_shader() { - shader=$(hyprshade current) - hyprshade off - trap restore_shader EXIT -} - -save_shader # Saving the current shader - -if [ -z "$XDG_PICTURES_DIR" ]; then - XDG_PICTURES_DIR="$HOME/Pictures" -fi - -scrDir=$(dirname "$(realpath "$0")") -source $scrDir/globalcontrol.sh -swpy_dir="${confDir}/swappy" -save_dir="${2:-$XDG_PICTURES_DIR/Screenshots}" -save_file=$(date +'%y%m%d_%Hh%Mm%Ss_screenshot.png') -temp_screenshot="/tmp/screenshot.png" - -mkdir -p $save_dir -mkdir -p $swpy_dir -echo -e "[Default]\nsave_dir=$save_dir\nsave_filename_format=$save_file" >$swpy_dir/config - -function print_error -{ - cat <<"EOF" - ./screenshot.sh - ...valid actions are... - p : print all screens - s : snip current screen - sf : snip current screen (frozen) - m : print focused monitor -EOF -} - -case $1 in -p) # print all outputs - grimblast copysave screen $temp_screenshot && restore_shader && swappy -f $temp_screenshot ;; -s) # drag to manually snip an area / click on a window to print it - grimblast copysave area $temp_screenshot ;; #&& restore_shader && swappy -f $temp_screenshot ;; -sf) # frozen screen, drag to manually snip an area / click on a window to print it - grimblast --freeze copysave area $temp_screenshot && restore_shader && swappy -f $temp_screenshot ;; -m) # print focused monitor - grimblast copysave output $temp_screenshot && restore_shader && swappy -f $temp_screenshot ;; -*) # invalid option - print_error ;; -esac - -rm "$temp_screenshot" - -if [ -f "${save_dir}/${save_file}" ]; then - notify-send -a "t1" -i "${save_dir}/${save_file}" "saved in ${save_dir}" -fi diff --git a/.nixos b/.nixos index 70a636c5..90277a89 160000 --- a/.nixos +++ b/.nixos @@ -1 +1 @@ -Subproject commit 70a636c5136ee67312101348dec901d0c7ff9035 +Subproject commit 90277a89cde982a4847d189979678bc504da36d7 diff --git a/.stow-local-ignore b/.stow-local-ignore deleted file mode 100644 index 9257fa6f..00000000 --- a/.stow-local-ignore +++ /dev/null @@ -1,26 +0,0 @@ -# Comments and blank lines are allowed. - -RCS -.+,v - -CVS -\.\#.+ # CVS conflict files / emacs lock files -\.cvsignore - -\.svn -_darcs -\.hg - -\.git -\.gitignore -\.gitmodules - -.+~ # emacs backup files -\#.*\# # emacs autosave files - -^/README.* -^/LICENSE.* -^/COPYING - -/stowfile -.stowrc diff --git a/.stowrc b/.stowrc deleted file mode 100644 index 8b80f435..00000000 --- a/.stowrc +++ /dev/null @@ -1 +0,0 @@ ---target=~/ diff --git a/.zshrc b/.zshrc index 0ddc572f..94b9e2ef 100755 --- a/.zshrc +++ b/.zshrc @@ -8,11 +8,10 @@ eval "$(oh-my-posh init zsh --config $HOME/.config/oh-my-posh/zen.toml)" # custom aliases alias ls="lsd -l" -alias pa="sudo pacman" +alias pa="sudo pacman" # compat alias v="nvim" alias lg="lazygit" -alias n="nvim" -alias vinix="nvim ~/.nixos/configuration.nix" -alias vif="nvim ~/.nixos/flake.nix" -alias nrs="sudo nixos-rebuild switch --impure --flake ~/.nixos#mobile02" alias nsh="nix-shell -p" +alias vif="nvim ~/.nixos/flake.nix" + +source ~/.zshrc-local diff --git a/doot/config.toml b/doot/config.toml new file mode 100644 index 00000000..1d33de3e --- /dev/null +++ b/doot/config.toml @@ -0,0 +1,38 @@ +# Where to install the symlinks. In most cases this will be either "$HOME" (dotfiles) or "/" (root configs). +# Must be an absolute path. It can contain environment variables. +target_dir = "$HOME" + +# Files and directories to ignore. Each entry is a glob pattern relative to the dotfiles directory. +# IMPORTANT: Hidden files/directories are ignored by default. If you set `implicit_dot` to false, you should remove the `**/.*` pattern from this list. +exclude_files = [ + "LICENSE", + "README.md", + "**/.git", + ".gitignore", + ".gitmodules", +] + +# Files and directories that are always symlinked, overriding `exclude_files`. Each entry is a glob pattern relative to the dotfiles directory. +include_files = [] + +# You can get a large performance boost by setting this to `false`, but read this first: +# https://github.com/pol-rivero/doot/wiki/Tip:-set-explore_excluded_dirs-to-false +explore_excluded_dirs = false + +# If set to true, files and directories in the root of the dotfiles directory will be prefixed with a dot. For example, `/config/foo` will be symlinked to `~/.config/foo`. +# This is useful if you don't want to have hidden files in the root of the dotfiles directory. +implicit_dot = false + +# If set to true, the dotfiles will be installed as hardlinks instead of symlinks. +# See: https://github.com/pol-rivero/doot/wiki/Installing-files-as-hardlinks +use_hardlinks = false + +# Command and flags to use for displaying diffs. Use any tool and format you like, but it must accept 2 positional arguments for the files to compare. +diff_command = "diff --unified --color=always" + +# Key-value pairs of "host name" -> "host-specific directory". +# In the example below, /laptop-dots/.zshrc will be symlinked to ~/.zshrc, taking precedence over /.zshrc, if and only if the hostname is "my-laptop". +# If `implicit_dot` is set to true, the host-specific directories also count as top-level. For example, /laptop-dots/config/foo will be symlinked as ~/.config/foo. +[hosts] +"hackstation" = "pc-files" +"laptop" = "laptop-files" diff --git a/laptop-files/.zshrc-local b/laptop-files/.zshrc-local new file mode 100644 index 00000000..b4b8ccab --- /dev/null +++ b/laptop-files/.zshrc-local @@ -0,0 +1,3 @@ +# Just for Laptop +alias vinix="nvim ~/.nixos/configuration-laptop.nix" +alias nrs="sudo nixos-rebuild switch --impure --flake ~/.nixos#mobile02" diff --git a/pc-files/.config/hypr/windows.conf b/pc-files/.config/hypr/windows.conf new file mode 100644 index 00000000..d12d306d --- /dev/null +++ b/pc-files/.config/hypr/windows.conf @@ -0,0 +1,7 @@ +monitor = DP-1, 1920x1080@60, 0x0, 1 +monitor = DP-3, 1920x1080@60, 1920x0, 1 +monitor = HDMI-A-1, 1920x1080@60, -1920x0, 1 + +workspace = 2, monitor:HDMI-A-1, default:true +workspace = 3, monitor:DP-3, default:true +workspace = 1, monitor:DP-1, default:true diff --git a/pc-files/.zshrc-local b/pc-files/.zshrc-local new file mode 100644 index 00000000..3792a176 --- /dev/null +++ b/pc-files/.zshrc-local @@ -0,0 +1,3 @@ +# Just for Hackstation +alias vinix="nvim ~/.nixos/configuration-pc.nix" +alias nrs="sudo nixos-rebuild switch --impure --flake ~/.nixos#hackstation"