diff --git a/config/dunst/dunstrc b/config/dunst/dunstrc index baa2c4c..4be0e2b 100644 --- a/config/dunst/dunstrc +++ b/config/dunst/dunstrc @@ -68,7 +68,7 @@ ### Misc/Advanced ### dmenu = w -p dunst: - browser = zen + browser = zen-beta always_run_script = true title = Dunst class = Dunst diff --git a/config/fastfetch/ProphecySymbol.png b/config/fastfetch/ProphecySymbol.png deleted file mode 100644 index 55aeff2..0000000 Binary files a/config/fastfetch/ProphecySymbol.png and /dev/null differ diff --git a/config/fastfetch/ProphecySymbol.png b/config/fastfetch/ProphecySymbol.png new file mode 120000 index 0000000..1576411 --- /dev/null +++ b/config/fastfetch/ProphecySymbol.png @@ -0,0 +1 @@ +/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/fastfetch/ProphecySymbol.png \ No newline at end of file diff --git a/config/fastfetch/ProphecySymbol.png.hmbackup b/config/fastfetch/ProphecySymbol.png.hmbackup new file mode 100644 index 0000000..55aeff2 Binary files /dev/null and b/config/fastfetch/ProphecySymbol.png.hmbackup differ diff --git a/config/fastfetch/config.jsonc b/config/fastfetch/config.jsonc deleted file mode 100644 index 090edda..0000000 --- a/config/fastfetch/config.jsonc +++ /dev/null @@ -1,114 +0,0 @@ -{ - "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", - "logo": { - "source": "~/.config/fastfetch/deltarune.png" - }, - "display": { - "color": "magenta" - }, - "modules": [ - "break", - - { - "type": "title", - "keyColor": "blue", - "outputColor": "magenta", - "format": "kris@darkworld" // "{user-name-colored}{at-symbol-colored}{host-name-colored}" - }, - - "break", - - { - "type": "os", - "key": "OS", - "format": "DARKWORLD NIXOS" - }, - { - "type": "kernel", - "format": "Linux 6.17.0-2-dark-fountain" - }, - { - "type": "packages", - "format": "9999 (darkworld), 4 (deltarune), 1 (the-prophecy)" - }, - //"packages", - - "break", - - //"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 - }, - { - "type": "gpu", - "format": "{name} [{type}] {temperature}", - "temp": true - }, - - "break", - - "memory", - "disk", - - "break", - - { - "type": "wm", - "key": "WM", - "format": "{pretty-name}" - }, - { - "type": "shell", - "key": "Shell", - "format": "{pretty-name}" - }, - "terminal", - "locale", - - /* - "break", - - { - "type": "weather", - "location": "Latvia", - "timeout": 1000, - "outputFormat": "%t+-+%C" - }, - */ - - "break", - - { - "type": "media", - "key": "Song", - "format": "{artist} — {title}" - }, - { - "type": "media", - "key": "Album", - "format": "{album}" - }, - - "break", - - { - "type": "colors", - "symbol": "circle" - } - ] -} diff --git a/config/fastfetch/config.jsonc b/config/fastfetch/config.jsonc new file mode 120000 index 0000000..4c77aeb --- /dev/null +++ b/config/fastfetch/config.jsonc @@ -0,0 +1 @@ +/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/fastfetch/config.jsonc \ No newline at end of file diff --git a/config/fastfetch/config.jsonc.hmbackup b/config/fastfetch/config.jsonc.hmbackup new file mode 100644 index 0000000..090edda --- /dev/null +++ b/config/fastfetch/config.jsonc.hmbackup @@ -0,0 +1,114 @@ +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "logo": { + "source": "~/.config/fastfetch/deltarune.png" + }, + "display": { + "color": "magenta" + }, + "modules": [ + "break", + + { + "type": "title", + "keyColor": "blue", + "outputColor": "magenta", + "format": "kris@darkworld" // "{user-name-colored}{at-symbol-colored}{host-name-colored}" + }, + + "break", + + { + "type": "os", + "key": "OS", + "format": "DARKWORLD NIXOS" + }, + { + "type": "kernel", + "format": "Linux 6.17.0-2-dark-fountain" + }, + { + "type": "packages", + "format": "9999 (darkworld), 4 (deltarune), 1 (the-prophecy)" + }, + //"packages", + + "break", + + //"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 + }, + { + "type": "gpu", + "format": "{name} [{type}] {temperature}", + "temp": true + }, + + "break", + + "memory", + "disk", + + "break", + + { + "type": "wm", + "key": "WM", + "format": "{pretty-name}" + }, + { + "type": "shell", + "key": "Shell", + "format": "{pretty-name}" + }, + "terminal", + "locale", + + /* + "break", + + { + "type": "weather", + "location": "Latvia", + "timeout": 1000, + "outputFormat": "%t+-+%C" + }, + */ + + "break", + + { + "type": "media", + "key": "Song", + "format": "{artist} — {title}" + }, + { + "type": "media", + "key": "Album", + "format": "{album}" + }, + + "break", + + { + "type": "colors", + "symbol": "circle" + } + ] +} diff --git a/config/fastfetch/deltarune.png b/config/fastfetch/deltarune.png deleted file mode 100644 index cba675b..0000000 Binary files a/config/fastfetch/deltarune.png and /dev/null differ diff --git a/config/fastfetch/deltarune.png b/config/fastfetch/deltarune.png new file mode 120000 index 0000000..99b61fe --- /dev/null +++ b/config/fastfetch/deltarune.png @@ -0,0 +1 @@ +/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/fastfetch/deltarune.png \ No newline at end of file diff --git a/config/fastfetch/deltarune.png.hmbackup b/config/fastfetch/deltarune.png.hmbackup new file mode 100644 index 0000000..cba675b Binary files /dev/null and b/config/fastfetch/deltarune.png.hmbackup differ diff --git a/config/fastfetch/ralsei.png b/config/fastfetch/ralsei.png deleted file mode 100755 index d83da62..0000000 Binary files a/config/fastfetch/ralsei.png and /dev/null differ diff --git a/config/fastfetch/ralsei.png b/config/fastfetch/ralsei.png new file mode 120000 index 0000000..0acd765 --- /dev/null +++ b/config/fastfetch/ralsei.png @@ -0,0 +1 @@ +/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/fastfetch/ralsei.png \ No newline at end of file diff --git a/config/fastfetch/ralsei.png.hmbackup b/config/fastfetch/ralsei.png.hmbackup new file mode 100755 index 0000000..d83da62 Binary files /dev/null and b/config/fastfetch/ralsei.png.hmbackup differ diff --git a/config/ghostty/config b/config/ghostty/config deleted file mode 100644 index 6252aab..0000000 --- a/config/ghostty/config +++ /dev/null @@ -1,11 +0,0 @@ -font-family = "SF Mono" -theme = Catppuccin Mocha -background-opacity = 0.7 -window-padding-x = 16 -window-padding-y = 16 -font-feature = -calt -font-feature = -liga -font-feature = -dlig -gtk-single-instance = true -window-decoration = none - diff --git a/config/gtk-3.0/.gitignore b/config/gtk-3.0/.gitignore deleted file mode 100644 index d354fcb..0000000 --- a/config/gtk-3.0/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -bookmarks -bookmarks_2 diff --git a/config/gtk-3.0/settings.ini b/config/gtk-3.0/settings.ini deleted file mode 100644 index 01874f2..0000000 --- a/config/gtk-3.0/settings.ini +++ /dev/null @@ -1,17 +0,0 @@ -[Settings] -gtk-theme-name=catppuccin-mocha-blue-standard+default -gtk-icon-theme-name=Arashi -gtk-font-name=Noto Sans 11 -gtk-cursor-theme-name=RalseiCursors -gtk-cursor-theme-size=24 -gtk-toolbar-style=GTK_TOOLBAR_ICONS -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=0 -gtk-menu-images=0 -gtk-enable-event-sounds=1 -gtk-enable-input-feedback-sounds=0 -gtk-xft-antialias=1 -gtk-xft-hinting=1 -gtk-xft-hintstyle=hintslight -gtk-xft-rgba=rgb -gtk-application-prefer-dark-theme=0 diff --git a/config/hypr/config/autoexec.conf b/config/hypr/config/autoexec.conf deleted file mode 100644 index 3501699..0000000 --- a/config/hypr/config/autoexec.conf +++ /dev/null @@ -1,45 +0,0 @@ -# Polkit -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" - -# Wallpaper -exec-once = swww-daemon - -# Notification Manager -# exec-once = dunst - -# Gentoo Stuff -exec-once = bash ~/config/scripts/gentoo-init.sh - -# Clipboard Manager -exec-once = wl-paste --watch cliphist store - -# XDG Desktop Portal -exec-once = bash ~/config/scripts/xdg.sh - -# Set GTK Settings -exec-once = bash ~/config/scripts/gtk.sh - -# Start Hot Reload -exec-once = bash ~/config/scripts/hot-reload.sh - -# Hyprland polkit -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 -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/autoexec.conf b/config/hypr/config/autoexec.conf new file mode 120000 index 0000000..c2e35a8 --- /dev/null +++ b/config/hypr/config/autoexec.conf @@ -0,0 +1 @@ +/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/autoexec.conf \ No newline at end of file diff --git a/config/hypr/config/autoexec.conf.hmbackup b/config/hypr/config/autoexec.conf.hmbackup new file mode 100644 index 0000000..c41563a --- /dev/null +++ b/config/hypr/config/autoexec.conf.hmbackup @@ -0,0 +1,35 @@ +# Polkit +exec-once = systemctl --user start /nix/store/*-hyprpolkitagent-*/libexec/hyprpolkitagent +exec-once = /usr/lib/hyprpolkitagent/hyprpolkitagent + +# Wallpaper +exec-once = swww-daemon + +# Gentoo Stuff +exec-once = bash /etc/nixos/scripts/gentoo-init.sh + +# Clipboard Manager +exec-once = wl-paste --watch cliphist store + +# XDG Desktop Portal +exec-once = bash /etc/nixos/scripts/xdg.sh + +# Start Hot Reload +exec-once = bash /etc/nixos/scripts/hot-reload.sh + +# Hyprland polkit +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 -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 deleted file mode 100644 index 52f7743..0000000 --- a/config/hypr/config/display.conf +++ /dev/null @@ -1,243 +0,0 @@ -############################################# -# MONITORS -############################################# - -monitor=,1920x1080@240,auto,1 -# monitor=Unknown-1,disabled - - -############################################# -# GENERAL -############################################# - -general { - gaps_in = 5 - gaps_out = 20 - border_size = 0 - - # col.active_border = rgb(89b4fa) - # col.inactive_border = rgb(585b70) - - resize_on_border = false - allow_tearing = true - layout = dwindle -} - - -############################################# -# DECORATION -############################################# - -decoration { - # rounding = 12 - - active_opacity = 1.0 - inactive_opacity = 1.0 - fullscreen_opacity = 1.0 - - shadow { - enabled = false - range = 8 - render_power = 8 - color = rgb(8aadf4) - color_inactive = rgb(585b70) - scale = 1.0 - offset = 0 0 - } - - blur { - enabled = true - size = 3 - passes = 1 - xray = false - vibrancy = 0.1696 - } -} - - -############################################# -# ANIMATIONS -############################################# - -animations { - enabled = true - - bezier = myBezier, 0.05, 0.9, 0.1, 1.05 - bezier = main, 0.445, 0.05, 0.55, 0.95 - bezier = monitorBez, 0, 1, 1, 1 - - animation = windows, 1, 7, myBezier - animation = windowsOut, 1, 7, default - animation = border, 1, 10, default - animation = borderangle, 1, 8, default - animation = fade, 1, 7, default - animation = workspaces, 1, 6, default, slide - animation = specialWorkspace, 1, 6, myBezier, slide - animation = monitorAdded, 1, 30, monitorBez -} - - -############################################# -# RENDER -############################################# - -render { - # new_render_scheduling = true -} - - -############################################# -# CURSOR -############################################# - -cursor { - use_cpu_buffer = 2 - enable_hyprcursor = true - invisible = false -} - - -############################################# -# WINDOW RULES (TAGGING) -############################################# - -windowrule { - name = games - match:class = org\.vinegarhq\.Sober|com\.mojang\.minecraft\.java-edition|deltarune\.exe|steam_app_1671210 - tag = +game -} - -windowrule { - name = discord - match:class = equibop - tag = +discord -} - - -windowrule { - name = roblox - match:class = org\.vinegarhq\.Sober - tag = +roblox -} - -windowrule { - name = deltarune - match:class = deltarune\.exe|steam_app_1671210 - tag = +deltarune -} - -windowrule { - name = code - match:class = code|windsurf - tag = +code -} - -windowrule { - name = music - match:class = cider|spotify - tag = +music -} - -# Tag behavior rules -windowrule { - name = render unfocused - match:tag = music|game|discord - render_unfocused = on -} - - -############################################# -# LAYOUTS -############################################# - -dwindle { - pseudotile = true - preserve_split = true -} - - -############################################# -# MISC -############################################# - -misc { - force_default_wallpaper = 2 - enable_anr_dialog = true - disable_hyprland_logo = false - initial_workspace_tracking = 0 - # new_window_takes_over_fullscreen = 1 - disable_splash_rendering = false - font_family = "SF Pro Display" - render_unfocused_fps = 240 - allow_session_lock_restore = 1 -} - - -############################################# -# LAYER RULES -############################################# - -layerrule { - name = waybar - match:namespace = waybar - animation = slide top - above_lock = 2 - order = -20 - no_screen_share = off -} - -layerrule { - name = notifications - match:namespace = notifications - animation = slide right - above_lock = 2 -} - -layerrule { - name = wofi - match:namespace = wofi - animation = popin 70% - dim_around = on - no_screen_share = off - order = -10 -} - -layerrule { - name = shimeji - match:namespace = wl_shimeji - order = -9999 - above_lock = 2 -} - -layerrule { - name = gtk layer shell - match:namespace = gtk-layer-shell - order = -25 -} - - -############################################# -# FLOATING UTILITY WINDOWS -############################################# - -windowrule { - 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 -} - -############################################# -# OTHER -############################################# - -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/display.conf b/config/hypr/config/display.conf new file mode 120000 index 0000000..17514ce --- /dev/null +++ b/config/hypr/config/display.conf @@ -0,0 +1 @@ +/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/display.conf \ No newline at end of file diff --git a/config/hypr/config/display.conf.hmbackup b/config/hypr/config/display.conf.hmbackup new file mode 100644 index 0000000..e4f23a5 --- /dev/null +++ b/config/hypr/config/display.conf.hmbackup @@ -0,0 +1,234 @@ +############################################# +# MONITORS +############################################# + +monitor=,1920x1080@240,auto,1 +# monitor=Unknown-1,disabled + + +############################################# +# GENERAL +############################################# + +general { + gaps_in = 5 + gaps_out = 20 + border_size = 0 + + # col.active_border = rgb(89b4fa) + # col.inactive_border = rgb(585b70) + + resize_on_border = false + allow_tearing = true + layout = dwindle +} + + +############################################# +# DECORATION +############################################# + +decoration { + # rounding = 12 + + active_opacity = 1.0 + inactive_opacity = 1.0 + fullscreen_opacity = 1.0 + + shadow { + enabled = false + range = 8 + render_power = 8 + color = rgb(8aadf4) + color_inactive = rgb(585b70) + scale = 1.0 + offset = 0 0 + } + + blur { + enabled = true + size = 3 + passes = 1 + xray = false + vibrancy = 0.1696 + } +} + + +############################################# +# ANIMATIONS +############################################# + +animations { + enabled = true + + bezier = myBezier, 0.05, 0.9, 0.1, 1.05 + bezier = main, 0.445, 0.05, 0.55, 0.95 + bezier = monitorBez, 0, 1, 1, 1 + + animation = windows, 1, 7, myBezier + animation = windowsOut, 1, 7, default + animation = border, 1, 10, default + animation = borderangle, 1, 8, default + animation = fade, 1, 7, default + animation = workspaces, 1, 6, default, slide + animation = specialWorkspace, 1, 6, myBezier, slide + animation = monitorAdded, 1, 30, monitorBez +} + + +############################################# +# RENDER +############################################# + +render { + # new_render_scheduling = true +} + + +############################################# +# CURSOR +############################################# + +cursor { + use_cpu_buffer = 2 + enable_hyprcursor = true + invisible = false +} + + +############################################# +# WINDOW RULES (TAGGING) +############################################# + +windowrule { + name = games + match:class = org\.vinegarhq\.Sober|com\.mojang\.minecraft\.java-edition|deltarune\.exe|steam_app_1671210 + tag = +game +} + +windowrule { + name = discord + match:class = equibop + tag = +discord +} + + +windowrule { + name = roblox + match:class = org\.vinegarhq\.Sober + tag = +roblox +} + +windowrule { + name = deltarune + match:class = deltarune\.exe|steam_app_1671210 + tag = +deltarune +} + +windowrule { + name = code + match:class = code|windsurf + tag = +code +} + +windowrule { + name = music + match:class = cider|spotify + tag = +music +} + +# Tag behavior rules +windowrule { + name = render unfocused + match:tag = music|game|discord + render_unfocused = on +} + + +############################################# +# LAYOUTS +############################################# + +dwindle { + pseudotile = true + preserve_split = true +} + + +############################################# +# MISC +############################################# + +misc { + force_default_wallpaper = 2 + enable_anr_dialog = true + disable_hyprland_logo = false + initial_workspace_tracking = 0 + # new_window_takes_over_fullscreen = 1 + disable_splash_rendering = false + font_family = "SF Pro Display" + render_unfocused_fps = 240 + allow_session_lock_restore = 1 +} + + +############################################# +# LAYER RULES +############################################# + +layerrule { + name = waybar + match:namespace = waybar + animation = slide top + above_lock = 2 + order = -20 + no_screen_share = off +} + +layerrule { + name = notifications + match:namespace = notifications + animation = slide right + above_lock = 2 +} + +layerrule { + name = shimeji + match:namespace = wl_shimeji + order = -9999 + above_lock = 2 +} + +layerrule { + name = gtk layer shell + match:namespace = gtk-layer-shell + order = -25 +} + + +############################################# +# FLOATING UTILITY WINDOWS +############################################# + +windowrule { + name = utility windows + match:class = org\.kde\.systemsettings|systemsettings + float = true + size = 900 500 + center = true +} + +############################################# +# OTHER +############################################# + +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/input.conf b/config/hypr/config/input.conf deleted file mode 100644 index 67a4738..0000000 --- a/config/hypr/config/input.conf +++ /dev/null @@ -1,10 +0,0 @@ - -cursor { - no_hardware_cursors = false - zoom_rigid = true -} - -$KBLANG = english - -# Keyboard -source = ./input_configs/english.conf diff --git a/config/hypr/config/input.conf b/config/hypr/config/input.conf new file mode 120000 index 0000000..1a0ef82 --- /dev/null +++ b/config/hypr/config/input.conf @@ -0,0 +1 @@ +/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/input.conf \ No newline at end of file diff --git a/config/hypr/config/input.conf.hmbackup b/config/hypr/config/input.conf.hmbackup new file mode 100644 index 0000000..67a4738 --- /dev/null +++ b/config/hypr/config/input.conf.hmbackup @@ -0,0 +1,10 @@ + +cursor { + no_hardware_cursors = false + zoom_rigid = true +} + +$KBLANG = english + +# Keyboard +source = ./input_configs/english.conf diff --git a/config/hypr/config/input_configs/english.conf b/config/hypr/config/input_configs/english.conf deleted file mode 100644 index 5f72e87..0000000 --- a/config/hypr/config/input_configs/english.conf +++ /dev/null @@ -1,17 +0,0 @@ -# Input Config ( https://wiki.hyprland.org/Configuring/Variables/#input ) - -input { - kb_layout = us,lv - kb_variant = ,apostrophe - kb_model = - kb_options = - kb_rules = - - follow_mouse = 1 - - sensitivity = 0 # -1.0 - 1.0, 0 means no modification. - - touchpad { - natural_scroll = false - } -} diff --git a/config/hypr/config/input_configs/english.conf b/config/hypr/config/input_configs/english.conf new file mode 120000 index 0000000..7aa88d2 --- /dev/null +++ b/config/hypr/config/input_configs/english.conf @@ -0,0 +1 @@ +/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/input_configs/english.conf \ No newline at end of file diff --git a/config/hypr/config/input_configs/english.conf.hmbackup b/config/hypr/config/input_configs/english.conf.hmbackup new file mode 100644 index 0000000..5f72e87 --- /dev/null +++ b/config/hypr/config/input_configs/english.conf.hmbackup @@ -0,0 +1,17 @@ +# Input Config ( https://wiki.hyprland.org/Configuring/Variables/#input ) + +input { + kb_layout = us,lv + kb_variant = ,apostrophe + kb_model = + kb_options = + kb_rules = + + follow_mouse = 1 + + sensitivity = 0 # -1.0 - 1.0, 0 means no modification. + + touchpad { + natural_scroll = false + } +} diff --git a/config/hypr/config/input_configs/latvian.conf b/config/hypr/config/input_configs/latvian.conf deleted file mode 100644 index ec17a2d..0000000 --- a/config/hypr/config/input_configs/latvian.conf +++ /dev/null @@ -1,23 +0,0 @@ -# Input Config ( https://wiki.hyprland.org/Configuring/Variables/#input ) - -# How to get Latvian Keyboard on Hyprland: -# uncomment "lv_lv.UTF-8 UTF-8" in /etc/locale.gen -# add first line "LANG=lv_LV.UTF-8" in /etc/locale.conf -# locale-gen -# setxkbmap lv - -input { - kb_layout = lv - kb_variant = apostrophe - kb_model = - kb_options = compose:apostrophe - kb_rules = #grp:alt_shift_toggle - - follow_mouse = 1 - - sensitivity = 0 # -1.0 - 1.0, 0 means no modification. - - touchpad { - natural_scroll = false - } -} \ No newline at end of file diff --git a/config/hypr/config/input_configs/latvian.conf b/config/hypr/config/input_configs/latvian.conf new file mode 120000 index 0000000..51b1958 --- /dev/null +++ b/config/hypr/config/input_configs/latvian.conf @@ -0,0 +1 @@ +/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/input_configs/latvian.conf \ No newline at end of file diff --git a/config/hypr/config/input_configs/latvian.conf.hmbackup b/config/hypr/config/input_configs/latvian.conf.hmbackup new file mode 100644 index 0000000..ec17a2d --- /dev/null +++ b/config/hypr/config/input_configs/latvian.conf.hmbackup @@ -0,0 +1,23 @@ +# Input Config ( https://wiki.hyprland.org/Configuring/Variables/#input ) + +# How to get Latvian Keyboard on Hyprland: +# uncomment "lv_lv.UTF-8 UTF-8" in /etc/locale.gen +# add first line "LANG=lv_LV.UTF-8" in /etc/locale.conf +# locale-gen +# setxkbmap lv + +input { + kb_layout = lv + kb_variant = apostrophe + kb_model = + kb_options = compose:apostrophe + kb_rules = #grp:alt_shift_toggle + + follow_mouse = 1 + + sensitivity = 0 # -1.0 - 1.0, 0 means no modification. + + touchpad { + natural_scroll = false + } +} \ No newline at end of file diff --git a/config/hypr/config/keybindings/default.conf b/config/hypr/config/keybindings/default.conf deleted file mode 100644 index 0018a2e..0000000 --- a/config/hypr/config/keybindings/default.conf +++ /dev/null @@ -1,76 +0,0 @@ -# $mainMod was defined in variables.conf - -# Default keybinds -bind = $mainMod, Q, exec, $terminal -bind = $mainMod, C, killactive, -bind = $mainMod, E, exec, $fileManager -bind = $mainMod, V, togglefloating, -bind = $mainMod, T, exec, $menu -bind = $mainMod, Y, exec, $browser -bind = $mainMod, P, pseudo, # dwindle -bind = $mainMod, J, togglesplit, # dwindle -bind = $mainMod, F, fullscreen - -# Window focus keybinds -bind = $mainMod, left, movefocus, l -bind = $mainMod, right, movefocus, r -bind = $mainMod, up, movefocus, u -bind = $mainMod, down, movefocus, d - -# Window size controls -bind = $mainMod SHIFT, right, resizeactive, 100 0 # Increase window width with keyboard -bind = $mainMod SHIFT, left, resizeactive, -100 0 # Reduce window width with keyboard -bind = $mainMod SHIFT, down, resizeactive, 0 100 # Increase window height with keyboard -bind = $mainMod SHIFT, up, resizeactive, 0 -100 # Reduce window height with keyboard - -# Window swapping controls -bind = $mainMod CTRL, left, swapwindow, l -bind = $mainMod CTRL, right, swapwindow, r -bind = $mainMod CTRL, up, swapwindow, u -bind = $mainMod CTRL, down, swapwindow, d - -# Window movement and size -bindm = $mainMod, mouse:272, movewindow -bindm = $mainMod, mouse:273, resizewindow - -# Workspace mouse keybinds -bind = $mainMod, mouse_down, workspace, e+1 -bind = $mainMod, mouse_up, workspace, e-1 - -# Workspace keybinds ($mainMod + [0-9]) -bind = $mainMod, 1, workspace, 1 -bind = $mainMod, 2, workspace, 2 -bind = $mainMod, 3, workspace, 3 -bind = $mainMod, 4, workspace, 4 -bind = $mainMod, 5, workspace, 5 -bind = $mainMod, 6, workspace, 6 -bind = $mainMod, 7, workspace, 7 -bind = $mainMod, 8, workspace, 8 -bind = $mainMod, 9, workspace, 9 -bind = $mainMod, 0, workspace, 10 - -# Workspace keybinds ($mainMod + SHIFT + [0-9]) -bind = $mainMod SHIFT, 1, movetoworkspace, 1 -bind = $mainMod SHIFT, 2, movetoworkspace, 2 -bind = $mainMod SHIFT, 3, movetoworkspace, 3 -bind = $mainMod SHIFT, 4, movetoworkspace, 4 -bind = $mainMod SHIFT, 5, movetoworkspace, 5 -bind = $mainMod SHIFT, 6, movetoworkspace, 6 -bind = $mainMod SHIFT, 7, movetoworkspace, 7 -bind = $mainMod SHIFT, 8, movetoworkspace, 8 -bind = $mainMod SHIFT, 9, movetoworkspace, 9 -bind = $mainMod SHIFT, 0, movetoworkspace, 10 - -# Function keys ( FN + F[1-12] ) -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/default.conf b/config/hypr/config/keybindings/default.conf new file mode 120000 index 0000000..6d3ed55 --- /dev/null +++ b/config/hypr/config/keybindings/default.conf @@ -0,0 +1 @@ +/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/keybindings/default.conf \ No newline at end of file diff --git a/config/hypr/config/keybindings/default.conf.hmbackup b/config/hypr/config/keybindings/default.conf.hmbackup new file mode 100644 index 0000000..5fce6b8 --- /dev/null +++ b/config/hypr/config/keybindings/default.conf.hmbackup @@ -0,0 +1,76 @@ +# $mainMod was defined in variables.conf + +# Default keybinds +bind = $mainMod, Q, exec, $terminal +bind = $mainMod, C, killactive, +bind = $mainMod, E, exec, $fileManager +bind = $mainMod, V, togglefloating, +bind = $mainMod, T, exec, $menu +bind = $mainMod, A, exec, qs ipc call deltarune.shell toggleQuickSettings +bind = $mainMod, Y, exec, $browser +bind = $mainMod, P, pseudo, # dwindle +bind = $mainMod, J, togglesplit, # dwindle +bind = $mainMod, F, fullscreen + +# Window focus keybinds +bind = $mainMod, left, movefocus, l +bind = $mainMod, right, movefocus, r +bind = $mainMod, up, movefocus, u +bind = $mainMod, down, movefocus, d + +# Window size controls +bind = $mainMod SHIFT, right, resizeactive, 100 0 # Increase window width with keyboard +bind = $mainMod SHIFT, left, resizeactive, -100 0 # Reduce window width with keyboard +bind = $mainMod SHIFT, down, resizeactive, 0 100 # Increase window height with keyboard +bind = $mainMod SHIFT, up, resizeactive, 0 -100 # Reduce window height with keyboard + +# Window swapping controls +bind = $mainMod CTRL, left, swapwindow, l +bind = $mainMod CTRL, right, swapwindow, r +bind = $mainMod CTRL, up, swapwindow, u +bind = $mainMod CTRL, down, swapwindow, d + +# Window movement and size +bindm = $mainMod, mouse:272, movewindow +bindm = $mainMod, mouse:273, resizewindow + +# Workspace mouse keybinds +bind = $mainMod, mouse_down, workspace, e+1 +bind = $mainMod, mouse_up, workspace, e-1 + +# Workspace keybinds ($mainMod + [0-9]) +bind = $mainMod, 1, workspace, 1 +bind = $mainMod, 2, workspace, 2 +bind = $mainMod, 3, workspace, 3 +bind = $mainMod, 4, workspace, 4 +bind = $mainMod, 5, workspace, 5 +bind = $mainMod, 6, workspace, 6 +bind = $mainMod, 7, workspace, 7 +bind = $mainMod, 8, workspace, 8 +bind = $mainMod, 9, workspace, 9 +bind = $mainMod, 0, workspace, 10 + +# Workspace keybinds ($mainMod + SHIFT + [0-9]) +bind = $mainMod SHIFT, 1, movetoworkspace, 1 +bind = $mainMod SHIFT, 2, movetoworkspace, 2 +bind = $mainMod SHIFT, 3, movetoworkspace, 3 +bind = $mainMod SHIFT, 4, movetoworkspace, 4 +bind = $mainMod SHIFT, 5, movetoworkspace, 5 +bind = $mainMod SHIFT, 6, movetoworkspace, 6 +bind = $mainMod SHIFT, 7, movetoworkspace, 7 +bind = $mainMod SHIFT, 8, movetoworkspace, 8 +bind = $mainMod SHIFT, 9, movetoworkspace, 9 +bind = $mainMod SHIFT, 0, movetoworkspace, 10 + +# Function keys ( FN + F[1-12] ) +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 deleted file mode 100644 index 661dafc..0000000 --- a/config/hypr/config/keybindings/other.conf +++ /dev/null @@ -1,66 +0,0 @@ -# Special workspace keybinds -bind = $mainMod, Z, togglespecialworkspace, quick -bind = $mainMod SHIFT, Z, movetoworkspace, special:quick - -bind = $mainMod, GRAVE, togglespecialworkspace, music -bind = $mainMod SHIFT, GRAVE, movetoworkspace, special:music - -# Hot reload -bind = $mainMod SHIFT, B, exec, bash ~/config/scripts/hot-reload.sh - -# Wallpaper -bind = $mainMod SHIFT, RETURN, exec, pkill wofi || bash ~/config/scripts/select-wallpaper.sh - -# Screenshot keybinds -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 -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,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 -bindl = SUPER SHIFT, L, exec, pkill -9 hyprlock || hyprlock - -# Group Stuff, complicated stuff. Enable if you dare! -# bind = SUPER, M, togglegroup -# bind = SUPER ALT, M, lockactivegroup, toggle -# bind = $mainMod ALT, right, changegroupactive, f -# bind = $mainMod ALT, down, changegroupactive, b -# bind = $mainMod ALT, up, moveoutofgroup -# bind = $mainMod CTRL ALT, left, moveintogroup, l -# bind = $mainMod CTRL ALT, right, moveintogroup, r -# bind = $mainMod CTRL ALT, up, moveintogroup, u -# bind = $mainMod CTRL ALT, down, moveintogroup, d - -# zoom -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 -bind = $mainMod, F2, exec, bash -c "xdg-open roblox://" -bind = $mainMod, F5, exec, notify-send -u critical "Hyprland" "Enabled debug overlay" && hyprctl keyword debug:overlay 1 -# bind = $mainMod SHIFT, F3, exec, bash -c "NIXPKGS_ALLOW_UNFREE=1 nix-shell -p osu-lazer-bin --command osu\!" - -bind = $mainMod CTRL SHIFT, F9, exec, pkill wofi || bash $HOME/config/scripts/open-game.sh - -bind = $mainMod SHIFT, F, fullscreen, 1 -bind = $mainMod, SPACE, exec, bash $HOME/config/scripts/toggle-language.sh - -# VM Passtrough -bind = $mainMod, Insert, submap, passthru -submap = passthru -bind = $mainMod, Escape, submap, reset -submap = reset diff --git a/config/hypr/config/keybindings/other.conf b/config/hypr/config/keybindings/other.conf new file mode 120000 index 0000000..9b13bac --- /dev/null +++ b/config/hypr/config/keybindings/other.conf @@ -0,0 +1 @@ +/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/keybindings/other.conf \ No newline at end of file diff --git a/config/hypr/config/keybindings/other.conf.hmbackup b/config/hypr/config/keybindings/other.conf.hmbackup new file mode 100644 index 0000000..455fa24 --- /dev/null +++ b/config/hypr/config/keybindings/other.conf.hmbackup @@ -0,0 +1,66 @@ +# Special workspace keybinds +bind = $mainMod, Z, togglespecialworkspace, quick +bind = $mainMod SHIFT, Z, movetoworkspace, special:quick + +bind = $mainMod, GRAVE, togglespecialworkspace, music +bind = $mainMod SHIFT, GRAVE, movetoworkspace, special:music + +# Hot reload +bind = $mainMod SHIFT, B, exec, bash /etc/nixos/scripts/hot-reload.sh + +# Wallpaper +bind = $mainMod SHIFT, RETURN, exec, bash /etc/nixos/scripts/select-wallpaper.sh + +# Screenshot keybinds +bindu = $mainMod, PRINT, exec, bash /etc/nixos/scripts/screenshot-selection.sh +bindu = $mainMod SHIFT, PRINT, exec, bash /etc/nixos/scripts/screenshot-fullscreen.sh +bind = $mainMod CTRL SHIFT, PRINT, exec, bash /etc/nixos/scripts/edit-last-screenshot.sh + +# Music Get Keybind + +# input:repeat_delay = 10 +bindelu = $mainMod, BACKSLASH, exec, bash /etc/nixos/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,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, qs ipc call deltarune.shell togglePowerMenu +bindl = SUPER SHIFT, L, exec, pkill -9 hyprlock || hyprlock + +# Group Stuff, complicated stuff. Enable if you dare! +# bind = SUPER, M, togglegroup +# bind = SUPER ALT, M, lockactivegroup, toggle +# bind = $mainMod ALT, right, changegroupactive, f +# bind = $mainMod ALT, down, changegroupactive, b +# bind = $mainMod ALT, up, moveoutofgroup +# bind = $mainMod CTRL ALT, left, moveintogroup, l +# bind = $mainMod CTRL ALT, right, moveintogroup, r +# bind = $mainMod CTRL ALT, up, moveintogroup, u +# bind = $mainMod CTRL ALT, down, moveintogroup, d + +# zoom +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 +bind = $mainMod, F2, exec, bash -c "xdg-open roblox://" +bind = $mainMod, F5, exec, notify-send -u critical "Hyprland" "Enabled debug overlay" && hyprctl keyword debug:overlay 1 +# bind = $mainMod SHIFT, F3, exec, bash -c "NIXPKGS_ALLOW_UNFREE=1 nix-shell -p osu-lazer-bin --command osu\!" + +bind = $mainMod CTRL SHIFT, F9, exec, bash $HOME/config/scripts/open-game.sh + +bind = $mainMod SHIFT, F, fullscreen, 1 +bind = $mainMod, SPACE, exec, bash $HOME/config/scripts/toggle-language.sh + +# VM Passtrough +bind = $mainMod, Insert, submap, passthru +submap = passthru +bind = $mainMod, Escape, submap, reset +submap = reset diff --git a/config/hypr/config/permissions.conf b/config/hypr/config/permissions.conf deleted file mode 100644 index 2187be7..0000000 --- a/config/hypr/config/permissions.conf +++ /dev/null @@ -1,29 +0,0 @@ -ecosystem { - enforce_permissions = true -} - -permission = /nix/store/[A-Za-z0-9]+\-(wrapped-)?(grim|hyprlock|xdg-desktop-portal-hyprland|obs-studio|hyprpicker)\-.*, screencopy, allow -permission = /(usr/)?bin/(grim|hyprlock|xdg-desktop-portal-hyprland|obs-studio|hyprpicker), screencopy, allow -permission = /run/current-system/sw/bin/(grim|hyprlock|xdg-desktop-portal-hyprland|obs-studio|hyprpicker), screencopy, allow -permission = /usr/lib(exec)?/xdg-desktop-portal-hyprland, screencopy, allow - -permission = /usr/(bin|local/bin)/hyprpm, plugin, allow - -# hyprlang noerror true - -source = ~/config/.hyprfail.conf - -# hyprland noerror false - - -# windowrulev2 = noscreenshare, class:^(equibop)$ - -# /swedbank|checkout|billing/i -# windowrulev2 = noscreenshare,title:.*([S|s]wedbank|[Cc]heckout|[Bb]illing).* - -windowrule = supressevent fullscreen,class:steam_proton,title:(Wine Desktop) -windowrule = supressevent maximize,class:steam_proton,title:(Wine Desktop) -windowrule = supressevent activate,class:steam_proton,title:(Wine Desktop) -windowrule = supressevent activatefocus,class:steam_proton,title:(Wine Desktop) -windowrule = supressevent fullscreenoutput,class:steam_proton,title:(Wine Desktop) -# windowrule = pin,class:steam_proton diff --git a/config/hypr/config/permissions.conf b/config/hypr/config/permissions.conf new file mode 120000 index 0000000..47de36d --- /dev/null +++ b/config/hypr/config/permissions.conf @@ -0,0 +1 @@ +/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/permissions.conf \ No newline at end of file diff --git a/config/hypr/config/permissions.conf.hmbackup b/config/hypr/config/permissions.conf.hmbackup new file mode 100644 index 0000000..2187be7 --- /dev/null +++ b/config/hypr/config/permissions.conf.hmbackup @@ -0,0 +1,29 @@ +ecosystem { + enforce_permissions = true +} + +permission = /nix/store/[A-Za-z0-9]+\-(wrapped-)?(grim|hyprlock|xdg-desktop-portal-hyprland|obs-studio|hyprpicker)\-.*, screencopy, allow +permission = /(usr/)?bin/(grim|hyprlock|xdg-desktop-portal-hyprland|obs-studio|hyprpicker), screencopy, allow +permission = /run/current-system/sw/bin/(grim|hyprlock|xdg-desktop-portal-hyprland|obs-studio|hyprpicker), screencopy, allow +permission = /usr/lib(exec)?/xdg-desktop-portal-hyprland, screencopy, allow + +permission = /usr/(bin|local/bin)/hyprpm, plugin, allow + +# hyprlang noerror true + +source = ~/config/.hyprfail.conf + +# hyprland noerror false + + +# windowrulev2 = noscreenshare, class:^(equibop)$ + +# /swedbank|checkout|billing/i +# windowrulev2 = noscreenshare,title:.*([S|s]wedbank|[Cc]heckout|[Bb]illing).* + +windowrule = supressevent fullscreen,class:steam_proton,title:(Wine Desktop) +windowrule = supressevent maximize,class:steam_proton,title:(Wine Desktop) +windowrule = supressevent activate,class:steam_proton,title:(Wine Desktop) +windowrule = supressevent activatefocus,class:steam_proton,title:(Wine Desktop) +windowrule = supressevent fullscreenoutput,class:steam_proton,title:(Wine Desktop) +# windowrule = pin,class:steam_proton diff --git a/config/hypr/config/plugin.conf b/config/hypr/config/plugin.conf deleted file mode 100644 index aff08a9..0000000 --- a/config/hypr/config/plugin.conf +++ /dev/null @@ -1,25 +0,0 @@ -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/plugin.conf b/config/hypr/config/plugin.conf new file mode 120000 index 0000000..c0ae5fe --- /dev/null +++ b/config/hypr/config/plugin.conf @@ -0,0 +1 @@ +/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/plugin.conf \ No newline at end of file diff --git a/config/hypr/config/plugin.conf.hmbackup b/config/hypr/config/plugin.conf.hmbackup new file mode 100644 index 0000000..aff08a9 --- /dev/null +++ b/config/hypr/config/plugin.conf.hmbackup @@ -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 deleted file mode 100644 index 1d8bfe2..0000000 --- a/config/hypr/config/rice/deltarune.conf +++ /dev/null @@ -1,51 +0,0 @@ -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/rice/deltarune.conf b/config/hypr/config/rice/deltarune.conf new file mode 120000 index 0000000..3caf6e8 --- /dev/null +++ b/config/hypr/config/rice/deltarune.conf @@ -0,0 +1 @@ +/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/rice/deltarune.conf \ No newline at end of file diff --git a/config/hypr/config/rice/deltarune.conf.hmbackup b/config/hypr/config/rice/deltarune.conf.hmbackup new file mode 100644 index 0000000..ddb509e --- /dev/null +++ b/config/hypr/config/rice/deltarune.conf.hmbackup @@ -0,0 +1,51 @@ +exec-once = qs -p /etc/nixos/Shell/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 deleted file mode 100644 index 9a46291..0000000 --- a/config/hypr/config/variables.conf +++ /dev/null @@ -1,51 +0,0 @@ -# Keywords: https://wiki.hyprland.org/Configuring/Keywords - -# Default -$mainMod = SUPER - -# Programs - -$terminal = kitty -$fileManager = nautilus -$menu = wofi --show drun -$browser = zen-browser - -# Cursor - -exec = hyprctl setcursor kris 24 - -# RalseiCursors 24 - -env = HYPRCURSOR_THEME,kris -env = HYPRCURSOR_SIZE,24 -env = XCURSOR_THEME,kris -env = XCURSOR_SIZE,24 - -# Toolkit Env - -env = GDK_BACKEND,wayland,x11,* -env = QT_QPA_PLATFORM,wayland;xcb -env = SDL_VIDEODRIVER,wayland -env = CLUTTER_BACKEND,wayland - -# XDG Env - -env = XDG_CURRENT_DESKTOP,Hyprland -env = XDG_SESSION_TYPE,wayland -env = XDG_SESSION_DESKTOP,Hyprland - -# Qt Env - -env = QT_AUTO_SCREEN_SCALE_FACTOR,1 -env = QT_QPA_PLATFORM,wayland;xcb -env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 -env = QT_QPA_PLATFORMTHEME,qt5ct - -# NVIDIA Env - -env = LIBVA_DRIVER_NAME,nvidia -env = XDG_SESSION_TYPE,wayland -env = GBM_BACKEND,nvidia-drm -env = __GLX_VENDOR_LIBRARY_NAME,nvidia - -env = NVD_BACKEND,direct diff --git a/config/hypr/config/variables.conf b/config/hypr/config/variables.conf new file mode 120000 index 0000000..7aad01d --- /dev/null +++ b/config/hypr/config/variables.conf @@ -0,0 +1 @@ +/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/variables.conf \ No newline at end of file diff --git a/config/hypr/config/variables.conf.hmbackup b/config/hypr/config/variables.conf.hmbackup new file mode 100644 index 0000000..2035e87 --- /dev/null +++ b/config/hypr/config/variables.conf.hmbackup @@ -0,0 +1,47 @@ +# Keywords: https://wiki.hyprland.org/Configuring/Keywords + +# Default +$mainMod = SUPER + +# Programs + +$terminal = kitty +$fileManager = dolphin +$menu = qs ipc call deltarune.shell toggleAppLauncher +$browser = zen-beta + +# Cursor + +# RalseiCursors 24 + +env = HYPRCURSOR_SIZE,24 +env = XCURSOR_THEME,RalseiCursors +env = XCURSOR_SIZE,24 + +# Toolkit Env + +env = GDK_BACKEND,wayland,x11,* +env = QT_QPA_PLATFORM,wayland;xcb +env = SDL_VIDEODRIVER,wayland +env = CLUTTER_BACKEND,wayland + +# XDG Env + +env = XDG_CURRENT_DESKTOP,Hyprland +env = XDG_SESSION_TYPE,wayland +env = XDG_SESSION_DESKTOP,Hyprland + +# Qt Env + +env = QT_AUTO_SCREEN_SCALE_FACTOR,1 +env = QT_QPA_PLATFORM,wayland;xcb +env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 + +# NVIDIA Env + +env = LIBVA_DRIVER_NAME,nvidia +env = XDG_SESSION_TYPE,wayland +env = GBM_BACKEND,nvidia-drm +env = __GLX_VENDOR_LIBRARY_NAME,nvidia + +env = NVD_BACKEND,direct diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf deleted file mode 100755 index d7e7363..0000000 --- a/config/hypr/hyprland.conf +++ /dev/null @@ -1,25 +0,0 @@ -# https://wiki.hyprland.org/Configuring/Configuring-Hyprland/ - -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 - -source = ~/config/config/hypr/config/variables.conf -source = ~/config/config/hypr/config/display.conf -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/plugin.conf - -# hyprlang noerror false diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf new file mode 120000 index 0000000..bef0e03 --- /dev/null +++ b/config/hypr/hyprland.conf @@ -0,0 +1 @@ +/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/hyprland.conf \ No newline at end of file diff --git a/config/hypr/hyprland.conf.hmbackup b/config/hypr/hyprland.conf.hmbackup new file mode 100644 index 0000000..b29a4f9 --- /dev/null +++ b/config/hypr/hyprland.conf.hmbackup @@ -0,0 +1,26 @@ +exec-once = /nix/store/5gln2rkcjx93cr5x0rr3wqrxjdmshd2f-dbus-1.16.2/bin/dbus-update-activation-environment --systemd DISPLAY HYPRLAND_INSTANCE_SIGNATURE WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XDG_SESSION_TYPE && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target +source=/nix/store/mjbgcv2gizslspivcnr7bpqi7igrs75z-catppuccin-hyprland-0-unstable-2024-06-19/mocha.conf +source=/nix/store/24vli1vbac3n0lrf5bz3dh4m57zg9dls-hyprland-blue-accent.conf +# https://wiki.hyprland.org/Configuring/Configuring-Hyprland/ + +exec-once = hyprctl notify 1 5000 0 " Hyprland!!" + +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 + +source = ~/.config/hypr/config/variables.conf +source = ~/.config/hypr/config/display.conf +source = ~/.config/hypr/config/input.conf +source = ~/.config/hypr/config/keybindings/default.conf +source = ~/.config/hypr/config/keybindings/other.conf +source = ~/.config/hypr/config/autoexec.conf +source = ~/.config/hypr/config/permissions.conf + +source = ~/.config/hypr/config/rice/deltarune.conf + +# hyprlang noerror true + +source = ~/.config/hypr/config/plugin.conf + +# hyprlang noerror false diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf deleted file mode 100644 index c76e5f8..0000000 --- a/config/hypr/hyprlock.conf +++ /dev/null @@ -1,40 +0,0 @@ -# GENERAL -general { - no_fade_in = true - no_fade_out = true - disable_loading_bar = false - hide_cursor = false - ignore_empty_input = true - immediate_render = false - text_trim = true -} - -#BACKGROUND -background { - monitor = - color = rgba(0,0,0,0) - # path = ~/Pictures/Wallpapers/israel.png # definetly not a picture of kris and ralsei kissing!! -} - -input-field { - monitor = - size = 250, 60 - outline_thickness = 0 - dots_size = 0.1 # Scale of input-field height, 0.2 - 0.8 - dots_spacing = 1 # Scale of dots' absolute size, 0.0 - 1.0 - dots_center = true - inner_color = rgba(0, 0, 0, 0) - check_color = rgba(0, 0, 0, 0) - fail_color = rgba(0, 0, 0, 0) - 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 = wrong password mf - position = 0, -30 - halign = center - valign = top - zindex = 10 -} - diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf new file mode 120000 index 0000000..84e2a10 --- /dev/null +++ b/config/hypr/hyprlock.conf @@ -0,0 +1 @@ +/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/hyprlock.conf \ No newline at end of file diff --git a/config/hypr/hyprlock.conf.hmbackup b/config/hypr/hyprlock.conf.hmbackup new file mode 100644 index 0000000..c76e5f8 --- /dev/null +++ b/config/hypr/hyprlock.conf.hmbackup @@ -0,0 +1,40 @@ +# GENERAL +general { + no_fade_in = true + no_fade_out = true + disable_loading_bar = false + hide_cursor = false + ignore_empty_input = true + immediate_render = false + text_trim = true +} + +#BACKGROUND +background { + monitor = + color = rgba(0,0,0,0) + # path = ~/Pictures/Wallpapers/israel.png # definetly not a picture of kris and ralsei kissing!! +} + +input-field { + monitor = + size = 250, 60 + outline_thickness = 0 + dots_size = 0.1 # Scale of input-field height, 0.2 - 0.8 + dots_spacing = 1 # Scale of dots' absolute size, 0.0 - 1.0 + dots_center = true + inner_color = rgba(0, 0, 0, 0) + check_color = rgba(0, 0, 0, 0) + fail_color = rgba(0, 0, 0, 0) + 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 = wrong password mf + position = 0, -30 + halign = center + valign = top + zindex = 10 +} + diff --git a/config/hypr/hyprpaper.conf b/config/hypr/hyprpaper.conf deleted file mode 100644 index 883d33f..0000000 --- a/config/hypr/hyprpaper.conf +++ /dev/null @@ -1,5 +0,0 @@ -preload = ~/.config/hypr/wallpaper.png -wallpaper = ,~/.config/hypr/wallpaper.png - -# preload = ~/.cache/.wallpaper -# wallpaper = ,~/.cache/.wallpaper diff --git a/config/hypr/hyprpaper.conf b/config/hypr/hyprpaper.conf new file mode 120000 index 0000000..f1c03ce --- /dev/null +++ b/config/hypr/hyprpaper.conf @@ -0,0 +1 @@ +/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/hyprpaper.conf \ No newline at end of file diff --git a/config/hypr/hyprpaper.conf.hmbackup b/config/hypr/hyprpaper.conf.hmbackup new file mode 100644 index 0000000..883d33f --- /dev/null +++ b/config/hypr/hyprpaper.conf.hmbackup @@ -0,0 +1,5 @@ +preload = ~/.config/hypr/wallpaper.png +wallpaper = ,~/.config/hypr/wallpaper.png + +# preload = ~/.cache/.wallpaper +# wallpaper = ,~/.cache/.wallpaper diff --git a/config/hypr/wallpaper.png b/config/hypr/wallpaper.png deleted file mode 100644 index 43444e5..0000000 Binary files a/config/hypr/wallpaper.png and /dev/null differ diff --git a/config/hypr/wallpaper.png b/config/hypr/wallpaper.png new file mode 120000 index 0000000..9175115 --- /dev/null +++ b/config/hypr/wallpaper.png @@ -0,0 +1 @@ +/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/wallpaper.png \ No newline at end of file diff --git a/config/hypr/wallpaper.png.hmbackup b/config/hypr/wallpaper.png.hmbackup new file mode 100644 index 0000000..43444e5 Binary files /dev/null and b/config/hypr/wallpaper.png.hmbackup differ diff --git a/config/hypr/xdph.conf b/config/hypr/xdph.conf deleted file mode 100644 index 16b6f97..0000000 --- a/config/hypr/xdph.conf +++ /dev/null @@ -1,4 +0,0 @@ -screencopy { - max_fps = 240 - allow_token_by_default = true -} diff --git a/config/hypr/xdph.conf b/config/hypr/xdph.conf new file mode 120000 index 0000000..484dc1d --- /dev/null +++ b/config/hypr/xdph.conf @@ -0,0 +1 @@ +/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/xdph.conf \ No newline at end of file diff --git a/config/hypr/xdph.conf.hmbackup b/config/hypr/xdph.conf.hmbackup new file mode 100644 index 0000000..16b6f97 --- /dev/null +++ b/config/hypr/xdph.conf.hmbackup @@ -0,0 +1,4 @@ +screencopy { + max_fps = 240 + allow_token_by_default = true +} diff --git a/config/qt5ct/colors/catppuccin-mocha-blue.conf b/config/qt5ct/colors/catppuccin-mocha-blue.conf deleted file mode 100644 index be74f7a..0000000 --- a/config/qt5ct/colors/catppuccin-mocha-blue.conf +++ /dev/null @@ -1,4 +0,0 @@ -[ColorScheme] -active_colors= #ffcdd6f4, #ff45475a, #ff585b70, #ff313244, #ff11111b, #ff181825, #ffcdd6f4, #ffcdd6f4, #ffcdd6f4, #ff1e1e2e, #ff181825, #ff11111b, #ff89b4fa, #ff11111b, #ff89b4fa, #ffb4befe, #ff181825, #ffffffff, #ff1e1e2e, #ffcdd6f4, #806c7086 -inactive_colors=#ff7f849c, #ff1e1e2e, #ff45475a, #ff313244, #ff11111b, #ff181825, #ff7f849c, #ffcdd6f4, #ff7f849c, #ff1e1e2e, #ff181825, #ff11111b, #ff313244, #ff7f849c, #ff7f849c, #ff7f849c, #ff181825, #ffffffff, #ff1e1e2e, #ffcdd6f4, #806c7086 -disabled_colors=#ff6c7086, #ff313244, #ff45475a, #ff313244, #ff11111b, #ff181825, #ff6c7086, #ffcdd6f4, #ff6c7086, #ff1e1e2e, #ff181825, #ff11111b, #ff181825, #ff6c7086, #ffa9bcdb, #ffc7cceb, #ff181825, #ffffffff, #ff1e1e2e, #ffcdd6f4, #806c7086 diff --git a/config/qt5ct/qt5ct.conf b/config/qt5ct/qt5ct.conf deleted file mode 100644 index d1a5586..0000000 --- a/config/qt5ct/qt5ct.conf +++ /dev/null @@ -1,32 +0,0 @@ -[Appearance] -color_scheme_path=/home/kris/.config/qt5ct/colors/catppuccin-mocha-blue.conf -custom_palette=true -icon_theme=Arashi -standard_dialogs=default -style=Fusion - -[Fonts] -fixed="Geist Mono,9,-1,5,50,0,0,0,0,0" -general="Sans Serif,9,-1,5,50,0,0,0,0,0" - -[Interface] -activate_item_on_single_click=1 -buttonbox_layout=0 -cursor_flash_time=1000 -dialog_buttons_have_icons=1 -double_click_interval=400 -gui_effects=General, AnimateMenu, AnimateCombo, AnimateTooltip, AnimateToolBox -keyboard_scheme=1 -menus_have_icons=true -show_shortcuts_in_context_menus=true -stylesheets=@Invalid() -toolbutton_style=4 -underline_shortcut=1 -wheel_scroll_lines=3 - -[SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\x16\0\0\0\x33\0\0\x3\xb8\0\0\x4!\0\0\0\x16\0\0\0\x33\0\0\x3\xb8\0\0\x4!\0\0\0\0\0\0\0\0\a\x80\0\0\0\x16\0\0\0\x33\0\0\x3\xb8\0\0\x4!) - -[Troubleshooting] -force_raster_widgets=1 -ignored_applications=@Invalid() diff --git a/config/qt5ct/style-colors.conf b/config/qt5ct/style-colors.conf deleted file mode 100644 index fa37345..0000000 --- a/config/qt5ct/style-colors.conf +++ /dev/null @@ -1,4 +0,0 @@ -[ColorScheme] -active_colors=#ff232629, #fffcfcfc, #ffffffff, #fff9fafa, #ff71757a, #ffbdc1c6, #ff232629, #ffffffff, #ff232629, #ffffffff, #ffeff0f1, #ff3b3d3f, #ff3daee9, #ffffffff, #ff2980b9, #ff9b59b6, #fff7f7f7, #ffffffff, #fff7f7f7, #ff232629, #80ffffff -disabled_colors=#ff808080, #ff424245, #ff979797, #ff5e5c5b, #ff302f2e, #ff4a4947, #ff808080, #ffffffff, #ff808080, #ff3d3d3d, #ff222020, #ffe7e4e0, #ff12608a, #ff808080, #ff0986d3, #ffa70b06, #ff5c5b5a, #ffffffff, #ff3f3f36, #ffffffff, #80ffffff -inactive_colors=#ff232629, #fffcfcfc, #ffffffff, #fff9fafa, #ff71757a, #ffbdc1c6, #ff232629, #ffffffff, #ff232629, #ffffffff, #ffeff0f1, #ff3b3d3f, #ff3daee9, #ffffffff, #ff2980b9, #ff9b59b6, #fff7f7f7, #ffffffff, #fff7f7f7, #ff232629, #80ffffff diff --git a/config/waybar/config b/config/waybar/config index d856bbc..4e21452 100644 --- a/config/waybar/config +++ b/config/waybar/config @@ -6,7 +6,7 @@ "margin-right": 8, "spacing": 10, "include": [ - "~/config/config/waybar/modules.json" + "~/.config/waybar/modules.json" ], "modules-left": [ "hyprland/workspaces", diff --git a/config/waybar/modules.json b/config/waybar/modules.json index 383bcc4..0ff53e6 100644 --- a/config/waybar/modules.json +++ b/config/waybar/modules.json @@ -125,7 +125,7 @@ ] }, "tooltip-format": "{desc}\n{icon} {volume}%", - "on-click": "pavucontrol" + "on-click": "qs ipc call deltarune.shell toggleQuickSettings" }, "pulseaudio#lol": { "format": "{volume}%", @@ -140,7 +140,7 @@ ] }, "tooltip-format": "{desc}\n{icon} {volume}%", - "on-click": "pavucontrol", + "on-click": "qs ipc call deltarune.shell toggleQuickSettings", "class": "pulseaudio-lol" }, "network": { @@ -153,7 +153,7 @@ "tooltip-format-ethernet": " {ifname}\n  {bandwidthUpBits}  {bandwidthDownBits}", "tooltip-format-disconnected": "󰈂", "max-length": 50, - "on-click": "nm-connection-editor" + "on-click": "kitty -e nmtui" }, "bluetooth": { "format": "", @@ -161,7 +161,7 @@ "format-off": "", "tooltip-format": "Ierīces pieslēgas Bluetooth: {num_connections}", "interval": 1, - "on-click": "blueman-manager", + "on-click": "qs ipc call deltarune.shell toggleQuickSettings", "format-no-controller": "" } } diff --git a/config/xdg-desktop-portal/hyprland-portals.conf b/config/xdg-desktop-portal/hyprland-portals.conf deleted file mode 100644 index 40b9113..0000000 --- a/config/xdg-desktop-portal/hyprland-portals.conf +++ /dev/null @@ -1,3 +0,0 @@ -[preferred] -default = hyprland;gtk -# org.freedesktop.impl.portal.FileChooser = gnome diff --git a/config/xdg-desktop-portal/hyprland-portals.conf b/config/xdg-desktop-portal/hyprland-portals.conf new file mode 120000 index 0000000..e239a3b --- /dev/null +++ b/config/xdg-desktop-portal/hyprland-portals.conf @@ -0,0 +1 @@ +/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/xdg-desktop-portal/hyprland-portals.conf \ No newline at end of file diff --git a/config/xdg-desktop-portal/hyprland-portals.conf.hmbackup b/config/xdg-desktop-portal/hyprland-portals.conf.hmbackup new file mode 100644 index 0000000..24fec34 --- /dev/null +++ b/config/xdg-desktop-portal/hyprland-portals.conf.hmbackup @@ -0,0 +1,2 @@ +[preferred] +default = hyprland diff --git a/flake.lock b/flake.lock index a9b55cb..f1ce613 100644 --- a/flake.lock +++ b/flake.lock @@ -180,22 +180,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1767039857, @@ -211,7 +195,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1751685974, @@ -227,7 +211,7 @@ "url": "https://git.lix.systems/lix-project/flake-compat.git" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1751685974, @@ -278,7 +262,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -296,7 +280,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1731533236, @@ -314,7 +298,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1731533236, @@ -332,7 +316,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1681202837, @@ -415,28 +399,7 @@ }, "home-manager_2": { "inputs": { - "nixpkgs": [ - "ghostty", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1770586272, - "narHash": "sha256-Ucci8mu8QfxwzyfER2DQDbvW9t1BnTUJhBmY7ybralo=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "b1f916ba052341edc1f80d4b2399f1092a4873ca", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { - "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1774647770, @@ -452,7 +415,7 @@ "type": "github" } }, - "home-manager_4": { + "home-manager_3": { "inputs": { "nixpkgs": [ "openclaw", @@ -473,7 +436,7 @@ "type": "github" } }, - "home-manager_5": { + "home-manager_4": { "inputs": { "nixpkgs": [ "zen-browser", @@ -518,6 +481,27 @@ "url": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.2" } }, + "hypr-dynamic-cursors": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1773098910, + "narHash": "sha256-hHMMP4h9VvacDLb8lkI6gZcUnhDbEt+GP2RLLL2s2C4=", + "owner": "VirtCode", + "repo": "hypr-dynamic-cursors", + "rev": "57e14edd0ae265b01828e466e287e96eb1e84dd3", + "type": "github" + }, + "original": { + "owner": "VirtCode", + "repo": "hypr-dynamic-cursors", + "type": "github" + } + }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -649,7 +633,7 @@ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", + "systems": "systems", "xdph": "xdph" }, "locked": { @@ -831,7 +815,7 @@ "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": "nixpkgs_6", - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1774282873, @@ -857,7 +841,7 @@ "hyprwayland-scanner": "hyprwayland-scanner_3", "hyprwire": "hyprwire_2", "nixpkgs": "nixpkgs_7", - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1772476157, @@ -1184,11 +1168,38 @@ "lastModified": 1731402384, "narHash": "sha256-OwUmrPfEehLDz0fl2ChYLK8FQM2p0G1+EMrGsYEq+6g=", "type": "tarball", - "url": "https://github.com/IBM/plex/releases/download/@ibm%2Fplex-mono@1.1.0/ibm-plex-mono.zip" + "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip" }, "original": { "type": "tarball", - "url": "https://github.com/IBM/plex/releases/download/@ibm%2Fplex-mono@1.1.0/ibm-plex-mono.zip" + "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip" + } + }, + "imgborders": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "nixpkgs": [ + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1772579252, + "narHash": "sha256-MjcPFZOaUFwdu74bkQhIbcDihZx8NZOqI/bniioh2aw=", + "ref": "refs/heads/master", + "rev": "63d3508aa3367f82f8ba1c31b562f8964e7b250c", + "revCount": 55, + "type": "git", + "url": "https://codeberg.org/zacoons/imgborders" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/zacoons/imgborders" } }, "indigo": { @@ -1304,22 +1315,6 @@ "type": "github" } }, - "nix-flatpak": { - "locked": { - "lastModified": 1711997201, - "narHash": "sha256-J71xzQlVYsjagA4AsVwRazhBh2rZrPpKvxTgs6UzL7c=", - "owner": "gmodena", - "repo": "nix-flatpak", - "rev": "b76fa31346db7fc958a9898f3c594696ca71c4fd", - "type": "github" - }, - "original": { - "owner": "gmodena", - "ref": "v0.4.1", - "repo": "nix-flatpak", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -1504,19 +1499,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1770537093, - "narHash": "sha256-XV30uo8tXuxdzuV8l3sojmlPRLd/8tpMsOp4lNzLGUo=", - "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51", - "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre942631.fef9403a3e4d/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1774106199, "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", @@ -1532,6 +1514,22 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1768127708, + "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_6": { "locked": { "lastModified": 1772433332, @@ -1598,12 +1596,12 @@ }, "nvf": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "mnw": "mnw", "ndg": "ndg", "nixpkgs": "nixpkgs_9", - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1774687915, @@ -1622,7 +1620,7 @@ "openclaw": { "inputs": { "flake-utils": "flake-utils", - "home-manager": "home-manager_4", + "home-manager": "home-manager_3", "nix-steipete-tools": "nix-steipete-tools", "nixpkgs": "nixpkgs_11" }, @@ -1667,7 +1665,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "gitignore": "gitignore", "nixpkgs": [ "hyprland", @@ -1714,11 +1712,12 @@ "chaotic": "chaotic", "deltarune-grub-theme": "deltarune-grub-theme", "disko": "disko", - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", + "hypr-dynamic-cursors": "hypr-dynamic-cursors", "hyprland": "hyprland", "hyprlock": "hyprlock", "hyprsysteminfo": "hyprsysteminfo", - "nix-flatpak": "nix-flatpak", + "imgborders": "imgborders", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_8", "nvf": "nvf", @@ -1804,18 +1803,17 @@ } }, "systems": { - "flake": false, "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1851,16 +1849,16 @@ }, "systems_4": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1924,26 +1922,11 @@ "type": "github" } }, - "systems_9": { - "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", + "flake-compat": "flake-compat_3", "gomod2nix": "gomod2nix", "htmx-src": "htmx-src", "htmx-ws-src": "htmx-ws-src", @@ -2031,15 +2014,15 @@ }, "zen-browser": { "inputs": { - "home-manager": "home-manager_5", + "home-manager": "home-manager_4", "nixpkgs": "nixpkgs_14" }, "locked": { - "lastModified": 1774673612, - "narHash": "sha256-z4SWAbnq3KMBxKiUTJcvve7ZoPC3KaNCLUe30F67K+4=", + "lastModified": 1774706015, + "narHash": "sha256-rEzceyYrSKJ5Ur5FyjwswEVPdzijbLcmixM9IU4NMq0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "660cf61b157f014f4e09f316da150e9ab1f6ea6a", + "rev": "99ec80a50cb5bba8a840e04f24c4c10603a3e43c", "type": "github" }, "original": { @@ -2047,57 +2030,6 @@ "repo": "zen-browser-flake", "type": "github" } - }, - "zig": { - "inputs": { - "flake-compat": [ - "ghostty", - "flake-compat" - ], - "nixpkgs": [ - "ghostty", - "nixpkgs" - ], - "systems": [ - "ghostty", - "systems" - ] - }, - "locked": { - "lastModified": 1773145353, - "narHash": "sha256-dE8zx8WA54TRmFFQBvA48x/sXGDTP7YaDmY6nNKMAYw=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "8666155d83bf792956a7c40915508e6d4b2b8716", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } - }, - "zon2nix": { - "inputs": { - "nixpkgs": [ - "ghostty", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1768231828, - "narHash": "sha256-wL/8Iij4T2OLkhHcc4NieOjf7YeJffaUYbCiCqKv/+0=", - "owner": "jcollie", - "repo": "zon2nix", - "rev": "c28e93f3ba133d4c1b1d65224e2eebede61fd071", - "type": "github" - }, - "original": { - "owner": "jcollie", - "repo": "zon2nix", - "rev": "c28e93f3ba133d4c1b1d65224e2eebede61fd071", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index e29aee1..cd7e7fc 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,8 @@ description = "Not a Deltarune reference!"; inputs = { + self.submodules = true; + # Core nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; @@ -15,6 +17,16 @@ }; hyprlock.url = "github:hyprwm/hyprlock"; hyprsysteminfo.url = "github:hyprwm/hyprsysteminfo"; + hypr-dynamic-cursors = { + url = "github:VirtCode/hypr-dynamic-cursors"; + inputs.hyprland.follows = "hyprland"; + }; + imgborders = { + url = "git+https://codeberg.org/zacoons/imgborders"; + inputs.hyprland.follows = "hyprland"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.systems.follows = "hyprland/systems"; + }; zen-browser.url = "github:0xc000022070/zen-browser-flake"; quickshell = { url = "github:outfoxxed/quickshell"; @@ -24,7 +36,6 @@ # Package tooling disko.url = "github:nix-community/disko"; chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; - nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; nvf.url = "github:notashelf/nvf"; # Extras @@ -66,12 +77,12 @@ inputs.home-manager.nixosModules.default inputs.disko.nixosModules.disko inputs.catppuccin.nixosModules.catppuccin - inputs.nix-flatpak.nixosModules.nix-flatpak + inputs.hyprland.nixosModules.default inputs.chaotic.nixosModules.nyx-cache inputs.chaotic.nixosModules.nyx-overlay inputs.chaotic.nixosModules.nyx-registry ./hosts/default/disko.nix - "/etc/nixos/hardware-configuration.nix" + ./hosts/default/hardware-configuration.nix ./hosts/default/configuration.nix ]; }; diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 6aab4dd..e9cda04 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -3,8 +3,6 @@ let userName = "kris"; realName = "Kris"; - configRoot = "/etc/nixos"; - quickshellRoot = "${configRoot}/Shell"; in { imports = [ @@ -17,11 +15,16 @@ in { # ./apps/ancs.nix ]; - services.displayManager.gdm.enable = true; + services.displayManager.sddm.enable = true; + services.displayManager.sddm.wayland.enable = true; + services.displayManager.autoLogin = { + enable = true; + user = userName; + }; - boot.loader.grub.theme = inputs.deltarune-grub-theme; + boot.loader.grub.theme = lib.mkDefault inputs.deltarune-grub-theme; - boot.kernelPackages = pkgs.linuxPackages_cachyos-lto; + # boot.kernelPackages = pkgs.linuxPackages_cachyos-lto; services.scx.enable = true; services.scx.scheduler = "scx_bpfland"; @@ -39,20 +42,6 @@ in { # services.ancs.enable = true; - services.flatpak.enable = true; - services.flatpak.remotes = [ - { - name = "flathub"; - location = "https://dl.flathub.org/repo/flathub.flatpakrepo"; - } - ]; - services.flatpak.packages = [ - { - appId = "com.modrinth.ModrinthApp"; - origin = "flathub"; - } - ]; - services.printing = { enable = true; drivers = with pkgs; [ @@ -95,12 +84,6 @@ in { }; }; - # Sadly, I don't know how to install flatpaks like this. - # services.flatpak.packages = [ - # "com.usebottles.bottles" - # { flatpakref = "https://sober.vinegarhq.org/sober.flatpakref"; sha256 = "0"; } - # ]; - programs.hyprland = { enable = true; xwayland.enable = true; @@ -123,10 +106,7 @@ in { equibop code-cursor kdePackages.kdenlive - libsForQt5.qt5ct - catppuccin-qt5ct darkly - kdePackages.qt6ct hyfetch kitty ]; @@ -138,8 +118,6 @@ in { xdg.portal = { enable = true; extraPortals = [ - pkgs.xdg-desktop-portal-gnome - pkgs.xdg-desktop-portal-gtk inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland ]; }; @@ -173,6 +151,7 @@ in { programs.dconf.enable = true; services.gvfs.enable = true; + services.flatpak.enable = true; # home-manager.services.mpris-proxy.enable = true; @@ -184,7 +163,10 @@ in { accent = "blue"; }; - home-manager.users.${userName} = { programs, config, pkgs, ... }: { + home-manager.users.${userName} = { programs, config, pkgs, ... }: + let + system = pkgs.stdenv.hostPlatform.system; + in { imports = [ inputs.catppuccin.homeModules.catppuccin @@ -193,11 +175,7 @@ in { gtk = { enable = true; - - cursorTheme = { - name = "RalseiCursors"; - package = pkgs.callPackage ./packages/ralsei-cursors/default.nix {}; - }; + gtk4.theme = config.gtk.theme; iconTheme = { name = "Arashi"; @@ -205,12 +183,29 @@ in { }; }; + home.pointerCursor = { + name = "RalseiCursors"; + package = pkgs.callPackage ./packages/ralsei-cursors/default.nix {}; + size = 24; + gtk.enable = true; + x11.enable = true; + }; + catppuccin = { enable = true; flavor = "mocha"; accent = "blue"; # we're already using arashi gtk.icon.enable = false; + cursors.enable = false; + qt5ct.enable = true; + kvantum.enable = true; + }; + + qt = { + enable = true; + platformTheme.name = "qtct"; + style.name = "kvantum"; }; programs.zen-browser = { @@ -222,63 +217,26 @@ in { }; }; - home.file.".config/fastfetch" = { - source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/fastfetch"; - recursive = true; - }; - - home.file.".config/dunst" = { - source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/dunst"; - recursive = true; - }; - - # home.file.".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 "${configRoot}/config/hypr"; - recursive = true; - }; - - home.file.".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 "${configRoot}/config/dotfile_deps/DotfilesFont.otf"; + source = ../../config/dotfile_deps/DotfilesFont.otf; }; - home.file.".config/wlogout" = { - source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/wlogout"; - recursive = true; + programs.quickshell = { + enable = true; + package = inputs.quickshell.packages.${system}.default.withModules ( + with pkgs.qt6; [ + qtimageformats + qtmultimedia + qtsvg + qt5compat + ] + ); + configs = { + default = ../../Shell; + DeltaruneQuickshell = ../../Shell; + }; }; - home.file.".config/qt5ct" = { - source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/qt5ct"; - recursive = true; - }; - - home.file.".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 = "${configRoot}/config"; - services.mpris-proxy.enable = true; programs.chromium = { @@ -309,8 +267,11 @@ in { programs.git = { enable = true; - userName = realName; - userEmail = "kris@kris.darkworld.download"; + signing.format = "openpgp"; + settings.user = { + name = realName; + email = "kris@kris.darkworld.download"; + }; }; programs.obs-studio = { diff --git a/hosts/default/hardware-configuration.nix b/hosts/default/hardware-configuration.nix index a6c7545..7b0b369 100644 --- a/hosts/default/hardware-configuration.nix +++ b/hosts/default/hardware-configuration.nix @@ -8,43 +8,36 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/5ca305a1-d705-4c99-913c-a2d1c3447282"; + fileSystems."/" = lib.mkDefault + { device = "/dev/disk/by-uuid/d18510ee-3ef5-4ab0-a94b-aa6c4f4e0c31"; fsType = "btrfs"; - options = [ "subvol=root" ]; + options = [ "subvol=@root" ]; }; - fileSystems."/home" = - { device = "/dev/disk/by-uuid/5ca305a1-d705-4c99-913c-a2d1c3447282"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; - - fileSystems."/nix" = - { device = "/dev/disk/by-uuid/5ca305a1-d705-4c99-913c-a2d1c3447282"; - fsType = "btrfs"; - options = [ "subvol=nix" "noatime" ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/732D-084E"; + fileSystems."/boot" = lib.mkDefault + { device = "/dev/disk/by-uuid/EA40-0DB9"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; - # swapDevices = [ { device = "/swap/swapfile"; } ]; + fileSystems."/home" = lib.mkDefault + { device = "/dev/disk/by-uuid/d18510ee-3ef5-4ab0-a94b-aa6c4f4e0c31"; + fsType = "btrfs"; + options = [ "subvol=@home" ]; + }; - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; + fileSystems."/nix" = lib.mkDefault + { device = "/dev/disk/by-uuid/d18510ee-3ef5-4ab0-a94b-aa6c4f4e0c31"; + fsType = "btrfs"; + options = [ "subvol=@nix" ]; + }; + + swapDevices = [ ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/hosts/default/other/activate.nix b/hosts/default/other/activate.nix index 11400bc..ad7f228 100644 --- a/hosts/default/other/activate.nix +++ b/hosts/default/other/activate.nix @@ -24,9 +24,20 @@ ''; }; - system.activationScripts.xdgDesktopPortal = { + system.activationScripts.linkDotConfigChildren = { text = '' - echo "${pkgs.xdg-desktop-portal-gtk}/libexec/xdg-desktop-portal-gtk" > /.xdg.sh + config_root=/etc/nixos/config + target_root=/home/kris/.config + + mkdir -p "$target_root" + + for src in "$config_root"/*; do + name=$(basename "$src") + dst="$target_root/$name" + rm -rf "$dst" + ln -s "$src" "$dst" + chown -h kris:users "$dst" + done ''; }; diff --git a/hosts/default/packages.nix b/hosts/default/packages.nix index 1eb34cd..e909431 100644 --- a/hosts/default/packages.nix +++ b/hosts/default/packages.nix @@ -4,7 +4,7 @@ fonts.packages = with pkgs; [ noto-fonts noto-fonts-cjk-sans - noto-fonts-emoji + noto-fonts-color-emoji monaspace geist-font nerd-fonts.geist-mono @@ -13,8 +13,6 @@ minecraftia ]; - programs.seahorse.enable = true; - environment.sessionVariables.LD_LIBRARY_PATH = "${pkgs.gcc15}/lib"; security.polkit.enable = true; @@ -39,19 +37,14 @@ (writeShellScriptBin "kaijuparadise" "xdg-open roblox://placeId=6456351776") (writeShellScriptBin "sewh" "xdg-open roblox://placeId=16991287194") - (writeShellScriptBin "fix-gtk" ''${ - inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland - }/bin/hyprctl dispatch exec "${pkgs.xdg-desktop-portal-gtk}/libexec/xdg-desktop-portal-gtk -r"'') (callPackage ./apps/wl-shimeji.nix {}) (writeShellScriptBin "stop-shimejis" ''${ inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland }/bin/hyprctl dispatch exec "shimejictl stop"'') - inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default tailscale bitwarden-desktop kdePackages.qtdeclarative - catppuccin-gtk catppuccin catppuccin-qt5ct catppuccin-catwalk @@ -60,7 +53,6 @@ libxkbcommon ffmpeg-full gnupg - code-cursor nix-direnv htop nixpkgs-fmt @@ -74,8 +66,8 @@ alacritty libimobiledevice direnv - nautilus kdePackages.dolphin + kdePackages.kleopatra kdePackages.kservice qpwgraph wget @@ -94,12 +86,8 @@ xclip gamescope yt-dlp - fontforge-gtk deno - wofi - waybar hyprpaper - dunst swww swappy slurp @@ -109,18 +97,13 @@ github-cli cliphist pywal - pavucontrol - wlogout libnotify killall - networkmanagerapplet - blueman arrpc playerctl mangohud jq file - nwg-look hyprpolkitagent glib @@ -130,7 +113,7 @@ gobject-introspection gimp3 mpv - nixfmt-rfc-style + nixfmt kdePackages.kdialog diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index 415d6fb..5694fd7 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -215,6 +215,8 @@ in ]; }; + networking.hostName = "kris-server"; + # Lock /etc/nixos to read-only mode (config lives in /home/ocbwoy3/config). systemd.tmpfiles.rules = [ "z /etc/nixos 0555 root root - -" diff --git a/modules/force.nix b/modules/force.nix index 107b677..074cc26 100644 --- a/modules/force.nix +++ b/modules/force.nix @@ -24,7 +24,7 @@ nss glibc kitty - nixfmt-rfc-style + nixfmt killall deno bun diff --git a/modules/forceMainPC.nix b/modules/forceMainPC.nix index 18ca505..068c7af 100644 --- a/modules/forceMainPC.nix +++ b/modules/forceMainPC.nix @@ -5,9 +5,7 @@ ./force.nix ]; - # because i love cuda - nixpkgs.config.cudaSupport = lib.warn "you're going to fucking hell if you aren't using a binary cache" true; - + nixpkgs.config.cudaSupport = lib.mkDefault true; services.desktopManager.plasma6.enable = lib.mkDefault false; environment.systemPackages = with pkgs; [ diff --git a/modules/nixos/hardware.nix b/modules/nixos/hardware.nix index af81e42..318695d 100644 --- a/modules/nixos/hardware.nix +++ b/modules/nixos/hardware.nix @@ -3,7 +3,7 @@ { hardware.bluetooth.enable = true; - services.blueman.enable = true; + services.blueman.enable = false; hardware.bluetooth.settings = { General = { diff --git a/modules/nixos/network.nix b/modules/nixos/network.nix index 679814a..0f0fb4e 100644 --- a/modules/nixos/network.nix +++ b/modules/nixos/network.nix @@ -8,8 +8,6 @@ "1.0.0.1" ]; - networking.hostName = "kris-server"; networking.networkmanager.enable = true; - networking.resolvconf.enable = false; } diff --git a/modules/nixos/nvidia.nix b/modules/nixos/nvidia.nix index 6e230f2..3fee19c 100644 --- a/modules/nixos/nvidia.nix +++ b/modules/nixos/nvidia.nix @@ -56,7 +56,6 @@ powerManagement.finegrained = false; open = true; nvidiaSettings = true; - package = config.boot.kernelPackages.nvidiaPackages.beta; }; boot.kernelModules = [ diff --git a/modules/nixos/programs.nix b/modules/nixos/programs.nix index 500a7f2..b6abb1e 100644 --- a/modules/nixos/programs.nix +++ b/modules/nixos/programs.nix @@ -68,7 +68,7 @@ # enable = true; agent = { enable = true; - pinentryPackage = pkgs.pinentry-gnome3; + pinentryPackage = pkgs.pinentry-qt; }; }; diff --git a/modules/stuff/nvim.nix b/modules/stuff/nvim.nix index 91576b7..5b98639 100644 --- a/modules/stuff/nvim.nix +++ b/modules/stuff/nvim.nix @@ -14,8 +14,8 @@ viAlias = true; vimAlias = true; statusline.lualine.enable = true; + lsp.enable = true; languages = { - enableLSP = true; enableTreesitter = true; nix.enable = true; diff --git a/scripts/hot-reload.sh b/scripts/hot-reload.sh index f70f42b..ce05a41 100755 --- a/scripts/hot-reload.sh +++ b/scripts/hot-reload.sh @@ -20,6 +20,6 @@ if [[ "$(hostname)" == "gentoo" ]]; then if [ ${#HYPRPAPER_PID} -lt 1 ]; then hyprctl dispatch exec hyprpaper sleep 1 - bash ~/config/scripts/load-wallpaper.sh + bash /etc/nixos/scripts/load-wallpaper.sh fi fi