feat: updated nh, gc, and core

flake.lock

@@ -59,11 +59,11 @@
     },
     "crane": {
       "locked": {
-        "lastModified": 1742394900,
+        "lastModified": 1748047550,
-        "narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=",
+        "narHash": "sha256-t0qLLqb4C1rdtiY8IFRH5KIapTY/n3Lqt57AmxEv9mk=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd",
+        "rev": "b718a78696060df6280196a6f992d04c87a16aef",
         "type": "github"
       },
       "original": {
@@ -110,11 +110,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1733328505,
+        "lastModified": 1747046372,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
         "type": "github"
       },
       "original": {
@@ -221,11 +221,11 @@
     },
     "flake-compat_8": {
       "locked": {
-        "lastModified": 1733328505,
+        "lastModified": 1747046372,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
         "type": "github"
       },
       "original": {
@@ -391,17 +391,16 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
-        "nixpkgs-stable": "nixpkgs-stable",
+        "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable",
         "zig": "zig",
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1748096269,
+        "lastModified": 1748672231,
-        "narHash": "sha256-B1VEZQDJ1Q3VjR8egAI7Hyn3kTsIYkzgQEfwChJIROM=",
+        "narHash": "sha256-9DwoMa9VvwATvK3lolyUwJBfiF+y28EKmGj9FyEaJWo=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "034c1c12ef22005ddb7042d4e9a1c315d5432dfe",
+        "rev": "1ff91625981ef92add92624c01b6b9095c365ed1",
         "type": "github"
       },
       "original": {
@@ -483,11 +482,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1748101349,
+        "lastModified": 1748702599,
-        "narHash": "sha256-XKqmBA2kCZkZLa/sZ4PQbNiYAe0oWODSahLzdCOHacU=",
+        "narHash": "sha256-cXzTGHrZsT4wSxlLvw2ZlHPVjC/MA2W0sI/KF1yStbY=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "702a9615178bc9f06b07ef5eb6a8768d403a4431",
+        "rev": "2baff46b2578d78d817b9e128e8cc00345541f0b",
         "type": "github"
       },
       "original": {
@@ -530,11 +529,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747978958,
+        "lastModified": 1748737919,
-        "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=",
+        "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7419250703fd5eb50e99bdfb07a86671939103ea",
+        "rev": "5675a9686851d9626560052a032c4e14e533c1fa",
         "type": "github"
       },
       "original": {
@@ -619,11 +618,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1748036495,
+        "lastModified": 1748808233,
-        "narHash": "sha256-kYyrhoxu8pZ/YHd2Yy2VNaRGeqydOh1OTayvknhweGg=",
+        "narHash": "sha256-8ODprnZklafpJ5f2aLsZf8Lo3pP6z75NR4ArkwlH6cI=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "81cd526f923f4a9074bbfef59b4c7e9f3350c349",
+        "rev": "16c62a6dbb5f8eee4dcfe903e743f6f144971c06",
         "type": "github"
       },
       "original": {
@@ -644,11 +643,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1745871725,
+        "lastModified": 1748204791,
-        "narHash": "sha256-M24SNc2flblWGXFkGQfqSlEOzAGZnMc9QG3GH4K/KbE=",
+        "narHash": "sha256-fc97Jf4TbLAnJ0TQrQrcEE3SOEZi5BI2sdttNCiifqE=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "76bbf1a6b1378e4ab5230bad00ad04bc287c969e",
+        "rev": "6036ce9c86e88fc1549a54c3e44749f81ec399b1",
         "type": "github"
       },
       "original": {
@@ -986,18 +985,17 @@
         "buildbot-nix": "buildbot-nix",
         "dream2nix": "dream2nix",
         "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
-        "nixpkgs-stable": "nixpkgs-stable_2",
         "pre-commit-hooks": "pre-commit-hooks_2",
         "sops-nix": "sops-nix",
         "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1747831714,
+        "lastModified": 1748622925,
-        "narHash": "sha256-YOfpNuADwzrh76A5iXID0qYqxuauQb2sEz9yNqDWDZM=",
+        "narHash": "sha256-mB9F6/IdZFF7jWWmnEsUf87z3mxNJPIJlKNgNQmPf5k=",
         "owner": "ngi-nix",
         "repo": "ngipkgs",
-        "rev": "52c0b887994e3f497ef21878ccfc2c7b8b292d5c",
+        "rev": "55dbfb268e7effdb8405dbb6cdd9c7dd83db36c2",
         "type": "github"
       },
       "original": {
@@ -1013,16 +1011,16 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-stable": "nixpkgs-stable_3",
+        "nixpkgs-stable": "nixpkgs-stable",
         "xwayland-satellite-stable": "xwayland-satellite-stable",
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1748033637,
+        "lastModified": 1748797644,
-        "narHash": "sha256-TetDbakvubacirX9JTzrZ8FePtT8taVv53sbqY61t38=",
+        "narHash": "sha256-zLkSMDE/4kEK+1q0Ep0fmSO7PJ/3ZxovvYNIA5TuN4I=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "262837d8190629c4af723e35a7f2a3f49d1afb26",
+        "rev": "2036ef9e1bfac9d50d96c0771a412226b6998ba5",
         "type": "github"
       },
       "original": {
@@ -1051,11 +1049,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1748030931,
+        "lastModified": 1748794937,
-        "narHash": "sha256-34Y9mI/IN9eWZm6v1wQS+TUw1BK9Ed5XBWe8lrVu6RE=",
+        "narHash": "sha256-LQfI1BlFm+JeZGjg0MPKdsmyupETu/9HzGmxVd0G4fw=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "a605a3f016769ba2fd7e2147fe05c9ac3707f973",
+        "rev": "1911cf3f55ac3d9d24c8692434a93214dcbde9ba",
         "type": "github"
       },
       "original": {
@@ -1067,16 +1065,16 @@
     "nixos-cosmic": {
       "inputs": {
         "flake-compat": "flake-compat_5",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
-        "nixpkgs-stable": "nixpkgs-stable_4",
+        "nixpkgs-stable": "nixpkgs-stable_2",
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1748084900,
+        "lastModified": 1748776124,
-        "narHash": "sha256-XxVAY/U3qloh2gCy8T8aBj6lXu6DOAX5wH7cTg1QSkE=",
+        "narHash": "sha256-vs2cMCHX9wnWJutXhQyWkWOpMF/Xbw0ZAUAFGsKLifA=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "d01c1a4044129f6eddb944f4d71a84e07c139eba",
+        "rev": "e989a41092f6f0375e7afb789bc97cb30d01fdb8",
         "type": "github"
       },
       "original": {
@@ -1086,6 +1084,51 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1748189127,
+        "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=",
+        "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1748437600,
+        "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "7282cb574e0607e65224d33be8241eae7cfe0979",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable_2": {
+      "locked": {
+        "lastModified": 1748421225,
+        "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1747467164,
         "narHash": "sha256-JBXbjJ0t6T6BbVc9iPVquQI9XSXCGQJD8c8SgnUquus=",
@@ -1101,109 +1144,13 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1741992157,
-        "narHash": "sha256-nlIfTsTrMSksEJc1f7YexXiPVuzD1gOfeN1ggwZyUoc=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "da4b122f63095ca1199bd4d526f9e26426697689",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "release-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable_2": {
-      "locked": {
-        "lastModified": 1747485343,
-        "narHash": "sha256-YbsZyuRE1tobO9sv0PUwg81QryYo3L1F3R3rF9bcG38=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "9b5ac7ad45298d58640540d0323ca217f32a6762",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable_3": {
-      "locked": {
-        "lastModified": 1747862697,
-        "narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2baa12ff69913392faf0ace833bc54bba297ea95",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable_4": {
-      "locked": {
-        "lastModified": 1747862697,
-        "narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2baa12ff69913392faf0ace833bc54bba297ea95",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1741865919,
-        "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1747744144,
-        "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1748026106,
+        "lastModified": 1748693115,
-        "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
+        "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
+        "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
         "type": "github"
       },
       "original": {
@@ -1214,6 +1161,22 @@
       }
     },
     "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1748693115,
+        "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1747312588,
         "narHash": "sha256-MmJvj6mlWzeRwKGLcwmZpKaOPZ5nJb/6al5CXqJsgjo=",
@@ -1238,11 +1201,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1748108751,
+        "lastModified": 1748782935,
-        "narHash": "sha256-3nny7VjOFPC3geBCQj59qQdKoYE8+bf+tc48YPEL8QU=",
+        "narHash": "sha256-wjo1BhHoBFzdtj92LrAonR1eJ8j5dt1YhnkPpqaam38=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "65f929e6e23929e6da5fa6b95ac3c5c4e43d6216",
+        "rev": "73385c8de1fac0066f513adc9a7e59d69f2327c2",
         "type": "github"
       },
       "original": {
@@ -1372,7 +1335,7 @@
         "ngipkgs": "ngipkgs",
         "niri": "niri",
         "nixos-cosmic": "nixos-cosmic",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "nur": "nur",
         "pre-commit-hooks-nix": "pre-commit-hooks-nix",
         "sops-nix": "sops-nix_2",
@@ -1412,11 +1375,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748054080,
+        "lastModified": 1748746145,
-        "narHash": "sha256-rwFiLLNCwkj9bqePtH1sMqzs1xmohE0Ojq249piMzF4=",
+        "narHash": "sha256-bwkCAK9pOyI2Ww4Q4oO1Ynv7O9aZPrsIAMMASmhVGp4=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "2221d8d53c128beb69346fa3ab36da3f19bb1691",
+        "rev": "12a0d94a2f2b06714f747ab97b2fa546f46b460c",
         "type": "github"
       },
       "original": {
@@ -1454,11 +1417,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747363019,
+        "lastModified": 1748227081,
-        "narHash": "sha256-N4dwkRBmpOosa4gfFkFf/LTD8oOcNkAyvZ07JvRDEf0=",
+        "narHash": "sha256-RLnN7LBxhEdCJ6+rIL9sbhjBVDaR6jG377M/CLP/fmE=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "0e624f2b1972a34be1a9b35290ed18ea4b419b6f",
+        "rev": "1cbe817fd8c64a9f77ba4d7861a4839b0b15983e",
         "type": "github"
       },
       "original": {
@@ -1761,11 +1724,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1747111562,
+        "lastModified": 1748488455,
-        "narHash": "sha256-GAqhWoxaBIk0tgoecZPa8gTHDHxNc0JtlwWHZN2iOOo=",
+        "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "ec9ff64c1e0cbec42710b580b7c0f759b1694e72",
+        "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73",
         "type": "github"
       },
       "original": {
@@ -1777,15 +1740,15 @@
     "yazi": {
       "inputs": {
         "flake-utils": "flake-utils_4",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1747819961,
+        "lastModified": 1748740817,
-        "narHash": "sha256-ZlXhPOAz/j3cte0K7uIr6+Qs/+4Y4c8N+d5W21E2eVY=",
+        "narHash": "sha256-Vj4QAPNXONRmpL9LdmZt2DTqLCqgIBFjuseQprs9Kvg=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "622ba09a803b4a38983339b027d420238affa3d6",
+        "rev": "d5038eeed52a459fa43b953c3b42a65a1b0d922c",
         "type": "github"
       },
       "original": {
@@ -1804,11 +1767,11 @@
         "rust-overlay": "rust-overlay_4"
       },
       "locked": {
-        "lastModified": 1748069556,
+        "lastModified": 1748790933,
-        "narHash": "sha256-Pn3pIXN58ZGJmj9LqZIXjILP0GXXvteyvd8+tX6SGJ8=",
+        "narHash": "sha256-zEQSuEcJgEiFac2odqDjIq8mpg2QaxiQpojGcwvmrHI=",
         "owner": "zed-industries",
         "repo": "zed",
-        "rev": "6f918ed99bfa107d496f7e6a7101a956494f3153",
+        "rev": "d3bc561f26e8077a1de8ffb98b7d9e012133980c",
         "type": "github"
       },
       "original": {
@@ -1850,15 +1813,15 @@
         ],
         "nixpkgs": [
           "ghostty",
-          "nixpkgs-stable"
+          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1741825901,
+        "lastModified": 1748261582,
-        "narHash": "sha256-aeopo+aXg5I2IksOPFN79usw7AeimH1+tjfuMzJHFdk=",
+        "narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "0b14285e283f5a747f372fb2931835dd937c4383",
+        "rev": "aafb1b093fb838f7a02613b719e85ec912914221",
         "type": "github"
       },
       "original": {
@@ -1875,7 +1838,7 @@
         ],
         "nixpkgs": [
           "ghostty",
-          "nixpkgs-unstable"
+          "nixpkgs"
         ]
       },
       "locked": {

modules/home/gui/apps/tools/espanso/config/base.nix

@@ -1,7 +0,0 @@
-{ matchHelper, ... }:
-[
-  (matchHelper ":up" "↑")
-  (matchHelper ":down" "↓")
-  (matchHelper ":left" "←")
-  (matchHelper ":right" "→")
-]

modules/home/gui/apps/tools/espanso/config/characters.nix

@@ -3,4 +3,14 @@
   (matchHelper ":delta" "Δ")
   (matchHelper ":emdash" "—")
   (matchHelper ":degree" "°")
+  (matchHelper ":+-" "±")
+  (matchHelper ":<=" "≤")
+  (matchHelper ":>=" "≥")
+  (matchHelper ":copyright" "©")
+  (matchHelper ":restricted" "®")
+  (matchHelper ":trademark" "™")
+  (matchHelper ":up" "↑")
+  (matchHelper ":down" "↓")
+  (matchHelper ":left" "←")
+  (matchHelper ":right" "→")
 ]

modules/home/gui/apps/tools/espanso/config/debate.nix

@@ -1,8 +1,35 @@
 { matchHelper, ... }:
 [
-  (matchHelper ":ntt" ''
+  (matchHelper ":ntt1" ''
     World A) Animals farmed for food.
     World B) Humans farmed for food.
 
     All else equal, what is true of world A that is untrue of world B, that if made true of world B, would make world B permissible?'')
+  (matchHelper ":ntt2" ''
+    P1) For all things, if a being has moral worth, then we should not exploit it to any greater degree than we would tolerate for trait-adjusted humans.
+    (∀x(Px→¬Qx))
+
+    P2) If animals don’t have moral worth, then there exists a trait that is absent in animals such that if it were absent in humans, humans wouldn’t have moral worth.
+    (¬Pa→∃t(Rta→(Rth→¬Ph)))
+
+    P3) There doesn’t exist a trait that is absent in animals such that if it were absent in humans, humans wouldn’t have moral worth.
+    (¬∃t(Rta→(Rth→¬Ph)))
+
+    C) Therefore, we should not exploit animals to any greater degree than we would tolerate for trait-adjusted humans.
+    (∴¬Qa)'')
+  (matchHelper ":transid" ''
+    P1) Someone is a woman if, and only if, someone possesses a sufficiently greater sum of weighted traits that more closely associate with large gametes than weighted traits that associate with small gametes and someone is over 18 years of age.
+    (∀x(Px↔Rx∧Wx))
+
+    P2) Someone is a man if, and only if, someone possesses a sufficiently greater sum of weighted traits that more closely associate with small gametes than weighted traits that associate with large gametes and someone is over 18 years of age.
+    (∀x(Qx↔Sx∧Wx))
+
+    P3) A trans person of the male sex possesses a sufficiently greater sum of weighted traits that more closely associate with large gametes than weighted traits that associate with small gametes and a trans person with small gametes is over 18 years of age.
+    (Ra∧Wa)
+
+    P4)A trans person of the female sex possesses a sufficiently greater sum of weighted traits that more closely associate with small gametes than weighted traits that associate with large gametes and a trans person with large gametes is over 18 years of age.
+    (Sg∧Wg)
+
+    C) Therefore, a trans person of the male sex is a woman and a trans person with female sex is a man.
+    (∴Pa∧Qg)'')
 ]

