Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles

xps to linux_6_11
health reminder syntax fix
2024-11-21 22:28:42 +01:00 · 2024-11-21 22:27:48 +01:00 · 2024-11-21 22:27:28 +01:00
3 changed files with 85 additions and 104 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1728710667,
-        "narHash": "sha256-9HR9EePhzweUAUPUccByNYxKQzfFAnxfu2BXTLqOLZQ=",
+        "lastModified": 1730569007,
+        "narHash": "sha256-cwbcYg+rPmvHFFtAEie7nw5IaBidrTYe5XsTlhOyoyQ=",
        "owner": "KZDKM",
        "repo": "Hyprspace",
-        "rev": "e8406a7708bceb3b5bedf56b67490dbe3d27e6f8",
+        "rev": "260f386075c7f6818033b05466a368d8821cde2d",
        "type": "github"
      },
      "original": {
@@ -41,11 +41,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728902391,
-        "narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=",
+        "lastModified": 1731774881,
+        "narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "9874e08eec85b5542ca22494e127b0cdce46b786",
+        "rev": "b31a6a4da8199ae3489057db7d36069a70749a56",
        "type": "github"
      },
      "original": {
@@ -124,11 +124,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1727826117,
-        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
+        "lastModified": 1730504689,
+        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
+        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
        "type": "github"
      },
      "original": {
@@ -302,11 +302,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1729629261,
-        "narHash": "sha256-IJtor2qFpsZkCm4UMnCHOSosW9GXKZVOm7DILtJJgoM=",
+        "lastModified": 1732100541,
+        "narHash": "sha256-vFeNbKUstvSZbe9TD4bDYozZd+A/bKD+fxCye+p/Mp8=",
        "ref": "refs/heads/main",
-        "rev": "29997ef4ba8ef0a80390e80199998d1390177454",
-        "revCount": 5366,
+        "rev": "940f7aa990dbc99815bab8d355999d8277534b17",
+        "revCount": 5484,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland"
@@ -334,11 +334,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729596320,
-        "narHash": "sha256-sBPr6O2Ad916f+L7biAjmJVx4TLDITC4joKgeOT47V8=",
+        "lastModified": 1732053779,
+        "narHash": "sha256-v9FS0r2XWMf/+uwevvzaF/2TimMFeLEQTf4T8cgc6c0=",
        "owner": "hyprwm",
        "repo": "hyprland-plugins",
-        "rev": "4d7f0b5d8b952f31f7d2e29af22ab0a55ca5c219",
+        "rev": "0bc619b2c3b4f9c2b65247e81d69f8bbc573d991",
        "type": "github"
      },
      "original": {
@@ -407,11 +407,11 @@
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1725107917,
-        "narHash": "sha256-6on3nwb3gB4t+P/2IExgGhVLVgAkF6ZiE5x+qcQHEXU=",
+        "lastModified": 1732059967,
+        "narHash": "sha256-PN7B3bzpXJgfJ5oUzTWx7Y/v2Zeq6bsRLxqeWmqXN1I=",
        "owner": "h3rmt",
        "repo": "hyprswitch",
-        "rev": "f478c394ad6db5ba268f80052f1eb2366366b21e",
+        "rev": "e9c4cf7a9f69d52bdbaec14006f04b1205eeceb5",
        "type": "github"
      },
      "original": {
@@ -433,11 +433,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728941256,
-        "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=",
+        "lastModified": 1731702627,
+        "narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85",
+        "rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1",
        "type": "github"
      },
      "original": {
@@ -498,11 +498,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1728888510,
-        "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
+        "lastModified": 1731676054,
+        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
+        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
        "type": "github"
      },
      "original": {
@@ -514,11 +514,11 @@
    },
    "nixpkgs-latest": {
      "locked": {
-        "lastModified": 1729631290,
-        "narHash": "sha256-zVL79jvDihxcnq9FKkAoILYWxGmxCw1DGdBnpv/B+3s=",
+        "lastModified": 1732219096,
+        "narHash": "sha256-gbvtOPW7K7v4EFo7Feo5s+SI7FMVrCOA5CgnuMhWO/Y=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "1f9d2cf67508efd9b5e81cdf7af556bbbfe02377",
+        "rev": "328abff1f7a707dc8da8e802f724f025521793ea",
        "type": "github"
      },
      "original": {
@@ -530,23 +530,23 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1727825735,
-        "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
+        "lastModified": 1730504152,
+        "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
      },
      "original": {
        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
      }
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1720386169,
-        "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
+        "lastModified": 1730741070,
+        "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
+        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
        "type": "github"
      },
      "original": {
@@ -572,29 +572,13 @@
        "type": "github"
      }
    },
