diff --git a/configs/hypr/hypridle.conf b/configs/hypr/hypridle.conf
deleted file mode 100644
index 44c1fc0..0000000
--- a/configs/hypr/hypridle.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-general {
- lock_cmd = notify-send "hyprctl notify 0 5000 'rgb(ff0000)' 'Locking...'" # dbus/sysd lock command (loginctl lock-session)
- # unlock_cmd = notify-send "unlock!" # same as above, but unlock
- before_sleep_cmd = notify-send "hyprctl notify 0 5000 'rgb(ff0000)' 'Going to sleep...'" # command ran before sleep
- # after_sleep_cmd = notify-send "Awake!" # command ran after sleep
- ignore_dbus_inhibit = false # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam)
-}
-
-listener {
- timeout = 500 # in seconds
- on-timeout = notify-send "You are idle!" # command to run when timeout has passed
- on-resume = notify-send "Welcome back!" # command to run when activity is detected after timeout has fired.
-}
\ No newline at end of file
diff --git a/configs/hypr/hyprland.conf b/configs/hypr/hyprland.conf
index 798b9d6..4b3e8f3 100644
--- a/configs/hypr/hyprland.conf
+++ b/configs/hypr/hyprland.conf
@@ -1,30 +1,12 @@
-# nwg-shell Hyprland config file
-#
-# The nwg-shell-config utility generates a part of settings for you:
-# General, Input devices, Touchpad, Dwindle layout, Master layout.
-# Decoration, animations, gestures and per-device config are left to be configured by yourself.
-# Refer to the Hyprland wiki at https://wiki.hyprland.org for more information.
-
-#
-# Monitors & workspaces: nwg-displays generates 2 files, which we include here:
-#
-source = ~/.config/hypr/monitors.conf
-source = ~/.config/hypr/workspaces.conf
+source = ~/.config/hypr/includes.conf
+source = ~/.config/hypr/background.conf
+# source = ~/.config/hypr/monitors.conf
source = ~/.config/hypr/keybindings.conf
source = ~/.config/hypr/special-window-rules.conf
-# Include settings generated by nwg-shell-config
-source = ~/.config/hypr/includes.conf
-env = XDG_SESSION_DESKTOP,KDE
-env = XDG_CURRENT_DESKTOP,KDE
-#
-# Autostart. Feel free to add your own entries.
-# Shell components will be started in the includes.conf file, which we include below.
-#
-exec-once = lxqt-policykit-agent
-exec-once = dunst
-exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+
+# env = XDG_SESSION_DESKTOP,KDE
+# env = XDG_CURRENT_DESKTOP,KDE
decoration {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
@@ -44,10 +26,7 @@ decoration {
animations {
enabled = true
-
- # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
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
@@ -62,7 +41,48 @@ gestures {
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
+}
-xwayland {
- force_zero_scaling = 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 4f3ac04..0000000
--- a/configs/hypr/hyprlock.conf
+++ /dev/null
@@ -1,86 +0,0 @@
-background {
- monitor =
- path = /mnt/Data/Pictures/LockScreen.jpg
- color = rgba(25, 20, 20, 1.0)
-
- # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
- blur_passes = 0 # 0 disables blurring
- blur_size = 7
- noise = 0.0117
- contrast = 0.8916
- brightness = 0.8172
- vibrancy = 0.1696
- vibrancy_darkness = 0.0
-}
-image {
- monitor =
- path = /mnt/Data/Pictures/LockScreen.jpg
- size = 150 # lesser side if not 1:1 ratio
- rounding = -1 # negative values mean circle
- border_size = 4
- border_color = rgb(221, 221, 221)
- rotate = 0 # degrees, counter-clockwise
- reload_time = -1 # seconds between reloading, 0 to reload with SIGUSR2
- reload_cmd = # command to get new path. if empty, old path will be used. don't run "follow" commands like tail -F
-
- position = 0, 200
- halign = center
- valign = center
-}
-shape {
- monitor =
- size = 360, 60
- color = rgba(17, 17, 17, 1.0)
- rounding = -1
- border_size = 8
- border_color = rgba(0, 207, 230, 1.0)
- rotate = 0
- xray = false # if true, make a "hole" in the background (rectangle of specified size, no rotation)
-
- position = 0, 80
- halign = center
- valign = center
-}
-input-field {
- monitor =
- size = 200, 50
- outline_thickness = 3
- dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8
- dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0
- dots_center = false
- dots_rounding = -1 # -1 default circle, -2 follow input-field rounding
- outer_color = rgb(151515)
- inner_color = rgb(200, 200, 200)
- font_color = rgb(10, 10, 10)
- fade_on_empty = true
- fade_timeout = 1000 # Milliseconds before fade_on_empty is triggered.
- placeholder_text = Input Password... # Text rendered in the input box when it's empty.
- hide_input = false
- rounding = -1 # -1 means complete rounding (circle/oval)
- check_color = rgb(204, 136, 34)
- fail_color = rgb(204, 34, 34) # if authentication failed, changes outer_color and fail message color
- fail_text = $FAIL ($ATTEMPTS) # can be set to empty
- fail_transition = 300 # transition time in ms between normal outer_color and fail_color
- capslock_color = -1
- numlock_color = -1
- bothlock_color = -1 # when both locks are active. -1 means don't change outer color (same for above)
- invert_numlock = false # change color if numlock is off
- swap_font_color = false # see below
-
- position = 0, -20
- halign = center
- valign = center
-}
-
-label {
- monitor =
- text = Hi there, $USER
- text_align = center # center/right or any value for default left. multi-line text alignment inside label container
- color = rgba(200, 200, 200, 1.0)
- font_size = 25
- font_family = Noto Sans
- rotate = 0 # degrees, counter-clockwise
- position = 0, 80
- halign = center
- valign = center
-}
\ No newline at end of file
diff --git a/configs/hypr/includes.conf b/configs/hypr/includes.conf
index 4f4d1b2..a357393 100644
--- a/configs/hypr/includes.conf
+++ b/configs/hypr/includes.conf
@@ -1,99 +1,51 @@
# This content was generated by nwg-shell-config. Do not modify it manually.
# VARIABLES
-$term = kitty
-$browser = firefox
-$filemanager = dolphin
-$editor = code
-$launcher = nwg-drawer
-$theme = hyprland-1
-$exit = nwg-bar -t hyprland.json -p center -a middle -i 48 -s $theme.css
+$term = alacritty
+$browser = brave
+$filemanager = thunar
+$editor = nvim
+$applauncher = wofi --show drun
+$cmdlauncher = wofi --show run
+# $theme = hyprland-1
-# AUTOSTART
-# exec-once = rm /tmp/nwg-shell-check-update.lock
-# exec-once = wlsunset -t 4500 -T 6500 -l 52.2322 -L 20.9841 -g 1.1
-# exec-once = swaync -c ~/.config/swaync/hyprland.json -s ~/.config/swaync/$theme.css
-# exec-once = nwg-update-indicator
-exec-once = wl-paste --type text --watch cliphist store
-exec-once = wl-paste --type image --watch cliphist store
-# exec = nwg-screenshot-applet
-exec-once = hypridle
-exec = nwg-look -a
-exec = nwg-drawer -r -c 6 -is 64 -fscol 2 -s $theme.css -term $term -ft
-exec = nwg-panel -c $theme -s $theme.css
-# exec = nwg-shell-check-updates
-exec-once = nm-applet --indicator
-# exec = nwg-shell-config -s
+# # AUTOSTART
+# exec-once = wl-paste --type text --watch cliphist store
+# exec-once = wl-paste --type image --watch cliphist store
+# # exec = nwg-screenshot-applet
+# exec-once = hypridle
+# exec = nwg-look -a
+# exec = nwg-drawer -r -c 6 -is 64 -fscol 2 -s $theme.css -term $term -ft
+# exec = nwg-panel -c $theme -s $theme.css
+# # exec = nwg-shell-check-updates
+# exec-once = nm-applet --indicator
+# # exec = nwg-shell-config -s
-# GENERAL SETTINGS
-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
-}
+# # GENERAL SETTINGS
-# DWINDLE LAYOUT
-dwindle {
- pseudotile = false
- force_split = 0
- preserve_split = true
- smart_split = false
- special_scale_factor = 0.8
- split_width_multiplier = 1.0
- no_gaps_when_only = false
- use_active_for_splits = true
- default_split_ratio = 1.0
-}
-# MASTER LAYOUT
-master {
- allow_small_split = false
- special_scale_factor = 0.8
- mfact = 0.5
- new_is_master = false
- new_on_top = false
- no_gaps_when_only = true
- orientation = left
- inherit_fullscreen = true
- always_center_master = true
-}
+# # DWINDLE LAYOUT
+# dwindle {
+# pseudotile = false
+# force_split = 0
+# preserve_split = true
+# smart_split = false
+# special_scale_factor = 0.8
+# split_width_multiplier = 1.0
+# no_gaps_when_only = false
+# use_active_for_splits = true
+# default_split_ratio = 1.0
+# }
-# 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
- hide_cursor_on_touch = true
- mouse_move_focuses_monitor = true
-}
+# # MASTER LAYOUT
+# master {
+# allow_small_split = false
+# special_scale_factor = 0.8
+# mfact = 0.5
+# new_is_master = false
+# new_on_top = false
+# no_gaps_when_only = true
+# orientation = left
+# inherit_fullscreen = true
+# always_center_master = true
+# }
diff --git a/configs/hypr/keybindings.conf b/configs/hypr/keybindings.conf
index da77a78..0222656 100644
--- a/configs/hypr/keybindings.conf
+++ b/configs/hypr/keybindings.conf
@@ -2,19 +2,17 @@ $mainMod = SUPER
# # We've defined $term, $editor and so on in includes.conf.
-# bind = $mainMod, W, exec, $browser
-# bind = $mainMod, E, exec, $editor
+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
# bind = $mainMod, X, exec, $exit
-# bind = $mainMod, F, exec, $filemanager
-# bind = ALT, F1, exec, $launcher
-# bind = ALT, C, exec, nwg-clipman
# My Binds
bind = $mainMod, T, exec, $term
bind = $mainMod, Q, killactive,
bind = ALT, F4, killactive,
-bind = $mainMod, V, togglefloating,
-bind = $mainMod, space, exec, rofi -show drun
# Screen shot
bind = $mainMod, s, exec, hyprshot -m region -r | swappy -f -
diff --git a/configs/hypr/monitors.conf b/configs/hypr/monitors.conf
deleted file mode 100644
index 98c7d02..0000000
--- a/configs/hypr/monitors.conf
+++ /dev/null
@@ -1 +0,0 @@
-monitor=,preferred,auto,1.0
diff --git a/configs/hypr/workspaces.conf b/configs/hypr/workspaces.conf
deleted file mode 100644
index e69de29..0000000
diff --git a/flake.nix b/flake.nix
index 2d54ebc..66ce744 100644
--- a/flake.nix
+++ b/flake.nix
@@ -76,9 +76,11 @@
};
# Lib Config
libConfig = {
- nix-darwin = nix-darwin;
- hlCommonSettings = hlCommonSettings;
- systems = systems;
+ inherit
+ nix-darwin
+ hlCommonSettings
+ systems
+ ;
};
# Libs
lib = (import modules/lib.nix ({
diff --git a/modules/nixos/desktop/hyprland.nix b/modules/nixos/desktop/hyprland.nix
index a766ce4..3f0dbe8 100644
--- a/modules/nixos/desktop/hyprland.nix
+++ b/modules/nixos/desktop/hyprland.nix
@@ -35,15 +35,17 @@ in
# hyprlock
# hypridle
# hyprpaper
- # gbar
+ gbar
- # lxqt.lxqt-policykit
+ # App Support
+ lxqt.lxqt-policykit
xdg-desktop-portal
xdg-desktop-portal-hyprland
# color picker
hyprpicker
+
# nwg-shell
# # nwg-dock
# # nwg-dock-hyprland
@@ -60,6 +62,8 @@ in
# swappy
hyprshot # screenshots
cliphist # clipboard manager
+ xfce.thunar # file manager
+ wofi # app launcher
# networking
networkmanagerapplet
@@ -69,14 +73,14 @@ in
# xdg-desktop-portal-wlr
# # app launchers
# rofi-wayland
- # wofi
+ #
];
services.mpd.enable = true;
services.pipewire.wireplumber.enable = true;
users.users.${config.skyg.user.name}.extraGroups = [ "input" ];
system.userActivationScripts.hyprlandlocalConfig.text = ''
if [[ ! -h "$HOME/.config/hypr" ]]; then
- ln -s "$HOME/.config/hypr" "/home/${config.skyg.user.name}/nixos-setup/configs/hypr"
+ ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hypr" "$HOME/.config/hypr"
fi
'';
};