modules/home/gui/apps/tools/espanso/config/logic.nix

@@ -4,8 +4,27 @@
   (matchHelper ":conj" "∧")
   (matchHelper ":disj" "∨")
   (matchHelper ":imp" "→")
-  (matchHelper ":bicon" "↔")
+  (matchHelper ":iff" "↔")
   (matchHelper ":forall" "∀")
   (matchHelper ":exist" "∃")
   (matchHelper ":therefore" "∴")
+  (matchHelper ":because" "∵")
+  (matchHelper ":nexist" "∄")
+  (matchHelper ":nand" "⊼")
+  (matchHelper ":nor" "⊽")
+  (matchHelper ":xor" "⊕")
+  (matchHelper ":xnor" "⊙")
+  (matchHelper ":notimp" "↛")
+  (matchHelper ":notiff" "↮")
+  (matchHelper ":models" "⊨")
+  (matchHelper ":notmodels" "⊭")
+  (matchHelper ":proves" "⊢")
+  (matchHelper ":notproves" "⊬")
+  (matchHelper ":forces" "⊩")
+  (matchHelper ":notforces" "⊮")
+  (matchHelper ":top" "⊤")
+  (matchHelper ":bottom" "⊥")
+  (matchHelper ":dashv" "⊣")
+  (matchHelper ":necessary" "□")
+  (matchHelper ":possible" "◇")
 ]