-    "nixpkgs-stable_3": {
-      "locked": {
-        "lastModified": 1729357638,
-        "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1729413321,
-        "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
+        "lastModified": 1732014248,
+        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
+        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
        "type": "github"
      },
      "original": {
@@ -636,11 +620,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1729449015,
-        "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=",
+        "lastModified": 1731797254,
+        "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "89172919243df199fe237ba0f776c3e3e3d72367",
+        "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
        "type": "github"
      },
      "original": {
@@ -692,11 +676,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1728778939,
-        "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=",
+        "lastModified": 1731363552,
+        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "ff68f91754be6f3427e4986d7949e6273659be1d",
+        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
        "type": "github"
      },
      "original": {
@@ -802,15 +786,14 @@
      "inputs": {
        "nixpkgs": [
          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable_3"
+        ]
      },
      "locked": {
-        "lastModified": 1729587807,
-        "narHash": "sha256-YOc4033a/j1TbdLfkaSOSX2SrvlmuM+enIFoveNTCz4=",
+        "lastModified": 1732186149,
+        "narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "26642e8f193f547e72d38cd4c0c4e45b49236d27",
+        "rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699",
        "type": "github"
      },
      "original": {
@@ -907,11 +890,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728166987,
-        "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=",
+        "lastModified": 1731703417,
+        "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787",
+        "rev": "8070f36deec723de71e7557441acb17e478204d3",
        "type": "github"
      },
      "original": {
@@ -927,11 +910,11 @@
        "rust-overlay": "rust-overlay_2"
      },
      "locked": {
-        "lastModified": 1729473414,
-        "narHash": "sha256-ffiEVFCUMnShcSa4hvCbT1EQeu7c2lVOk6OdaxjiUmU=",
+        "lastModified": 1732207337,
+        "narHash": "sha256-lPgx3ElbhNp2q0ASAIUDwuszh8cYGmJTNQSdiasmBGI=",
        "owner": "sxyazi",
        "repo": "yazi",
-        "rev": "0e118b5b3a5baacf7fe62971e2bfe2b0ad972bab",
+        "rev": "428c92270385c55ffc2862947f2377f4247268e4",
        "type": "github"
      },
      "original": {
--- a/system-modules/boot.nix
+++ b/system-modules/boot.nix
@@ -105,7 +105,7 @@ in
          '';
        };
      };
-      kernelPackages = pkgs-unstable.linuxPackages_6_10;
+      kernelPackages = pkgs-unstable.linuxPackages_6_11;
      extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
      kernelModules = [ "v4l2loopback" ];
      extraModprobeConfig = ''options v4l2loopback devices=1 video_nr=1 card_label="OBS VCam" exclusive_caps=1'';
--- a/system-modules/health_reminder.nix
+++ b/system-modules/health_reminder.nix
@@ -12,42 +12,40 @@ lib.mkIf (host != "NxACE")
  };

  systemd.user.services."health_reminder" = let
-      hm = pkgs.writers.writePython3Bin "health_reminder" {
-        text = /*python*/ ''
-          import random
-          import re
+      hm = pkgs.writers.writePython3Bin "health_reminder" {}  /*python*/ ''
+        import random
+        import re

-          class Action:
-              def __init__(self, action: str, likelihood: int, options: list[str] = None):
-                  self.action = action
-                  self.likelihood = likelihood
-                  self.options = options if options is not None else []
+        class Action:
+            def __init__(self, action: str, likelihood: int, options: list[str] = None):
+                self.action = action
+                self.likelihood = likelihood
+                self.options = options if options is not None else []

-              def __str__(self):
-                  try:
-                      choice = random.choice(self.options) 
-                  except IndexError:
-                      choice = ""
-                
-                  action = re.sub("%o", choice, self.action)
-                  return action
+            def __str__(self):
+                try:
+                    choice = random.choice(self.options) 
+                except IndexError:
+                    choice = ""
+              
+                action = re.sub("%o", choice, self.action)
+                return action

-          actions = [
-              Action(action="look away for %o Seconds!", likelyhood=300, options=["10", "15"]),
-              Action(action="Posture Check!", likelyhood=300),
-              Action(action="Strech your upper body!", likelyhood=20),
-              Action(action="Strech your core!", likelyhood=10),
-              Action(action="Strech your legs!", likelyhood=10),
-              Action(action="Strech your arms/hands!", likelyhood=10),
-              Action(action="Make Tea!", likelyhood=5),
-              Action(action="说现在中文的时间！", likelyhood=2),
-          ]
+        actions = [
+            Action(action="look away for %o Seconds!", likelyhood=300, options=["10", "15"]),
+            Action(action="Posture Check!", likelyhood=300),
+            Action(action="Strech your upper body!", likelyhood=20),
+            Action(action="Strech your core!", likelyhood=10),
+            Action(action="Strech your legs!", likelyhood=10),
+            Action(action="Strech your arms/hands!", likelyhood=10),
+            Action(action="Make Tea!", likelyhood=5),
+            Action(action="说现在中文的时间！", likelyhood=2),
+        ]

-          total_likelihood = sum(a.likelihood for a in actions)
-          random_action = random.choices(actions, [a.likelihood for a in actions], k=1)[0]
-          print(random_action)
-        '';
-      };
+        total_likelihood = sum(a.likelihood for a in actions)
+        random_action = random.choices(actions, [a.likelihood for a in actions], k=1)[0]
+        print(random_action)
+      '';
    in {
      script = ''
        set -eu
Author	SHA1	Message	Date
Lennart J. Kurzweg (Nx2)	9c2a69aa03	Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles	2024-11-21 22:28:42 +01:00
Lennart J. Kurzweg (Nx2)	a8c3a12089	xps to linux_6_11	2024-11-21 22:27:48 +01:00
Lennart J. Kurzweg (Nx2)	b8199c24ef	health reminder syntax fix	2024-11-21 22:27:28 +01:00