diff --git a/README.org b/README.org
index f1e0c7a..140e035 100644
--- a/README.org
+++ b/README.org
@@ -171,11 +171,9 @@ services.xserver = {
package = pkgs.awesome;
};
displayManager = {
- startx.enable = true;
- defaultSession = "plasmawayland";
- sddm = {
+ defaultSession = "plasma";
+ lightdm = {
enable = true;
- enableHidpi = true;
};
};
desktopManager.plasma5 = {
@@ -366,8 +364,6 @@ kwallet-pam
plasma5Packages.kwallet
sierra-breeze-enhanced
libimobiledevice
-sddm-kcm
-ydotool
bottles
jitsi-meet-electron
imv
@@ -912,7 +908,7 @@ Kaladin is my desktop machine. A powerhouse for the most part with a recent i7 a
name = "kwallet";
enableKwallet = true;
};
- security.pam.services.sddm.enableKwallet = true;
+ # security.pam.services.sddm.enableKwallet = true;
# virtualisation.waydroid.enable = true;
@@ -1808,6 +1804,10 @@ I also use home-manager for managing dotfiles. This means that everything is con
source = ../hypr;
};
+ home.file.".config/dunst" = {
+ source = ../dunst;
+ };
+
programs.direnv.enable = true;
programs.direnv.nix-direnv.enable = true;
@@ -1959,20 +1959,20 @@ I also use home-manager for managing dotfiles. This means that everything is con
};
systemd.user.services = {
- ydotoold = {
- Unit = {
- Description = "An auto-input utility for wayland";
- Documentation = [ "man:ydotool(1)" "man:ydotoold(8)" ];
- };
+ # ydotoold = {
+ # Unit = {
+ # Description = "An auto-input utility for wayland";
+ # Documentation = [ "man:ydotool(1)" "man:ydotoold(8)" ];
+ # };
- Service = {
- ExecStart = "/run/current-system/sw/bin/ydotoold --socket-path /tmp/ydotools";
- };
+ # Service = {
+ # ExecStart = "/run/current-system/sw/bin/ydotoold --socket-path /tmp/ydotools";
+ # };
- Install = {
- WantedBy = ["default.target"];
- };
- };
+ # Install = {
+ # WantedBy = ["default.target"];
+ # };
+ # };
jellyfin-mpv-shim = {
Unit = {
diff --git a/dunst/dunstrc b/dunst/dunstrc
index 25979b9..d515dcb 100644
--- a/dunst/dunstrc
+++ b/dunst/dunstrc
@@ -17,54 +17,84 @@
# will be ignored.
follow = none
- # The geometry of the window:
- # [{width}]x{height}[+/-{x}+/-{y}]
- # The geometry of the message window.
- # The height is measured in number of notifications everything else
- # in pixels. If the width is omitted but the height is given
- # ("-geometry x2"), the message window expands over the whole screen
- # (dmenu-like). If width is 0, the window expands to the longest
- # message displayed. A positive x is measured from the left, a
- # negative from the right side of the screen. Y is measured from
- # the top and down respectively.
- # The width can be negative. In this case the actual width is the
- # screen width minus the width defined in within the geometry option.
- geometry = "500-1300+1700"
+ ### Geometry ###
- # Show how many messages are currently hidden (because of geometry).
+ # dynamic width from 0 to 300
+ # width = (0, 300)
+ # constant width of 300
+ width = (0, 300)
+
+ # The maximum height of a single notification, excluding the frame.
+ height = 300
+
+ # Position the notification in the top right corner
+ origin = bottom-right
+
+ # Offset from the origin
+ offset = 20x50
+
+ # Scale factor. It is auto-detected if value is 0.
+ scale = 0
+
+ # Maximum number of notification (0 means no limit)
+ notification_limit = 0
+
+ ### Progress bar ###
+
+ # Turn on the progess bar. It appears when a progress hint is passed with
+ # for example dunstify -h int:value:12
+ progress_bar = true
+
+ # Set the progress bar height. This includes the frame, so make sure
+ # it's at least twice as big as the frame width.
+ progress_bar_height = 10
+
+ # Set the frame width of the progress bar
+ progress_bar_frame_width = 1
+
+ # Set the minimum width for the progress bar
+ progress_bar_min_width = 150
+
+ # Set the maximum width for the progress bar
+ progress_bar_max_width = 300
+
+
+ # Show how many messages are currently hidden (because of
+ # notification_limit).
indicate_hidden = yes
- # Shrink window if it's smaller than the width. Will be ignored if
- # width is 0.
- shrink = no
-
# The transparency of the window. Range: [0; 100].
# This option will only work if a compositing window manager is
- # present (e.g. xcompmgr, compiz, etc.).
- transparency = 1
-
- # The height of the entire notification. If the height is smaller
- # than the font height and padding combined, it will be raised
- # to the font height and padding.
- notification_height = 0
+ # present (e.g. xcompmgr, compiz, etc.). (X11 only)
+ transparency = 10
# Draw a line of "separator_height" pixel height between two
# notifications.
# Set to 0 to disable.
+ # If gap_size is greater than 0, this setting will be ignored.
separator_height = 2
# Padding between text and separator.
- padding = 8
+ padding = 10
# Horizontal padding.
horizontal_padding = 8
+ # Padding between text and icon.
+ text_icon_padding = 8
+
# Defines width in pixels of frame around the notification window.
# Set to 0 to disable.
- frame_width = 0
+ frame_width = 1
# Defines color of the frame around the notification window.
- frame_color = "#282a36"
+ frame_color = "#aaaaaa"
+
+ # Size of gap to display between notifications - requires a compositor.
+ # If value is greater than 0, separator_height will be ignored and a border
+ # of size frame_width will be drawn around each notification instead.
+ # Click events on gaps do not currently propagate to applications below.
+ gap_size = 8
# Define a color for the separator.
# possible values are:
@@ -82,11 +112,11 @@
# Set to 0 to disable.
# A client can set the 'transient' hint to bypass this. See the rules
# section for how to disable this if necessary
- idle_threshold = 120
+ # idle_threshold = 120
### Text ###
- font = Monospace 8
+ font = VictorMono Nerd Font 10
# The spacing between lines. If the height is smaller than the
# font height, it will get raised to the font height.
@@ -100,7 +130,7 @@
# underline
#
# For a complete reference see
- # .
+ # .
#
# strip: This setting is provided for compatibility with some broken
# clients that send markup even though it's not enabled on the
@@ -126,7 +156,7 @@
# %n progress value if set without any extra characters
# %% Literal %
# Markup is allowed
- format = "%b"
+ format = "%s\n%b"
# Alignment of message text.
# Possible values are "left", "center" and "right".
@@ -141,11 +171,7 @@
# Set to -1 to disable.
show_age_threshold = 60
- # Split notifications into multiple lines if they don't fit into
- # geometry.
- word_wrap = yes
-
- # When word_wrap is set to no, specify where to make an ellipsis in long lines.
+ # Specify where to make an ellipsis in long lines.
# Possible values are "start", "middle" and "end".
ellipsize = middle
@@ -163,19 +189,28 @@
### Icons ###
- # Align icons left/right/off
+ # Recursive icon lookup. You can set a single theme, instead of having to
+ # define all lookup paths.
+ enable_recursive_icon_lookup = true
+
+ # Set icon theme (only used for recursive icon lookup)
+ icon_theme = Papirus-Dark
+ # You can also set multiple icon themes, with the leftmost one being used first.
+ # icon_theme = "Adwaita, breeze"
+
+ # Align icons left/right/top/off
icon_position = left
# Scale small icons up to this size, set to 0 to disable. Helpful
# for e.g. small files or high-dpi screens. In case of conflict,
# max_icon_size takes precedence over this.
- min_icon_size = 0
+ min_icon_size = 16
# Scale larger icons down to this size, set to 0 to disable
- max_icon_size = 32
+ max_icon_size = 128
- # Paths to default icons.
- icon_path = /usr/share/icons/Papirus/32x32/devices:/usr/share/icons/Papirus/32x32/status
+ # Paths to default icons (only neccesary when not using recursive icon lookup)
+ icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
### History ###
@@ -192,7 +227,7 @@
dmenu = /usr/bin/dmenu -p dunst:
# Browser for opening urls in context menu.
- browser = /usr/bin/firefox -new-tab
+ browser = /usr/bin/xdg-open
# Always run rule-defined scripts, even if the notification is suppressed
always_run_script = true
@@ -203,33 +238,29 @@
# Define the class of the windows spawned by dunst
class = Dunst
- # Print a notification on startup.
- # This is mainly for error detection, since dbus (re-)starts dunst
- # automatically after a crash.
- startup_notification = false
-
- # Manage dunst's desire for talking
- # Can be one of the following values:
- # crit: Critical features. Dunst aborts
- # warn: Only non-fatal warnings
- # mesg: Important Messages
- # info: all unimportant stuff
- # debug: all less than unimportant stuff
- verbosity = mesg
-
# Define the corner radius of the notification window
# in pixel size. If the radius is 0, you have no rounded
# corners.
# The radius will be automatically lowered if it exceeds half of the
# notification height to avoid clipping text and/or icons.
- corner_radius = 15
+ corner_radius = 12
# Ignore the dbus closeNotification message.
# Useful to enforce the timeout set by dunst configuration. Without this
- # parameter, an application may close the notification sent before the
+ # parameter, an application may close the notification sent before the
# user defined timeout.
ignore_dbusclose = false
+ ### Wayland ###
+ # These settings are Wayland-specific. They have no effect when using X11
+
+ # Uncomment this if you want to let notications appear under fullscreen
+ # applications (default: overlay)
+ # layer = top
+
+ # Set this to true to use X11 output on Wayland.
+ force_xwayland = false
+
### Legacy
# Use the Xinerama extension instead of RandR for multi-monitor support.
@@ -247,10 +278,14 @@
# Defines list of actions for each mouse event
# Possible values are:
# * none: Don't do anything.
- # * do_action: If the notification has exactly one action, or one is marked as default,
- # invoke it. If there are multiple and no default, open the context menu.
+ # * do_action: Invoke the action determined by the action_name rule. If there is no
+ # such action, open the context menu.
+ # * open_url: If the notification has exactly one url, open it. If there are multiple
+ # ones, open the context menu.
# * close_current: Close current notification.
# * close_all: Close all notifications.
+ # * context: Open context menu for the notification.
+ # * context_all: Open context menu for all notifications.
# These values can be strung together for each mouse event, and
# will be executed in sequence.
mouse_left_click = close_current
@@ -265,53 +300,32 @@
# dunst will attempt to calculate an appropriate dpi value for each monitor
# using the resolution and physical size. This might be useful in setups
# where there are multiple screens with very different dpi values.
- per_monitor_dpi = true
+ per_monitor_dpi = false
-[shortcuts]
-
- # Shortcuts are specified as [modifier+][modifier+]...key
- # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2",
- # "mod3" and "mod4" (windows-key).
- # Xev might be helpful to find names for keys.
-
- # Close notification.
- close = ctrl+space
-
- # Close all notifications.
- close_all = ctrl+shift+space
-
- # Redisplay last message(s).
- # On the US keyboard layout "grave" is normally above TAB and left
- # of "1". Make sure this key actually exists on your keyboard layout,
- # e.g. check output of 'xmodmap -pke'
- history = ctrl+grave
-
- # Context menu.
- context = ctrl+shift+period
[urgency_low]
# IMPORTANT: colors have to be defined in quotation marks.
# Otherwise the "#" and following would be interpreted as a comment.
background = "#282a36"
- foreground = "#888888"
+ foreground = "#57c7ff"
timeout = 10
# Icon for notifications with low urgency, uncomment to enable
- #icon = /path/to/icon
+ #default_icon = /path/to/icon
[urgency_normal]
background = "#282a36"
- foreground = "#ffffff"
+ foreground = "#5af78e"
timeout = 10
# Icon for notifications with normal urgency, uncomment to enable
- #icon = /path/to/icon
+ #default_icon = /path/to/icon
[urgency_critical]
- background = "#900000"
- foreground = "#ffffff"
+ background = "#282a36"
+ foreground = "#ff5c57"
frame_color = "#ff0000"
timeout = 0
# Icon for notifications with critical urgency, uncomment to enable
- #icon = /path/to/icon
+ #default_icon = /path/to/icon
# Every section that isn't one of the above is interpreted as a rules to
# override settings for certain messages.
@@ -336,8 +350,17 @@
# new_icon
# set_stack_tag
# set_transient
+# set_category
# timeout
# urgency
+# icon_position
+# skip_display
+# history_ignore
+# action_name
+# word_wrap
+# ellipsize
+# alignment
+# hide_text
#
# Shell-like globbing will get expanded.
#
@@ -352,8 +375,6 @@
# script appname summary body icon urgency
# where urgency can be "LOW", "NORMAL" or "CRITICAL".
#
-# NOTE: if you don't want a notification to be displayed, set the format
-# to "".
# NOTE: It might be helpful to run dunst -print in a terminal in order
# to find fitting options for rules.
@@ -392,7 +413,7 @@
#[ignore]
# # This notification will not be displayed
# summary = "foobar"
-# format = ""
+# skip_display = true
#[history-ignore]
# # This notification will not be saved in history
@@ -428,4 +449,4 @@
# appname = "some_volume_notifiers"
# set_stack_tag = "volume"
#
-# vim: ft=cfg
+# vim: ft=cfg
\ No newline at end of file
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index c0c40d1..60afb6b 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -1,7 +1,7 @@
monitor=eDP-1,2256x1504@60,0x0,1.5
workspace=eDP-1,1
-monitor=DVI-D-1,preferred,auto,1
-monitor=HDMI-A-1,preferred,auto,1
+monitor=DVI-D-1,preferred,1600x0,1
+monitor=HDMI-A-1,preferred,0x0,1
workspace=DVI-D-1,1
workspace=HDMI-A-1,2
@@ -160,4 +160,5 @@ bindm=SUPER,mouse:272,movewindow
bindm=SUPER,mouse:273,resizewindow
exec-once=/home/chris/bin/startup.sh
-exec-once=hyprpaper
\ No newline at end of file
+exec-once=hyprpaper
+exec-once=dunst
\ No newline at end of file
diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix
index 531eb81..987e5c3 100644
--- a/system/kaladin/configuration.nix
+++ b/system/kaladin/configuration.nix
@@ -92,11 +92,9 @@
package = pkgs.awesome;
};
displayManager = {
- startx.enable = true;
- defaultSession = "plasmawayland";
- sddm = {
+ defaultSession = "plasma";
+ lightdm = {
enable = true;
- enableHidpi = true;
};
};
desktopManager.plasma5 = {
@@ -169,7 +167,7 @@
name = "kwallet";
enableKwallet = true;
};
- security.pam.services.sddm.enableKwallet = true;
+ # security.pam.services.sddm.enableKwallet = true;
# virtualisation.waydroid.enable = true;
@@ -251,8 +249,6 @@
plasma5Packages.kwallet
sierra-breeze-enhanced
libimobiledevice
- sddm-kcm
- ydotool
bottles
jitsi-meet-electron
imv
diff --git a/user/home.nix b/user/home.nix
index 1060fff..5626250 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -344,6 +344,10 @@
source = ../hypr;
};
+ home.file.".config/dunst" = {
+ source = ../dunst;
+ };
+
programs.direnv.enable = true;
programs.direnv.nix-direnv.enable = true;