From 890c29afcade5021b5d102ba05bfaea0240875b5 Mon Sep 17 00:00:00 2001 From: lulusilly Date: Thu, 25 Dec 2025 15:34:38 -0400 Subject: [PATCH] moved around dotfiles to focus around nix configuration, as most of my systems already utilize Nix/NixOS in some capacity. --- .config/htop/htoprc | 64 ------- .config/nix/modules/kanata/conf.kbd | 164 ------------------ .config/rofi/config.rasi | 2 - .gitignore | 6 + {.config/nix => nix}/flake.lock | 0 {.config/nix => nix}/flake.nix | 0 .../hosts/cantor/configuration.nix | 0 .../hosts/cantor/hardware-configuration.nix | 0 {.config/nix => nix}/hosts/common.nix | 0 {.emacs.d => nix/hosts/dots/.emacs.d}/init.el | 0 {.config => nix/hosts/dots}/ghostty/config | 0 {.config => nix/hosts/dots}/hypr/bg.jpg | Bin .../hosts/dots}/hypr/hyprland.conf | 0 {.config => nix/hosts/dots}/hypr/start.sh | 0 {.config => nix/hosts/dots}/mpv/mpv.conf | 0 .../hosts/dots}/neofetch/config.conf | 44 +++-- {.config => nix/hosts/dots}/nvim/init.lua | 0 {.config => nix/hosts/dots}/waybar/config | 0 {.config => nix/hosts/dots}/waybar/style.css | 0 {.config/nix => nix}/hosts/home.nix | 20 ++- .../nix => nix}/hosts/mecca/configuration.nix | 0 .../hosts/mecca/hardware-configuration.nix | 0 {.config/nix => nix}/modules/efi.nix | 0 {.config/nix => nix}/modules/hypr.nix | 0 {.config => nix/modules}/kanata/conf.kbd | 0 .../nix => nix}/modules/kanata/kanata.nix | 2 +- {.config/nix => nix}/modules/laptop.nix | 0 {.config/nix => nix}/modules/syncthing.nix | 0 28 files changed, 47 insertions(+), 255 deletions(-) delete mode 100644 .config/htop/htoprc delete mode 100644 .config/nix/modules/kanata/conf.kbd delete mode 100644 .config/rofi/config.rasi mode change 100644 => 100755 .gitignore rename {.config/nix => nix}/flake.lock (100%) mode change 100644 => 100755 rename {.config/nix => nix}/flake.nix (100%) mode change 100644 => 100755 rename {.config/nix => nix}/hosts/cantor/configuration.nix (100%) mode change 100644 => 100755 rename {.config/nix => nix}/hosts/cantor/hardware-configuration.nix (100%) mode change 100644 => 100755 rename {.config/nix => nix}/hosts/common.nix (100%) mode change 100644 => 100755 rename {.emacs.d => nix/hosts/dots/.emacs.d}/init.el (100%) mode change 100644 => 100755 rename {.config => nix/hosts/dots}/ghostty/config (100%) mode change 100644 => 100755 rename {.config => nix/hosts/dots}/hypr/bg.jpg (100%) mode change 100644 => 100755 rename {.config => nix/hosts/dots}/hypr/hyprland.conf (100%) mode change 100644 => 100755 rename {.config => nix/hosts/dots}/hypr/start.sh (100%) mode change 100644 => 100755 rename {.config => nix/hosts/dots}/mpv/mpv.conf (100%) mode change 100644 => 100755 rename {.config => nix/hosts/dots}/neofetch/config.conf (96%) mode change 100644 => 100755 rename {.config => nix/hosts/dots}/nvim/init.lua (100%) mode change 100644 => 100755 rename {.config => nix/hosts/dots}/waybar/config (100%) mode change 100644 => 100755 rename {.config => nix/hosts/dots}/waybar/style.css (100%) mode change 100644 => 100755 rename {.config/nix => nix}/hosts/home.nix (79%) mode change 100644 => 100755 rename {.config/nix => nix}/hosts/mecca/configuration.nix (100%) mode change 100644 => 100755 rename {.config/nix => nix}/hosts/mecca/hardware-configuration.nix (100%) mode change 100644 => 100755 rename {.config/nix => nix}/modules/efi.nix (100%) mode change 100644 => 100755 rename {.config/nix => nix}/modules/hypr.nix (100%) mode change 100644 => 100755 rename {.config => nix/modules}/kanata/conf.kbd (100%) mode change 100644 => 100755 rename {.config/nix => nix}/modules/kanata/kanata.nix (94%) mode change 100644 => 100755 rename {.config/nix => nix}/modules/laptop.nix (100%) mode change 100644 => 100755 rename {.config/nix => nix}/modules/syncthing.nix (100%) mode change 100644 => 100755 diff --git a/.config/htop/htoprc b/.config/htop/htoprc deleted file mode 100644 index 15d33b5..0000000 --- a/.config/htop/htoprc +++ /dev/null @@ -1,64 +0,0 @@ -# Beware! This file is rewritten by htop when settings are changed in the interface. -# The parser is also very primitive, and not human-friendly. -htop_version=3.4.1 -config_reader_min_version=3 -fields=0 48 17 18 38 39 40 2 46 47 49 1 -hide_kernel_threads=1 -hide_userland_threads=0 -hide_running_in_container=0 -shadow_other_users=0 -show_thread_names=0 -show_program_path=1 -highlight_base_name=0 -highlight_deleted_exe=1 -shadow_distribution_path_prefix=0 -highlight_megabytes=1 -highlight_threads=1 -highlight_changes=0 -highlight_changes_delay_secs=5 -find_comm_in_cmdline=1 -strip_exe_from_cmdline=1 -show_merged_command=0 -header_margin=1 -screen_tabs=1 -detailed_cpu_time=0 -cpu_count_from_one=0 -show_cpu_usage=1 -show_cpu_frequency=0 -show_cpu_temperature=0 -degree_fahrenheit=0 -show_cached_memory=1 -update_process_names=0 -account_guest_in_cpu_meter=0 -color_scheme=0 -enable_mouse=1 -delay=15 -hide_function_bar=0 -header_layout=two_50_50 -column_meters_0=LeftCPUs Memory Swap -column_meter_modes_0=1 1 1 -column_meters_1=RightCPUs Tasks LoadAverage Uptime -column_meter_modes_1=1 2 2 2 -tree_view=0 -sort_key=46 -tree_sort_key=0 -sort_direction=-1 -tree_sort_direction=1 -tree_view_always_by_pid=0 -all_branches_collapsed=0 -screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command -.sort_key=PERCENT_CPU -.tree_sort_key=PID -.tree_view_always_by_pid=0 -.tree_view=0 -.sort_direction=-1 -.tree_sort_direction=1 -.all_branches_collapsed=0 -screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command -.sort_key=IO_RATE -.tree_sort_key=PID -.tree_view_always_by_pid=0 -.tree_view=0 -.sort_direction=-1 -.tree_sort_direction=1 -.all_branches_collapsed=0 diff --git a/.config/nix/modules/kanata/conf.kbd b/.config/nix/modules/kanata/conf.kbd deleted file mode 100644 index 6b13055..0000000 --- a/.config/nix/modules/kanata/conf.kbd +++ /dev/null @@ -1,164 +0,0 @@ -#| - Kanata Config - ○ Ergonomic (kinda?) 34-key QWERTY layout - ○ GACS home-row mods - ○ Layers for function, number, media, and symbol keys - ○ Dedicated (and non-intrusive!) standard layout toggle for reliant tasks - ○ Decently commented for beginners and seasoned veterans alike. - - FEEL FREE TO FORK!!! -|# -(defcfg - concurrent-tap-hold yes - movemouse-smooth-diagonals yes -) -#| - Trying to be minimal in order to reduce constant editing - of layer keys, not to mention how ugly having a 60% layout - is when you have mapped keys in the grid. -|# -(defsrc - caps - q w e r t y u i o p - a s d f g h j k l scln - z x c v b n m , . / - lalt spc ralt -) -;; Variables for clean code -(defvar - tap-time 200 - hold-time 250 - chord-time 50 -) -;; Bindings -(defalias - ;; Normal keyboard layer for gaming/other normie usage - normie (layer-switch norm) - ;; Key chord definitions - chw (chord ch w) - che (chord ch e) - chi (chord ch i) - cho (chord ch o) - chs (chord ch s) - chd (chord ch d) - chk (chord ch k) - chl (chord ch l) - ch_lalt (chord ch lalt) - ch_ralt (chord ch ralt) - ;; Remap Caps to Escape/Nav layer - navlayer (layer-while-held nav) - caps (tap-hold $tap-time $hold-time (tap-dance 200 (esc caps)) @navlayer) - ;; Home row mods - a (tap-hold $tap-time $hold-time a lmet) - s (tap-hold $tap-time $hold-time s lalt) - d (tap-hold $tap-time $hold-time d lctl) - f (tap-hold $tap-time $hold-time f lsft) - j (tap-hold $tap-time $hold-time j rsft) - k (tap-hold $tap-time $hold-time k lctl) - l (tap-hold $tap-time $hold-time l lalt) - scln (tap-hold $tap-time $hold-time scln rmet) - ;; Numpad layer - numpad (layer-while-held num) - g (tap-hold $tap-time $hold-time g @numpad) - ;; Function key layer - fnkeys (layer-while-held fn) - h (tap-hold $tap-time $hold-time h @fnkeys) - #| - Hyper key when V or M are held down to allow for either hand to - use hyper key for AHK/Raycast shortcuts. - |# - v (tap-hold $tap-time $hold-time v (multi lsft lctl lalt)) - m (tap-hold $tap-time $hold-time m (multi lsft lctl lalt)) - ;; Holding Spacebar activates symbol layer - symbols (layer-while-held symbol) - spc (tap-hold $tap-time $hold-time spc @symbols) - ;; Media layer when Z or / are held. - medialy (layer-while-held md) - z (tap-hold $tap-time $hold-time z @medialy) - / (tap-hold $tap-time $hold-time / @medialy) -) -;; Chord definitions. Kind of weird to read as a layperson -;; so I provided sufficient comments for general understanding. -(defchords ch $chord-time - (w ) w ;; W => W - ( e) e ;; E => E - (w e) ret ;; W + E => Enter - (i ) i ;; I => I - ( o) o ;; O => O - (i o) bspc ;; I + O => Backspace - (s ) @s ;; S => S - ( d) @d ;; D => D - (s d) tab ;; S + D => Tab - (k ) @k ;; K => K (See defalias) - ( l) @l ;; L => L (See defalias) - (k l) esc ;; K + L => Escape - (lalt ) (tap-dance $tap-time ((multi lsft lctl lalt lmet) lalt)) ;; LAlt => Hyper Key, LAlt × 2 => LAlt - ( ralt) (tap-dance $tap-time ((multi lsft lctl lalt lmet) lalt)) ;; RAlt => Hyper Key, RAlt × 2 => RAlt - #| - Put simply, the below line allows for toggling a no-bind - layer for when you may require a standard layout (such as - playing Street Fighter, Counter Strike, etc.) by pressing - both alt keys at the same time. You can toggle back to the - base layer by holding both alts at the same time, as to allow - for normal functionality when holding either key down for a shortcut. - |# - (lalt ralt) (tap-hold $tap-time $hold-time @normie (layer-switch base)) -) -;; Base layer with all binds enabled -(deflayer base - @caps - q @chw @che r t y u @chi @cho p - @a @chs @chd @f @g @h @j @chk @chl @scln - @z x c @v b n @m , . @/ - @ch_lalt @spc @ch_ralt -) -;; Navigation layer -(deflayer nav - _ - mbck (movemouse-up 3 3) mfwd _ _ _ mlft mrgt pgup pgdn - (movemouse-left 3 3) (movemouse-down 3 3) (movemouse-right 3 3) _ home left down up right end - _ _ _ _ _ _ _ _ _ _ - _ _ _ -) -;; Numpad Layer -(deflayer num - _ - _ _ _ _ _ _ 7 8 9 _ - _ _ _ _ _ _ 4 5 6 0 _ - _ _ _ _ _ 1 2 3 _ - _ _ _ -) -;; Function key layer -(deflayer fn - _ - f1 f2 f3 f4 _ _ _ _ _ _ - f5 f6 f7 f8 _ _ _ _ _ _ _ - f9 f10 f11 f12 _ _ _ _ _ - _ _ _ -) -;; Symbol layer -(deflayer symbol - _ - S-1 S-2 S-3 S-4 S-5 S-6 S-7 S-8 S-9 S-0 - - S-= S-[ S-] [ ] S-` S-scln S-\ \ - = _ _ ` _ S-- _ _ ' S-' - _ _ _ -) -;; Aformentioned standard layer with combo binds for toggling back -;; to base layer. -(deflayer norm - esc - q w e r t y u i o p - a s d f g h j k l scln - z x c v b n m , . / - @ch_lalt spc @ch_ralt -) -;; Media layer -;; NOTE: On Windows the brdn and brup keys cause Kanata to crash for some reason as of kanata_gui 1.8.1 -(deflayer md - _ - _ _ _ _ _ _ _ _ _ _ - prev pp next mute vold volu brdn brup ins del - _ _ _ _ _ _ _ _ _ _ - _ _ _ -) \ No newline at end of file diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi deleted file mode 100644 index 637c9cf..0000000 --- a/.config/rofi/config.rasi +++ /dev/null @@ -1,2 +0,0 @@ - -@theme "/nix/store/si1728pghbj94zby6kla4c7kbkmpnyy6-rofi-1.7.9+wayland1/share/rofi/themes/gruvbox-dark-soft.rasi" diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index a0bd704..72d5bd0 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,9 @@ nicotine medialib.dbpl playlists running +index-v0.14.0.db +CURRENT.bak +LOG +dolphinrc +QtProject.conf +kde.org diff --git a/.config/nix/flake.lock b/nix/flake.lock old mode 100644 new mode 100755 similarity index 100% rename from .config/nix/flake.lock rename to nix/flake.lock diff --git a/.config/nix/flake.nix b/nix/flake.nix old mode 100644 new mode 100755 similarity index 100% rename from .config/nix/flake.nix rename to nix/flake.nix diff --git a/.config/nix/hosts/cantor/configuration.nix b/nix/hosts/cantor/configuration.nix old mode 100644 new mode 100755 similarity index 100% rename from .config/nix/hosts/cantor/configuration.nix rename to nix/hosts/cantor/configuration.nix diff --git a/.config/nix/hosts/cantor/hardware-configuration.nix b/nix/hosts/cantor/hardware-configuration.nix old mode 100644 new mode 100755 similarity index 100% rename from .config/nix/hosts/cantor/hardware-configuration.nix rename to nix/hosts/cantor/hardware-configuration.nix diff --git a/.config/nix/hosts/common.nix b/nix/hosts/common.nix old mode 100644 new mode 100755 similarity index 100% rename from .config/nix/hosts/common.nix rename to nix/hosts/common.nix diff --git a/.emacs.d/init.el b/nix/hosts/dots/.emacs.d/init.el old mode 100644 new mode 100755 similarity index 100% rename from .emacs.d/init.el rename to nix/hosts/dots/.emacs.d/init.el diff --git a/.config/ghostty/config b/nix/hosts/dots/ghostty/config old mode 100644 new mode 100755 similarity index 100% rename from .config/ghostty/config rename to nix/hosts/dots/ghostty/config diff --git a/.config/hypr/bg.jpg b/nix/hosts/dots/hypr/bg.jpg old mode 100644 new mode 100755 similarity index 100% rename from .config/hypr/bg.jpg rename to nix/hosts/dots/hypr/bg.jpg diff --git a/.config/hypr/hyprland.conf b/nix/hosts/dots/hypr/hyprland.conf old mode 100644 new mode 100755 similarity index 100% rename from .config/hypr/hyprland.conf rename to nix/hosts/dots/hypr/hyprland.conf diff --git a/.config/hypr/start.sh b/nix/hosts/dots/hypr/start.sh old mode 100644 new mode 100755 similarity index 100% rename from .config/hypr/start.sh rename to nix/hosts/dots/hypr/start.sh diff --git a/.config/mpv/mpv.conf b/nix/hosts/dots/mpv/mpv.conf old mode 100644 new mode 100755 similarity index 100% rename from .config/mpv/mpv.conf rename to nix/hosts/dots/mpv/mpv.conf diff --git a/.config/neofetch/config.conf b/nix/hosts/dots/neofetch/config.conf old mode 100644 new mode 100755 similarity index 96% rename from .config/neofetch/config.conf rename to nix/hosts/dots/neofetch/config.conf index fb88b56..cedbb9e --- a/.config/neofetch/config.conf +++ b/nix/hosts/dots/neofetch/config.conf @@ -1,35 +1,33 @@ -# See this wiki page for more info: -# https://github.com/dylanaraps/neofetch/wiki/Customizing-Info print_info() { info title info underline info "OS" distro info "Host" model - info "Kernel" kernel + # info "Kernel" kernel info "Uptime" uptime - info "Packages" packages - info "Shell" shell + # info "Packages" packages + # info "Shell" shell info "Resolution" resolution - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "Terminal" term - info "Terminal Font" term_font + # info "DE" de + # info "WM" wm + # info "WM Theme" wm_theme + # info "Theme" theme + # info "Icons" icons + # info "Terminal" term + # info "Terminal Font" term_font info "CPU" cpu - info "GPU" gpu + # info "GPU" gpu info "Memory" memory # info "GPU Driver" gpu_driver # Linux/macOS only # info "CPU Usage" cpu_usage - # info "Disk" disk + info "Disk" disk info "Battery" battery # info "Font" font - # info "Song" song - # [[ "$player" ]] && prin "Music Player" "$player" - # info "Local IP" local_ip + info "Song" song + [[ "$player" ]] && prin "Music Player" "$player" + info "Local IP" local_ip # info "Public IP" public_ip # info "Users" users # info "Locale" locale # This only works on glibc systems. @@ -85,7 +83,7 @@ distro_shorthand="off" # Example: # on: 'Arch Linux x86_64' # off: 'Arch Linux' -os_arch="on" +os_arch="off" # Uptime @@ -101,7 +99,7 @@ os_arch="on" # on: '2 days, 10 hours, 3 mins' # tiny: '2d 10h 3m' # off: '2 days, 10 hours, 3 minutes' -uptime_shorthand="on" +uptime_shorthand="tiny" # Memory @@ -128,7 +126,7 @@ memory_percent="off" # kib '1020928KiB / 7117824KiB' # mib '1042MiB / 6951MiB' # gib: ' 0.98GiB / 6.79GiB' -memory_unit="mib" +memory_unit="gib" # Packages @@ -195,7 +193,7 @@ speed_type="bios_limit" # Example: # on: 'i7-6500U (4) @ 3.1GHz' # off: 'i7-6500U (4) @ 3.100GHz' -speed_shorthand="off" +speed_shorthand="on" # Enable/Disable CPU brand in output. # @@ -249,7 +247,7 @@ cpu_cores="logical" # C: 'Intel i7-6500U (4) @ 3.1GHz [27.2°C]' # F: 'Intel i7-6500U (4) @ 3.1GHz [82.0°F]' # off: 'Intel i7-6500U (4) @ 3.1GHz' -cpu_temp="off" +cpu_temp="C" # GPU @@ -298,7 +296,7 @@ gpu_type="all" # Example: # on: '1920x1080 @ 60Hz' # off: '1920x1080' -refresh_rate="off" +refresh_rate="on" # Gtk Theme / Icons / Font diff --git a/.config/nvim/init.lua b/nix/hosts/dots/nvim/init.lua old mode 100644 new mode 100755 similarity index 100% rename from .config/nvim/init.lua rename to nix/hosts/dots/nvim/init.lua diff --git a/.config/waybar/config b/nix/hosts/dots/waybar/config old mode 100644 new mode 100755 similarity index 100% rename from .config/waybar/config rename to nix/hosts/dots/waybar/config diff --git a/.config/waybar/style.css b/nix/hosts/dots/waybar/style.css old mode 100644 new mode 100755 similarity index 100% rename from .config/waybar/style.css rename to nix/hosts/dots/waybar/style.css diff --git a/.config/nix/hosts/home.nix b/nix/hosts/home.nix old mode 100644 new mode 100755 similarity index 79% rename from .config/nix/hosts/home.nix rename to nix/hosts/home.nix index 8269530..c166d88 --- a/.config/nix/hosts/home.nix +++ b/nix/hosts/home.nix @@ -101,7 +101,6 @@ hyfetch # basically neofetch but with queer flags htop # OG resource manager btop # Pretty resource manager - stow # For dotfiles deployment. May use home.file in future imagemagick # For converting images into other fmts sxiv # Minimal image viewer mpv # Media player @@ -125,6 +124,25 @@ fonts.fontconfig.enable = true; home.file = { + # Ghostty + ".config/ghostty/config" .source = dotfiles/ghostty/config; + # Neovim + ".config/nvim/init.lua" .source = dotfiles/nvim/init.lua; + # Emacs + ".emacs.d/init.el" .source = dotfiles/.emacs.d/init.el; + # MPV + ".config/mpv/mpv.conf" .source = dotfiles/mpv/mpv.conf; + # Btop + ".config/btop/btop.conf" .source = dotfiles/btop/btop.conf; + # Neofetch + ".config/neofetch/config.conf" .source = dotfiles/neofetch/config.conf; + # Hyprland + ".config/hypr/bg.jpg" .source = dotfiles/hypr/bg.jpg; + ".config/hypr/hyprland.conf" .source = dotfiles/hypr/hyprland.conf; + ".config/hypr/start.sh" .source = dotfiles/hypr/start.sh; + # Waybar + ".config/waybar/config" .source = dotfiles/waybar/config; + ".config/waybar/style.css" .source = dotfiles/waybar/style.css; }; home.sessionVariables = { diff --git a/.config/nix/hosts/mecca/configuration.nix b/nix/hosts/mecca/configuration.nix old mode 100644 new mode 100755 similarity index 100% rename from .config/nix/hosts/mecca/configuration.nix rename to nix/hosts/mecca/configuration.nix diff --git a/.config/nix/hosts/mecca/hardware-configuration.nix b/nix/hosts/mecca/hardware-configuration.nix old mode 100644 new mode 100755 similarity index 100% rename from .config/nix/hosts/mecca/hardware-configuration.nix rename to nix/hosts/mecca/hardware-configuration.nix diff --git a/.config/nix/modules/efi.nix b/nix/modules/efi.nix old mode 100644 new mode 100755 similarity index 100% rename from .config/nix/modules/efi.nix rename to nix/modules/efi.nix diff --git a/.config/nix/modules/hypr.nix b/nix/modules/hypr.nix old mode 100644 new mode 100755 similarity index 100% rename from .config/nix/modules/hypr.nix rename to nix/modules/hypr.nix diff --git a/.config/kanata/conf.kbd b/nix/modules/kanata/conf.kbd old mode 100644 new mode 100755 similarity index 100% rename from .config/kanata/conf.kbd rename to nix/modules/kanata/conf.kbd diff --git a/.config/nix/modules/kanata/kanata.nix b/nix/modules/kanata/kanata.nix old mode 100644 new mode 100755 similarity index 94% rename from .config/nix/modules/kanata/kanata.nix rename to nix/modules/kanata/kanata.nix index c07d4ea..9a5f0c1 --- a/.config/nix/modules/kanata/kanata.nix +++ b/nix/modules/kanata/kanata.nix @@ -25,7 +25,7 @@ devices = [ "/dev/input/by-path/platform-i8042-serio-0-event-kbd" ]; - configFile = builtins.readFile = ./conf.kbd; + configFile = ./conf.kbd; }; }; }; diff --git a/.config/nix/modules/laptop.nix b/nix/modules/laptop.nix old mode 100644 new mode 100755 similarity index 100% rename from .config/nix/modules/laptop.nix rename to nix/modules/laptop.nix diff --git a/.config/nix/modules/syncthing.nix b/nix/modules/syncthing.nix old mode 100644 new mode 100755 similarity index 100% rename from .config/nix/modules/syncthing.nix rename to nix/modules/syncthing.nix