modules/home/gui/apps/tools/espanso/config/numbers.nix

@@ -0,0 +1,41 @@
+{ matchHelper, ... }:
+[
+  (matchHelper ":super1" "¹")
+  (matchHelper ":super2" "²")
+  (matchHelper ":super3" "³")
+  (matchHelper ":super4" "⁴")
+  (matchHelper ":super5" "⁵")
+  (matchHelper ":super6" "⁶")
+  (matchHelper ":super7" "⁷")
+  (matchHelper ":super8" "⁸")
+  (matchHelper ":super9" "⁹")
+  (matchHelper ":super0" "⁰")
+  (matchHelper ":sub1" "₁")
+  (matchHelper ":sub2" "₂")
+  (matchHelper ":sub3" "₃")
+  (matchHelper ":sub4" "₄")
+  (matchHelper ":sub5" "₅")
+  (matchHelper ":sub6" "₆")
+  (matchHelper ":sub7" "₇")
+  (matchHelper ":sub8" "₈")
+  (matchHelper ":sub9" "₉")
+  (matchHelper ":sub0" "₀")
+  (matchHelper ":1/2" "½")
+  (matchHelper ":1/3" "⅓")
+  (matchHelper ":2/3" "⅔")
+  (matchHelper ":1/4" "¼")
+  (matchHelper ":3/4" "¾")
+  (matchHelper ":1/5" "⅕")
+  (matchHelper ":2/5" "⅖")
+  (matchHelper ":3/5" "⅗")
+  (matchHelper ":4/5" "⅘")
+  (matchHelper ":1/6" "⅙")
+  (matchHelper ":5/6" "⅚")
+  (matchHelper ":1/7" "⅐")
+  (matchHelper ":1/8" "⅛")
+  (matchHelper ":3/8" "⅜")
+  (matchHelper ":5/8" "⅝")
+  (matchHelper ":7/8" "⅞")
+  (matchHelper ":1/9" "⅑")
+  (matchHelper ":1/10" "⅒")
+]

