Switch to relative paths instead of inputs.self madness

+1 -1

nixosModules/base/nushell.nix

··· 53 53 } | do $in $spans 54 54 } 55 55 56 - let command_not_found = ${fileContents "${inputs.self}/res/command_not_found.nu"} 56 + let command_not_found = ${fileContents ../../res/command_not_found.nu} 57 57 58 58 def --env __batman [...rest:string] { 59 59 BAT_THEME="Monokai Extended" batman ...$rest

+1 -2

nixosModules/base/personal.nix

··· 1 1 { 2 - edition, 3 2 inputs, 4 3 config, 5 4 ... ··· 29 28 home = { 30 29 username = "bean"; 31 30 homeDirectory = "/home/bean"; 32 - file.".face".source = "${inputs.self}/res/pictures/cow.png"; 31 + file.".face".source = "${../../res/pictures/cow.png}"; 33 32 stateVersion = config.system.stateVersion; 34 33 }; 35 34 };

+4 -8

nixosModules/graphics/lock.nix

··· 1 - { 2 - pkgs, 3 - inputs, 4 - ... 5 - }: { 1 + {pkgs, ...}: { 6 2 home-manager.users.bean = { 7 3 wayland.windowManager.hyprland.settings = { 8 4 bind = [ ··· 27 23 general.grace = 5; 28 24 background = { 29 25 monitor = ""; 30 - path = "${inputs.self}/res/pictures/background.png"; 26 + path = "${../../res/pictures/background.png}"; 31 27 blur_passes = 1; 32 28 }; 33 29 shape = [ ··· 57 53 ]; 58 54 image = { 59 55 monitor = ""; 60 - path = "${inputs.self}/res/pictures/cow.png"; 56 + path = "${../../res/pictures/cow.png}"; 61 57 size = 150; 62 58 rounding = -1; 63 59 border_size = 4; ··· 112 108 } 113 109 { 114 110 monitor = ""; 115 - text = ''cmd[update:30000] echo " $(date +"%A, %B %-d | %I:%M %p") | $(${pkgs.nushell}/bin/nu ${inputs.self}/res/bat_display.nu) "''; 111 + text = ''cmd[update:30000] echo " $(date +"%A, %B %-d | %I:%M %p") | $(${pkgs.nushell}/bin/nu ${../../res/bat_display.nu}) "''; 116 112 color = text; 117 113 font_size = 20; 118 114 font_family = "sans-serif";

+2 -7

nixosModules/graphics/news.nix

··· 1 - { 2 - pkgs, 3 - inputs, 4 - config, 5 - ... 6 - }: let 1 + {pkgs, ...}: let 7 2 yt-feed = id: { 8 3 url = "https://www.youtube.com/feeds/videos.xml?channel_id=" + id; 9 4 tags = ["!" "youtube"]; ··· 64 59 65 60 programs.newsboat = { 66 61 enable = true; 67 - browser = ''"${inputs.self}/res/news-open.nu %u"''; 62 + browser = ''"${../../res/news-open.nu} %u"''; 68 63 69 64 # notify-program ${../res/news-notify.nu} 70 65

+7 -8

nixosModules/graphics/shell.nix

··· 1 1 { 2 2 pkgs, 3 - inputs, 4 3 config, 5 4 lib, 6 5 ... ··· 69 68 70 69 home-manager.users.bean = { 71 70 xdg.configFile = { 72 - dolphinrc.source = "${inputs.self}/res/theming/dolphinrc"; 71 + dolphinrc.source = "${../../res/theming/dolphinrc}"; 73 72 "swappy/config".text = '' 74 73 [Default] 75 74 save_dir=$HOME/Pictures/Screenshots ··· 125 124 "hypridle" 126 125 "uwsm app -- dolphin --daemon" 127 126 "uwsm app -- waybar" 128 - "wl-paste --watch bash ${inputs.self}/res/clipboard_middleman.sh" 127 + "wl-paste --watch bash ${../../res/clipboard_middleman.sh}" 129 128 "uwsm app -- swaync" 130 129 "uwsm app -- swayosd-server" 131 130 "uwsm app -- nm-applet" 132 131 "${pkgs.udiskie}/bin/udiskie -A -f dolphin" 133 - "${pkgs.nushell}/bin/nu ${inputs.self}/res/battery_notif.nu" 132 + "${pkgs.nushell}/bin/nu ${../../res/battery_notif.nu}" 134 133 "playerctld" 135 134 "[workspace 3] uwsm app -- keepassxc /home/bean/Documents/Database.kdbx" 136 135 ]; 137 136 138 137 bind = let 139 138 powerMenu = "rofi -modi 'p:${pkgs.rofi-power-menu}/bin/rofi-power-menu' -show p --symbols-font \"FiraMono Nerd Font Mono\""; 140 - screenshot = "${pkgs.nushell}/bin/nu ${inputs.self}/res/screenshot.nu"; 139 + screenshot = "${pkgs.nushell}/bin/nu ${../../res/screenshot.nu}"; 141 140 in [ 142 141 "SUPER,S,exec,uwsm app -- rofi -show drun -icon-theme \"candy-icons\" -show-icons" 143 142 "SUPER SHIFT,E,exec,uwsm app -- rofi -modi emoji -show emoji" ··· 146 145 "SUPER ALT,C,exec,uwsm app -- rofi -show calc -modi calc -no-show-match -no-sort -calc-command \"echo -n '{result}' | wl-copy\"" 147 146 "SUPER,B,exec,uwsm app -- ${pkgs.rofi-bluetooth}/bin/rofi-bluetooth" 148 147 "SUPER,Tab,exec,uwsm app -- rofi -show window -show-icons" 149 - "SUPER,E,exec,uwsm app -- ${pkgs.nushell}/bin/nu ${inputs.self}/res/rofi/rofi-places.nu" 148 + "SUPER,E,exec,uwsm app -- ${pkgs.nushell}/bin/nu ${../../res/rofi/rofi-places.nu}" 150 149 "SUPER,N,exec,uwsm app -- ${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw" 151 150 "SUPER,A,exec,uwsm app -- pavucontrol --tab 5" 152 151 ''SUPER,V,exec,cliphist list | sed -r 's/\[\[ binary data (.* .iB) (.*) (.*) \]\]/ 󰋩 \2 Image (\3, \1)/g' | rofi -dmenu -display-columns 2 -p Clipboard | cliphist decode | wl-copy'' 153 152 "SUPER ALT,V,exec,echo -e \"Yes\\nNo\" | [[ $(rofi -dmenu -mesg \"Clear Clipboard History?\" -p Clear) == \"Yes\" ]] && cliphist wipe" 154 153 ",Print,exec,uwsm app -- ${screenshot}" 155 154 "SUPER SHIFT,S,exec,uwsm app -- ${screenshot}" 156 - "SUPER SHIFT,T,exec,nu ${../../res/ocr.nu}" 155 + "SUPER SHIFT,T,exec,${pkgs.nushell}/bin/nu ${../../res/ocr.nu}" 157 156 "SUPER SHIFT,C,exec,uwsm app -- ${pkgs.hyprpicker}/bin/hyprpicker -a" 158 157 ]; 159 158 bindr = [ 160 - "SUPER SHIFT,R,exec,pkill wf-recorder --signal SIGINT || uwsm app -- nu ${inputs.self}/res/screenrec.nu" 159 + "SUPER SHIFT,R,exec,pkill wf-recorder --signal SIGINT || uwsm app -- ${pkgs.nushell}/bin/nu ${../../res/screenrec.nu}" 161 160 "CAPS,Caps_Lock,exec,uwsm app -- swayosd-client --caps-lock" 162 161 ",Scroll_Lock,exec,uwsm app -- swayosd-client --scroll-lock" 163 162 ",Num_Lock,exec,uwsm app -- swayosd-client --num-lock"

+1 -1

nixosModules/graphics/swaync.nix

··· 37 37 script-fail-notify = true; 38 38 scripts = { 39 39 all = { 40 - exec = "${pkgs.nushell}/bin/nu ${inputs.self}/res/notification.nu ${inputs.self}/res/notif-sounds"; 40 + exec = "${pkgs.nushell}/bin/nu ${../../res/notification.nu} ${../../res/notif-sounds}"; 41 41 urgency = ".*"; 42 42 }; 43 43 };

+8 -12

nixosModules/graphics/theming.nix

··· 1 - { 2 - pkgs, 3 - inputs, 4 - ... 5 - }: { 1 + {pkgs, ...}: { 6 2 qt = { 7 3 enable = true; 8 4 platformTheme = "qt5ct"; ··· 17 13 }; 18 14 19 15 xdg.configFile = { 20 - kdeglobals.source = "${inputs.self}/res/theming/kdeglobals"; 21 - "qt5ct/qt5ct.conf".source = "${inputs.self}/res/theming/qt5ct.conf"; 22 - "qt6ct/qt6ct.conf".source = "${inputs.self}/res/theming/qt6ct.conf"; 23 - "gtk-3.0/settings.ini".source = "${inputs.self}/res/theming/gtk/settings.ini"; 24 - "gtk-4.0/settings.ini".source = "${inputs.self}/res/theming/gtk/settings.ini"; 16 + kdeglobals.source = ../../res/theming/kdeglobals; 17 + "qt5ct/qt5ct.conf".source = ../../res/theming/qt5ct.conf; 18 + "qt6ct/qt6ct.conf".source = ../../res/theming/qt6ct.conf; 19 + "gtk-3.0/settings.ini".source = ../../res/theming/gtk/settings.ini; 20 + "gtk-4.0/settings.ini".source = ../../res/theming/gtk/settings.ini; 25 21 }; 26 22 27 23 services.hyprpaper = { ··· 29 25 settings = { 30 26 ipc = "on"; 31 27 splash = false; 32 - preload = ["${inputs.self}/res/pictures/background.png"]; 33 - wallpaper = [",${inputs.self}/res/pictures/background.png"]; 28 + preload = ["${../../res/pictures/background.png}"]; 29 + wallpaper = [",${../../res/pictures/background.png}"]; 34 30 }; 35 31 }; 36 32

+4 -8

nixosModules/graphics/waybar.nix

··· 1 - { 2 - pkgs, 3 - inputs, 4 - ... 5 - }: let 1 + {pkgs, ...}: let 6 2 catppuccinCss = pkgs.fetchurl { 7 3 url = "https://github.com/catppuccin/waybar/raw/refs/heads/main/themes/mocha.css"; 8 4 hash = "sha256-puMFl8zIKOiYhE6wzqnffXOHn/VnKmpVDzrMJMk+3Rc="; ··· 281 277 tooltip-format = "{:%F at %T in %Z (UTC%Ez)}"; 282 278 }; 283 279 "custom/kde-connect" = { 284 - exec = "${pkgs.nushell}/bin/nu ${inputs.self}/res/custom_waybar_modules/kdeconnect.nu"; 280 + exec = "${pkgs.nushell}/bin/nu ${../../res/custom_waybar_modules/kdeconnect.nu}"; 285 281 format = "{}"; 286 282 interval = 30; 287 283 on-click = "kdeconnect-settings"; 288 284 return-type = "json"; 289 285 }; 290 286 "custom/news" = { 291 - exec = "${pkgs.nushell}/bin/nu ${inputs.self}/res/custom_waybar_modules/newsboat.nu"; 287 + exec = "${pkgs.nushell}/bin/nu ${../../res/custom_waybar_modules/newsboat.nu}"; 292 288 exec-on-event = true; 293 289 format = "{}"; 294 290 on-click-right = "pkill waybar -SIGRTMIN+6"; ··· 319 315 tooltip = false; 320 316 }; 321 317 "custom/weather" = { 322 - exec = "${pkgs.nushell}/bin/nu ${inputs.self}/res/custom_waybar_modules/weather.nu"; 318 + exec = "${pkgs.nushell}/bin/nu ${../../res/custom_waybar_modules/weather.nu}"; 323 319 format = "{}"; 324 320 interval = 600; 325 321 on-click = "xdg-open https://duckduckgo.com/?q=weather";

Configure Feed

Configure Feed