diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..2a43a44 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "Shell"] + path = Shell + url = https://git.ocbwoy3.dev/kris/DeltaruneQuickshell + branch = main diff --git a/README.md b/README.md index 4868b9c..ec4ac7f 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ | ------------------- | ---------------------------------------------------------------------------------------------------------------- | | `SUPER+SHIFT+ENTER` | Change wallpaper | | `SUPER+F1` | Hide waybar | -| `SUPER+F2` | [Roblox](https://roblox.com) [Roblox](https://sober.vinegarhq.org) [Roblox](https://github.com/ocbwoy3/tuxstrap) | +| `SUPER+F2` | [Roblox](https://roblox.com) [Roblox](https://sober.vinegarhq.org) | | `SUPER+Space` | Switch Keyboard Layout (English, Latvian) | ## How to install NixOS @@ -85,7 +85,7 @@ root -> /root ``` -2. Create user named 'ocbwoy3' +2. Create user named `kris` 3. Run this in order: @@ -97,19 +97,21 @@ nix-shell -p git 4. Run this inside the `nix-shell` ```bash -git clone git@tangled.sh:ocbwoy3.dev/nix -cd config -sudo nixos-rebuild switch --flake .#default --impure --cores 20 +git clone git@tangled.sh:kris.darkworld.download/nix /tmp/nix-config +sudo rm -rf /etc/nixos +sudo mv /tmp/nix-config /etc/nixos +cd /etc/nixos +sudo nixos-rebuild switch --flake /etc/nixos#default --cores 20 ``` 1. Reboot, run this in your terminal: ```bash -mkdir -p /home/ocbwoy3/Pictures/Screenshots -mkdir -p /home/ocbwoy3/Downloads -mkdir -p /home/ocbwoy3/Desktop -mkdir -p /home/ocbwoy3/Documents -mkdir -p /home/ocbwoy3/Projects +mkdir -p /home/kris/Pictures/Screenshots +mkdir -p /home/kris/Downloads +mkdir -p /home/kris/Desktop +mkdir -p /home/kris/Documents +mkdir -p /home/kris/Projects ``` 6. Add this to `/etc/resolv.conf` as root diff --git a/asset/thirdparty/deltarune/COPYRIGHT_NOTICE.txt b/asset/thirdparty/deltarune/COPYRIGHT_NOTICE.txt new file mode 100644 index 0000000..0f89a6b --- /dev/null +++ b/asset/thirdparty/deltarune/COPYRIGHT_NOTICE.txt @@ -0,0 +1,2 @@ +Asset & Copyright Disclaimer +DELTARUNE, its trademark and all related assets are Copyright (c) Toby Fox. diff --git a/asset/thirdparty/deltarune/border.png b/asset/thirdparty/deltarune/border.png new file mode 100644 index 0000000..f291e77 Binary files /dev/null and b/asset/thirdparty/deltarune/border.png differ diff --git a/config/dunst/dunstrc b/config/dunst/dunstrc index 8b60aae..baa2c4c 100644 --- a/config/dunst/dunstrc +++ b/config/dunst/dunstrc @@ -39,7 +39,7 @@ ### Text ### - font = SF Pro Display 11, SFProJPDisplay-Regular 11 + font = 8-bit Operator+, 8bitoperator JVE, Determination Mono, SF Pro Display 11, SFProJPDisplay-Regular 11 line_height = 0 markup = full @@ -115,7 +115,7 @@ timeout = 10 [hyprland_welcome_new] - summary = "Sveicināti Hyprland!" + summary = "Welcome to Hyprland!" background = "#1e1e2e" frame_color = "#a6e3a1" foreground = "#a6e3a1" @@ -128,13 +128,13 @@ foreground = "#fab387" [dotfiles_kbd] - summary = "Tastatūra" + summary = "Keyboard" background = "#1e1e2e" frame_color = "#fab387" foreground = "#fab387" [dotfiles_wallpaper] - summary = "Fons" + summary = "Wallpaper" background = "#1e1e2e" frame_color = "#fab387" foreground = "#fab387" @@ -146,13 +146,13 @@ frame_color = "#f38ba8" [dotfiles_screenshot] - summary = "Ekrānuzņēmums" + summary = "Screenshot" background = "#1e1e2e" frame_color = "#89dceb" foreground = "#89dceb" [dotfiles_error] - summary = "Kļūda" + summary = "Error" background = "#1e1e2e" foreground = "#f38ba8" frame_color = "#f38ba8" diff --git a/config/fastfetch/ProphecySymbol.png b/config/fastfetch/ProphecySymbol.png new file mode 100644 index 0000000..55aeff2 Binary files /dev/null and b/config/fastfetch/ProphecySymbol.png differ diff --git a/config/fastfetch/config.jsonc b/config/fastfetch/config.jsonc index 8c579e4..090edda 100644 --- a/config/fastfetch/config.jsonc +++ b/config/fastfetch/config.jsonc @@ -1,10 +1,10 @@ { "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", "logo": { - "source": "~/.config/fastfetch/ralsei.png", + "source": "~/.config/fastfetch/deltarune.png" }, "display": { - "color": "magenta", + "color": "magenta" }, "modules": [ "break", @@ -12,7 +12,8 @@ { "type": "title", "keyColor": "blue", - "format": "{user-name-colored}{at-symbol-colored}{host-name-colored}", + "outputColor": "magenta", + "format": "kris@darkworld" // "{user-name-colored}{at-symbol-colored}{host-name-colored}" }, "break", @@ -20,30 +21,43 @@ { "type": "os", "key": "OS", - "format": "{pretty-name}", + "format": "DARKWORLD NIXOS" }, { "type": "kernel", - // "format": "Linux 6.17.0-2-cachyos-ralsei-rt-bore-lto" + "format": "Linux 6.17.0-2-dark-fountain" }, - // "packages", + { + "type": "packages", + "format": "9999 (darkworld), 4 (deltarune), 1 (the-prophecy)" + }, + //"packages", "break", - "host", - "uptime", + //"host", + { + "type": "os", + "key": "Host", + "format": "Hopes and Dreams" + }, + { + "type": "uptime", + "format": "a few minutes" + }, + //"uptime", "break", { "type": "cpu", "format": "{cores-logical}x {name} @ {freq-base} {temperature}", - "temp": true, + "temp": true }, { "type": "gpu", "format": "{name} [{type}] {temperature}", - "temp": true, + "temp": true }, "break", @@ -56,12 +70,12 @@ { "type": "wm", "key": "WM", - "format": "{pretty-name}", + "format": "{pretty-name}" }, { "type": "shell", "key": "Shell", - "format": "{pretty-name}", + "format": "{pretty-name}" }, "terminal", "locale", @@ -82,19 +96,19 @@ { "type": "media", "key": "Song", - "format": "{artist} — {title}", + "format": "{artist} — {title}" }, { "type": "media", "key": "Album", - "format": "{album}", + "format": "{album}" }, "break", { "type": "colors", - "symbol": "circle", - }, - ], + "symbol": "circle" + } + ] } diff --git a/config/fastfetch/deltarune.png b/config/fastfetch/deltarune.png new file mode 100644 index 0000000..cba675b Binary files /dev/null and b/config/fastfetch/deltarune.png differ diff --git a/config/hypr/config/autoexec.conf b/config/hypr/config/autoexec.conf index a9ee8a2..3501699 100644 --- a/config/hypr/config/autoexec.conf +++ b/config/hypr/config/autoexec.conf @@ -1,5 +1,6 @@ # Polkit -# exec-once = systemctl --user start /nix/store/*-hyprpolkitagent-*/libexec/hyprpolkitagent +exec-once = systemctl --user start /nix/store/*-hyprpolkitagent-*/libexec/hyprpolkitagent +exec-once = /usr/lib/hyprpolkitagent/hyprpolkitagent # Waybar exec-once = "GTK_THEME=Adwaita LC_TIME=lv_LV.UTF-8 waybar -c ~/config/config/waybar/config -s ~/config/config/waybar/style.css" @@ -8,7 +9,7 @@ exec-once = "GTK_THEME=Adwaita LC_TIME=lv_LV.UTF-8 waybar -c ~/config/config/way exec-once = swww-daemon # Notification Manager -exec-once = dunst +# exec-once = dunst # Gentoo Stuff exec-once = bash ~/config/scripts/gentoo-init.sh @@ -26,14 +27,19 @@ exec-once = bash ~/config/scripts/gtk.sh exec-once = bash ~/config/scripts/hot-reload.sh # Hyprland polkit -exec-once = /usr/libexec/hyprpolkitagent +exec-once = /usr/lib/hyprpolkitagent/hyprpolkitagent + +exec-once = [workspace special:music silent] cider +exec-once = [workspace special:quick silent] equibop # exec-once = arrpc +# deltarune +exec-once = qs # Hyprland Splash # exec-once = "sleep 5 && bun run scripts/bin/betterSplash.ts" -exec-once = sleep 5 && notify-send "Sveicināti Hyprland!" "$(hyprctl splash)" +exec-once = sleep 5 && notify-send -a dotfiles "Welcome to Hyprland!" "$(hyprctl splash)" # exec-once = nix-shell -p mpvpaper --command "mpvpaper -o \"no-audio loop loop-playlist\" HDMI-A-2 \"/home/ralsei/Documents/Boykisser Chipi Chipi Full Animation [3sP6ZvlqJeE].webm\"" diff --git a/config/hypr/config/display.conf b/config/hypr/config/display.conf index b65b30e..52f7743 100644 --- a/config/hypr/config/display.conf +++ b/config/hypr/config/display.conf @@ -13,10 +13,10 @@ monitor=,1920x1080@240,auto,1 general { gaps_in = 5 gaps_out = 20 - border_size = 2 + border_size = 0 - col.active_border = rgb(89b4fa) - col.inactive_border = rgb(585b70) + # col.active_border = rgb(89b4fa) + # col.inactive_border = rgb(585b70) resize_on_border = false allow_tearing = true @@ -29,7 +29,7 @@ general { ############################################# decoration { - rounding = 12 + # rounding = 12 active_opacity = 1.0 inactive_opacity = 1.0 @@ -103,7 +103,7 @@ cursor { windowrule { name = games - match:class = org.vinegarhq.Sober|com.mojang.minecraft.java-edition|deltarune.exe|steam_app_1671210 + match:class = org\.vinegarhq\.Sober|com\.mojang\.minecraft\.java-edition|deltarune\.exe|steam_app_1671210 tag = +game } @@ -113,9 +113,16 @@ windowrule { tag = +discord } + +windowrule { + name = roblox + match:class = org\.vinegarhq\.Sober + tag = +roblox +} + windowrule { name = deltarune - match:class = deltarune.exe|steam_app_1671210 + match:class = deltarune\.exe|steam_app_1671210 tag = +deltarune } @@ -158,7 +165,7 @@ misc { enable_anr_dialog = true disable_hyprland_logo = false initial_workspace_tracking = 0 - new_window_takes_over_fullscreen = 1 + # new_window_takes_over_fullscreen = 1 disable_splash_rendering = false font_family = "SF Pro Display" render_unfocused_fps = 240 @@ -191,6 +198,7 @@ layerrule { match:namespace = wofi animation = popin 70% dim_around = on + no_screen_share = off order = -10 } @@ -213,8 +221,8 @@ layerrule { ############################################# windowrule { - name = blueman music internet - match:class = blueman-manager|blueman-manager-wrapped|org.pulseaudio.pavucontrol|nm-connection-editor|nm-connection-editor-wrapped + name = utility windows + match:class = xdg-desktop-portal-gtk|blueman-manager|blueman-manager-wrapped|org\.pulseaudio\.pavucontrol|nm-connection-editor|nm-connection-editor-wrapped float = true size = 900 500 center = true @@ -224,7 +232,12 @@ windowrule { # OTHER ############################################# -windowrule = match:class steam_proton|org.vinegarhq.Sober, allows_input on +windowrule = match:class steam_proton|org\.vinegarhq\.Sober, allows_input on + +env = QT_QPA_PLATFORMTHEME,qt6ct +env = QT_STYLE_OVERRIDE,kvantum +env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 + # windowrulev2 = immediate, class:^(sober)$ # windowrulev2 = fullscreen,title:^(Sober)$ diff --git a/config/hypr/config/keybindings/default.conf b/config/hypr/config/keybindings/default.conf index afafff4..0018a2e 100644 --- a/config/hypr/config/keybindings/default.conf +++ b/config/hypr/config/keybindings/default.conf @@ -62,15 +62,15 @@ bind = $mainMod SHIFT, 9, movetoworkspace, 9 bind = $mainMod SHIFT, 0, movetoworkspace, 10 # Function keys ( FN + F[1-12] ) -bindl = , XF86MonBrightnessUp, exec, brightnessctl -q s +10% -bindl = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%- -bindl = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ -bindl = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- -bindl = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle -bindl = , XF86AudioPlay, exec, playerctl -p cider,chromium,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone,cmus play-pause -bindl = , XF86AudioPause, exec, playerctl -p cider,chromium,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone,cmus pause -bindl = , XF86AudioNext, exec, playerctl -p cider,chromium,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone,cmus next -bindl = , XF86AudioPrev, exec, playerctl -p cider,chromium,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone,cmus previous -bindl = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle +bindlu = , XF86MonBrightnessUp, exec, brightnessctl -q s +10% +bindlu = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%- +bindlu = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ +bindlu = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- +bindlu = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle +bindlu = , XF86AudioPlay, exec, playerctl -p cider,chromium,Kris___s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone,cmus play-pause +bindlu = , XF86AudioPause, exec, playerctl -p cider,chromium,Kris___s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone,cmus pause +bindlu = , XF86AudioNext, exec, playerctl -p cider,chromium,Kris___s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone,cmus next +bindlu = , XF86AudioPrev, exec, playerctl -p cider,chromium,Kris___s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone,cmus previous +bindlu = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle bindl = , XF86Lock, exec, pkill -USR1 hyprlock || hyprlock diff --git a/config/hypr/config/keybindings/other.conf b/config/hypr/config/keybindings/other.conf index 082aa4e..661dafc 100644 --- a/config/hypr/config/keybindings/other.conf +++ b/config/hypr/config/keybindings/other.conf @@ -12,22 +12,22 @@ bind = $mainMod SHIFT, B, exec, bash ~/config/scripts/hot-reload.sh bind = $mainMod SHIFT, RETURN, exec, pkill wofi || bash ~/config/scripts/select-wallpaper.sh # Screenshot keybinds -bind = $mainMod, PRINT, exec, bash ~/config/scripts/screenshot-selection.sh -bind = $mainMod SHIFT, PRINT, exec, bash ~/config/scripts/screenshot-fullscreen.sh +bindu = $mainMod, PRINT, exec, bash ~/config/scripts/screenshot-selection.sh +bindu = $mainMod SHIFT, PRINT, exec, bash ~/config/scripts/screenshot-fullscreen.sh bind = $mainMod CTRL SHIFT, PRINT, exec, bash ~/config/scripts/edit-last-screenshot.sh # Music Get Keybind # input:repeat_delay = 10 -bindel = $mainMod, BACKSLASH, exec, bash ~/config/scripts/whatsplaying.sh -bindrl = $mainMod, BACKSLASH, exec, bash ~/config/scripts/whatsplaying.sh rel +bindelu = $mainMod, BACKSLASH, exec, bash ~/config/scripts/whatsplaying.sh +# bindrl = $mainMod, BACKSLASH, exec, bash ~/config/scripts/whatsplaying.sh rel # Global shit bind = ALT, F9, pass, class:^(com\.obsproject\.Studio)$ # Music volume control -bindl = $mainMod, XF86AudioRaiseVolume, exec, playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone volume 0.02+ -bindl = $mainMod, XF86AudioLowerVolume, exec, playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone volume 0.02- +bindl = $mainMod, XF86AudioRaiseVolume, exec, playerctl -p chromium,cmus,elisa,cider,spotify,Kris___s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone volume 0.02+ +bindl = $mainMod, XF86AudioLowerVolume, exec, playerctl -p chromium,cmus,elisa,cider,spotify,Kris___s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone volume 0.02- # Screen locker and logout keybinds bind = CTRL ALT, DELETE, exec, wlogout @@ -45,8 +45,8 @@ bindl = SUPER SHIFT, L, exec, pkill -9 hyprlock || hyprlock # bind = $mainMod CTRL ALT, down, moveintogroup, d # zoom -bind = $mainMod SHIFT CTRL, mouse_down, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor * 1.25}')" -bind = $mainMod SHIFT CTRL, mouse_up, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor / 1.25}')" +bindu = $mainMod SHIFT CTRL, mouse_down, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor * 1.25}')" +bindu = $mainMod SHIFT CTRL, mouse_up, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor / 1.25}')" bind = $mainMod SHIFT, M, exec, bun run $HOME/config/scripts/bin/r2Upload.ts bind = $mainMod, F1, exec, bash $HOME/config/scripts/roblox-fullscreen.sh diff --git a/config/hypr/config/plugin.conf b/config/hypr/config/plugin.conf new file mode 100644 index 0000000..aff08a9 --- /dev/null +++ b/config/hypr/config/plugin.conf @@ -0,0 +1,25 @@ +plugin:imgborders { + enabled = true + image = /etc/nixos/asset/thirdparty/deltarune/border.png + sizes = 52,52,52,52 # left, right, top, bottom + insets = 20,20,20,20 # left, right, top, bottom + # 16 16+8=24 16+4=20 + # 1 = the same scale in deltarune + scale = 0.5 + smooth = true + blur = false + noimgborders = true +} + +plugin:dynamic-cursors { + enabled = false + mode = tilt + shake { + enabled = false + } + hyprcursor { + nearest = true + enabled = true + resolution = -12 + } +} diff --git a/config/hypr/config/rice/deltarune.conf b/config/hypr/config/rice/deltarune.conf new file mode 100644 index 0000000..1d8bfe2 --- /dev/null +++ b/config/hypr/config/rice/deltarune.conf @@ -0,0 +1,51 @@ +exec-once = qs -p ~/.config/quickshell/default/Startup + +layerrule { + name = deltarune qs + match:namespace = deltarune-quickshell + animation = slide top + above_lock = 2 + order = -20 + no_screen_share = off +} + +layerrule { + name = deltarune qs dn + match:namespace = deltarune-quickshell-bottom + animation = slide bottom + above_lock = 2 + order = -20 + no_screen_share = off +} + +layerrule { + name = deltarune qs db + match:namespace = deltarune-quickshell-dialogbox + animation = slide bottom + order = 100 + above_lock = 2 + order = -20 + no_screen_share = off +} + +bind = SUPER, A, global, deltarune:shell_open + +submap = deltarune + +bind = SUPER, A, global, deltarune:shell_close + +bind = , ESCAPE, global, deltarune:input_back +bind = , Shift_L, global, deltarune:input_back +bind = , Shift_R, global, deltarune:input_back +bind = , X, global, deltarune:input_back + +bind = , Z, global, deltarune:input_enter +bind = , ENTER, global, deltarune:input_enter +bind = , RETURN, global, deltarune:input_enter + +bind = , UP, global, deltarune:input_up +bind = , DOWN, global, deltarune:input_down +bind = , LEFT, global, deltarune:input_left +bind = , RIGHT, global, deltarune:input_right + +submap = reset diff --git a/config/hypr/config/variables.conf b/config/hypr/config/variables.conf index b0e5678..9a46291 100644 --- a/config/hypr/config/variables.conf +++ b/config/hypr/config/variables.conf @@ -5,18 +5,20 @@ $mainMod = SUPER # Programs -$terminal = ghostty +$terminal = kitty $fileManager = nautilus $menu = wofi --show drun $browser = zen-browser # Cursor -exec = hyprctl setcursor RalseiCursors 24 +exec = hyprctl setcursor kris 24 -env = HYPRCURSOR_THEME,RalseiCursors +# RalseiCursors 24 + +env = HYPRCURSOR_THEME,kris env = HYPRCURSOR_SIZE,24 -env = XCURSOR_THEME,RalseiCursors +env = XCURSOR_THEME,kris env = XCURSOR_SIZE,24 # Toolkit Env diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index 536894b..d7e7363 100755 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -2,6 +2,8 @@ exec-once = hyprctl notify 1 5000 0 " Hyprland!!" +exec-once = hyprpm reload + exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY @@ -12,9 +14,12 @@ source = ~/config/config/hypr/config/input.conf source = ~/config/config/hypr/config/keybindings/default.conf source = ~/config/config/hypr/config/keybindings/other.conf source = ~/config/config/hypr/config/autoexec.conf +source = ~/config/config/hypr/config/permissions.conf + +source = ~/config/config/hypr/config/rice/deltarune.conf # hyprlang noerror true -source = ~/config/config/hypr/config/permissions.conf +source = ~/config/config/hypr/config/plugin.conf # hyprlang noerror false diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf index 33d57b2..c76e5f8 100644 --- a/config/hypr/hyprlock.conf +++ b/config/hypr/hyprlock.conf @@ -11,8 +11,9 @@ general { #BACKGROUND background { - monitor = - path = ~/Pictures/Wallpapers/kris_ralsei_kissing.png # definetly not a picture of kris and ralsei kissing!! + monitor = + color = rgba(0,0,0,0) + # path = ~/Pictures/Wallpapers/israel.png # definetly not a picture of kris and ralsei kissing!! } input-field { @@ -25,12 +26,12 @@ input-field { inner_color = rgba(0, 0, 0, 0) check_color = rgba(0, 0, 0, 0) fail_color = rgba(0, 0, 0, 0) - font_color = rgb(245, 194, 231) + font_color = rgb(255, 0, 255) fade_on_empty = false font_family = Symbols Nerd Font, SF Pro Display placeholder_text = Session locked, enter password to unlock! hide_input = false - fail_text = Password hint: Favorite Character - Deltarune, not Regretevator! + fail_text = wrong password mf position = 0, -30 halign = center valign = top diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf new file mode 100644 index 0000000..226f37e --- /dev/null +++ b/config/kitty/kitty.conf @@ -0,0 +1,62 @@ +foreground #ffffff +background #000000 +font_family family="Determination Mono" +font_size 15 +disable_ligatures always +bold_font auto +italic_font auto +bold_italic_font auto +cursor_shape beam +cursor_trail 1 +window_padding_width 16 + +# vim:ft=kitty + +## name: Catppuccin Kitty Diff Mocha +## author: Catppuccin Org +## license: MIT +## upstream: https://github.com/catppuccin/kitty/blob/main/themes/diff-mocha.conf +## blurb: Soothing pastel theme for the high-spirited! + +# text +# foreground #cdd6f4 +# base +# background #1e1e2e +# subtext0 +title_fg #a6adc8 + +# mantle +title_bg #181825 +margin_bg #181825 + +# subtext1 +margin_fg #a6adc8 +# mantle +filler_bg #181825 + +# 30% red, 70% base +removed_bg #5e3f53 +# 50% red, 50% base +highlight_removed_bg #89556b +# 40% red, 60% base +removed_margin_bg #734a5f + +# 30% green, 70% base +added_bg #475a51 +# 50% green, 50% base +highlight_added_bg #628168 +# 40% green, 60% base +added_margin_bg #734a5f + +# mantle +hunk_margin_bg #181825 +hunk_bg #181825 + +# 40% yellow, 60% base +search_bg #766c62 +# text +search_fg #cdd6f4 +# 30% sky, 70% base +select_bg #3e5767 +# text +select_fg #cdd6f4 diff --git a/config/qt5ct/qt5ct.conf b/config/qt5ct/qt5ct.conf index b12e5ea..d1a5586 100644 --- a/config/qt5ct/qt5ct.conf +++ b/config/qt5ct/qt5ct.conf @@ -1,5 +1,5 @@ [Appearance] -color_scheme_path=/home/ralsei/.config/qt5ct/colors/catppuccin-mocha-blue.conf +color_scheme_path=/home/kris/.config/qt5ct/colors/catppuccin-mocha-blue.conf custom_palette=true icon_theme=Arashi standard_dialogs=default diff --git a/config/waybar/config b/config/waybar/config index 90b18b0..d856bbc 100644 --- a/config/waybar/config +++ b/config/waybar/config @@ -14,7 +14,8 @@ ], "modules-right": [ // "custom/regretevator_state", - "custom/cider", + //"custom/cider", + "mpris", "group/traygroup", "clock" ] diff --git a/config/waybar/modules.json b/config/waybar/modules.json index cd59a76..383bcc4 100644 --- a/config/waybar/modules.json +++ b/config/waybar/modules.json @@ -9,11 +9,9 @@ "pulseaudio#lol" ] }, - "custom/middle-split": { "format": " " }, - "mpris": { "players": [ "chromium", @@ -21,14 +19,14 @@ "elisa", "cider", "spotify", - "OCbwoy3_s_iPhone" + "Kris_s_iPhone" ], "interval": 1, - "on-scroll-up": "playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone volume 0.05+", - "on-scroll-down": "playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone volume 0.05-", - "on-click": "playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone play-pause", - "on-click-right": "playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone next", - "on-click-middle": "playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone previous", + "on-scroll-up": "playerctl -p chromium,cmus,elisa,cider,spotify,Kris___s_iPhone volume 0.05+", + "on-scroll-down": "playerctl -p chromium,cmus,elisa,cider,spotify,Kris___s_iPhone volume 0.05-", + "on-click": "playerctl -p chromium,cmus,elisa,cider,spotify,Kris___s_iPhone play-pause", + "on-click-right": "playerctl -p chromium,cmus,elisa,cider,spotify,Kris___s_iPhone next", + "on-click-middle": "playerctl -p chromium,cmus,elisa,cider,spotify,Kris___s_iPhone previous", "format": " {artist} — {title}", // "format": " {title}", "tooltip-format": "{album}", @@ -37,32 +35,29 @@ "smooth-scrolling-treshold": 40, "max-length": 60 }, - "custom/cider": { "restart-interval": 1, "return-type": "json", // "exec": "bun run ~/config/scripts/bin/actWithMusic.ts waybar", - "exec": "~/config/scripts/bin/ocbwoy3-actwithmus waybar", - "on-scroll-up": "playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone volume 0.05+", - "on-scroll-down": "playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone volume 0.05-", - "on-click": "playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone play-pause", - "on-click-right": "playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone next", - "on-click-middle": "playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone previous" + "exec": "/etc/nixos/scripts/bin/ocbwoy3-actwithmus waybar", + "on-scroll-up": "playerctl -p chromium,cmus,elisa,cider,spotify,Kris___s_iPhone volume 0.05+", + "on-scroll-down": "playerctl -p chromium,cmus,elisa,cider,spotify,Kris___s_iPhone volume 0.05-", + "on-click": "playerctl -p chromium,cmus,elisa,cider,spotify,Kris___s_iPhone play-pause", + "on-click-right": "playerctl -p chromium,cmus,elisa,cider,spotify,Kris___s_iPhone next", + "on-click-middle": "playerctl -p chromium,cmus,elisa,cider,spotify,Kris___s_iPhone previous" }, - "custom/regretevator_state": { "restart-interval": 1, "return-type": "json", "exec": "cat /tmp/.regretevator_state" }, - "hyprland/window": { "format": "{}", // "tooltip": "{initialClass}", "rewrite": { "(Support Hyprland|MainPicker|Hyprland Updated)": "Hyprland", "DELTARUNE": "Deltarune", - "DELTARUNE Chapter ([0-9]+)": "Deltarune", + // "DELTARUNE Chapter ([0-9]+)": "Deltarune", "Sober": "Roblox", "vinegar": "Vinegar", "RobloxStudio": "Roblox Studio", @@ -70,14 +65,16 @@ "PORTAL 2 - (OpenGL|Vulkan)": "Portal 2", "HALF-LIFE 2 - (OpenGL|Vulkan)": "Half-Life 2", "(.*) - Google( Search| meklēšana)?": "$1", - "Cider": "Apple Music", "swappy": "Swappy", - "(.*) — (Firefox( Developer Edition)|Zen Browser)?": "$1" + // "(.*) - PDSls": "$1", + "(.*) — Mozilla Firefox": "$1", + "(.*) - PDSls — Mozilla Firefox": "PDSls", + "(.*) — ((Mozilla )?Firefox( Developer Edition)|Zen Browser)?": "$1", + "(.*) - PDSls": "$1" }, "separate-outputs": false }, - "hyprland/workspaces": { "on-click": "activate", "active-only": false, @@ -93,12 +90,10 @@ "*": 1 } }, - "tray": { "icon-size": 21, "spacing": 10 }, - "clock": { "timezone": "Europe/Riga", "locale": "lv_LV.UTF-8", @@ -117,32 +112,37 @@ "format-alt": "{:%H:%M:%S}", "interval": 1 }, - "pulseaudio": { "format": "{icon}", "format-muted": "", "format-source": "", "format-source-muted": "", "format-icons": { - "default": ["", "", ""] + "default": [ + "", + "", + "" + ] }, "tooltip-format": "{desc}\n{icon} {volume}%", "on-click": "pavucontrol" }, - "pulseaudio#lol": { "format": "{volume}%", "format-muted": "0%", "format-source": "{volume}%", "format-source-muted": "0%", "format-icons": { - "default": ["", "", ""] + "default": [ + "", + "", + "" + ] }, "tooltip-format": "{desc}\n{icon} {volume}%", "on-click": "pavucontrol", "class": "pulseaudio-lol" }, - "network": { "format": "󰈁", "format-wifi": "", @@ -155,7 +155,6 @@ "max-length": 50, "on-click": "nm-connection-editor" }, - "bluetooth": { "format": "", "format-disabled": "󰂲", diff --git a/config/waybar/style.css b/config/waybar/style.css index 8c2908c..654bff9 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -1,7 +1,7 @@ * { - font-family: "SF Pro Display", SFProJPDisplay-Regular, "Symbols Nerd Font"; + font-family: "8-bit Operator+", "Determination Mono", "8bitoperator JVE", "SF Pro Display", SFProJPDisplay-Regular, "Symbols Nerd Font"; border: none; - font-size: 15px; + font-size: 13px; min-height: 10px; /* max-height: 10px; */ } @@ -28,7 +28,7 @@ window#waybar { } #clock { - font-family: "SF Pro Display", SFProJPDisplay-Regular, "Symbols Nerd Font"; + font-family: "8-bit Operator+", "Determination Mono", "8bitoperator JVE", "SF Pro Display", SFProJPDisplay-Regular, "Symbols Nerd Font"; } #traygroup, @@ -46,7 +46,7 @@ window#waybar { #custom-regretevator_state, #custom-cider { font-family: - "DotfilesFont", SFProJPDisplay-Regular, "Symbols Nerd Font", "Geist"; + "DotfilesFont", "8-bit Operator+", "Determination Mono", "8bitoperator JVE", SFProJPDisplay-Regular, "Symbols Nerd Font", "Geist"; } #mpris, @@ -69,6 +69,7 @@ window#waybar { #workspaces button.active { color: #cba6f7; font-weight: bolder; + font-family: "Determination Mono"; } #tray { @@ -133,7 +134,7 @@ window#waybar { } tooltip { - font-family: "SF Pro Display", SFProJPDisplay-Regular, "Symbols Nerd Font"; + font-family: "8-bit Operator+", "Determination Mono", "8bitoperator JVE", "SF Pro Display", SFProJPDisplay-Regular, "Symbols Nerd Font"; padding: 0px 0px 0px 0px; margin: 0px 0px 0px 0px; border-radius: 4px; @@ -144,7 +145,7 @@ tooltip { } tooltip * { - font-family: "SF Pro Display", SFProJPDisplay-Regular, "Symbols Nerd Font"; + font-family: "8-bit Operator+", "Determination Mono", "8bitoperator JVE", "SF Pro Display", SFProJPDisplay-Regular, "Symbols Nerd Font"; padding: 0px 0px 0px 0px; margin: 0px 0px 0px 0px; color: #cdd6f4; diff --git a/config/wlogout/layout b/config/wlogout/layout index 69655e8..d1e335b 100644 --- a/config/wlogout/layout +++ b/config/wlogout/layout @@ -12,7 +12,7 @@ } { "label" : "logout", - "action" : "pkill -9 -u ralsei", + "action" : "pkill -9 -u kris", "text" : "Logout", "keybind" : "e" } diff --git a/config/wlogout/style.css b/config/wlogout/style.css index e123c31..6247412 100644 --- a/config/wlogout/style.css +++ b/config/wlogout/style.css @@ -1,7 +1,7 @@ * { background-image: none; box-shadow: none; - font-family: "SF Pro Display", "Symbols Nerd Font"; + font-family: "8-bit Operator+", "SF Pro Display", "Symbols Nerd Font"; font-size: 18px; } @@ -36,36 +36,36 @@ button:hover { #lock { background-image: image( - url("/home/ralsei/config/config/wlogout/assets/lock.png") + url("/etc/nixos/config/wlogout/assets/lock.png") ); } #logout { background-image: image( - url("/home/ralsei/config/config/wlogout/assets/logout.png") + url("/etc/nixos/config/wlogout/assets/logout.png") ); } #suspend { background-image: image( - url("/home/ralsei/config/config/wlogout/assets/suspend.png") + url("/etc/nixos/config/wlogout/assets/suspend.png") ); } #hibernate { background-image: image( - url("/home/ralsei/config/config/wlogout/assets/hibernate.png") + url("/etc/nixos/config/wlogout/assets/hibernate.png") ); } #shutdown { background-image: image( - url("/home/ralsei/config/config/wlogout/assets/shutdown.png") + url("/etc/nixos/config/wlogout/assets/shutdown.png") ); } #reboot { background-image: image( - url("/home/ralsei/config/config/wlogout/assets/reboot.png") + url("/etc/nixos/config/wlogout/assets/reboot.png") ); } diff --git a/flake.lock b/flake.lock index adcb40b..53cf028 100644 --- a/flake.lock +++ b/flake.lock @@ -36,11 +36,11 @@ ] }, "locked": { - "lastModified": 1762356719, - "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=", + "lastModified": 1774211390, + "narHash": "sha256-sTtAgCCaX8VNNZlQFACd3i1IQ+DB0Wf3COgiFS152ds=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7", + "rev": "f62a4dbfa4e5584f14ad4c62afedf6e4b433cf70", "type": "github" }, "original": { @@ -49,57 +49,36 @@ "type": "github" } }, - "blueprint": { + "aquamarine_2": { "inputs": { + "hyprutils": [ + "hyprsysteminfo", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprsysteminfo", + "hyprwayland-scanner" + ], "nixpkgs": [ - "tuxstrap", - "bun2nix", + "hyprsysteminfo", "nixpkgs" ], "systems": [ - "tuxstrap", - "bun2nix", + "hyprsysteminfo", "systems" ] }, "locked": { - "lastModified": 1744632722, - "narHash": "sha256-0chvqUV1Kzf8BMQ7MsH3CeicJEb2HeCpwliS77FGyfc=", - "owner": "numtide", - "repo": "blueprint", - "rev": "49bbd5d072b577072f4a1d07d4b0621ecce768af", + "lastModified": 1772460678, + "narHash": "sha256-NYaWs8fYJ38IgFld0hGSdT2LEVhrgO8SiRReBjIH7YY=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "5d2cb726b16ee349df443f84b64cff53221b6983", "type": "github" }, "original": { - "owner": "numtide", - "repo": "blueprint", - "type": "github" - } - }, - "bun2nix": { - "inputs": { - "blueprint": "blueprint", - "nixpkgs": [ - "tuxstrap", - "nixpkgs" - ], - "systems": [ - "tuxstrap", - "systems" - ], - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1750682174, - "narHash": "sha256-rUpcATQ0LiY8IYRndqTlPUhF4YGJH3lM2aMOs5vBDGM=", - "owner": "baileyluTCD", - "repo": "bun2nix", - "rev": "85d692d68a5345d868d3bb1158b953d2996d70f7", - "type": "github" - }, - "original": { - "owner": "baileyluTCD", - "repo": "bun2nix", + "owner": "hyprwm", + "repo": "aquamarine", "type": "github" } }, @@ -108,11 +87,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1763974424, - "narHash": "sha256-jPpxBhrBOAKrXPxdrdXnq4w7x3UIkUZjarNLNYkb7Zo=", + "lastModified": 1774616169, + "narHash": "sha256-fP4bU3SOH5sefSl6EagqULFs+bXoo3h3VLQCCyJplo4=", "owner": "catppuccin", "repo": "nix", - "rev": "931c6465c3eac4709684dbc320bca243252927df", + "rev": "e616c61cd9f7b05b32af266bc005fa266860dacf", "type": "github" }, "original": { @@ -130,11 +109,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1763959064, - "narHash": "sha256-GL6i5fTfToGQ5Wby+3zuUpOXofSVJRLK+J3fmPELO0I=", + "lastModified": 1765204341, + "narHash": "sha256-7xd45skcuLCu2DHxVvU+W/z+7CUOjyv+QPtT4PLZaIU=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "1708ebd1753a78439a8362a5c32d4e3c7addfa60", + "rev": "aacb796ccd42be1555196c20013b9b674b71df75", "type": "github" }, "original": { @@ -144,14 +123,36 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "tangled", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1772176312, + "narHash": "sha256-Yjo/QCJvY9GUhAzwac/m6Rx3oxvRyEaiT5DQ5o+T6g4=", + "owner": "nix-community", + "repo": "fenix", + "rev": "92d91250c1acd59beabc51208192adc92f31aeb5", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -163,15 +164,15 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -214,11 +215,11 @@ ] }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -243,7 +244,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_6" }, "locked": { "lastModified": 1731533236, @@ -261,25 +262,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1681202837, @@ -298,17 +281,18 @@ "ghostty": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_3", + "systems": "systems", "zig": "zig", "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1764001281, - "narHash": "sha256-ltKwSNhTbLAg0sD6i8SsLa4RhrQNKYluoTvkuyJwaW4=", + "lastModified": 1774618114, + "narHash": "sha256-3/flZanNntwcVvkB1pGK/HY+elOnYZuTN6NN98JgO3Y=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "b5dfe5dbfe7a3a22e21aa2d78590b3f2999a80fa", + "rev": "b8b0896324d60582e23896cb23febe19c72126cd", "type": "github" }, "original": { @@ -341,18 +325,18 @@ }, "gomod2nix": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "tangled", "nixpkgs" ] }, "locked": { - "lastModified": 1754078208, - "narHash": "sha256-YVoIFDCDpYuU3riaDEJ3xiGdPOtsx4sR5eTzHTytPV8=", + "lastModified": 1763982521, + "narHash": "sha256-ur4QIAHwgFc0vXiaxn5No/FuZicxBr2p0gmT54xZkUQ=", "owner": "nix-community", "repo": "gomod2nix", - "rev": "7f963246a71626c7fc70b431a315c4388a0c95cf", + "rev": "02e63a239d6eabd595db56852535992c898eba72", "type": "github" }, "original": { @@ -369,11 +353,11 @@ ] }, "locked": { - "lastModified": 1763869804, - "narHash": "sha256-2lw+MnkrnygEyUl+3qZjnlCCJF/kJ57GUtYkAQPfLDA=", + "lastModified": 1764998300, + "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", "owner": "nix-community", "repo": "home-manager", - "rev": "04c27d743d069cad58f9707ee8e165c471b1c7cd", + "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", "type": "github" }, "original": { @@ -384,14 +368,17 @@ }, "home-manager_2": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": [ + "ghostty", + "nixpkgs" + ] }, "locked": { - "lastModified": 1764007004, - "narHash": "sha256-OnonWWGrUGPc3y1TES/RVCe4Gd75YgdU8aIp07Au4lc=", + "lastModified": 1770586272, + "narHash": "sha256-Ucci8mu8QfxwzyfER2DQDbvW9t1BnTUJhBmY7ybralo=", "owner": "nix-community", "repo": "home-manager", - "rev": "125e40fa68b340aee9d474a46b540907e2537b5c", + "rev": "b1f916ba052341edc1f80d4b2399f1092a4873ca", "type": "github" }, "original": { @@ -401,6 +388,24 @@ } }, "home-manager_3": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1774626137, + "narHash": "sha256-1WelwA45Xm4glTG8R9IX9jYeFKDG2HbR79jAauLezUE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "9df3a639007cfe0d074433f7fc225ea94f877d08", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_4": { "inputs": { "nixpkgs": [ "zen-browser", @@ -408,11 +413,11 @@ ] }, "locked": { - "lastModified": 1762964643, - "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", + "lastModified": 1773422513, + "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "827f2a23373a774a8805f84ca5344654c31f354b", + "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", "type": "github" }, "original": { @@ -461,11 +466,11 @@ ] }, "locked": { - "lastModified": 1753964049, - "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", + "lastModified": 1772461003, + "narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", + "rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7", "type": "github" }, "original": { @@ -490,11 +495,11 @@ ] }, "locked": { - "lastModified": 1762462052, - "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=", + "lastModified": 1772461523, + "narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162", + "rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804", "type": "github" }, "original": { @@ -519,11 +524,40 @@ ] }, "locked": { - "lastModified": 1759490292, - "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=", + "lastModified": 1772461523, + "narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "9431db625cd9bb66ac55525479dce694101d6d7a", + "rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, + "hyprgraphics_3": { + "inputs": { + "hyprutils": [ + "hyprsysteminfo", + "hyprutils" + ], + "nixpkgs": [ + "hyprsysteminfo", + "nixpkgs" + ], + "systems": [ + "hyprsysteminfo", + "systems" + ] + }, + "locked": { + "lastModified": 1772461523, + "narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804", "type": "github" }, "original": { @@ -542,6 +576,7 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwire": "hyprwire", "nixpkgs": [ "nixpkgs" ], @@ -550,11 +585,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1763912895, - "narHash": "sha256-tTdCVeROhYTwV510tygS5AMutJGz5imM++P4+cXAy2w=", + "lastModified": 1774635054, + "narHash": "sha256-NVjEJ5u0VHKTc/A17kWDfXgFnBAsP2BOMNj+fAv58mM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "2b0fd417d32278159d0ca1d23fb997588c37995b", + "rev": "5dfb1033a433789021ab9f94b9044e6f32496211", "type": "github" }, "original": { @@ -596,11 +631,11 @@ ] }, "locked": { - "lastModified": 1762755186, - "narHash": "sha256-ZjjETUHtoEhVN7JI1Cbt3p/KcXpK8ZQaPHx7UkG1OgA=", + "lastModified": 1772467975, + "narHash": "sha256-kipyuDBxrZq+beYpZqWzGvFWm4QbayW9agAvi94vDXY=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "66356e20a8ed348aa49c1b9ceace786e224225b3", + "rev": "5e1c6b9025aaf4d578f3eff7c0eb1f0c197a9507", "type": "github" }, "original": { @@ -621,11 +656,11 @@ ] }, "locked": { - "lastModified": 1759610243, - "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=", + "lastModified": 1772460177, + "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622", + "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917", "type": "github" }, "original": { @@ -634,32 +669,6 @@ "type": "github" } }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": "hyprlang_3", - "nixpkgs": [ - "hyprsysteminfo", - "nixpkgs" - ], - "systems": [ - "hyprsysteminfo", - "systems" - ] - }, - "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, "hyprlang": { "inputs": { "hyprutils": [ @@ -676,11 +685,11 @@ ] }, "locked": { - "lastModified": 1763254292, - "narHash": "sha256-JNgz3Fz2KMzkT7aR72wsgu/xNeJB//LSmdilh8Z/Zao=", + "lastModified": 1772459629, + "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "deea98d5b61d066bdc7a68163edd2c4bd28d3a6b", + "rev": "7615ee388de18239a4ab1400946f3d0e498a8186", "type": "github" }, "original": { @@ -705,11 +714,11 @@ ] }, "locked": { - "lastModified": 1758927902, - "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", + "lastModified": 1772459629, + "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", + "rev": "7615ee388de18239a4ab1400946f3d0e498a8186", "type": "github" }, "original": { @@ -720,24 +729,25 @@ }, "hyprlang_3": { "inputs": { - "hyprutils": "hyprutils_3", + "hyprutils": [ + "hyprsysteminfo", + "hyprutils" + ], "nixpkgs": [ "hyprsysteminfo", - "hyprland-qt-support", "nixpkgs" ], "systems": [ "hyprsysteminfo", - "hyprland-qt-support", "systems" ] }, "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "lastModified": 1772459629, + "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "rev": "7615ee388de18239a4ab1400946f3d0e498a8186", "type": "github" }, "original": { @@ -752,15 +762,15 @@ "hyprlang": "hyprlang_2", "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "systems": "systems_3" }, "locked": { - "lastModified": 1761675634, - "narHash": "sha256-Et1jNDB2d3e0b4okIKuyAMktECS+5hk+vMAA7X598ao=", + "lastModified": 1774282873, + "narHash": "sha256-1PEKXrIfc4qIDo6Ut1D3aK2dK3HRnIso2SPopKNN2nA=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "98b86752fe4867bd14ef96a92ea788229af93130", + "rev": "768ade88a8a8b79acdec4b7cc92a32cbc4cdae19", "type": "github" }, "original": { @@ -771,17 +781,22 @@ }, "hyprsysteminfo": { "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprutils": "hyprutils_4", - "nixpkgs": "nixpkgs_7", + "aquamarine": "aquamarine_2", + "hyprgraphics": "hyprgraphics_3", + "hyprlang": "hyprlang_3", + "hyprtoolkit": "hyprtoolkit_2", + "hyprutils": "hyprutils_3", + "hyprwayland-scanner": "hyprwayland-scanner_3", + "hyprwire": "hyprwire_2", + "nixpkgs": "nixpkgs_6", "systems": "systems_4" }, "locked": { - "lastModified": 1759530744, - "narHash": "sha256-8kYeWF9A9YWlmMK/56CFWFwQRgjZ616ScWwL37binP8=", + "lastModified": 1772476157, + "narHash": "sha256-Cuqhd0Ry5cd3TWrmL8Y2TO9ABVeacYpswarVXrVJvT4=", "owner": "hyprwm", "repo": "hyprsysteminfo", - "rev": "fe81610278676d26ff47f62770ac238220285d3a", + "rev": "6abb64f66a48c342183fcc42419875905993a2d4", "type": "github" }, "original": { @@ -829,11 +844,56 @@ ] }, "locked": { - "lastModified": 1762463729, - "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=", + "lastModified": 1772462885, + "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532", + "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprtoolkit", + "type": "github" + } + }, + "hyprtoolkit_2": { + "inputs": { + "aquamarine": [ + "hyprsysteminfo", + "aquamarine" + ], + "hyprgraphics": [ + "hyprsysteminfo", + "hyprgraphics" + ], + "hyprlang": [ + "hyprsysteminfo", + "hyprlang" + ], + "hyprutils": [ + "hyprsysteminfo", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprsysteminfo", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprsysteminfo", + "nixpkgs" + ], + "systems": [ + "hyprsysteminfo", + "systems" + ] + }, + "locked": { + "lastModified": 1772462885, + "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=", + "owner": "hyprwm", + "repo": "hyprtoolkit", + "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998", "type": "github" }, "original": { @@ -854,11 +914,11 @@ ] }, "locked": { - "lastModified": 1763323331, - "narHash": "sha256-+Z0OfCo1MS8/aIutSAW5aJR9zTae1wz9kcJYMgpwN6M=", + "lastModified": 1774211405, + "narHash": "sha256-6KNwP4ojUzv3YBlZU5BqCpTrWHcix1Jo01BISsTT0xk=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "0c6411851cc779d551edc89b83966696201611aa", + "rev": "cb4e152dc72095a2af422956c6b689590572231a", "type": "github" }, "original": { @@ -879,11 +939,11 @@ ] }, "locked": { - "lastModified": 1759619523, - "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=", + "lastModified": 1772459870, + "narHash": "sha256-xxkK2Cvqxpf/4UGcJ/TyCwrvmiNWsKsJfFzHMp2bxis=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef", + "rev": "e63f3a79334dec49f8eb1691f66f18115df04085", "type": "github" }, "original": { @@ -893,35 +953,6 @@ } }, "hyprutils_3": { - "inputs": { - "nixpkgs": [ - "hyprsysteminfo", - "hyprland-qt-support", - "hyprlang", - "nixpkgs" - ], - "systems": [ - "hyprsysteminfo", - "hyprland-qt-support", - "hyprlang", - "systems" - ] - }, - "locked": { - "lastModified": 1737632363, - "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "006620eb29d54ea9086538891404c78563d1bae1", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_4": { "inputs": { "nixpkgs": [ "hyprsysteminfo", @@ -933,11 +964,11 @@ ] }, "locked": { - "lastModified": 1737632363, - "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", + "lastModified": 1772459870, + "narHash": "sha256-xxkK2Cvqxpf/4UGcJ/TyCwrvmiNWsKsJfFzHMp2bxis=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "006620eb29d54ea9086538891404c78563d1bae1", + "rev": "e63f3a79334dec49f8eb1691f66f18115df04085", "type": "github" }, "original": { @@ -958,11 +989,11 @@ ] }, "locked": { - "lastModified": 1755184602, - "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", + "lastModified": 1772459835, + "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", + "rev": "0a692d4a645165eebd65f109146b8861e3a925e7", "type": "github" }, "original": { @@ -983,11 +1014,11 @@ ] }, "locked": { - "lastModified": 1755184602, - "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", + "lastModified": 1772459835, + "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", + "rev": "0a692d4a645165eebd65f109146b8861e3a925e7", "type": "github" }, "original": { @@ -996,17 +1027,100 @@ "type": "github" } }, + "hyprwayland-scanner_3": { + "inputs": { + "nixpkgs": [ + "hyprsysteminfo", + "nixpkgs" + ], + "systems": [ + "hyprsysteminfo", + "systems" + ] + }, + "locked": { + "lastModified": 1772459835, + "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "0a692d4a645165eebd65f109146b8861e3a925e7", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwire": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1773074819, + "narHash": "sha256-qRqYnXiKoJLRTcfaRukn7EifmST2IVBUMZOeZMAc5UA=", + "owner": "hyprwm", + "repo": "hyprwire", + "rev": "f68afd0e73687598cc2774804fedad76693046f0", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwire", + "type": "github" + } + }, + "hyprwire_2": { + "inputs": { + "hyprutils": [ + "hyprsysteminfo", + "hyprutils" + ], + "nixpkgs": [ + "hyprsysteminfo", + "nixpkgs" + ], + "systems": [ + "hyprsysteminfo", + "systems" + ] + }, + "locked": { + "lastModified": 1772463520, + "narHash": "sha256-GIjASzYnV4fK19HnyJKmHyqyxHxIpjusK9foEA4Yo+4=", + "owner": "hyprwm", + "repo": "hyprwire", + "rev": "4e1933ae5602b350c5b6633f5c932549c9b8aca2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwire", + "type": "github" + } + }, "ibm-plex-mono-src": { "flake": false, "locked": { "lastModified": 1731402384, "narHash": "sha256-OwUmrPfEehLDz0fl2ChYLK8FQM2p0G1+EMrGsYEq+6g=", "type": "tarball", - "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip" + "url": "https://github.com/IBM/plex/releases/download/@ibm%2Fplex-mono@1.1.0/ibm-plex-mono.zip" }, "original": { "type": "tarball", - "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip" + "url": "https://github.com/IBM/plex/releases/download/@ibm%2Fplex-mono@1.1.0/ibm-plex-mono.zip" } }, "indigo": { @@ -1047,11 +1161,11 @@ ] }, "locked": { - "lastModified": 1763714684, - "narHash": "sha256-ZNJPAaeSYQTDgvwwE8XHhCz4HiHqYoUyoXdoBE2nxug=", + "lastModified": 1764922999, + "narHash": "sha256-LSvUxKm6S6ZAd/otQSkAHd3+8KJhi8OwGJGSe0K//B8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "6178d787ee61b8586fdb0ccb8644fbfd5317d0f3", + "rev": "9b9ead1b5591b68f4048e7205ba1397bc85ce6c4", "type": "github" }, "original": { @@ -1073,13 +1187,25 @@ "url": "https://github.com/lucide-icons/lucide/releases/download/0.536.0/lucide-icons-0.536.0.zip" } }, + "mermaid-src": { + "flake": false, + "locked": { + "narHash": "sha256-/YOdECG2V5c3kJ1QfGvhziTT6K/Dx/4mOk2mr3Fs/do=", + "type": "file", + "url": "https://cdn.jsdelivr.net/npm/mermaid@11.12.3/dist/mermaid.min.js" + }, + "original": { + "type": "file", + "url": "https://cdn.jsdelivr.net/npm/mermaid@11.12.3/dist/mermaid.min.js" + } + }, "mnw": { "locked": { - "lastModified": 1758834834, - "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=", + "lastModified": 1770419553, + "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=", "owner": "Gerg-L", "repo": "mnw", - "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001", + "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957", "type": "github" }, "original": { @@ -1088,6 +1214,28 @@ "type": "github" } }, + "ndg": { + "inputs": { + "nixpkgs": [ + "nvf", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1768214250, + "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=", + "owner": "feel-co", + "repo": "ndg", + "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8", + "type": "github" + }, + "original": { + "owner": "feel-co", + "ref": "refs/tags/v2.6.0", + "repo": "ndg", + "type": "github" + } + }, "nix-flatpak": { "locked": { "lastModified": 1711997201, @@ -1129,11 +1277,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762847253, - "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", + "lastModified": 1774567711, + "narHash": "sha256-uVlOHBvt6Vc/iYNJXLPa4c3cLXwMllOCVfAaLAcphIo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", + "rev": "3f6f874dfc34d386d10e434c48ad966c4832243e", "type": "github" }, "original": { @@ -1145,11 +1293,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1773821835, + "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", + "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", "type": "github" }, "original": { @@ -1160,38 +1308,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { "locked": { "lastModified": 1682134069, "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", @@ -1205,13 +1321,13 @@ "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs_11": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1773389992, + "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda", "type": "github" }, "original": { @@ -1223,11 +1339,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1763678758, - "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -1239,11 +1355,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 315532800, - "narHash": "sha256-sV6pJNzFkiPc6j9Bi9JuHBnWdVhtKB/mHgVmMPvDFlk=", - "rev": "82c2e0d6dde50b17ae366d2aa36f224dc19af469", + "lastModified": 1770537093, + "narHash": "sha256-XV30uo8tXuxdzuV8l3sojmlPRLd/8tpMsOp4lNzLGUo=", + "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre877938.82c2e0d6dde5/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre942631.fef9403a3e4d/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -1252,24 +1368,27 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1758360447, - "narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=", - "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre864002.8eaee1103447/nixexprs.tar.xz" + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_5": { "locked": { - "lastModified": 1763678758, - "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", + "lastModified": 1772433332, + "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", + "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", "type": "github" }, "original": { @@ -1281,11 +1400,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1759831965, - "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", + "lastModified": 1772433332, + "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c9b6fb798541223bbb396d287d16f43520250518", + "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", "type": "github" }, "original": { @@ -1297,15 +1416,15 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1737469691, - "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", - "owner": "NixOS", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1313,11 +1432,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1763835633, - "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { @@ -1329,16 +1448,16 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1761880412, - "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1348,15 +1467,16 @@ "flake-compat": "flake-compat_3", "flake-parts": "flake-parts", "mnw": "mnw", - "nixpkgs": "nixpkgs_9", + "ndg": "ndg", + "nixpkgs": "nixpkgs_8", "systems": "systems_5" }, "locked": { - "lastModified": 1762622004, - "narHash": "sha256-NpzzgaoMK8aRHnndHWbYNKLcZN0r1y6icCoJvGoBsoE=", + "lastModified": 1774631252, + "narHash": "sha256-SBPYPLuM+KSaauKsWa7sETRf26NT7LH0ilUw36V5nkA=", "owner": "notashelf", "repo": "nvf", - "rev": "09470524a214ed26633ddc2b6ec0c9bf31a8b909", + "rev": "5836038ead139a0c54269ecde45cba262fb3a3db", "type": "github" }, "original": { @@ -1375,11 +1495,11 @@ ] }, "locked": { - "lastModified": 1763319842, - "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", + "lastModified": 1774104215, + "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", + "rev": "f799ae951fde0627157f40aec28dec27b22076d0", "type": "github" }, "original": { @@ -1393,20 +1513,36 @@ "catppuccin": "catppuccin", "chaotic": "chaotic", "ghostty": "ghostty", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "hyprland": "hyprland", "hyprlock": "hyprlock", "hyprsysteminfo": "hyprsysteminfo", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nvf": "nvf", "tangled": "tangled", - "tuxstrap": "tuxstrap", "vscode-server": "vscode-server", "zen-browser": "zen-browser" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1772094427, + "narHash": "sha256-TiVs6OUBJEvajHdJZ5nIq0KognNJooUWuLGPFfQacSw=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "56b59a832858329c2f947f9b7bdf1a49da39c981", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -1415,11 +1551,11 @@ ] }, "locked": { - "lastModified": 1763865987, - "narHash": "sha256-DJpzM8Jz3B0azJcAoF+YFHr8rEbxYLJ0wy1kWZ29HOw=", + "lastModified": 1765075567, + "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "042d905c01a6eec3bcae8530dacb19cda9758a63", + "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", "type": "github" }, "original": { @@ -1442,6 +1578,7 @@ } }, "systems": { + "flake": false, "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1546,24 +1683,10 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tangled": { "inputs": { "actor-typeahead-src": "actor-typeahead-src", + "fenix": "fenix", "flake-compat": "flake-compat_4", "gomod2nix": "gomod2nix", "htmx-src": "htmx-src", @@ -1572,15 +1695,16 @@ "indigo": "indigo", "inter-fonts-src": "inter-fonts-src", "lucide-src": "lucide-src", - "nixpkgs": "nixpkgs_10", + "mermaid-src": "mermaid-src", + "nixpkgs": "nixpkgs_9", "sqlite-lib-src": "sqlite-lib-src" }, "locked": { - "lastModified": 1764005195, - "narHash": "sha256-PzuWiW/nMxwQTX0i1bHwGazQF4ptLNI9OGwpmhDb9i0=", + "lastModified": 1774607445, + "narHash": "sha256-Iefcxr89SgQujiIXKGgX31H2J/aVznD9hBQXv+eNeWA=", "ref": "refs/heads/master", - "rev": "7358ec6edfa4d17b8b8f543d99e83a4705901148", - "revCount": 1687, + "rev": "5a17af77bf13448e49a3b0b00cf93baa7821ce30", + "revCount": 2120, "type": "git", "url": "https://tangled.sh/@tangled.sh/core" }, @@ -1589,59 +1713,17 @@ "url": "https://tangled.sh/@tangled.sh/core" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "tuxstrap", - "bun2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748243702, - "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "tuxstrap": { - "inputs": { - "bun2nix": "bun2nix", - "nixpkgs": "nixpkgs_11", - "systems": "systems_7" - }, - "locked": { - "lastModified": 1760196423, - "narHash": "sha256-1BpxEHAJe++YlVznML+8A2nTc9xpsVpLxiuFYG+MTog=", - "ref": "refs/heads/dev", - "rev": "bf4bd032622ff38f40313f89db98aa82c3700510", - "revCount": 55, - "type": "git", - "url": "https://tangled.sh/@ocbwoy3.dev/tuxstrap" - }, - "original": { - "type": "git", - "url": "https://tangled.sh/@ocbwoy3.dev/tuxstrap" - } - }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_12" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1753541826, - "narHash": "sha256-foGgZu8+bCNIGeuDqQ84jNbmKZpd+JvnrL2WlyU4tuU=", + "lastModified": 1770124655, + "narHash": "sha256-yHmd2B13EtBUPLJ+x0EaBwNkQr9LTne1arLVxT6hSnY=", "owner": "nix-community", "repo": "nixos-vscode-server", - "rev": "6d5f074e4811d143d44169ba4af09b20ddb6937d", + "rev": "92ce71c3ba5a94f854e02d57b14af4997ab54ef0", "type": "github" }, "original": { @@ -1678,11 +1760,11 @@ ] }, "locked": { - "lastModified": 1761431178, - "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", + "lastModified": 1773601989, + "narHash": "sha256-2tJf/CQoHApoIudxHeJye+0Ii7scR0Yyi7pNiWk0Hn8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", + "rev": "a9b862d1aa000a676d310cc62d249f7ad726233d", "type": "github" }, "original": { @@ -1693,15 +1775,15 @@ }, "zen-browser": { "inputs": { - "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_13" + "home-manager": "home-manager_4", + "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1764007718, - "narHash": "sha256-0AFVGwghB2NUh/l30fI5q7FeJL3C/xIf1Y8se7NHoG8=", + "lastModified": 1774605342, + "narHash": "sha256-VEcy7N8TExxCsDem0SUsqJJlTcUm0y4vaSPYCghe5W8=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c396e711f7704f8675d34630b3bebcbff465672d", + "rev": "4916e4d7ab444c544c3f36cc9fafe58cdb0f7237", "type": "github" }, "original": { @@ -1716,21 +1798,21 @@ "ghostty", "flake-compat" ], - "flake-utils": [ - "ghostty", - "flake-utils" - ], "nixpkgs": [ "ghostty", "nixpkgs" + ], + "systems": [ + "ghostty", + "systems" ] }, "locked": { - "lastModified": 1760401936, - "narHash": "sha256-/zj5GYO5PKhBWGzbHbqT+ehY8EghuABdQ2WGfCwZpCQ=", + "lastModified": 1773145353, + "narHash": "sha256-dE8zx8WA54TRmFFQBvA48x/sXGDTP7YaDmY6nNKMAYw=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "365085b6652259753b598d43b723858184980bbe", + "rev": "8666155d83bf792956a7c40915508e6d4b2b8716", "type": "github" }, "original": { @@ -1741,20 +1823,23 @@ }, "zon2nix": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": [ + "ghostty", + "nixpkgs" + ] }, "locked": { - "lastModified": 1758405547, - "narHash": "sha256-WgaDgvIZMPvlZcZrpPMjkaalTBnGF2lTG+62znXctWM=", + "lastModified": 1768231828, + "narHash": "sha256-wL/8Iij4T2OLkhHcc4NieOjf7YeJffaUYbCiCqKv/+0=", "owner": "jcollie", "repo": "zon2nix", - "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245", + "rev": "c28e93f3ba133d4c1b1d65224e2eebede61fd071", "type": "github" }, "original": { "owner": "jcollie", "repo": "zon2nix", - "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245", + "rev": "c28e93f3ba133d4c1b1d65224e2eebede61fd071", "type": "github" } } diff --git a/flake.nix b/flake.nix index db03c4b..c06b173 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "https://tangled.sh/@ocbwoy3.dev/nix"; + description = "https://tangled.sh/@kris.darkworld.download/nix"; inputs = { # Core @@ -18,9 +18,6 @@ ghostty.url = "github:ghostty-org/ghostty"; zen-browser.url = "github:0xc000022070/zen-browser-flake"; - # Programs - tuxstrap.url = "git+https://tangled.sh/@ocbwoy3.dev/tuxstrap"; - # Package tooling chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index a3a4625..f761a59 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -1,6 +1,12 @@ { config, inputs, pkgs, lib, ... }: -{ +let + userName = "kris"; + realName = "Kris"; + configRoot = "/etc/nixos"; + homeDir = "/home/${userName}"; + quickshellRoot = "${homeDir}/Projects/DeltaruneQuickshell"; +in { imports = [ ../../modules/forceMainPC.nix @@ -14,12 +20,7 @@ services.displayManager.gdm.enable = true; - boot.kernelPackages = (pkgs.linuxPackages_cachyos-lto.override { - ticksHz = 1000; - useLTO = "full"; - # extraMakeFlags = ["-O3"]; - withoutDebug = true; - }); + boot.kernelPackages = pkgs.linuxPackages_cachyos-lto; services.scx.enable = true; services.scx.scheduler = "scx_bpfland"; @@ -68,7 +69,7 @@ }; programs.virt-manager.enable = true; - users.groups.libvirtd.members = [ "ocbwoy3" ]; + users.groups.libvirtd.members = [ userName ]; virtualisation.libvirtd.enable = true; # virtualisation.waydroid.enable = true; virtualisation.spiceUSBRedirection.enable = true; @@ -165,8 +166,8 @@ # CHANGE YOUR NAME IN HOME MANAGER! # BETTER YET, DON'T TOUCH THIS. AT ALL. - main-user.userName = "ocbwoy3"; - main-user.realName = "OCbwoy3"; + main-user.userName = userName; + main-user.realName = realName; services.fstrim.enable = true; systemd.services.fstrim.enable = false; @@ -188,7 +189,7 @@ accent = "blue"; }; - home-manager.users.ocbwoy3 = { programs, config, pkgs, ... }: { + home-manager.users.${userName} = { programs, config, pkgs, ... }: { imports = [ inputs.catppuccin.homeModules.catppuccin @@ -227,56 +228,66 @@ }; home.file.".config/fastfetch" = { - source = config.lib.file.mkOutOfStoreSymlink "/home/ocbwoy3/config/config/fastfetch"; + source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/fastfetch"; recursive = true; }; home.file.".config/dunst" = { - source = config.lib.file.mkOutOfStoreSymlink "/home/ocbwoy3/config/config/dunst"; + source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/dunst"; recursive = true; }; # home.file.".config/gtk-3.0" = { - # source = config.lib.file.mkOutOfStoreSymlink "/home/ocbwoy3/config/config/gtk-3.0"; + # source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/gtk-3.0"; # recursive = true; # }; home.file.".config/hypr" = { - source = config.lib.file.mkOutOfStoreSymlink "/home/ocbwoy3/config/config/hypr"; + source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/hypr"; recursive = true; }; home.file.".config/xdg-desktop-portal" = { - source = config.lib.file.mkOutOfStoreSymlink "/home/ocbwoy3/config/config/xdg-desktop-portal"; + source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/xdg-desktop-portal"; recursive = true; }; home.file.".local/share/fonts/DotfilesFont.otf" = { - source = config.lib.file.mkOutOfStoreSymlink "/home/ocbwoy3/config/config/dotfile_deps/DotfilesFont.otf"; + source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/dotfile_deps/DotfilesFont.otf"; }; home.file.".config/ghostty" = { - source = config.lib.file.mkOutOfStoreSymlink "/home/ocbwoy3/config/config/ghostty"; + source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/ghostty"; recursive = true; }; home.file.".config/wlogout" = { - source = config.lib.file.mkOutOfStoreSymlink "/home/ocbwoy3/config/config/wlogout"; + source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/wlogout"; recursive = true; }; home.file.".config/qt5ct" = { - source = config.lib.file.mkOutOfStoreSymlink "/home/ocbwoy3/config/config/qt5ct"; + source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/qt5ct"; recursive = true; }; home.file.".config/wofi" = { - source = config.lib.file.mkOutOfStoreSymlink "/home/ocbwoy3/config/config/wofi"; + source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/wofi"; + recursive = true; + }; + + home.file.".config/quickshell/default" = { + source = config.lib.file.mkOutOfStoreSymlink quickshellRoot; + recursive = true; + }; + + home.file.".config/quickshell/DeltaruneQuickshell" = { + source = config.lib.file.mkOutOfStoreSymlink quickshellRoot; recursive = true; }; - # xdg.configHome = "/home/ocbwoy3/config/config"; + # xdg.configHome = "${configRoot}/config"; services.mpris-proxy.enable = true; @@ -308,8 +319,8 @@ programs.git = { enable = true; - userName = "OCbwoy3"; - userEmail = "ocbwoy3@ocbwoy3.dev"; + userName = realName; + userEmail = "kris@kris.darkworld.download"; }; programs.obs-studio = { diff --git a/hosts/default/other/activate.nix b/hosts/default/other/activate.nix index 94300d1..11400bc 100644 --- a/hosts/default/other/activate.nix +++ b/hosts/default/other/activate.nix @@ -14,9 +14,9 @@ }; }; - system.name = "ocbwoy3"; - system.nixos.label = "ocbwoy3-config-main"; - boot.loader.grub.configurationName = lib.mkDefault "git+https://tangled.sh/@ocbwoy3.dev/nix?ref=main"; + system.name = "kris"; + system.nixos.label = "kris-config-main"; + boot.loader.grub.configurationName = lib.mkDefault "git+https://tangled.sh/@kris.darkworld.download/nix?ref=main"; system.activationScripts.reloadFonts = { text = '' diff --git a/hosts/default/packages.nix b/hosts/default/packages.nix index 5b22873..bc3be0d 100644 --- a/hosts/default/packages.nix +++ b/hosts/default/packages.nix @@ -35,9 +35,6 @@ inputs.hyprlock.packages.${pkgs.stdenv.hostPlatform.system}.hyprlock inputs.hyprsysteminfo.packages.${pkgs.stdenv.hostPlatform.system}.hyprsysteminfo - # roblox - inputs.tuxstrap.packages.${pkgs.stdenv.hostPlatform.system}.default - # minecraft qemu (writeShellScriptBin "qemu-system-x86_64-uefi" '' @@ -53,7 +50,7 @@ (callPackage ./apps/wl-shimeji.nix {}) (writeShellScriptBin "stop-shimejis" ''${inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland}/bin/hyprctl dispatch exec "shimejictl stop"'') # (writeShellScriptBin "partynoob" ''shimejictl summon PartyNoob'') - # inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default + quickshell kdePackages.qtdeclarative catppuccin-gtk catppuccin @@ -141,13 +138,9 @@ mpv nixfmt-rfc-style - protonvpn-cli - protonvpn-gui - (writeShellScriptBin "protonvpn" ''${pkgs.protonvpn-cli}/bin/protonvpn-cli "$@"'') - kdePackages.kdialog - (writeShellScriptBin "roblox-studio-patcher" ''${pkgs.bun}/bin/bun run /home/ocbwoy3/config/scripts/bin/patchInternalRobloxStudio.ts'') + (writeShellScriptBin "roblox-studio-patcher" ''${pkgs.bun}/bin/bun run /etc/nixos/scripts/bin/patchInternalRobloxStudio.ts'') # firefox-devedition ]; diff --git a/hosts/default/packages/ocbwoy3-icons/default.nix b/hosts/default/packages/ocbwoy3-icons/default.nix index 682fee8..8c6a7f6 100644 --- a/hosts/default/packages/ocbwoy3-icons/default.nix +++ b/hosts/default/packages/ocbwoy3-icons/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "OCbwoy3's Custom Icons for NixOS"; - homepage = "https://tangled.sh/@ocbwoy3.dev/nix?ref=main"; + homepage = "https://tangled.sh/@kris.darkworld.download/nix?ref=main"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/modules/nixos/main-user.nix b/modules/nixos/main-user.nix index 0c925aa..0ba13b9 100644 --- a/modules/nixos/main-user.nix +++ b/modules/nixos/main-user.nix @@ -3,13 +3,13 @@ { options = { main-user.userName = lib.mkOption { - default = "ocbwoy3"; + default = "kris"; description = '' Username ''; }; main-user.realName = lib.mkOption { - default = "OCbwoy3"; + default = "Kris"; description = '' User's Name ''; diff --git a/modules/nixos/nixpkgs.nix b/modules/nixos/nixpkgs.nix index 7e47cbc..e1592aa 100644 --- a/modules/nixos/nixpkgs.nix +++ b/modules/nixos/nixpkgs.nix @@ -3,6 +3,7 @@ { nixpkgs.config.allowUnfree = true; + nixpkgs.config.replaceStdenv = args: args.pkgs.stdenv; nixpkgs.config.packageOverrides = pkgs: { vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; }; diff --git a/modules/nixos/programs.nix b/modules/nixos/programs.nix index 1d9ae1f..500a7f2 100644 --- a/modules/nixos/programs.nix +++ b/modules/nixos/programs.nix @@ -42,7 +42,7 @@ PasswordAuthentication = false; KbdInteractiveAuthentication = false; PermitRootLogin = "no"; - AllowUsers = [ "ocbwoy3" "git" ]; + AllowUsers = [ "kris" "ocbwoy3" "git" ]; }; # fucks up ssh connections from iphone if you enable this # settings = { diff --git a/scripts/bin/handleScreenshot.ts b/scripts/bin/handleScreenshot.ts index 00932eb..2653acb 100755 --- a/scripts/bin/handleScreenshot.ts +++ b/scripts/bin/handleScreenshot.ts @@ -50,9 +50,10 @@ import { getRegretevatorState } from "../lib/RegretevatorUtil"; const windowClassFriendyName: { [windowClass: string]: string } = { steam_app_1671210: "Deltarune", - "deltarune.exe": "Deltarune", // deltarune with proton-cachyos/proton-cachyos-slr + PROTON_ENABLE_WAYLAND=1 + "deltarune.exe": "Deltarune", // <-- proton-cachyos + steam_app_1690940: "Deltarune", // <-- demo + "org.vinegarhq.Sober": "Roblox", - steam_app_1690940: "Deltarune", // demo }; async function getWMClass(): Promise { @@ -86,7 +87,7 @@ async function getFilename(wmClass?: string): Promise { const program = new Command("handle-screenshot"); -const SCREENSHOT_PATH = `/home/ralsei/Pictures/Screenshots`; +const SCREENSHOT_PATH = `/home/kris/Pictures/Screenshots`; // useless async function transformImage(b: Buffer): Promise { diff --git a/scripts/bin/musicTest.ts b/scripts/bin/musicTest.ts index 5e5fed4..edc360a 100644 --- a/scripts/bin/musicTest.ts +++ b/scripts/bin/musicTest.ts @@ -6,13 +6,13 @@ setConsoleTitle("Music Test"); try { const artUrl = - await $`playerctl -s -p cider,chromium,OCbwoy3_s_iPhone metadata mpris:artUrl`.text(); + await $`playerctl -s -p cider,chromium,Kris___s_iPhone metadata mpris:artUrl`.text(); const title = - await $`playerctl -s -p cider,chromium,OCbwoy3_s_iPhone metadata title`.text(); + await $`playerctl -s -p cider,chromium,Kris___s_iPhone metadata title`.text(); const artist = - await $`playerctl -s -p cider,chromium,OCbwoy3_s_iPhone metadata artist`.text(); + await $`playerctl -s -p cider,chromium,Kris___s_iPhone metadata artist`.text(); const album = - await $`playerctl -s -p cider,chromium,OCbwoy3_s_iPhone metadata album`.text(); + await $`playerctl -s -p cider,chromium,Kris___s_iPhone metadata album`.text(); const MT = `${artist.trim()},${album.trim()}`; @@ -28,8 +28,8 @@ try { $`notify-send ${title.trim()} ${artist.trim()} -i /tmp/.musictest` .nothrow() - .catch((a) => {}); + .catch((a) => { }); } catch (e_) { console.error(e_); - $`notify-send "music test" "lol"`.nothrow().catch((a) => {}); + $`notify-send "music test" "lol"`.nothrow().catch((a) => { }); } diff --git a/scripts/bin/r2Upload.ts b/scripts/bin/r2Upload.ts index f590939..56fa31a 100644 --- a/scripts/bin/r2Upload.ts +++ b/scripts/bin/r2Upload.ts @@ -11,9 +11,9 @@ setConsoleTitle("Screenshot Uploader"); try { const start = Date.now(); - $`notify-send -t 1000 "Screenshot" "Uploading.."` + $`notify-send -a dotfiles-screenshot -t 1000 "Screenshot" "Uploading.."` .nothrow() - .catch((a) => {}); + .catch((a) => { }); configDotenv({ path: `${homedir()}/.ocbwoy3-dotfiles-SECRET-DO-NOT-TOUCH.env`, }); @@ -34,8 +34,8 @@ try { execSync(`echo "${url}" | wl-copy -n`); execSync( - `notify-send "Ekrānuzņēmums" "Attēls augšuplādēts e-z.host ${Date.now() - start}ms"`, + `notify-send -a dotfiles-screenshot "Screenshot" "Uploaded to e-z.host in ${Date.now() - start}ms"`, ); } catch (e_) { - execSync(`notify-send "Error" "${`${e_}`}"`); + execSync(`notify-send -a dotfiles-screenshot "Error" "${`${e_}`}"`); } diff --git a/scripts/dev/notif-test.sh b/scripts/dev/notif-test.sh index be4cc7f..0aa7e87 100755 --- a/scripts/dev/notif-test.sh +++ b/scripts/dev/notif-test.sh @@ -1,7 +1,7 @@ hyprctl notify 1 5000 0 " Loading OCbwoy3's Dotfiles" # Dotfiles -notify-send "Sveicināti Hyprland!" "some basic startup code" +notify-send "Welcome to Hyprland!" "some basic startup code" notify-send "Hyprland" "Enabled debugging overlay" notify-send "OCbwoy3's Dotfiles" "Keyboard Layout: English" notify-send "Screenshot" "Saved and copied to clipboard." diff --git a/scripts/dev/setup-gentoo-symlinks.sh b/scripts/dev/setup-gentoo-symlinks.sh index d216f46..1c376cc 100644 --- a/scripts/dev/setup-gentoo-symlinks.sh +++ b/scripts/dev/setup-gentoo-symlinks.sh @@ -1,6 +1,6 @@ #!/bin/bash -DOTFILES_DIR="/home/ralsei/config/config" +DOTFILES_DIR="/etc/nixos/config" # fastfetch ln -sfn "${DOTFILES_DIR}/fastfetch" "${HOME}/.config/fastfetch" @@ -29,4 +29,6 @@ ln -sfn "${DOTFILES_DIR}/wofi" "${HOME}/.config/wofi" # dotfile font ln -sfn "${DOTFILES_DIR}/dotfile_deps/DotfilesFont.otf" "${HOME}/.local/share/fonts/DotfilesFont.otf" +ln -sfn "${DOTFILES_DIR}/kitty" "${HOME}/.config/kitty + echo "symlinked this that" diff --git a/scripts/edit-last-screenshot.sh b/scripts/edit-last-screenshot.sh index a9d69a6..05943b0 100755 --- a/scripts/edit-last-screenshot.sh +++ b/scripts/edit-last-screenshot.sh @@ -7,5 +7,5 @@ LAST_SCREENSHOT=$(ls -t "$SCREENSHOTS_DIR" | head -n 1) if [[ -n "$LAST_SCREENSHOT" ]]; then swappy -f "$SCREENSHOTS_DIR/$LAST_SCREENSHOT" -o "$SCREENSHOTS_DIR/$LAST_SCREENSHOT" else - notify-send -u critical -t 3 "Error" "Can't find the damn file :(" + notify-send -a dotfiles-screenshot -u critical -t 3 "Error" "Can't find the damn file :(" fi diff --git a/scripts/hot-reload.sh b/scripts/hot-reload.sh index c00bb29..f70f42b 100755 --- a/scripts/hot-reload.sh +++ b/scripts/hot-reload.sh @@ -2,7 +2,7 @@ pkill -9 waybar > /dev/null -hyprctl dispatch exec "GTK_THEME=Adwaita waybar -c ~/config/config/waybar/config -s ~/config/config/waybar/style.css" > /dev/null & +# hyprctl dispatch exec "GTK_THEME=Adwaita waybar -c ~/config/config/waybar/config -s ~/config/config/waybar/style.css" > /dev/null & hyprctl reload > /dev/null & ROBLOX_PID="$(pidof sober)" diff --git a/scripts/lib/RegretevatorUtil.ts b/scripts/lib/RegretevatorUtil.ts index 6d21d29..bfdd53b 100644 --- a/scripts/lib/RegretevatorUtil.ts +++ b/scripts/lib/RegretevatorUtil.ts @@ -1,5 +1,6 @@ import { existsSync, readFileSync } from "fs"; +// removed in tuxstrap v2 const STATE_FILE_PATH = "/tmp/.regretevator_state"; type DeadUnknownState = { state: "DEAD" | "UNKNOWN" }; @@ -14,6 +15,8 @@ export type RegretevatorState = DeadUnknownState | InElevatorState; /* +when using dotfilesfont, `ý` is replaced with the regretevator icon + ➜ config git:(main) ✗ cat /tmp/.regretevator_state {"text":"ý 82","tooltip":"On Floor 82"} ➜ config git:(main) ✗ cat /tmp/.regretevator_state diff --git a/scripts/screenshot-fullscreen.sh b/scripts/screenshot-fullscreen.sh index f19e7ac..4e1abb7 100755 --- a/scripts/screenshot-fullscreen.sh +++ b/scripts/screenshot-fullscreen.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash # do NOT use $PATH for this!! -SS_PATH=$(timeout 30s bun run ~/config/scripts/bin/handleScreenshot.ts fullscreen) +SS_PATH=$(timeout 30s bun run /etc/nixos/scripts/bin/handleScreenshot.ts fullscreen) echo "$SS_PATH" -if [[ -n "$SS_PATH" && "$SS_PATH" == /home/ralsei/Pictures/Screenshots/* ]]; then +if [[ -n "$SS_PATH" && "$SS_PATH" == /home/kris/Pictures/Screenshots/* ]]; then wl-copy < "$SS_PATH" - notify-send -i "$SS_PATH" "Ekrānuzņēmums" "nokopēts starpliktuvē!" + notify-send -i "$SS_PATH" "Screenshot" "copied to clipboard!" fi diff --git a/scripts/screenshot-selection.sh b/scripts/screenshot-selection.sh index 8a54a15..0185bfa 100755 --- a/scripts/screenshot-selection.sh +++ b/scripts/screenshot-selection.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash # do NOT use $PATH for this!! -SS_PATH=$(timeout 30s bun run ~/config/scripts/bin/handleScreenshot.ts selection) +SS_PATH=$(timeout 30s bun run /etc/nixos/scripts/bin/handleScreenshot.ts selection) echo "$SS_PATH" -if [[ -n "$SS_PATH" && "$SS_PATH" == /home/ralsei/Pictures/Screenshots/* ]]; then +if [[ -n "$SS_PATH" && "$SS_PATH" == /home/kris/Pictures/Screenshots/* ]]; then wl-copy < "$SS_PATH" - notify-send -i "$SS_PATH" "Ekrānuzņēmums" "nokopēts starpliktuvē!" + notify-send -a dotfiles-screenshot -i "$SS_PATH" "Screenshot" "selection copied to clipboard!" fi diff --git a/scripts/toggle-language.sh b/scripts/toggle-language.sh index 579b57f..9328057 100755 --- a/scripts/toggle-language.sh +++ b/scripts/toggle-language.sh @@ -1,6 +1,6 @@ -KBLANG=$(hyprctl getoption input:kb_layout | awk 'NR==1{print $2}') +#!/usr/bin/env bash # hyprctl switchxkblayout semico--usb-gaming-keyboard- next hyprctl switchxkblayout current next -notify-send -u low "Tastatūra" "Valoda mainīta" +notify-send -r 13 "Keyboard" "Language changed!" diff --git a/scripts/waybar-music-status.sh b/scripts/waybar-music-status.sh index 2691a35..356fa47 100755 --- a/scripts/waybar-music-status.sh +++ b/scripts/waybar-music-status.sh @@ -1,16 +1,16 @@ #!/bin/bash function _sanitize { - sed -r "s/(^[ ]*)|([ ]*$)//g" | sed -r 's/\&/\&/g' | sed -r 's/\"/\"/g' | sed -r "s/'/\'/g" + sed -r "s/(^[ ]*)|([ ]*$)//g" | sed -r 's/\&/\&/g' | sed -r 's/\"/\"/g' | sed -r "s/'/\'/g" } # {{artist}} — {{title}} -SONGNAME="$( playerctl -s -p cider,chromium,OCbwoy3_s_iPhone metadata -f "{{artist}} — {{title}}" | _sanitize )" -ALBUMNAME="$( playerctl -s -p cider,chromium,OCbwoy3_s_iPhone metadata album | _sanitize )" +SONGNAME="$( playerctl -s -p cider,chromium,Kris___s_iPhone metadata -f "{{artist}} — {{title}}" | _sanitize )" +ALBUMNAME="$( playerctl -s -p cider,chromium,Kris___s_iPhone metadata album | _sanitize )" if [ ${#SONGNAME} -gt 0 ] ; then - printf "{\"text\": \" $SONGNAME\", \"tooltip\": \"$ALBUMNAME\", \"class\":\"music\" }" + printf "{\"text\": \" $SONGNAME\", \"tooltip\": \"$ALBUMNAME\", \"class\":\"music\" }" else - printf "{\"text\": \"\", \"tooltip\": \" \", \"class\":\"invisible\" }" + printf "{\"text\": \"\", \"tooltip\": \" \", \"class\":\"invisible\" }" fi diff --git a/scripts/whatsplaying.sh b/scripts/whatsplaying.sh index ac50f59..bd5e043 100755 --- a/scripts/whatsplaying.sh +++ b/scripts/whatsplaying.sh @@ -1,2 +1,2 @@ -# bun run ~/config/scripts/bin/actWithMusic.ts notif $@ -exec ~/config/scripts/bin/ocbwoy3-actwithmus notif $@ +# bun run /etc/nixos/scripts/bin/actWithMusic.ts notif "$@" +exec /etc/nixos/scripts/bin/ocbwoy3-actwithmus notif "$@"