modules/home/gui/apps/tools/espanso/config/superscript.nix

@@ -1,13 +0,0 @@
-{ matchHelper, ... }:
-[
-  (matchHelper ":ss1" "¹")
-  (matchHelper ":ss2" "²")
-  (matchHelper ":ss3" "³")
-  (matchHelper ":ss4" "⁴")
-  (matchHelper ":ss5" "⁵")
-  (matchHelper ":ss6" "⁶")
-  (matchHelper ":ss7" "⁷")
-  (matchHelper ":ss8" "⁸")
-  (matchHelper ":ss9" "⁹")
-  (matchHelper ":ss0" "⁰")
-]

modules/home/gui/apps/tools/espanso/default.nix

@@ -1,28 +1,30 @@
 {
   flake,
+  lib,
   pkgs,
   ...
 }:
 let
-
   matchHelper = trigger: replace: {
     trigger = trigger;
     replace = replace;
   };
-
   configPath = ./config;
 
+  configs = {
+    url = { inherit flake matchHelper; };
+    logic = { inherit matchHelper; };
+    debate = { inherit matchHelper; };
+    characters = { inherit matchHelper; };
+    academic = { inherit matchHelper; };
+    numbers = { inherit matchHelper; };
+    email = { inherit flake matchHelper; };
+  };
+
   baseMatches = {
-    matches =
+    matches = lib.concatMap (name: import (configPath + "/${name}.nix") configs.${name}) (
-      [ ]
+      builtins.attrNames configs
-      ++ (import (configPath + /base.nix) { inherit matchHelper; })
+    );
-      ++ (import (configPath + /url.nix) { inherit flake matchHelper; })
-      ++ (import (configPath + /logic.nix) { inherit matchHelper; })
-      ++ (import (configPath + /debate.nix) { inherit matchHelper; })
-      ++ (import (configPath + /characters.nix) { inherit matchHelper; })
-      ++ (import (configPath + /academic.nix) { inherit matchHelper; })
-      ++ (import (configPath + /superscript.nix) { inherit matchHelper; })
-      ++ (import (configPath + /email.nix) { inherit flake matchHelper; });
   };
 in
 {

modules/home/gui/desktop/hypr/land/config/monitor.nix

@@ -1,6 +1,14 @@
+{ flake, osConfig, ... }:
 let
+  inherit (flake.config.machines) devices;
+
+  deimos = devices.deimos.name;
+  host = osConfig.networking.hostName;
+
+  deviceLogic = if host == deimos then "1" else "1";
+
   monitorSettings = [
-    "eDP-1,highres@highrr,0x0,1"
+    "eDP-1,highres@highrr,0x0,${deviceLogic}"
   ];
 in
 monitorSettings

modules/home/gui/desktop/hypr/land/default.nix

@@ -20,7 +20,7 @@ let
     misc = import (configPath + /misc.nix);
     windowrulev2 = import (configPath + /windowrulev2.nix);
     xwayland = import (configPath + /xwayland.nix);
-    monitor = import (configPath + /monitor.nix);
+    monitor = import (configPath + /monitor.nix) { inherit flake osConfig; };
   };
 in
 {

modules/nixos/core/nh/default.nix

@@ -1,5 +1,14 @@
+{ flake, ... }:
+let
+  inherit (flake.config.people) user0;
+in
 {
   programs.nh = {
     enable = true;
+    clean = {
+      enable = true;
+      dates = "daily";
+    };
+    flake = "/home/${user0}/Files/Projects/dotfiles";
   };
 }

modules/nixos/core/nix/default.nix

@@ -19,15 +19,10 @@
 
   nix = {
     extraOptions = ''
-      experimental-features = nix-command flakes
+      experimental-features = nix-command flakes repl-flake
       keep-outputs = true
       keep-derivations = true
     '';
-    gc = {
-      automatic = true;
-      dates = "weekly";
-      options = "--delete-older-than 10d";
-    };
     settings = {
       substituters = [
       ];

modules/nixos/programs/coreCtrl/default.nix

@@ -3,9 +3,5 @@
   programs.corectrl = {
     enable = true;
     package = pkgs.corectrl;
-    gpuOverclock = {
-      enable = true;
-      ppfeaturemask = "0xffffffff";
-    };
   };
 }

systems/deimos/config/hardware.nix

@@ -6,6 +6,10 @@
 }:
 {
   hardware = {
+    amdgpu.overdrive = {
+      enable = true;
+      ppfeaturemask = "0xffffffff";
+    };
     firmware = [
       pkgs.rtl8761b-firmware
     ];

systems/mars/config/graphics.nix

@@ -1,6 +1,10 @@
 { pkgs, ... }:
 {
   hardware = {
+    amdgpu.overdrive = {
+      enable = true;
+      ppfeaturemask = "0xffffffff";
+    };
     graphics = {
       enable = true;
       enable32Bit = true;