Add nixos-unstable-small to temporarily override pyside6

flake.lock

@@ -1,24 +1,75 @@
 {
   "nodes": {
-    "alerttonotify": {
+    "flake-utils": {
       "inputs": {
-        "nixpkgs": [
+        "systems": "systems"
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1733205085,
+        "lastModified": 1710146030,
-        "narHash": "sha256-W+GqdY5EQ6AY5//TIc1QCTF5Fs4DmvF7IyR+V1GEOrA=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "ref": "master",
+        "owner": "numtide",
-        "rev": "d941260e388f1d790bc45f37788e2216605b105f",
+        "repo": "flake-utils",
-        "revCount": 4,
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "git",
+        "type": "github"
-        "url": "https://git.t-juice.club/torjus/alerttonotify"
       },
       "original": {
-        "ref": "master",
+        "owner": "numtide",
-        "type": "git",
+        "repo": "flake-utils",
-        "url": "https://git.t-juice.club/torjus/alerttonotify"
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_4": {
+      "inputs": {
+        "systems": "systems_5"
+      },
+      "locked": {
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
       }
     },
     "ghettoptt": {
@@ -49,11 +100,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734344598,
+        "lastModified": 1732025103,
-        "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=",
+        "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "83ecd50915a09dca928971139d3a102377a8d242",
+        "rev": "a46e702093a5c46e192243edbd977d5749e7f294",
         "type": "github"
       },
       "original": {
@@ -64,19 +115,18 @@
     },
     "huecli": {
       "inputs": {
+        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "pyproject-build-systems": "pyproject-build-systems",
+        "poetry2nix": "poetry2nix"
-        "pyproject-nix": "pyproject-nix",
-        "uv2nix": "uv2nix"
       },
       "locked": {
-        "lastModified": 1732927393,
+        "lastModified": 1728336978,
-        "narHash": "sha256-S/StGXd2t8VvvnZ81uPyggc0dHfgHyrFMmXWkGhsJqg=",
+        "narHash": "sha256-7FX4K8QBH/9jiYyCMs2JyCTzlx1/D5Cw6upaFThSVg4=",
         "ref": "master",
-        "rev": "c2ff98ce55605e57370ea216300d0e58df602c26",
+        "rev": "700ece0bada9833fcfd3b6ce698cd74bc00e4493",
-        "revCount": 31,
+        "revCount": 22,
         "type": "git",
         "url": "https://git.t-juice.club/torjus/huecli"
       },
@@ -86,6 +136,50 @@
         "url": "https://git.t-juice.club/torjus/huecli"
       }
     },
+    "nix-github-actions": {
+      "inputs": {
+        "nixpkgs": [
+          "huecli",
+          "poetry2nix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1703863825,
+        "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=",
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "type": "github"
+      }
+    },
+    "nix-github-actions_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nixprstatus",
+          "poetry2nix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1720066371,
+        "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=",
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "type": "github"
+      }
+    },
     "nix-packages": {
       "inputs": {
         "nixpkgs": [
@@ -109,11 +203,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1734424634,
+        "lastModified": 1731676054,
-        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
+        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
+        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
         "type": "github"
       },
       "original": {
@@ -123,13 +217,29 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable": {
+    "nixpkgs-small": {
       "locked": {
-        "lastModified": 1734323986,
+        "lastModified": 1732007104,
-        "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=",
+        "narHash": "sha256-qaWPxgLAvtIHTDcm0qJuc+WNYjcy4ZKigOyn2ag4ihM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "394571358ce82dff7411395829aa6a3aad45b907",
+        "rev": "0705964c881cea8896474610188905ba41b59b08",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable-small",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1731755305,
+        "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
         "type": "github"
       },
       "original": {
@@ -141,19 +251,18 @@
     },
     "nixprstatus": {
       "inputs": {
+        "flake-utils": "flake-utils_3",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "pyproject-build-systems": "pyproject-build-systems_2",
+        "poetry2nix": "poetry2nix_2"
-        "pyproject-nix": "pyproject-nix_2",
-        "uv2nix": "uv2nix_2"
       },
       "locked": {
-        "lastModified": 1733204290,
+        "lastModified": 1729118937,
-        "narHash": "sha256-I7rct67R/zkoXZ//EI2DxFOVSZRNanITQwbkrtNjP2g=",
+        "narHash": "sha256-7xYCJXTh92OpKwfshYYnxrWmfNjqaH9SzQ0stuBARVM=",
         "ref": "master",
-        "rev": "d1b8c63d604016d1520e7d1780439ebfe271a234",
+        "rev": "58b113d934f5d62f27dc50439b89fece4eb621f5",
-        "revCount": 43,
+        "revCount": 37,
         "type": "git",
         "url": "https://git.t-juice.club/torjus/nixprstatus"
       },
@@ -163,114 +272,64 @@
         "url": "https://git.t-juice.club/torjus/nixprstatus"
       }
     },
-    "pyproject-build-systems": {
+    "poetry2nix": {
       "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nix-github-actions": "nix-github-actions",
         "nixpkgs": [
           "huecli",
           "nixpkgs"
         ],
-        "pyproject-nix": [
+        "systems": "systems_3",
-          "huecli",
+        "treefmt-nix": "treefmt-nix"
-          "pyproject-nix"
-        ],
-        "uv2nix": [
-          "huecli",
-          "uv2nix"
-        ]
       },
       "locked": {
-        "lastModified": 1732506638,
+        "lastModified": 1724208502,
-        "narHash": "sha256-aIjGCa8Lvhb8QnbHPOtkZ6yTrb8KURRlYzlo7UaBeac=",
+        "narHash": "sha256-TCRcEPSfgAw/t7kClmlr23s591N06mQCrhzlAO7cyFw=",
-        "owner": "pyproject-nix",
+        "owner": "nix-community",
-        "repo": "build-system-pkgs",
+        "repo": "poetry2nix",
-        "rev": "70c271e7a64199c71c9dbcbe513c7b2402573789",
+        "rev": "884b66152b0c625b8220b570a31dc7acc36749a3",
         "type": "github"
       },
       "original": {
-        "owner": "pyproject-nix",
+        "owner": "nix-community",
-        "repo": "build-system-pkgs",
+        "repo": "poetry2nix",
         "type": "github"
       }
     },
-    "pyproject-build-systems_2": {
+    "poetry2nix_2": {
       "inputs": {
+        "flake-utils": "flake-utils_4",
+        "nix-github-actions": "nix-github-actions_2",
         "nixpkgs": [
           "nixprstatus",
           "nixpkgs"
         ],
-        "pyproject-nix": [
+        "systems": "systems_6",
-          "nixprstatus",
+        "treefmt-nix": "treefmt-nix_2"
-          "pyproject-nix"
-        ],
-        "uv2nix": [
-          "nixprstatus",
-          "uv2nix"
-        ]
       },
       "locked": {
-        "lastModified": 1733103007,
+        "lastModified": 1729073785,
-        "narHash": "sha256-7xEh7JboF6tTyzfIRbPcb7OtwZsIPBLUfg9mkv6Yum0=",
+        "narHash": "sha256-KaDC7emuamQblDdka+gkBUUdEjQf3YGYozMb+zomgSM=",
-        "owner": "pyproject-nix",
+        "owner": "nix-community",
-        "repo": "build-system-pkgs",
+        "repo": "poetry2nix",
-        "rev": "52f42c78204f705289339a27e0f2a2e38dc25899",
+        "rev": "795fddefc9f910671c1cf0752c29802ce27322d6",
         "type": "github"
       },
       "original": {
-        "owner": "pyproject-nix",
+        "owner": "nix-community",
-        "repo": "build-system-pkgs",
+        "repo": "poetry2nix",
-        "type": "github"
-      }
-    },
-    "pyproject-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "huecli",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1732502826,
-        "narHash": "sha256-tgInDnNOGd5haarL7i94TZ/TqOR1UHvYliw+Db0lk6U=",
-        "owner": "pyproject-nix",
-        "repo": "pyproject.nix",
-        "rev": "fb87b3bad09fbd71b448e2f71f0337087430dbc7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "pyproject-nix",
-        "repo": "pyproject.nix",
-        "type": "github"
-      }
-    },
-    "pyproject-nix_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixprstatus",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733112511,
-        "narHash": "sha256-qQd6K8RYZpwEeawyqSnDkFCPZAIbz8c7BP9490EsgQM=",
-        "owner": "pyproject-nix",
-        "repo": "pyproject.nix",
-        "rev": "60b55f8095cc1909d1c8f1806431f0f7f5f3fc32",
-        "type": "github"
-      },
-      "original": {
-        "owner": "pyproject-nix",
-        "repo": "pyproject.nix",
         "type": "github"
       }
     },
     "root": {
       "inputs": {
-        "alerttonotify": "alerttonotify",
         "ghettoptt": "ghettoptt",
         "home-manager": "home-manager",
         "huecli": "huecli",
         "nix-packages": "nix-packages",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-small": "nixpkgs-small",
         "nixpkgs-stable": "nixpkgs-stable",
         "nixprstatus": "nixprstatus",
         "sops-nix": "sops-nix"
@@ -283,11 +342,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734546875,
+        "lastModified": 1731954233,
-        "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=",
+        "narHash": "sha256-vvXx1m2Rsw7MkbKJdpcICzz4YPgZPApGKQGhNZfkhOI=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d",
+        "rev": "e39947d0ee8e341fa7108bd02a33cdfa24a1360e",
         "type": "github"
       },
       "original": {
@@ -296,53 +355,135 @@
         "type": "github"
       }
     },
-    "uv2nix": {
+    "systems": {
-      "inputs": {
-        "nixpkgs": [
-          "huecli",
-          "nixpkgs"
-        ],
-        "pyproject-nix": [
-          "huecli",
-          "pyproject-nix"
-        ]
-      },
       "locked": {
-        "lastModified": 1732759365,
+        "lastModified": 1681028828,
-        "narHash": "sha256-kOOlzfAsFpfiLltRbqFysVhT86erXVe4TZCNIq5zv0o=",
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "pyproject-nix",
+        "owner": "nix-systems",
-        "repo": "uv2nix",
+        "repo": "default",
-        "rev": "f932943b62a0b4fade224f18df13558f8015dd99",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
-        "owner": "pyproject-nix",
+        "owner": "nix-systems",
-        "repo": "uv2nix",
+        "repo": "default",
         "type": "github"
       }
     },
-    "uv2nix_2": {
+    "systems_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixprstatus",
-          "nixpkgs"
-        ],
-        "pyproject-nix": [
-          "nixprstatus",
-          "pyproject-nix"
-        ]
-      },
       "locked": {
-        "lastModified": 1733106626,
+        "lastModified": 1681028828,
-        "narHash": "sha256-kXgLAT2dnRbUeg8/ekx0d5Svc+7GPpoamGBNgcYu46Y=",
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "pyproject-nix",
+        "owner": "nix-systems",
-        "repo": "uv2nix",
+        "repo": "default",
-        "rev": "3614215065f1c828e5d5c1653af5cba078387a78",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
-        "owner": "pyproject-nix",
+        "owner": "nix-systems",
-        "repo": "uv2nix",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "id": "systems",
+        "type": "indirect"
+      }
+    },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_6": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "id": "systems",
+        "type": "indirect"
+      }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "huecli",
+          "poetry2nix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1719749022,
+        "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
+    "treefmt-nix_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nixprstatus",
+          "poetry2nix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1727984844,
+        "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
         "type": "github"
       }
     }

