diff --git a/configs/hypr/hypridle.conf b/configs/hypr/hypridle.conf deleted file mode 100644 index 7e373b0..0000000 --- a/configs/hypr/hypridle.conf +++ /dev/null @@ -1,40 +0,0 @@ -general { - # lock_cmd = pidof hyprlock || hyprlock # avoid starting multiple hyprlock instances. - before_sleep_cmd = loginctl lock-session # lock before suspend. - after_sleep_cmd = hyprctl dispatch dpms on # to avoid having to press a key twice to turn on the display. -} - -listener { - timeout = 150 # 2.5min. - on-timeout = brightnessctl -s set 10 # set monitor backlight to minimum, avoid 0 on OLED monitor. - on-resume = brightnessctl -r # monitor backlight restor. -} - -# turn off keyboard backlight, uncomment this section if have keyboard backlight. -listener { - timeout = 150 # 2.5min. - on-timeout = brightnessctl -sd rgb:kbd_backlight set 0 # turn off keyboard backlight. - on-resume = brightnessctl -rd rgb:kbd_backlight # turn on keyboard backlight. -} - -listener { - timeout = 295 - on-timeout = hyprctl notify 0 5000 'rgb(ff0000)' 'Locking..' - on-resume = hyprctl notify 0 5000 'rgb(ff0000)' 'Stopping lock process..' -} - -listener { - timeout = 300 # 5min - on-timeout = loginctl lock-session # lock screen when timeout has passed -} - -listener { - timeout = 380 # 5.5min - on-timeout = hyprctl dispatch dpms off # screen off when timeout has passed - on-resume = hyprctl dispatch dpms on # screen on when activity is detected after timeout has fired. -} - -listener { - timeout = 1800 # 30min - on-timeout = systemctl suspend # suspend pc -} diff --git a/configs/hypr/hyprland.conf b/configs/hypr/hyprland.conf deleted file mode 100644 index 1aee73d..0000000 --- a/configs/hypr/hyprland.conf +++ /dev/null @@ -1,2 +0,0 @@ -source = ~/.config/hypr/hyprland.d/*.conf - diff --git a/configs/hypr/hyprland.d/bg-proc.conf b/configs/hypr/hyprland.d/bg-proc.conf deleted file mode 100644 index 9993371..0000000 --- a/configs/hypr/hyprland.d/bg-proc.conf +++ /dev/null @@ -1,6 +0,0 @@ -exec-once = lxqt-policykit-agent -exec-once = dunst --startup_notification -exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP -exec-once = swww-daemon -exec-once = hypridle -exec-once = waybar diff --git a/configs/hypr/hyprland.d/consts.conf b/configs/hypr/hyprland.d/consts.conf deleted file mode 100644 index a219328..0000000 --- a/configs/hypr/hyprland.d/consts.conf +++ /dev/null @@ -1,6 +0,0 @@ -$term = alacritty -$browser = brave -$filemanager = thunar -$editor = nvim -$applauncher = wofi --show drun -$cmdlauncher = wofi --show run diff --git a/configs/hypr/hyprland.d/keybindings.conf b/configs/hypr/hyprland.d/keybindings.conf deleted file mode 100644 index 2f7904c..0000000 --- a/configs/hypr/hyprland.d/keybindings.conf +++ /dev/null @@ -1,60 +0,0 @@ -$mainMod = SUPER - - -# # We've defined $term, $editor and so on in includes.conf. -bind = $mainMod, W, exec, $browser -bind = $mainMod, C, exec, $editor -bind = $mainMod, F, exec, $filemanager -bind = $mainMod, space, exec, $applauncher -bind = $mainMod, R, exec, $cmdlauncher - -# My Binds -bind = $mainMod, T, exec, $term -bind = $mainMod, Q, killactive, -bind = ALT, F4, killactive, -bind = $mainMod, V, togglefloating, -bind = $mainMod SHIFT, F, fullscreen -bind = $mainMod, P, exec, rofimoji - -# Screen shot -bind = $mainMod, s, exec, hyprshot -m region -r | swappy -f - -# bind = $mainMod, , exec wl-screenrec --audio -g "$(slurp)" - -# Move focus with mainMod + arrow keys -bind = $mainMod, left, movefocus, l -bind = $mainMod, right, movefocus, r -bind = $mainMod, up, movefocus, u -bind = $mainMod, down, movefocus, d - - -# Switch workspaces with mainMod -bind = $mainMod, right, workspace, +1 -bind = $mainMod, left, workspace, -1 - -# Move active window to a workspace with mainMod + SHIFT -bind = $mainMod CTRL, right, movetoworkspace, +1 -bind = $mainMod CTRL, left, movetoworkspace, -1 - -# Resize actions -bind = $mainMod SHIFT, right, resizeactive, 10 0 -bind = $mainMod SHIFT, left, resizeactive, -10 0 -bind = $mainMod SHIFT, up, resizeactive, 0 -10 -bind = $mainMod SHIFT, down, resizeactive, 0 10 - -# Scroll through existing workspaces with mainMod + scroll -bind = $mainMod, mouse_down, workspace, e+1 -bind = $mainMod, mouse_up, workspace, e-1 - -# Move/resize windows with mainMod + LMB/RMB and dragging -bindm = $mainMod, mouse:272, movewindow -bindm = $mainMod, mouse:273, resizewindow -bindm = $mainMod, ALT_L, resizewindow - -# Brigthness -bind = ,XF86MonBrightnessDown, exec, brightnessctl s 20%- -bind = ,XF86MonBrightnessUp, exec, brightnessctl s +20% - -# Volume -binde =, XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%+ && hyprctl notify 0 500 'rgb(00ff00)' $(wpctl get-volume @DEFAULT_AUDIO_SINK@) -binde =, XF86AudioLowerVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%- && hyprctl notify 0 500 'rgb(00ff00)' $(wpctl get-volume @DEFAULT_AUDIO_SINK@) -bind =, XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && hyprctl notify 0 500 'rgb(00ff00)' $(wpctl get-volume @DEFAULT_AUDIO_SINK@) diff --git a/configs/hypr/hyprland.d/monitors.conf b/configs/hypr/hyprland.d/monitors.conf deleted file mode 100644 index 7f171d7..0000000 --- a/configs/hypr/hyprland.d/monitors.conf +++ /dev/null @@ -1,5 +0,0 @@ -monitor = eDP-1, 2256x1504, 0x0, 2 -monitor = DP-9, 1920x1080, 1128x0, 2 -monitor = DP-10, 1920x1080, -970x0, 2 - -monitor = , preferred, auto-right, 1 \ No newline at end of file diff --git a/configs/hypr/hyprland.d/slack-ws.conf b/configs/hypr/hyprland.d/slack-ws.conf deleted file mode 100644 index d12fcbf..0000000 --- a/configs/hypr/hyprland.d/slack-ws.conf +++ /dev/null @@ -1 +0,0 @@ -workspace = name:‍, monitor:DP-10, default:true, persistent:true, on-created-empty:[fullscreen] slack \ No newline at end of file diff --git a/configs/hypr/hyprland.d/special-window-rules.conf b/configs/hypr/hyprland.d/special-window-rules.conf deleted file mode 100644 index 35d06ce..0000000 --- a/configs/hypr/hyprland.d/special-window-rules.conf +++ /dev/null @@ -1,24 +0,0 @@ -# Extras -windowrulev2 = float,class:(nwg-.*) -windowrulev2 = float,class:(org\.kde\..*) -windowrulev2 = float,class:(.*blueman.*) - -# Vscode -windowrulev2 = fakefullscreen,class:(Code) -windowrulev2 = fakefullscreen, class:^(code-url-handler)$ - - -# VLC -windowrulev2 = fullscreen,class:(vlc.*) - -# Rofi Randomness (mostly for rofimoji) -windowrulev2 = float,class:(Rofi) -windowrulev2 = size 30% 90%,class:(Rofi) -windowrulev2 = move 5% 5%,class:(Rofi) - -$centerable = (Slack|nm-connection-editor|pavucontrol|system-config-printer|lxqt-policykit-agent|amdgpu_top|.*blueman.*|thunar) - -# Centerable & Floatable -windowrulev2 = float, class:$centerable -windowrulev2 = size 90% 90%, class:$centerable -windowrulev2 = move 5% 5%, class:$centerable diff --git a/configs/hypr/hyprland.d/visuals.conf b/configs/hypr/hyprland.d/visuals.conf deleted file mode 100644 index a5313e6..0000000 --- a/configs/hypr/hyprland.d/visuals.conf +++ /dev/null @@ -1,79 +0,0 @@ - -decoration { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - rounding = 5 - blur { - enabled = true - size = 3 - passes = 1 - new_optimizations = true - } - - drop_shadow = true - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) -} - -animations { - enabled = true - bezier = myBezier, 0.05, 0.9, 0.1, 1.05 - animation = windows, 1, 7, myBezier - animation = windowsOut, 1, 7, default, popin 80% - animation = border, 1, 10, default - animation = borderangle, 1, 8, default - animation = fade, 1, 7, default - animation = workspaces, 1, 6, default -} - -gestures { - workspace_swipe = on - workspace_swipe_fingers = 4 - workspace_swipe_create_new = true -} - -general { - border_size = 1 - no_border_on_floating = false - gaps_in = 3 - gaps_out = 3 - col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg - col.inactive_border = rgba(595959aa) - layout = dwindle - resize_on_border = true - extend_border_grab_area = true - hover_icon_on_border = true -} - - -# # INPUT DEVICES -input { - kb_layout = us - numlock_by_default = false - repeat_rate = 25 - repeat_delay = 600 - accel_profile = adaptive - scroll_method = 2fg - follow_mouse = 1 - mouse_refocus = true - float_switch_override_focus = 1 - touchpad { - natural_scroll = yes - clickfinger_behavior = yes - disable_while_typing = true - scroll_factor = 1.0 - tap_button_map = lrm - tap-to-click = true - } -} - -# # MISC SETTINGS -misc { - disable_hyprland_logo = true - vrr = 0 - mouse_move_enables_dpms = false - key_press_enables_dpms = false - layers_hog_keyboard_focus = true - focus_on_activate = false - mouse_move_focuses_monitor = true -} diff --git a/configs/hypr/hyprlock.conf b/configs/hypr/hyprlock.conf deleted file mode 100644 index 5a46246..0000000 --- a/configs/hypr/hyprlock.conf +++ /dev/null @@ -1,140 +0,0 @@ -# source = /home/justin/.cache/wal/colors-hyprland.conf - -# BACKGROUND -background { - monitor = - #path = screenshot - # path = /home/justin/Pictures/wal.png - color = rgba(255, 0, 0, 1) - blur_passes = 2 - contrast = 1 - brightness = 0.5 - vibrancy = 0.2 - vibrancy_darkness = 0.2 -} - -# GENERAL -general { - no_fade_in = true - no_fade_out = true - hide_cursor = false - grace = 0 - disable_loading_bar = true -} - -# INPUT FIELD -input-field { - monitor = - size = 250, 60 - outline_thickness = 2 - dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8 - dots_spacing = 0.35 # Scale of dots' absolute size, 0.0 - 1.0 - dots_center = true - outer_color = rgba(0, 0, 0, 0) - inner_color = rgba(0, 0, 0, 0.2) - font_color = $foreground - fade_on_empty = false - rounding = -1 - check_color = rgb(204, 136, 34) - placeholder_text = Input Password... - hide_input = false - position = 0, -200 - halign = center - valign = center -} - -# DATE -label { - monitor = - text = cmd[update:1000] echo "$(date +"%A, %B %d")" - color = rgba(242, 243, 244, 0.75) - font_size = 22 - font_family = JetBrains Mono - position = 0, 300 - halign = center - valign = center -} - -# TIME -label { - monitor = - text = cmd[update:1000] echo "$(date +"%-I:%M")" - color = rgba(242, 243, 244, 0.75) - font_size = 95 - font_family = JetBrains Mono Extrabold - position = 0, 200 - halign = center - valign = center -} - - - -# Profile Picture -# image { -# monitor = -# path = /home/justin/Pictures/profile_pictures/justin_square.png -# size = 100 -# border_size = 2 -# border_color = $foreground -# position = 0, -100 -# halign = center -# valign = center -# } - -# # Desktop Environment -# image { -# monitor = -# path = /home/justin/Pictures/profile_pictures/hypr.png -# size = 75 -# border_size = 2 -# border_color = $foreground -# position = -50, 50 -# halign = right -# valign = bottom -# } - -# CURRENT SONG -# label { -# monitor = -# text = cmd[update:1000] echo "$(/home/justin/Documents/Scripts/whatsong.sh)" -# color = $foreground -# #color = rgba(255, 255, 255, 0.6) -# font_size = 18 -# font_family = Metropolis Light, Font Awesome 6 Free Solid -# position = 0, 50 -# halign = center -# valign = bottom -# } - -# label { -# monitor = -# text = cmd[update:1000] echo "$(/home/justin/Documents/Scripts/whoami.sh)" -# color = $foreground -# font_size = 14 -# font_family = JetBrains Mono -# position = 0, -10 -# halign = center -# valign = top -# } - -# label { -# monitor = -# text = cmd[update:1000] echo "$(/home/justin/Documents/Scripts/battery.sh)" -# color = $foreground -# font_size = 24 -# font_family = JetBrains Mono -# position = -90, -10 -# halign = right -# valign = top -# } - -# label { -# monitor = -# text = cmd[update:1000] echo "$(/home/justin/Documents/Scripts/network-status.sh)" -# color = $foreground -# font_size = 24 -# font_family = JetBrains Mono -# position = -20, -10 -# halign = right -# valign = top -# } \ No newline at end of file diff --git a/configs/hyprland/mine/hypr/hyprland.d/monitors.conf b/configs/hyprland/mine/hypr/hyprland.d/monitors.conf index 7f171d7..9c63cab 100644 --- a/configs/hyprland/mine/hypr/hyprland.d/monitors.conf +++ b/configs/hyprland/mine/hypr/hyprland.d/monitors.conf @@ -1,5 +1,4 @@ -monitor = eDP-1, 2256x1504, 0x0, 2 -monitor = DP-9, 1920x1080, 1128x0, 2 -monitor = DP-10, 1920x1080, -970x0, 2 - -monitor = , preferred, auto-right, 1 \ No newline at end of file +monitor = eDP-1, highres, 0x0, 1 +monitor = DP-9, 1920x1080, 1128x0, 1 +monitor = DP-10, 1920x1080, -970x0, 1 +monitor = , highres, auto-right, 1 \ No newline at end of file diff --git a/configs/hyprland/mine/hypr/hyprland.d/visuals.conf b/configs/hyprland/mine/hypr/hyprland.d/visuals.conf index a5313e6..c1fc638 100644 --- a/configs/hyprland/mine/hypr/hyprland.d/visuals.conf +++ b/configs/hyprland/mine/hypr/hyprland.d/visuals.conf @@ -77,3 +77,11 @@ misc { focus_on_activate = false mouse_move_focuses_monitor = true } + +# unscale XWayland +xwayland { + force_zero_scaling = true +} + +env = GDK_SCALE,2 +env = XCURSOR_SIZE,32 \ No newline at end of file diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 5764b34..1156c13 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -3,6 +3,9 @@ let zshFWBook = builtins.filterSource (p: t: true) ./scripts/fwbook; zshFunctions = zshFWBook + "/functions.sh"; + openPorts = [ + 8000 + ]; in { imports = [ ./fwbook.hardware-configuration.nix ]; @@ -169,4 +172,7 @@ in fsType = "nfs"; options = [ "x-systemd.automount" "noauto" ]; }; + # Firewall + networking.firewall.allowedUDPPorts = openPorts; + networking.firewall.allowedTCPPorts = openPorts; } diff --git a/modules/home/gtk.nix b/modules/home/gtk.nix index 668549f..be7822c 100644 --- a/modules/home/gtk.nix +++ b/modules/home/gtk.nix @@ -5,4 +5,9 @@ with pkgs; name = "WhiteSur-Dark"; package = whitesur-gtk-theme; }; + font = { + name = "FiraCode"; + package = fira-code; + size = 8; + }; } diff --git a/modules/nixos/common/fonts.nix b/modules/nixos/common/fonts.nix index 4340b83..8f2807c 100644 --- a/modules/nixos/common/fonts.nix +++ b/modules/nixos/common/fonts.nix @@ -8,6 +8,9 @@ mplus-outline-fonts.githubRelease jetbrains-mono ubuntu_font_family + noto-fonts + noto-fonts-cjk + noto-fonts-emoji ]; enableDefaultPackages = true; fontDir.enable = true;