waybar: fix use of deprecated function substituteAll

system/sound.nix

@@ -1,6 +1,6 @@
 { pkgs, ... }:
 {
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
   services.pipewire = {
     enable = true;
     wireplumber.enable = true;

user/gnome.nix

@@ -43,7 +43,7 @@ lib.mkIf (config.my.desktop == "gnome") {
     qt6Packages.qtstyleplugin-kvantum
   ];
 
-  services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome;
+  services.gpg-agent.pinentry.package = pkgs.pinentry-gnome;
 
   xdg.defaultApplications = {
     enable = lib.mkForce false;

user/home.nix

@@ -36,6 +36,7 @@
     ./pass.nix
     ./pqiv.nix
     ./zathura.nix
+    ./satty
     ./man.nix
     ./mpd.nix
     ./sway

user/satty/config.toml

@@ -0,0 +1,63 @@
+[general]
+# Start Satty in fullscreen mode
+fullscreen = true
+# Exit directly after copy/save action
+early-exit = true
+# Draw corners of rectangles round if the value is greater than 0 (0 disables rounded corners)
+corner-roundness = 12
+# Select the tool on startup [possible values: pointer, crop, line, arrow, rectangle, text, marker, blur, brush]
+initial-tool = "brush"
+# Configure the command to be called on copy, for example `wl-copy`
+copy-command = "wl-copy"
+# Increase or decrease the size of the annotations
+# annotation-size-factor = 2
+# Filename to use for saving action. Omit to disable saving to file. Might contain format specifiers: https://docs.rs/chrono/latest/chrono/format/strftime/index.html
+# output-filename = "/tmp/test-%Y-%m-%d_%H:%M:%S.png"
+# After copying the screenshot, save it to a file as well
+# save-after-copy = false
+# Hide toolbars by default
+# default-hide-toolbars = false
+# Experimental: whether window focus shows/hides toolbars. This does not affect initial state of toolbars, see default-hide-toolbars.
+# focus-toggles-toolbars = false
+# The primary highlighter to use, the other is accessible by holding CTRL at the start of a highlight [possible values: block, freehand]
+primary-highlighter = "block"
+# Disable notifications
+disable-notifications = true
+# Actions to trigger on right click (order is important)
+# [possible values: save-to-clipboard, save-to-file, exit]
+# actions-on-right-click = []
+# Actions to trigger on Enter key (order is important)
+# [possible values: save-to-clipboard, save-to-file, exit]
+# actions-on-enter = ["save-to-clipboard"]
+# Actions to trigger on Escape key (order is important)
+# [possible values: save-to-clipboard, save-to-file, exit]
+# actions-on-escape = ["exit"]
+# Action to perform when the Enter key is pressed [possible values: save-to-clipboard, save-to-file]
+# Deprecated: use actions-on-enter instead
+action-on-enter = "save-to-clipboard"
+# Right click to copy
+# Deprecated: use actions-on-right-click instead
+# right-click-copy = false
+# request no window decoration. Please note that the compositor has the final say in this. At this point. requires xdg-decoration-unstable-v1.
+# no-window-decoration = true
+# experimental feature: adjust history size for brush input smooting (0: disabled, default: 0, try e.g. 5 or 10)
+# brush-smooth-history-size = 10
+
+# Font to use for text annotations
+[font]
+family = "Roboto"
+style = "Bold"
+
+# Custom colours for the colour palette
+[color-palette]
+# These will be shown in the toolbar for quick selection
+palette = [
+    "#ff0000",
+    "#00ffff",
+    "#a52a2a",
+    "#dc143c",
+    "#ff1493",
+    "#ffd700",
+    "#008000",
+]
+

user/satty/default.nix

@@ -0,0 +1,22 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+let
+  cfg = config.my.satty;
+in
+{
+  options.my.satty.enable = lib.mkEnableOption { };
+
+  config = lib.mkIf cfg.enable {
+    xdg.configFile."satty/config.toml" = {
+      source = ./config.toml;
+    };
+
+    home.packages = with pkgs; [
+      satty
+    ];
+  };
+}

user/sway/default.nix

@@ -32,6 +32,7 @@ in
     my.swaylock.enable = true;
     my.mpd.enable = true;
     my.zathura.enable = true;
+    my.satty.enable = true;
     my.waybar.enable = true;
     my.gammastep.enable = true;
 
@@ -123,7 +124,7 @@ in
       indicator = true;
     };
 
-    services.gpg-agent.pinentryPackage = pkgs.pinentry-all;
+    services.gpg-agent.pinentry.package = pkgs.pinentry-all;
 
     xdg.configFile."OpenTabletDriver/settings.json" = {
       force = true;

user/sway/mako.nix

@@ -20,21 +20,22 @@ in
   config = lib.mkIf cfg.enable {
     services.mako = {
       enable = true;
-      borderSize = 2;
-      padding = "5";
-      margin = "15";
-      layer = "overlay";
-
-      font = "${font.interface} ${toString font.size.small}";
-      textColor = color.txt;
-
-      backgroundColor = color.bg;
-      borderColor = accent.color;
-      progressColor = "over ${accent.color}88";
-
-      defaultTimeout = 10000;
 
       settings = {
+        border-size = 2;
+        padding = "5";
+        margin = "15";
+        layer = "overlay";
+
+        font = "${font.interface} ${toString font.size.small}";
+        text-color = color.txt;
+
+        background-color = color.bg;
+        border-color = accent.color;
+        progress-color = "over ${accent.color}88";
+
+        default-timeout = 10000;
+
         "app-name=volumesh" = {
           "default-timeout" = "5000";
           "group-by" = "app-name";

user/sway/sway-binds.nix

@@ -172,7 +172,7 @@ let
     "${mod}+Return" = "exec ${terminal}";
     "${mod}+Ctrl+Return" = "exec thunar";
     "${mod}+Shift+s" = ''
-      exec grim - | satty --filename - --fullscreen --output-filename "$(xdg-user-dir PICTURES)"/Screenshots/satty-$(date '+%Y%m%d-%H:%M:%S').png
+      exec grim - | satty --filename - --output-filename "$(xdg-user-dir PICTURES)"/Screenshots/satty-$(date '+%Y%m%d-%H:%M:%S').png
     '';
     "${mod}+Ctrl+v" = "exec wl-paste | tesseract -l por - - | wl-copy";
     "${mod}+k" = "exec showkeys";

user/vscode/default.nix

@@ -4,7 +4,7 @@
   programs.vscode = {
     enable = true;
     package = pkgs.vscodium;
-    extensions = with pkgs.vscode-extensions; [
+    profiles.default.extensions = with pkgs.vscode-extensions; [
       jnoortheen.nix-ide
       github.github-vscode-theme
       rust-lang.rust-analyzer

user/waybar/default.nix

@@ -234,23 +234,19 @@ in
           };
         }
       ];
-      style = builtins.readFile (
-        pkgs.substituteAll {
-          src = ./style.css;
+      style = pkgs.replaceVars ./style.css {
+        accent_color = accent.color;
 
-          accent_color = accent.color;
+        color_bg = color.bg;
+        color_bg_dark = color.bg_dark;
+        color_bg_light = color.bg_light;
+        color_txt = color.txt;
 
-          color_bg = color.bg;
-          color_bg_dark = color.bg_dark;
-          color_bg_light = color.bg_light;
-          color_txt = color.txt;
+        font_interface = font.interface;
 
-          font_interface = font.interface;
-
-          font_size_big = "${toString font.size.big}px";
-          font_size_medium = "${toString font.size.medium}px";
-        }
-      );
+        font_size_big = "${toString font.size.big}px";
+        font_size_medium = "${toString font.size.medium}px";
+      };
     };
     home.packages = with pkgs; [ waybar ];
   };