flake.nix

@@ -5,6 +5,7 @@
     nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-24.11";
     #nixpkgs-master.url = "github:nixos/nixpkgs?ref=master";
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    nixpkgs-small.url = "github:nixos/nixpkgs?ref=nixos-unstable-small";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -30,10 +31,6 @@
       url = "git+https://git.t-juice.club/torjus/nixprstatus?ref=master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    alerttonotify = {
-      url = "git+https://git.t-juice.club/torjus/alerttonotify?ref=master";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs =
@@ -42,11 +39,11 @@
       nixpkgs,
       # nixpkgs-master,
       nixpkgs-stable,
+      nixpkgs-small,
       nixprstatus,
       sops-nix,
       ghettoptt,
       huecli,
-      alerttonotify,
       nix-packages,
       ...
     }@inputs:
@@ -59,6 +56,17 @@
           config.allowUnfree = true;
         };
       };
+      overlay-pyside6 =
+        final: prev:
+        let
+          small = import nixpkgs-small {
+            inherit system;
+            config.allowUnfree = true;
+          };
+        in
+        {
+          python312Packages = small.lib.warn "Using python312Packages from nixos-unstable-small #" small.python312Packages;
+        };
       # overlay-master = final: prev: {
       #   master = import nixpkgs-master {
       #     inherit system;
