diff --git a/hosts/patricknix/fs.nix b/hosts/patricknix/fs.nix index 51a7ee1..4eaf880 100644 --- a/hosts/patricknix/fs.nix +++ b/hosts/patricknix/fs.nix @@ -23,5 +23,6 @@ rpool = defaultZpoolOptions // {datasets = defaultZfsDatasets;}; }; }; + fileSystems."/state".neededForBoot = true; boot.initrd.luks.devices.enc-rpool.allowDiscards = true; } diff --git a/pkgs/ron.nix b/pkgs/ron.nix index 821dfc8..96efc6a 100644 --- a/pkgs/ron.nix +++ b/pkgs/ron.nix @@ -86,6 +86,8 @@ entriesStr = if value ? _ronType then specialType indent value + else if !builtins.isAttrs value + then toRon indent value else let entries = mapAttrsToList toEntry value; entriesStrSpace = concatStringsSep ", " entries; diff --git a/users/common/graphical/Xorg/i3.nix b/users/common/graphical/Xorg/i3.nix index 2c9cec3..c2b719c 100644 --- a/users/common/graphical/Xorg/i3.nix +++ b/users/common/graphical/Xorg/i3.nix @@ -36,8 +36,9 @@ '' ); "${cfg.modifier}+F10" = let - nsend = '' ${pkgs.libnotify}/bin/notify-send \ - -h string:category:Screenshot\ + nsend = '' + ${pkgs.libnotify}/bin/notify-send \ + -h string:category:Screenshot\ ''; in "exec " diff --git a/users/common/graphical/default.nix b/users/common/graphical/default.nix index fd230a0..83792bb 100644 --- a/users/common/graphical/default.nix +++ b/users/common/graphical/default.nix @@ -2,7 +2,7 @@ imports = [ #./deadd ./themes.nix - #./wired-notify.nix + ./wired-notify.nix ]; home = { packages = with pkgs; [ diff --git a/users/common/graphical/sway3.nix b/users/common/graphical/sway3.nix index aa327f7..4297751 100644 --- a/users/common/graphical/sway3.nix +++ b/users/common/graphical/sway3.nix @@ -40,6 +40,9 @@ let "2:d" = [ {class = "^firefox$";} ]; + "1:1" = [ + {class = "^spotify$";} + ]; "3:u" = [ {class = "^thunderbird$";} ]; diff --git a/users/common/graphical/wired-notify.nix b/users/common/graphical/wired-notify.nix index 307663c..f4af59f 100644 --- a/users/common/graphical/wired-notify.nix +++ b/users/common/graphical/wired-notify.nix @@ -17,7 +17,7 @@ inherit (config.stylix) fonts; # A global scaling factor to apply to all notifications. - globalScale = 1.2; + globalScale = 0.6; # Ron format shorthands and helpers unnamedStruct = struct ""; @@ -418,7 +418,7 @@ ])) ]; params = struct "NotificationBlock" (unnamedStruct { - monitor = 1; + monitor = 2; border_width = globalScale * 2; border_rounding = globalScale * 0; background_color = colors.base00; diff --git a/users/common/programs/spicetify.nix b/users/common/programs/spicetify.nix index 89a14c9..b89d733 100644 --- a/users/common/programs/spicetify.nix +++ b/users/common/programs/spicetify.nix @@ -8,12 +8,9 @@ fullAppDisplay shuffle # shuffle+ (special characters are sanitized out of ext names) hidePodcasts - popupLyrics fullAlbumDate skipStats - showQueueDuration history - volumePercentage ]; }; }