Minor fix for manual swaylock activation

flake.lock

@@ -150,11 +150,11 @@
     "blocklist-hosts": {
       "flake": false,
       "locked": {
-        "lastModified": 1705875931,
-        "narHash": "sha256-gqW1iysJQlzlK4xMRaIkjBkBJShaGUaQaStjHN+55oI=",
+        "lastModified": 1706623780,
+        "narHash": "sha256-zqa64JLLMWIp/v7GBZbdYzOomCSQMEWcGtf5vybzB2M=",
         "owner": "StevenBlack",
         "repo": "hosts",
-        "rev": "01b3c89fbfdaa1156c37b04267eecdb9271c0f8d",
+        "rev": "a786144d25675795d9d7bd27dd445b9c7a102f86",
         "type": "github"
       },
       "original": {
@@ -199,11 +199,11 @@
     "eaf": {
       "flake": false,
       "locked": {
-        "lastModified": 1706179506,
-        "narHash": "sha256-/wHOlse/LkdebQdQyDhz9dJi84NjJprP9UCI2nu4m/Q=",
+        "lastModified": 1706411779,
+        "narHash": "sha256-bcowbVKG1lynWBAOwtu/KE39z/9jmyZteb8As2ovLPI=",
         "owner": "emacs-eaf",
         "repo": "emacs-application-framework",
-        "rev": "f7de2f0f5b5ec8ffd110392a1b72a414f71bbdf1",
+        "rev": "2c1c275c41e4e6ef6064426e4d8ee85e9a90a0f6",
         "type": "github"
       },
       "original": {
@@ -396,11 +396,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
         "type": "github"
       },
       "original": {
@@ -449,11 +449,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706221476,
-        "narHash": "sha256-T4b8YafVjHXvtDY8ARec1WrXO8uyyNZOpNgv9yoQy2M=",
+        "lastModified": 1706955260,
+        "narHash": "sha256-W3y0j77IDVbmbajudHoUr46RpswujUCl+D5Vru53UsI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c7ce343d9bf1a329056a4dd5b32ea8cc43b55e15",
+        "rev": "880d9bc2110f7cae59698f715b8ca42cdc53670c",
         "type": "github"
       },
       "original": {
@@ -487,11 +487,11 @@
     "hyprland-plugins": {
       "flake": false,
       "locked": {
-        "lastModified": 1706142741,
-        "narHash": "sha256-gGAp3BF5cthUtzlxdF3GU3zgU/xLodvH+nVUJvUnhFQ=",
+        "lastModified": 1706478736,
+        "narHash": "sha256-V1T0x16p4r+/fdWR5RU2lV0tTW0YrA8K9+GIibsZAeQ=",
         "owner": "hyprwm",
         "repo": "hyprland-plugins",
-        "rev": "8ce5e6ebccb5444b2cbc98dc8664abac432476fc",
+        "rev": "24e33780589f5c15132fc86c97ea033e56b06f59",
         "type": "github"
       },
       "original": {
@@ -577,11 +577,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1706098335,
-        "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=",
+        "lastModified": 1706826059,
+        "narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a77ab169a83a4175169d78684ddd2e54486ac651",
+        "rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d",
         "type": "github"
       },
       "original": {
@@ -592,11 +592,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1705856552,
-        "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=",
+        "lastModified": 1706732774,
+        "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d",
+        "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d",
         "type": "github"
       },
       "original": {
@@ -607,11 +607,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1681358109,
-        "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=",
+        "lastModified": 1706487304,
+        "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9",
+        "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac",
         "type": "github"
       },
       "original": {
@@ -720,11 +720,11 @@
     "org-side-tree": {
       "flake": false,
       "locked": {
-        "lastModified": 1704204195,
-        "narHash": "sha256-NOYt8GTIFBqOmKWmrjoqIWDD5GXsofc7w1ZXfcnHvJ0=",
+        "lastModified": 1706597780,
+        "narHash": "sha256-y7a/ouih5Jnug50OJHAv7S5BsfKSxMWoQ63t7cq7XrI=",
         "owner": "localauthor",
         "repo": "org-side-tree",
-        "rev": "77e88e8c528b809f24827c7cd986580d5bc4cd17",
+        "rev": "62169a26edfafacd681ecaf84289dd6b58be6c32",
         "type": "github"
       },
       "original": {
@@ -870,11 +870,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1706235145,
-        "narHash": "sha256-3jh5nahTlcsX6QFcMPqxtLn9p9CgT9RSce5GLqjcpi4=",
+        "lastModified": 1706926144,
+        "narHash": "sha256-2ausVOGPuTIHQtodO36jguE5giMl5aT6NNuG91PiAYE=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "3a57c4e29cb2beb777b2e6ae7309a680585b8b2f",
+        "rev": "130b1b89799ae76c0ad1bf4b9019470403d9fbe1",
         "type": "github"
       },
       "original": {
@@ -915,11 +915,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1706172305,
-        "narHash": "sha256-9VXEpF+wFyVNmUAMyGFPqXCSTAa+oXEkwm2Fe0Oq/JM=",
+        "lastModified": 1706783767,
+        "narHash": "sha256-Rn21YNSa4TgZzTsarghUPQv+fz1dZcfdDKQZS9H79Hg=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "1a5dee1957dc45e125013ae3919ff284cfb83cdc",
+        "rev": "ccca01b5b0393119822b1888cb7c68e294fc115b",
         "type": "github"
       },
       "original": {

patches/nixos-nixpkgs-268027.patch

@@ -12,12 +12,10 @@ diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.n
 index 1a6f9c784cf675..6d51b51b215d43 100644
 --- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
 +++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
-@@ -57,7 +57,8 @@
+@@ -57,3 +57,3 @@
  # Raise an error if two packages are installed with the same name
- # TODO: For cross we probably need a different PYTHONPATH, or not
  # add the runtime deps until after buildPhase.
 -, catchConflicts ? (python.stdenv.hostPlatform == python.stdenv.buildPlatform)
-+# FIXME: disabled for Python 2 because broken
 +, catchConflicts ? false
 
  # Additional arguments to pass to the makeWrapper function, which wraps

system/hardware-configuration.nix

@@ -21,7 +21,7 @@
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/637d8261-0650-4ece-a35b-59d97baf64a7";
       fsType = "btrfs";
-      options = [ "noatime,compress=zstd:2,space_cache=v2,subvol=@" ];
+      options = [ "noatime,compress-force=zstd:2,discard=async,commit=120,clear_cache,space_cache=v2,subvol=@" ];
     };
 
   boot.initrd.luks.devices."luks-385106b5-71f7-460e-9a2b-2416f3b54cb6".device = "/dev/disk/by-uuid/385106b5-71f7-460e-9a2b-2416f3b54cb6";

user/app/doom-emacs/config.el

@@ -556,8 +556,6 @@ same directory as the org-buffer and insert a link to this file."
   (save-buffer)
 )
 
-;; TODO make function to edit title or date post post creation
-
 (map! :leader
       :prefix ("N")
 
@@ -707,9 +705,6 @@ same directory as the org-buffer and insert a link to this file."
 (defun org-current-buffer-has-todos ()
   "Return non-nil if current buffer has any todo entry.
 
-TODO entries marked as done are ignored, meaning the this
-function returns nil if current buffer contains only completed
-tasks."
   (org-element-map                          ; (2)
        (org-element-parse-buffer 'headline) ; (1)
        'headline

user/app/doom-emacs/doom.nix

@@ -63,7 +63,7 @@ in
       requests
       pyqt6 sip qtpy qt6.qtwebengine epc lxml pyqt6-webengine
       pysocks
-      #pymupdf TODO pymupdf fails to build
+      pymupdf
       markdown
     ]))
   ];

user/app/doom-emacs/doom.org

@@ -677,8 +677,6 @@ exit
   (save-buffer)
 )
 
-;; TODO make function to edit title or date post post creation
-
 (map! :leader
       :prefix ("N")
 
@@ -838,9 +836,6 @@ exit
 (defun org-current-buffer-has-todos ()
   "Return non-nil if current buffer has any todo entry.
 
-TODO entries marked as done are ignored, meaning the this
-function returns nil if current buffer contains only completed
-tasks."
   (org-element-map                          ; (2)
        (org-element-parse-buffer 'headline) ; (1)
        'headline
@@ -2047,7 +2042,7 @@ in
       requests
       pyqt6 sip qtpy qt6.qtwebengine epc lxml pyqt6-webengine
       pysocks
-      #pymupdf TODO pymupdf fails to build
+      pymupdf
       markdown
     ]))
   ];

user/app/ranger/commands_full.py

@@ -1335,7 +1335,7 @@ class cunmap(uncmap):
 
     Remove the given "console" mappings
 
-    DEPRECATED in favor of uncmap.
+    Deprecated in favor of uncmap.
     """
 
     def execute(self):
@@ -1356,7 +1356,7 @@ class punmap(unpmap):
 
     Remove the given "pager" mappings
 
-    DEPRECATED in favor of unpmap.
+    Deprecated in favor of unpmap.
     """
 
     def execute(self):
@@ -1377,7 +1377,7 @@ class tunmap(untmap):
 
     Remove the given "taskview" mappings
 
-    DEPRECATED in favor of untmap.
+    Deprecated in favor of untmap.
     """
 
     def execute(self):

user/app/ranger/ranger.nix

@@ -1,11 +1,16 @@
 { config, pkgs, ... }:
 let myCbxScript = ''
-  # TODO fix this for wayland
   #!/bin/sh
+
+  # this lets my copy and paste images and/or plaintext of files directly out of ranger
   if [ "$#" -le "2" ]; then
     if [ "$1" = "copy" -o "$1" = "cut" ]; then
-      #xclip -selection clipboard -t $(file -b --mime-type $2) -i $2;
-      xclip -selection clipboard -t image/png -i $2;
+      if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
+        wl-copy < $2;
+      else
+        # xclip -selection clipboard -t $(file -b --mime-type $2) -i $2;
+        xclip -selection clipboard -t image/png -i $2;
+      fi
     fi
   fi
   '';

user/app/ranger/scope.sh

@@ -266,7 +266,7 @@ handle_image() {
     esac
 
     # openscad_image() {
-    #     TMPPNG="$(mktemp -t XXXXXX.png)"
+    #     TMPPNG="$(mktemp -t xxxxxx.png)"
     #     openscad --colorscheme="${OPENSCAD_COLORSCHEME}" \
     #         --imgsize="${OPENSCAD_IMGSIZE/x/,}" \
     #         -o "${TMPPNG}" "${1}"

user/style/stylix.nix

@@ -85,7 +85,6 @@ in
     swaybg -m fill -i ''+config.stylix.image+'';
   '';
   home.file.".swaybg-stylix".executable = true;
-  # TODO add stylix colors to swaylock cmd
   home.file.".swayidle-stylix".text = ''
     #!/bin/sh
     swaylock_cmd='swaylock --indicator-radius 200 --screenshots --effect-blur 10x10'

user/wm/hyprland/hyprland.nix

@@ -39,7 +39,7 @@
       exec-once = emacs --daemon
 
       #exec-once = swayidle -w timeout 90 '${pkgs.gtklock}/bin/gtklock -d' timeout 210 'suspend-unless-render' resume '${pkgs.hyprland}/bin/hyprctl dispatch dpms on' before-sleep "${pkgs.gtklock}/bin/gtklock -d"
-      exec-once = swayidle -w timeout 90 '${pkgs.swaylock}/bin/swaylock -f' timeout 210 'suspend-unless-render' resume '${pkgs.hyprland}/bin/hyprctl dispatch dpms on' before-sleep "${pkgs.swaylock}/bin/swaylock -f"
+      exec-once = swayidle -w timeout 90 '${config.programs.swaylock.package}/bin/swaylock -f' timeout 210 'suspend-unless-render' resume '${pkgs.hyprland}/bin/hyprctl dispatch dpms on' before-sleep "${config.programs.swaylock.package}/bin/swaylock -f"
       exec-once = obs-notification-mute-daemon
 
       exec = ~/.swaybg-stylix
@@ -129,8 +129,8 @@
        bind=,code:255,exec,airplane-mode
        bind=SUPER,C,exec,wl-copy $(hyprpicker)
 
-       bind=SUPERSHIFT,S,exec,swaylock & sleep 1 && systemctl suspend
-       bind=SUPERCTRL,L,exec,swaylock
+       bind=SUPERSHIFT,S,exec,swaylock --grace 0 & sleep 1 && systemctl suspend
+       bind=SUPERCTRL,L,exec,swaylock --grace 0
 
        bind=SUPER,H,movefocus,l
        bind=SUPER,J,movefocus,d
@@ -277,21 +277,8 @@
     hyprland-protocols
     hyprpicker
     swayidle
-    gtklock
-    #swaylock
-    #(pkgs.swaylock-effects.overrideAttrs (oldAttrs: {
-    #  version = "1.6.4-1";
-    #  src = fetchFromGitHub {
-    #    owner = "mortie";
-    #    repo = "swaylock-effects";
-    #    rev = "20ecc6a0a5b61bb1a66cfb513bc357f74d040868";
-    #    sha256 = "sha256-nYA8W7iabaepiIsxDrCkG/WIFNrVdubk/AtFhIvYJB8=";
-    #  };
-    #}))
     swaybg
     fnott
-    #hyprpaper
-    #wofi
     fuzzel
     keepmenu
     pinentry-gnome
@@ -738,8 +725,33 @@
   services.udiskie.tray = "always";
   programs.swaylock = {
     enable = true;
+    package = pkgs.swaylock-effects;
     settings = {
       color = "#"+config.lib.stylix.colors.base00;
+      inside-color = "#"+config.lib.stylix.colors.base00+"cc";
+      inside-caps-lock-color = "#"+config.lib.stylix.colors.base09;
+      inside-clear-color = "#"+config.lib.stylix.colors.base0A;
+      inside-wrong-color = "#"+config.lib.stylix.colors.base08;
+      inside-ver-color = "#"+config.lib.stylix.colors.base0D;
+      line-color = "#"+config.lib.stylix.colors.base00;
+      line-caps-lock-color = "#"+config.lib.stylix.colors.base00;
+      line-clear-color = "#"+config.lib.stylix.colors.base00;
+      line-wrong-color = "#"+config.lib.stylix.colors.base00;
+      line-ver-color = "#"+config.lib.stylix.colors.base00;
+      ring-color = "#"+config.lib.stylix.colors.base00;
+      ring-caps-lock-color = "#"+config.lib.stylix.colors.base09;
+      ring-clear-color = "#"+config.lib.stylix.colors.base0A;
+      ring-wrong-color = "#"+config.lib.stylix.colors.base08;
+      ring-ver-color = "#"+config.lib.stylix.colors.base0D;
+      text-color = "#"+config.lib.stylix.colors.base00;
+      key-hl-color = "#"+config.lib.stylix.colors.base0B;
+      font = config.stylix.fonts.monospace.name;
+      font-size = 20;
+      fade-in = 0.5;
+      grace = 5;
+      indicator-radius = 100;
+      screenshots = true;
+      effect-blur = "10x10";
     };
   };
   programs.fuzzel.enable = true;