@@ -76,11 +84,11 @@
       commonOverlays = [
         overlay-stable
         # overlay-master
+        overlay-pyside6
         ghettoptt.overlays.default
         huecli.overlays.default
         nix-packages.overlays.default
         nixprstatus.overlays.default
-        alerttonotify.overlays.default
       ];
     in
     {

home/gunter.nix

@@ -31,7 +31,6 @@
           ./scripts
           ./services/backup-home.nix
           ./services/ghettoptt.nix
-          ./services/alerttonotify.nix
           ./sops
           ./ssh
           ./zsh

home/hyprland/hyprland_gunter.nix

@@ -1,14 +1,21 @@
 {
+  inputs,
   pkgs,
   lib,
   config,
   ...
 }:
 {
+  imports = [
+    ./hyprlock.nix
+    ./hypridle.nix
+  ];
   options.hyprland.enable = lib.mkEnableOption "Hyprland";
   config = {
     home.packages = with pkgs; [
       dunst
+      # hyprlock
+      hyprpaper
       rofi-wayland
       slurp
       swww
@@ -21,130 +28,6 @@
       libsForQt5.qt5ct
     ];
 
-    services.hyprpaper = {
-      enable = true;
-      settings = {
-        splash = false;
-      };
-    };
-    services.hypridle = {
-      enable = true;
-      settings = {
-        general = {
-          lock_cmd = "hyprlock";
-          before_sleep_cmd = "lockhelper";
-          ignore_dbus_inhibit = false;
-        };
-        listener = {
-          timeout = 240;
-          on-timeout = "lockhelper";
-        };
-      };
-    };
-
-    programs.hyprlock = {
-      enable = true;
-      settings = {
-        background = [
-          {
-            monitor = "DP-5";
-            path = "/tmp/lockscreen/DP-5.png";
-            blur_passes = 3;
-            contrast = 0.8916;
-            brightness = 0.8172;
-            vibrancy = 0.1696;
-            vibrancy_darkness = 0.0;
-          }
-          {
-            monitor = "DP-6";
-            path = "/tmp/lockscreen/DP-6.png";
-            blur_passes = 3;
-            contrast = 0.8916;
-            brightness = 0.8172;
-            vibrancy = 0.1696;
-            vibrancy_darkness = 0.0;
-          }
-          {
-            monitor = "DP-7";
-            path = "/tmp/lockscreen/DP-7.png";
-            blur_passes = 3;
-            contrast = 0.8916;
-            brightness = 0.8172;
-            vibrancy = 0.1696;
-            vibrancy_darkness = 0.0;
-          }
-          {
-            monitor = "DP-8";
-            path = "/tmp/lockscreen/DP-8.png";
-            blur_passes = 3;
-            contrast = 0.8916;
-            brightness = 0.8172;
-            vibrancy = 0.1696;
-            vibrancy_darkness = 0.0;
-          }
-        ];
-
-        general = {
-          no_fade_in = false;
-          grace = 0;
-          disable_loading_bar = true;
-        };
-
-        input-field = [
-          {
-            size = "250, 60";
-            outline_thickness = 2;
-            dots_size = 0.2;
-            dots_spacing = 0.2;
-            dots_center = true;
-            outer_color = "rgba(0, 0, 0, 0)";
-            inner_color = "rgba(0, 0, 0, 0.5)";
-            font_color = "rgb(200, 200, 200)";
-            fade_on_empty = false;
-            font_family = "JetBrains Mono Nerd Font Mono";
-            placeholder_text = "<i><span foreground=\"##cdd6f4\">Input Password...</span></i>";
-            hide_input = false;
-            position = "0, -120";
-            halign = "center";
-            valign = "center";
-          }
-        ];
-
-        label = [
-          {
-            text = "cmd[update:2000] echo \"$(date +\"%b %d %H:%M\")\"";
-            color = "rgba(255, 255, 255, 0.6)";
-            font_size = 120;
-            font_family = "JetBrains Mono Nerd Font Mono ExtraBold";
-            position = "0, -300";
-            halign = "center";
-            valign = "top";
-          }
-        ];
-      };
-    };
-
-    # streamcontroller service
-    systemd.user.services = {
-      streamcontroller = {
-        Unit = {
-          Description = "Streamcontroller service";
-          PartOf = [ "graphical-session.target" ];
-          After = [ "graphical-session.target" ];
-          Requisite = [ "graphical-session.target" ];
-        };
-
-        Service = {
-          ExecStart = "${pkgs.streamcontroller}/bin/streamcontroller -b";
-          Restart = "on-failure";
-        };
-
-        Install = {
-          WantedBy = [ "graphical-session.target" ];
-        };
-      };
-    };
-
     wayland.windowManager.hyprland = {
       enable = true;
       package = pkgs.hyprland;
@@ -188,11 +71,9 @@
 
         decoration = {
           rounding = 10;
-          # shadow = {
+          drop_shadow = true;
-          #   enable = true;
+          shadow_range = 4;
-          #   range = 4;
+          shadow_render_power = 3;
-          #   render_power = 3;
-          # };
           blur = {
             enabled = true;
             size = 3;
@@ -337,10 +218,10 @@
 
         exec-once = [
           "waybar"
-          # "hyprpaper & sleep 10 && randomwp"
+          "hyprpaper & sleep 10 && randomwp"
-          # "easyeffects --gapplication-service"
+          "easyeffects --gapplication-service"
-          # "hypridle"
+          "hypridle"
-          # "streamcontroller -b"
+          "streamcontroller -b"
           # "dunst"
         ];
       };

home/hyprland/waybar/arrhist.py

@@ -6,7 +6,6 @@ from datetime import datetime, date, timedelta
 
 SECRET_DIR = "/home/torjus/.config/sops-nix/secrets"
 
-
 def sonarr_url():
     xdg_dir = os.environ["XDG_RUNTIME_DIR"]
     if not xdg_dir:
@@ -14,31 +13,26 @@ def sonarr_url():
     with open(f"{SECRET_DIR}/sonarr_base_url") as f:
         return f.read().strip()
 
-
 def radarr_url():
     with open(f"{SECRET_DIR}/radarr_base_url") as f:
         return f.read().strip()
 
-
 def make_header(api_key: str):
     return {"X-Api-Key": api_key, "Accept": "application/json"}
 
-
 def get_sonarr_key():
     with open(f"{SECRET_DIR}/sonarr_api_key") as f:
         return f.read().strip()
 
-
 def get_radarr_key():
     with open(f"{SECRET_DIR}/radarr_api_key") as f:
         return f.read().strip()
 
-
 def get_sonarr_history(since: datetime|None=None):
     api_key = get_sonarr_key()
     if not since:
         since = datetime.combine(date.today()-timedelta(days=1),datetime.min.time())
-    url = f"{sonarr_url()}/api/v3/history/since"
+    url = f"{sonarr_url()}/api/history/since"
     url += f"?date={since.isoformat()}"
     response = requests.get(url, headers=make_header(api_key))
     response.raise_for_status()
@@ -50,7 +44,6 @@ def get_sonarr_history(since: datetime | None = None):
             items.append(item["sourceTitle"])
     return items
 
-
 def get_radarr_history(since: datetime|None=None):
     api_key = get_radarr_key()
     if not since:
@@ -67,17 +60,12 @@ def get_radarr_history(since: datetime | None = None):
             items.append(item["sourceTitle"])
     return items
 
-
 if __name__ == "__main__":
     sonarr_items = get_sonarr_history()
     radarr_items = get_radarr_history()
 
     output = {
         "text": f"Son: {len(sonarr_items)}|Rad: {len(radarr_items)}",
-        "tooltip": "Radarr: \n"
+        "tooltip": "Radarr: \n" + "\n".join(radarr_items) + "\n" + "Sonarr: \n" + "\n".join(sonarr_items)
-        + "\n".join(radarr_items)
-        + "\n"
-        + "Sonarr: \n"
-        + "\n".join(sonarr_items),
     }
     print(json.dumps(output))

home/packages/default.nix

@@ -45,7 +45,6 @@ in
     ripgrep
     sops
     sshfs
-    step-cli
     tea
     tldr
     tokei

home/packages/zoom.nix

@@ -1,17 +1,16 @@
 { pkgs, lib, ... }:
-# let
+let
-#   version = "6.2.6.2503";
+  version = "6.2.6.2503";
-#   zoom-override = pkgs.zoom-us.overrideAttrs (old: {
+  zoom-override = pkgs.zoom-us.overrideAttrs (old: {
-#     inherit version;
+    inherit version;
-#     src = pkgs.fetchurl {
+    src = pkgs.fetchurl {
-#       url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
+      url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
-#       hash = "sha256-qhymegXkXSl9fK/5klSi5uRPwFVN88QH/5EVGaBUbfc=";
+      hash = "sha256-qhymegXkXSl9fK/5klSi5uRPwFVN88QH/5EVGaBUbfc=";
-#     };
+    };
-#   });
+  });
-# in
+in
 {
   home.packages = [
-    pkgs.zoom-us
+    (lib.warn "Using overridden zoom version" zoom-override)
-    #(lib.warn "Using overridden zoom version" zoom-override)
   ];
 }

home/scripts/randomwp.sh

@@ -26,6 +26,11 @@ if [ -z "$wallpaper_path" ]; then
     exit 1
 fi
 
+if ! command -v hyprpaper &> /dev/null; then
+    echo "Could not find hyprpaper command"
+    exit 1
+fi
+
 echo "setting $wallpaper_path as wallpaper"
 hyprctl hyprpaper unload all
 hyprctl hyprpaper preload "$wallpaper_path"

home/services/alerttonotify.nix

@@ -1,15 +0,0 @@
-{ pkgs, config, ... }:
-{
-  systemd.user.services.alerttonotify = {
-    Unit = {
-      Description = "Run alerttonotify";
-    };
-    Service = {
-      Type = "simple";
-      ExecStart = "${pkgs.alerttonotify}/bin/alerttonotify";
-    };
-    Install = {
-      WantedBy = [ "graphical-session.target" ];
-    };
-  };
-}

hosts/gunter/configuration.nix

@@ -9,7 +9,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../../system/monitoring
+    ../../system/monitoring.nix
   ];
 
   # Sops stuff
@@ -24,8 +24,9 @@
   # Bootloader stuff
   boot = {
     # Kernel stuff
+    # kernelPackages = pkgs.linuxPackages_xanmod_latest;
     kernelPackages = pkgs.linuxPackages_latest;
-    # kernelPackages = lib.warn "Pinned to kernel 6.11 due to nvidia trouble!" pkgs.linuxPackages_6_11;
+    # kernelPackages = lib.warn "Pinned to kernel 6.10 due to nvidia fbdev trouble!" pkgs.linuxPackages_6_10;
     kernelParams = [
       "quiet"
       "splash"
@@ -75,7 +76,7 @@
     open = true;
     nvidiaSettings = false;
 
-    package = config.boot.kernelPackages.nvidiaPackages.beta;
+    package = config.boot.kernelPackages.nvidiaPackages.latest;
     # package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
     #   version = "560.28.03";
     #   sha256_64bit = "sha256-martv18vngYBJw1IFUCAaYr+uc65KtlHAMdLMdtQJ+Y=";

system/default.nix

@@ -1,7 +1,6 @@
 {
   imports = [
     ./fonts.nix
-    ./root-ca.nix
     ./fwupd.nix
     ./git.nix
     ./greetd.nix

system/fonts.nix

@@ -5,10 +5,14 @@
     fira-code
     fira-code-symbols
     font-awesome
-    nerd-fonts.jetbrains-mono
+    (nerdfonts.override {
-    nerd-fonts.fira-code
+      fonts = [
-    nerd-fonts.droid-sans-mono
+        "JetBrainsMono"
-    nerd-fonts.dejavu-sans-mono
+        "FiraCode"
+        "DroidSansMono"
+        "DejaVuSansMono"
+      ];
+    })
     noto-fonts
     noto-fonts-cjk-sans
     noto-fonts-emoji

system/monitoring.nix

@@ -0,0 +1,37 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    prometheus-node-exporter
+    prometheus-systemd-exporter
+  ];
+
+  systemd.services."node-exporter" = {
+    enable = true;
+    unitConfig = {
+      Description = "Prometheus Node Exporter";
+      After = [ "network.target" ];
+    };
+    serviceConfig = {
+      ExecStart = "${pkgs.prometheus-node-exporter}/bin/node_exporter";
+    };
+    wantedBy = [ "multi-user.target" ];
+  };
+
+  systemd.services."systemd-exporter" = {
+    enable = true;
+    unitConfig = {
+      Description = "Prometheus Systemd Exporter";
+      After = [ "network.target" ];
+    };
+    serviceConfig = {
+      ExecStart = "${pkgs.prometheus-systemd-exporter}/bin/systemd_exporter";
+    };
+    wantedBy = [ "multi-user.target" ];
+  };
+
+  networking.firewall.allowedTCPPorts = [
+    9100
+    9558
+    8989
+  ];
+}

system/monitoring/default.nix

@@ -1,7 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./metrics.nix
-    ./logs.nix
-  ];
-}

system/monitoring/logs.nix

@@ -1,39 +0,0 @@
-{ ... }:
-{
-  services.promtail = {
-    enable = true;
-    configuration = {
-      server = {
-        http_listen_address = "0.0.0.0";
-        http_listen_port = 9099;
-        grpc_listen_address = "0.0.0.0";
-        grpc_listen_port = 9098;
-      };
-
-      clients = [
-        {
-          url = "http://monitoring01.home.2rjus.net:3100/loki/api/v1/push";
-        }
-      ];
-
-      scrape_configs = [
-        {
-          job_name = "journal";
-          journal = {
-            json = true;
-          };
-          relabel_configs = [
-            {
-              source_labels = [ "__journal__systemd_unit" ];
-              target_label = "systemd_unit";
-            }
-            {
-              source_labels = [ "__journal__hostname" ];
-              target_label = "host";
-            }
-          ];
-        }
-      ];
-    };
-  };
-}

system/monitoring/metrics.nix

@@ -1,11 +0,0 @@
-{ ... }:
-{
-  services.prometheus.exporters.node = {
-    enable = true;
-    openFirewall = true;
-    enabledCollectors = [
-      "systemd"
-      "logind"
-    ];
-  };
-}

system/root-ca.crt

@@ -1,12 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBxDCCAWmgAwIBAgIQQCSzuOLIKLj1dGbC+NFttjAKBggqhkjOPQQDAjBAMRow
-GAYDVQQKExFob21lLjJyanVzLm5ldCBDQTEiMCAGA1UEAxMZaG9tZS4ycmp1cy5u
-ZXQgQ0EgUm9vdCBDQTAeFw0yNDEwMjEwOTEyNDRaFw0zNDEwMTkwOTEyNDRaMEAx
-GjAYBgNVBAoTEWhvbWUuMnJqdXMubmV0IENBMSIwIAYDVQQDExlob21lLjJyanVz
-Lm5ldCBDQSBSb290IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEGDE4ss9y
-9msphQ/Sa/tAoEaGoDHQcg5oRcxWL5SZYjUPNl+zbRZzqkvCz2S1XrHJPiPWbyJX
-cZAlPxbwZrWDyKNFMEMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8C
-AQEwHQYDVR0OBBYEFPZx6AahX5diBMChZbv5N4dh+vCTMAoGCCqGSM49BAMCA0kA
-MEYCIQC6yqMM9/s1Dct5jlq0NAGsDA68hVTDcO3RP61lxQlfBwIhAL1jlmIwaSJc
-TjdIMjPQ3ombBRqDJBDvDr8o6oOUjret
------END CERTIFICATE-----

system/root-ca.nix

@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-{
-  security.pki = {
-    certificateFiles = [
-      "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"
-      ./root-ca.crt
-    ];
-  };
-}