Add nixos-unstable-small to temporarily override pyside6

Updates current stable inputs
flake.lock: Update
2024-11-20 15:36:48 +01:00 · 2024-11-19 22:33:13 +01:00 · 2024-11-19 16:02:08 +00:00 · 2024-11-19 14:02:08 +00:00 · 2024-11-19 00:02:08 +00:00 · 2024-11-18 22:01:58 +00:00
91 changed files with 2246 additions and 967 deletions
--- a/.envrc
+++ b/.envrc
@@ -0,0 +1 @@
+use flake
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# nixfmt all
+90ccaa07bd0dc2235af7fdd37909e17f637e9cab
--- a/.github/workflows/actions-check.yaml
+++ b/.github/workflows/actions-check.yaml
@@ -0,0 +1,33 @@
+name: Check actions
+on:
+  push:
+    paths:
+      - .github/workflows/*.yaml
+      - .github/workflows/*.yml
+  pull_request:
+    paths:
+      - .github/workflows/*.yaml
+      - .github/workflows/*.yml
+
+jobs:
+  check-actions-actionlint:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/catthehacker/ubuntu:runner-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.23'
+      - run: |
+          go install github.com/rhysd/actionlint/cmd/actionlint@latest
+          actionlint .github/workflows/*.yaml
+  check-actions-yamllint:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/catthehacker/ubuntu:runner-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v5
+      - run: |
+          pipx run yamllint .github/workflows/*.yaml
--- a/.github/workflows/flake-check.yaml
+++ b/.github/workflows/flake-check.yaml
@@ -0,0 +1,14 @@
+name: Run nix flake check
+on:
+  push:
+  pull_request:
+
+jobs:
+  flake-check:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/catthehacker/ubuntu:runner-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v27
+      - run: nix flake check
--- a/.github/workflows/flake-update.yaml
+++ b/.github/workflows/flake-update.yaml
@@ -0,0 +1,36 @@
+---
+name: Periodic flake update
+on:  # yamllint disable-line rule:truthy
+  schedule:
+    - cron: "0 */2 * * *"
+
+permissions:
+  contents: write
+
+jobs:
+  flake-update:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/catthehacker/ubuntu:runner-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: master
+      - uses: cachix/install-nix-action@v27
+      - name: configure git
+        env:
+          SSH_PRIVKEY: ${{ secrets.BOT_SSH_PRIVKEY }}
+          SSH_PUBKEY: ${{ secrets.BOT_SSH_PUBKEY }}
+        run: |
+          echo "$SSH_PRIVKEY" > "$RUNNER_TEMP/id_ed25519"
+          echo "$SSH_PUBKEY" > "$RUNNER_TEMP/id_ed25519.pub"
+          chmod -R 0600 "$RUNNER_TEMP/id_ed25519.pub" "$RUNNER_TEMP/id_ed25519"
+          git config --global user.name 'torjus-bot'
+          git config --global user.email 'torjus-bot@git.t-juice.club'
+          git config --global user.signingKey "$RUNNER_TEMP/id_ed25519.pub"
+          git config --global gpg.format ssh
+          git config --global commit.gpgsign true
+      - name: flake update
+        run: nix flake update --commit-lock-file
+      - name: push
+        run: git push
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -1,13 +0,0 @@
-name: pre-commit
-on:
-  push:
-  pull_request:
-
-jobs:
-  pre-commit:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/catthehacker/ubuntu:act-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: pre-commit/action@v3.0.1
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+result
+.direnv/
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,12 +0,0 @@
-repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
-    hooks:
-      - id: trailing-whitespace
-      - id: end-of-file-fixer
-      - id: check-yaml
-      - id: check-added-large-files
-  - repo: https://github.com/nix-community/nixpkgs-fmt
-    rev: v1.3.0
-    hooks:
-      - id: nixpkgs-fmt
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,6 +1,8 @@
 keys:
  - &admin_torjus age1lznyk4ee7e7x8n92cq2n87kz9920473ks5u9jlhd3dczfzq4wamqept56u
  - &server_gunter age1whxf34vjdndqzwgm7yyaexdm46gdnv9sf3nal7qqyjr0nyhhndlsrmc0g3
+  - &server_magicman age1stlqqspmt5fepyz35udrwr5avf9zuju79f787p26pu2d2j08yqps2q2t2c
+  - &server_prismo age1lznyk4ee7e7x8n92cq2n87kz9920473ks5u9jlhd3dczfzq4wamqept56u
 creation_rules:
  - path_regex: secrets/[^/]+\.(yaml|json|env|ini|toml)
    key_groups:
@@ -11,6 +13,16 @@ creation_rules:
      - age:
        - *admin_torjus
        - *server_gunter
+  - path_regex: secrets/magicman/[^/]+\.(yaml|json|env|ini|toml)
+    key_groups:
+      - age:
+        - *admin_torjus
+        - *server_magicman
+  - path_regex: secrets/prismo/[^/]+\.(yaml|json|env|ini|toml)
+    key_groups:
+      - age:
+        - *admin_torjus
+        - *server_prismo
  - path_regex: secrets/torjus/[^/]+\.(yaml|json|env|ini|toml)
    key_groups:
      - age:
--- a/README.md
+++ b/README.md
@@ -1 +1,8 @@
-# My NixOS config
+# My nixos configurations
+
+Configurations for:
+
+* gunter
+* magicman
+* prismo
+
--- a/flake.lock
+++ b/flake.lock
@@ -1,15 +1,89 @@
 {
  "nodes": {
-    "ghettoptt": {
+    "flake-utils": {
      "inputs": {
-        "nixpkgs": "nixpkgs"
+        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1713427889,
-        "narHash": "sha256-aClsLuo5rAxZWx8IA+CDSgtLGRxfh0ovrpqQ+xOqU5s=",
+        "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_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": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1728602333,
+        "narHash": "sha256-sKbnng/g4ijuKcjShBi7oPxyUrCnMJDDy17U9W/TuMg=",
        "ref": "master",
-        "rev": "106df5c4a55c85308de69f99c835b20c06e5fd0e",
-        "revCount": 11,
+        "rev": "84fcfdde62de9888d3af8bcb0d7134137b276b55",
+        "revCount": 23,
        "type": "git",
        "url": "https://git.t-juice.club/torjus/ghettoptt"
      },
@@ -26,156 +100,253 @@
        ]
      },
      "locked": {
-        "lastModified": 1712386041,
-        "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=",
+        "lastModified": 1732025103,
+        "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff",
+        "rev": "a46e702093a5c46e192243edbd977d5749e7f294",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-23.11",
        "repo": "home-manager",
        "type": "github"
      }
    },
-    "nixpkgs": {
+    "huecli": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "poetry2nix": "poetry2nix"
+      },
      "locked": {
-        "lastModified": 1713248628,
-        "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
+        "lastModified": 1728336978,
+        "narHash": "sha256-7FX4K8QBH/9jiYyCMs2JyCTzlx1/D5Cw6upaFThSVg4=",
+        "ref": "master",
+        "rev": "700ece0bada9833fcfd3b6ce698cd74bc00e4493",
+        "revCount": 22,
+        "type": "git",
+        "url": "https://git.t-juice.club/torjus/huecli"
+      },
+      "original": {
+        "ref": "master",
+        "type": "git",
+        "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": "NixOS",
+        "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": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1728153756,
+        "narHash": "sha256-kNpO8yC2MioSRc2SNxNM5egVvFjA2Ox0b4SAs6GnM8w=",
+        "ref": "master",
+        "rev": "2fc840c15280d2dd3da1aba7272243b4aa11e611",
+        "revCount": 21,
+        "type": "git",
+        "url": "https://git.t-juice.club/torjus/nix-packages"
+      },
+      "original": {
+        "ref": "master",
+        "type": "git",
+        "url": "https://git.t-juice.club/torjus/nix-packages"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1731676054,
+        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
+    "nixpkgs-small": {
+      "locked": {
+        "lastModified": 1732007104,
+        "narHash": "sha256-qaWPxgLAvtIHTDcm0qJuc+WNYjcy4ZKigOyn2ag4ihM=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "0705964c881cea8896474610188905ba41b59b08",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable-small",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1713638189,
-        "narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "74574c38577914733b4f7a775dd77d24245081dd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-23.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1713537308,
-        "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=",
+        "lastModified": 1731755305,
+        "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f",
+        "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-24.11",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1713564160,
-        "narHash": "sha256-YguPZpiejgzLEcO36/SZULjJQ55iWcjAmf3lYiyV1Fo=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "bc194f70731cc5d2b046a6c1b3b15f170f05999c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-23.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1713248628,
-        "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1713596654,
-        "narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fd16bb6d3bcca96039b11aa52038fafeb6e4f4be",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "notlistener": {
+    "nixprstatus": {
      "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "poetry2nix": "poetry2nix_2"
      },
      "locked": {
-        "lastModified": 1713427933,
-        "narHash": "sha256-Nl12h/3NwvccbZUKqEyIaBohuVu0xpVET/rfriv8jy8=",
+        "lastModified": 1729118937,
+        "narHash": "sha256-7xYCJXTh92OpKwfshYYnxrWmfNjqaH9SzQ0stuBARVM=",
        "ref": "master",
-        "rev": "bebe25cc0210518b2a42eeb2fa9ff928cdde4d58",
-        "revCount": 7,
+        "rev": "58b113d934f5d62f27dc50439b89fece4eb621f5",
+        "revCount": 37,
        "type": "git",
-        "url": "https://git.t-juice.club/torjus/notlistener"
+        "url": "https://git.t-juice.club/torjus/nixprstatus"
      },
      "original": {
        "ref": "master",
        "type": "git",
-        "url": "https://git.t-juice.club/torjus/notlistener"
+        "url": "https://git.t-juice.club/torjus/nixprstatus"
+      }
+    },
+    "poetry2nix": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nix-github-actions": "nix-github-actions",
+        "nixpkgs": [
+          "huecli",
+          "nixpkgs"
+        ],
+        "systems": "systems_3",
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1724208502,
+        "narHash": "sha256-TCRcEPSfgAw/t7kClmlr23s591N06mQCrhzlAO7cyFw=",
+        "owner": "nix-community",
+        "repo": "poetry2nix",
+        "rev": "884b66152b0c625b8220b570a31dc7acc36749a3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "poetry2nix",
+        "type": "github"
+      }
+    },
+    "poetry2nix_2": {
+      "inputs": {
+        "flake-utils": "flake-utils_4",
+        "nix-github-actions": "nix-github-actions_2",
+        "nixpkgs": [
+          "nixprstatus",
+          "nixpkgs"
+        ],
+        "systems": "systems_6",
+        "treefmt-nix": "treefmt-nix_2"
+      },
+      "locked": {
+        "lastModified": 1729073785,
+        "narHash": "sha256-KaDC7emuamQblDdka+gkBUUdEjQf3YGYozMb+zomgSM=",
+        "owner": "nix-community",
+        "repo": "poetry2nix",
+        "rev": "795fddefc9f910671c1cf0752c29802ce27322d6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "poetry2nix",
+        "type": "github"
      }
    },
    "root": {
      "inputs": {
        "ghettoptt": "ghettoptt",
        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2",
-        "nixpkgs-unstable": "nixpkgs-unstable",
-        "notlistener": "notlistener",
+        "huecli": "huecli",
+        "nix-packages": "nix-packages",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-small": "nixpkgs-small",
+        "nixpkgs-stable": "nixpkgs-stable",
+        "nixprstatus": "nixprstatus",
        "sops-nix": "sops-nix"
      }
    },
    "sops-nix": {
      "inputs": {
-        "nixpkgs": "nixpkgs_4",
-        "nixpkgs-stable": "nixpkgs-stable"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1713668495,
-        "narHash": "sha256-4BvlfPfyUmB1U0r/oOF6jGEW/pG59c5yv6PJwgucTNM=",
+        "lastModified": 1731954233,
+        "narHash": "sha256-vvXx1m2Rsw7MkbKJdpcICzz4YPgZPApGKQGhNZfkhOI=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "09f1bc8ba3277c0f052f7887ec92721501541938",
+        "rev": "e39947d0ee8e341fa7108bd02a33cdfa24a1360e",
        "type": "github"
      },
      "original": {
@@ -183,6 +354,138 @@
        "repo": "sops-nix",
        "type": "github"
      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "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"
+      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@@ -2,73 +2,162 @@
  description = "Torjus nixos config flake";

  inputs = {
-    # nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-23.11";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    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?ref=release-23.11";
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    sops-nix = {
+      url = "github:Mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+      #inputs.nixpkgs-stable.follows = "nixpkgs-stable";
+    };
+    ghettoptt = {
+      url = "git+https://git.t-juice.club/torjus/ghettoptt?ref=master";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    huecli = {
+      url = "git+https://git.t-juice.club/torjus/huecli?ref=master";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    nix-packages = {
+      url = "git+https://git.t-juice.club/torjus/nix-packages?ref=master";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    nixprstatus = {
+      url = "git+https://git.t-juice.club/torjus/nixprstatus?ref=master";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    sops-nix.url = "github:Mic92/sops-nix";
-    notlistener.url = "git+https://git.t-juice.club/torjus/notlistener?ref=master";
-    ghettoptt.url = "git+https://git.t-juice.club/torjus/ghettoptt?ref=master";
  };

  outputs =
-    { self
-    , nixpkgs
-    , nixpkgs-unstable
-    , sops-nix
-    , notlistener
-    , ghettoptt
-    , ...
+    {
+      self,
+      nixpkgs,
+      # nixpkgs-master,
+      nixpkgs-stable,
+      nixpkgs-small,
+      nixprstatus,
+      sops-nix,
+      ghettoptt,
+      huecli,
+      nix-packages,
+      ...
    }@inputs:
    let
      system = "x86_64-linux";
      user = "torjus";
-      overlay-unstable = final: prev: {
-        unstable = import nixpkgs-unstable {
+      overlay-stable = final: prev: {
+        stable = import nixpkgs-stable {
          inherit system;
          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;
+      #     config.allowUnfree = true;
+      #   };
+      # };
+      allSystems = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
+      ];
+      forAllSystems =
+        f: nixpkgs.lib.genAttrs allSystems (system: f { pkgs = import nixpkgs { inherit system; }; });
+      commonOverlays = [
+        overlay-stable
+        # overlay-master
+        overlay-pyside6
+        ghettoptt.overlays.default
+        huecli.overlays.default
+        nix-packages.overlays.default
+        nixprstatus.overlays.default
+      ];
    in
    {
      nixosConfigurations = {
        prismo = nixpkgs.lib.nixosSystem {
          inherit system;
-          specialArgs = { inherit inputs self user; };
-          modules = [ ./hosts/prismo ];
+          specialArgs = {
+            inherit inputs self user;
+          };
+          modules = [
+            (
+              { config, pkgs, ... }:
+              {
+                nixpkgs.overlays = commonOverlays;
+              }
+            )
+            ./hosts/prismo
+            sops-nix.nixosModules.sops
+          ];
        };
        magicman = nixpkgs.lib.nixosSystem {
          inherit system;
-          specialArgs = { inherit inputs self user; };
+          specialArgs = {
+            inherit inputs self user;
+          };
          modules = [
-            ({ config, pkgs, ... }: {
-              nixpkgs.overlays = [
-                overlay-unstable
-                ghettoptt.overlays.default
-              ];
-            })
+            (
+              { config, pkgs, ... }:
+              {
+                nixpkgs.overlays = commonOverlays;
+              }
+            )
            ./hosts/magicman
            sops-nix.nixosModules.sops
          ];
        };
        gunter = nixpkgs.lib.nixosSystem {
          inherit system;
-          specialArgs = { inherit inputs self user sops-nix; };
+          specialArgs = {
+            inherit
+              inputs
+              self
+              user
+              sops-nix
+              ;
+          };
          modules = [
-            ({ config, pkgs, ... }: {
-              nixpkgs.overlays = [
-                overlay-unstable
-                notlistener.overlays.default
-                ghettoptt.overlays.default
-              ];
-            })
+            (
+              { config, pkgs, ... }:
+              {
+                nixpkgs.overlays = commonOverlays;
+              }
+            )
            ./hosts/gunter
            sops-nix.nixosModules.sops
          ];
        };
      };
+      devShells = forAllSystems (
+        { pkgs }:
+        {
+          default = pkgs.mkShell {
+            packages = with pkgs; [
+              act
+              actionlint
+              yamllint
+            ];
+          };
+        }
+      );
    };
 }
--- a/home/editor/neovim/default.nix
+++ b/home/editor/neovim/default.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
  programs = {
    neovim = {
      enable = true;
@@ -31,6 +32,11 @@
          p.tree-sitter-bash
          p.tree-sitter-json
          p.tree-sitter-python
+          p.tree-sitter-c
+          p.tree-sitter-cmake
+          p.tree-sitter-cpp
+          p.tree-sitter-markdown
+          p.tree-sitter-markdown-inline
        ]))
      ];
      extraLuaConfig = ''
@@ -42,17 +48,20 @@
  };
  home.packages = with pkgs; [
    # nix stuff
-    nixpkgs-fmt
+    nixfmt-rfc-style
    statix

    # LSPs
    gopls
-    nodePackages.pyright
+    pyright
    nodePackages.typescript-language-server
    nodePackages.typescript
    nil
    yaml-language-server
    lua-language-server
+    clang-tools
+    zls
+    ruff
  ];
  home.sessionVariables.EDITOR = "nvim";
 }
--- a/home/editor/neovim/plugins.lua
+++ b/home/editor/neovim/plugins.lua
@@ -17,7 +17,7 @@ lsp_zero.format_on_save({
 		['gopls'] = { 'go' },
 		['nil_ls'] = { 'nix' },
 		['lua_ls'] = { 'lua' },
-		['tsserver'] = { 'typescript', 'javascript' },
+		['ts_ls'] = { 'typescript', 'javascript' },
 	},
 })
 -- LSP: go
@@ -33,6 +33,8 @@ lspconfig.gopls.setup({
 		}
 	}
 })
+
+-- GO: Automatically organize imports on save
 vim.api.nvim_create_autocmd("BufWritePre", {
 	pattern = "*.go",
 	callback = function()
@@ -62,7 +64,7 @@ lspconfig.nil_ls.setup({
 	settings = {
 		['nil'] = {
 			formatting = {
-				command = { "nixpkgs-fmt" },
+				command = { "nixfmt" },
 			},
 		},
 	},
@@ -110,7 +112,7 @@ lspconfig.lua_ls.setup({
 })

 -- LSP: ts/js
-lspconfig.tsserver.setup({
+lspconfig.ts_ls.setup({
 	init_options = {
 		plugins = {
 		},
@@ -121,9 +123,62 @@ lspconfig.tsserver.setup({
 	},
 })

+-- LSP: rust
+
 lspconfig.rust_analyzer.setup {
 }

+-- LSP: python
+-- Ruff server
+lspconfig.ruff.setup({
+})
+
+-- Ruff: automatically format on save
+vim.api.nvim_create_autocmd("BufWritePre", {
+	pattern = "*.py",
+	callback = function()
+		vim.lsp.buf.format { async = false }
+	end,
+})
+
+-- Ruff: Disable hover capability
+vim.api.nvim_create_autocmd("LspAttach", {
+	group = vim.api.nvim_create_augroup('lsp_attach_disable_ruff_hover', { clear = true }),
+	callback = function(args)
+		local client = vim.lsp.get_client_by_id(args.data.client_id)
+		if client == nil then
+			return
+		end
+		if client.name == 'ruff' then
+			-- Disable hover in favor of Pyright
+			client.server_capabilities.hoverProvider = false
+		end
+	end,
+	desc = 'LSP: Disable hover capability from Ruff',
+})
+
+-- Pyright
+lspconfig.pyright.setup {
+	settings = {
+		pyright = {
+			-- Using Ruff's import organizer
+			disableOrganizeImports = true,
+		},
+		python = {
+			analysis = {
+				-- Ignore all files for analysis to exclusively use Ruff for linting
+				ignore = { '*' },
+			},
+		},
+	},
+}
+
+-- LSP: C/C++
+lspconfig.clangd.setup({})
+
+-- LSP: zig
+lspconfig.zls.setup({})
+
 -- Telescope
 require('telescope').setup({
 	extensions = {
--- a/home/gunter.nix
+++ b/home/gunter.nix
@@ -1,38 +1,49 @@
-{ pkgs, inputs, user, ... }: {
+{
+  pkgs,
+  inputs,
+  user,
+  ...
+}:
+{
  imports = [ inputs.home-manager.nixosModules.home-manager ];
  home-manager = {
    useUserPackages = true;
    useGlobalPkgs = true;
-    extraSpecialArgs = { inherit pkgs inputs user; };
-    users.${user} = { pkgs, ... }: {
-      imports = [
-        inputs.sops-nix.homeManagerModules.sops
-        ./sops
-        ./editor/neovim
-        ./programs/firefox
-        ./programs/tmux
-        ./programs/dunst
-        ./programs/kitty
-        ./programs/rofi
-        ./programs/obs-studio
-        ./programs/vscode
-        ./scripts
-        ./zsh
-        ./packages
-        ./hyprland/gunter.nix
-        ./ssh
-        ./services/backup-home.nix
-        ./services/ghettoptt.nix
-      ];
-      firefox.enable = true;
-      tmux.enable = true;
-      hyprland.enable = true;
-      home = {
-        username = "${user}";
-        homeDirectory = "/home/${user}";
-        stateVersion = "23.11";
-      };
-      programs.home-manager.enable = true;
+    extraSpecialArgs = {
+      inherit pkgs inputs user;
    };
+    users.${user} =
+      { pkgs, ... }:
+      {
+        imports = [
+          inputs.sops-nix.homeManagerModules.sops
+          ./editor/neovim
+          ./hyprland/gunter.nix
+          ./packages
+          ./programs/dunst
+          ./programs/git
+          ./programs/firefox
+          ./programs/kitty
+          ./programs/obs-studio
+          ./programs/rofi
+          ./programs/tmux
+          ./programs/vscode
+          ./scripts
+          ./services/backup-home.nix
+          ./services/ghettoptt.nix
+          ./sops
+          ./ssh
+          ./zsh
+        ];
+        firefox.enable = true;
+        tmux.enable = true;
+        hyprland.enable = true;
+        home = {
+          username = "${user}";
+          homeDirectory = "/home/${user}";
+          stateVersion = "23.11";
+        };
+        programs.home-manager.enable = true;
+      };
  };
 }
--- a/home/hyprland/cursor.nix
+++ b/home/hyprland/cursor.nix
@@ -1,9 +1,11 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
  home.pointerCursor = {
    gtk.enable = true;
    # x11.enable = true;
    package = pkgs.catppuccin-cursors.macchiatoLavender;
-    name = "Catppuccin-Macchiato-Lavender-Cursors";
+    # name = "Catppuccin-Macchiato-Lavender-Cursors";
+    name = "catppuccin-macchiato-lavender-cursors";
    size = 32;
  };

--- a/home/hyprland/gunter.nix
+++ b/home/hyprland/gunter.nix
@@ -1 +1,8 @@
-{ imports = [ ./hyprland_gunter.nix ./waybar ./xdg.nix ./cursor.nix ]; }
+{
+  imports = [
+    ./hyprland_gunter.nix
+    ./waybar
+    ./xdg.nix
+    ./cursor.nix
+  ];
+}
--- a/home/hyprland/hypridle.nix
+++ b/home/hyprland/hypridle.nix
@@ -1,11 +1,15 @@
-{ config, pkgs, ... }: {
+{
+  config,
+  osConfig,
+  pkgs,
+  ...
+}:
+{

-  home.packages = with pkgs; [
-    unstable.hypridle
-  ];
+  home.packages = with pkgs; [ hypridle ];
  xdg.configFile = {
    "hypr/hypridle.conf" = {
-      source = config.lib.file.mkOutOfStoreSymlink ./. + "/hypridle.conf";
+      source = config.lib.file.mkOutOfStoreSymlink ./. + "/hypridle_${osConfig.system.name}.conf";
      target = "hypr/hypridle.conf";
    };
  };
--- a/home/hyprland/hypridle_gunter.conf
+++ b/home/hyprland/hypridle_gunter.conf
@@ -0,0 +1,12 @@
+general {
+    lock_cmd = hyprlock          # dbus/sysd lock command (loginctl lock-session)
+    # unlock_cmd = notify-send "unlock!"      # same as above, but unlock
+    before_sleep_cmd = lockhelper # command ran before sleep
+    # after_sleep_cmd =   # command ran after sleep
+    ignore_dbus_inhibit = false             # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam)
+}
+
+listener {
+    timeout = 240                            # in seconds
+    on-timeout = lockhelper # command to run when timeout has passed
+}
--- a/home/hyprland/hypridle_magicman.conf
+++ b/home/hyprland/hypridle_magicman.conf
@@ -1,14 +1,14 @@
 general {
-    lock_cmd = hyprlock          # dbus/sysd lock command (loginctl lock-session)
+    lock_cmd = lockhelper # dbus/sysd lock command (loginctl lock-session)
    # unlock_cmd = notify-send "unlock!"      # same as above, but unlock
-    before_sleep_cmd = hyprlock    # command ran before sleep
-    # after_sleep_cmd =   # command ran after sleep
+    before_sleep_cmd = lockhelper # command ran before sleep
+    # after_sleep_cmd = lockhelper # command ran after sleep
    ignore_dbus_inhibit = false             # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam)
 }

 listener {
    timeout = 240                            # in seconds
-    on-timeout = hyprlock # command to run when timeout has passed
+    on-timeout = lockhelper # command to run when timeout has passed
    # on-resume = notify-send "Welcome back!"  # command to run when activity is detected after timeout has fired.
 }

--- a/home/hyprland/hyprland_gunter.nix
+++ b/home/hyprland/hyprland_gunter.nix
@@ -1,8 +1,18 @@
-{ inputs, pkgs, lib, config, ... }: {
+{
+  inputs,
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+{
+  imports = [
+    ./hyprlock.nix
+    ./hypridle.nix
+  ];
  options.hyprland.enable = lib.mkEnableOption "Hyprland";
  config = {
    home.packages = with pkgs; [
-      cliphist
      dunst
      # hyprlock
      hyprpaper
@@ -20,7 +30,7 @@

    wayland.windowManager.hyprland = {
      enable = true;
-      package = pkgs.unstable.hyprland;
+      package = pkgs.hyprland;
      settings = {
        "$mainMod" = "SUPER";
        "$shiftMainMod" = "SUPER_SHIFT";
@@ -38,7 +48,7 @@
          # "$mon_left,2560x1440@75,0x1080,1" # left
          "DP-8,2560x1440@75,0x1080,1" # left 75hz
          # "$mon_center,2560x1440@120,2560x1080,1" # main #ASPVEKfgZ8Dd
-          "DP-5,2560x1440@120,2560x1080,1" # main #ASPVEKfgZ8Dd 120hz
+          "DP-5,2560x1440@144,2560x1080,1" # main #ASPVEKfgZ8Dd 120hz
          # "$mon_right,2560x1440@75,5120x1080,1" # right
          "DP-7,2560x1440@75,5120x1080,1" # right 75hz
        ];
@@ -47,6 +57,10 @@
          follow_mouse = 1;
        };

+        cursor = {
+          no_hardware_cursors = true;
+        };
+
        env = [
          "LIBVA_DRIVER_NAME,nvidia"
          "XDG_SESSION_TYPE,wayland"
@@ -56,7 +70,7 @@
        ];

        decoration = {
-          rounding = 0;
+          rounding = 10;
          drop_shadow = true;
          shadow_range = 4;
          shadow_render_power = 3;
@@ -77,22 +91,32 @@

        animations = {
          enabled = true;
-          bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
+          bezier = [
+            "myBezier, 0.05, 0.9, 0.1, 1.05"
+            "easeInB, 0.6, -0.28, 0.735, 0.045"
+          ];
          animation = [
            "windows, 1, 7, myBezier"
            "windowsOut, 1, 7, default, popin 80%"
            "border, 1, 10, default"
            "borderangle, 1, 8, default"
            "fade, 1, 7, default"
-            "workspaces, 1, 6, default"
+            "workspaces, 1, 6, easeInB, slidefadevert"
+            "specialWorkspace, 1, 4, default, fade"
          ];
        };
        dwindle = {
          pseudotile = true;
          preserve_split = true;
+          special_scale_factor = 0.85;
+        };
+        master = {
+          new_status = "master";
+        };
+        misc = {
+          force_default_wallpaper = 0;
+          disable_hyprland_logo = true;
        };
-        master.new_is_master = true;
-        misc.force_default_wallpaper = -1;

        windowrulev2 = [
          "opacity 0.95 override 0.7 override,class:^(Alacritty)$"
@@ -100,15 +124,22 @@
        ];

        workspace = [
-          "name:mumble, monitor:$mon_top, persistent:true, default:true"
-          "name:left, monitor:$mon_left, persistent:true, default:true"
-          "name:right, monitor:$mon_right, persistent:true, default:true"
-          "name:main 1, monitor:$mon_center, persistent:true, default:true"
-          "name:main 2, monitor:$mon_center, persistent:true, default:true"
+          "name:T1, monitor:$mon_top, persistent:true, default:true"
+          "name:T2, monitor:$mon_top, persistent:true, default:false"
+          "name:L1, monitor:$mon_left, persistent:true, default:true"
+          "name:L2, monitor:$mon_left, persistent:true, default:false"
+          "name:R1, monitor:$mon_right, persistent:true, default:true"
+          "name:R2, monitor:$mon_right, persistent:true, default:false"
+          "name:c1, monitor:$mon_center, persistent:true, default:true"
+          "name:c2, monitor:$mon_center, persistent:true, default:false"
+          "name:c3, monitor:$mon_center, persistent:true, default:false"
+          "name:c4, monitor:$mon_center, persistent:true, default:false"
+          "special:special, on-created-empty:kitty, rounding:true, decorate:false, border:false"
        ];

        bindm = [
-          "ALT,mouse:272,movewindow"
+          "$mainMod,mouse:272,movewindow"
+          "$shiftMainMod,mouse:272,resizewindow"
        ];

        bindr = [
@@ -122,6 +153,9 @@
          # term
          "$mainMod,Return,exec,$term"

+          # hyprlock
+          "$shiftMainMod,l,exec,lockhelper"
+
          # rofi
          "$mainMod,D,exec,rofi-launcher"
          "$mainMod,P,exec,rofi-rbw"
@@ -147,25 +181,47 @@
          # Force opacity
          "$shiftMainMod,o,exec, hl-no-opacity"

+          # grimblast
+          "$mainMod,Print,exec,grimblast save active ~/tmp/$(date -Iseconds).png"
+          "$shiftMainMod,Print,exec,grimblast copy area"
+          ",Print,exec,grimblast copy active"
+
          # mumble ptt click
          # ",code:202,exec,mumble rpc starttalking"
          #",code:202,pass,^(info\.mumble\.Mumble)$"
          # ",code:202,exec,pamixer --default-source -u"
          ",code:202,pass,^discord$"

+          # Paste to wtype
+          "$mainMod,v,exec,sleep 0.5s && wl-paste | wtype -"
+
          # worspace switching
-          "$mainMod,1,workspace,name:main 1"
-          "$mainMod,2,workspace,name:main 2"
-          "$mainMod,3,workspace,3"
-          "$mainMod,4,workspace,4"
+          "$mainMod,1,workspace,name:c1"
+          "$mainMod,2,workspace,name:c2"
+          "$mainMod,3,workspace,name:c3"
+          "$mainMod,4,workspace,name:c4"
          "$mainMod,5,workspace,5"
          "$mainMod,6,workspace,6"
+
+          # Move window to workspace
+          "$shiftMainMod,1,movetoworkspace,name:c1"
+          "$shiftMainMod,2,movetoworkspace,name:c2"
+          "$shiftMainMod,3,movetoworkspace,name:c3"
+          "$shiftMainMod,4,movetoworkspace,name:c4"
+          "$shiftMainMod,5,movetoworkspace,5"
+          "$shiftMainMod,6,movetoworkspace,6"
+
+          # Special workspace
+          "$mainMod,c,togglespecialworkspace"
+          "$shiftMainMod,c,movetoworkspace, special"
        ];

        exec-once = [
          "waybar"
-          "hyprpaper & sleep 2 && randomwp"
+          "hyprpaper & sleep 10 && randomwp"
          "easyeffects --gapplication-service"
+          "hypridle"
+          "streamcontroller -b"
          # "dunst"
        ];
      };
--- a/home/hyprland/hyprland_magicman.nix
+++ b/home/hyprland/hyprland_magicman.nix
@@ -1,4 +1,11 @@
-{ inputs, pkgs, lib, config, ... }: {
+{
+  inputs,
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+{
  imports = [
    ./hyprlock.nix
    ./hypridle.nix
@@ -6,7 +13,6 @@
  options.hyprland.enable = lib.mkEnableOption "Hyprland";
  config = {
    home.packages = with pkgs; [
-      cliphist
      dunst
      # hyprlock
      hyprpaper
@@ -24,26 +30,22 @@

    wayland.windowManager.hyprland = {
      enable = true;
-      package = pkgs.unstable.hyprland;
+      package = pkgs.hyprland;
      settings = {
        "$mainMod" = "SUPER";
        "$shiftMainMod" = "SUPER_SHIFT";
        "$term" = "kitty";

-        monitor = [
-          "eDP-1,1920x1080@60,0x0,1"
-        ];
+        monitor = [ "eDP-1,1920x1080@60,0x0,1" ];
        input = {
          kb_layout = "no";
          follow_mouse = 1;
        };

-        env = [
-          "XDG_SESSION_TYPE,wayland"
-        ];
+        env = [ "XDG_SESSION_TYPE,wayland" ];

        decoration = {
-          rounding = 0;
+          rounding = 10;
          drop_shadow = true;
          shadow_range = 4;
          shadow_render_power = 3;
@@ -72,14 +74,21 @@
            "borderangle, 1, 8, default"
            "fade, 1, 7, default"
            "workspaces, 1, 6, default"
+            "specialWorkspace, 1, 4, default, fade"
          ];
        };
        dwindle = {
          pseudotile = true;
          preserve_split = true;
+          special_scale_factor = 0.85;
+        };
+        master = {
+          new_status = "master";
+        };
+        misc = {
+          force_default_wallpaper = 0;
+          disable_hyprland_logo = true;
        };
-        master.new_is_master = true;
-        misc.force_default_wallpaper = -1;

        windowrulev2 = [
          "opacity 0.95 override 0.7 override,class:^(Alacritty)$"
@@ -87,11 +96,10 @@
        ];

        workspace = [
+          "special:special, on-created-empty:kitty, rounding:true, decorate:false, border:false"
        ];

-        bindm = [
-          "ALT,mouse:272,movewindow"
-        ];
+        bindm = [ "ALT,mouse:272,movewindow" ];

        bindr = [
          # mumble ptt release
@@ -109,7 +117,7 @@
          "$mainMod,P,exec,rofi-rbw"

          # hyprlock
-          "$shiftMainMod,l,exec,hyprlock"
+          "$shiftMainMod,l,exec,lockhelper"

          # hyprland
          "$mainMod,Q,killactive,"
@@ -145,6 +153,10 @@
          "$mainMod,4,workspace,4"
          "$mainMod,5,workspace,5"
          "$mainMod,6,workspace,6"
+
+          # Special workspace
+          "$mainMod,c,togglespecialworkspace"
+          "$shiftMainMod,c,movetoworkspace, special"
        ];

        exec-once = [
--- a/home/hyprland/hyprland_prismo.nix
+++ b/home/hyprland/hyprland_prismo.nix
@@ -1,8 +1,14 @@
-{ inputs, pkgs, lib, config, ... }: {
+{
+  inputs,
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+{
  options.hyprland.enable = lib.mkEnableOption "Hyprland";
  config = {
    home.packages = with pkgs; [
-      cliphist
      dunst
      # hyprlock
      hyprpaper
@@ -20,23 +26,19 @@

    wayland.windowManager.hyprland = {
      enable = true;
-      package = pkgs.unstable.hyprland;
+      package = pkgs.hyprland;
      settings = {
        "$mainMod" = "SUPER";
        "$shiftMainMod" = "SUPER_SHIFT";
        "$term" = "kitty";

-
-        monitor = [
-        ];
+        monitor = [ ];
        input = {
          kb_layout = "no";
          follow_mouse = 1;
        };

-        env = [
-          "XDG_SESSION_TYPE,wayland"
-        ];
+        env = [ "XDG_SESSION_TYPE,wayland" ];

        decoration = {
          rounding = 0;
@@ -74,7 +76,9 @@
          pseudotile = true;
          preserve_split = true;
        };
-        master.new_is_master = true;
+        master = {
+          new_status = "master";
+        };
        misc.force_default_wallpaper = -1;

        windowrulev2 = [
@@ -90,9 +94,7 @@
          "name:main 2, monitor:$mon_center, persistent:true, default:true"
        ];

-        bindm = [
-          "ALT,mouse:272,movewindow"
-        ];
+        bindm = [ "ALT,mouse:272,movewindow" ];

        bindr = [
          # mumble ptt release
--- a/home/hyprland/hyprlock.nix
+++ b/home/hyprland/hyprlock.nix
@@ -1,11 +1,15 @@
-{ config, pkgs, ... }: {
+{
+  config,
+  osConfig,
+  pkgs,
+  ...
+}:
+{

-  home.packages = with pkgs; [
-    unstable.hyprlock
-  ];
+  home.packages = with pkgs; [ hyprlock ];
  xdg.configFile = {
    "hypr/hyprlock.conf" = {
-      source = config.lib.file.mkOutOfStoreSymlink ./. + "/hyprlock.conf";
+      source = config.lib.file.mkOutOfStoreSymlink ./. + "/hyprlock_${osConfig.system.name}.conf";
      target = "hypr/hyprlock.conf";
    };
  };
--- a/home/hyprland/hyprlock_gunter.conf
+++ b/home/hyprland/hyprlock_gunter.conf
@@ -0,0 +1,91 @@
+# BACKGROUND
+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
+}
+
+background {
+    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
+}
+background {
+    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
+}
+background {
+    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
+general {
+    no_fade_in = false
+    grace = 0
+    disable_loading_bar = true
+}
+
+# INPUT FIELD
+input-field {
+    monitor =
+    size = 250, 60
+    outline_thickness = 2
+    dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
+    dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
+    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
+}
+
+# TIME
+label {
+    monitor =
+    text = cmd[update:2000] echo "$(date +"%b %d %H:%M")"
+    #color = $foreground
+    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
+}
+
+## USER
+#label {
+#    monitor =
+#    text = Hi there, $USER
+#    color = $foreground
+#    #color = rgba(255, 255, 255, 0.6)
+#    font_size = 25
+#    font_family = JetBrains Mono Nerd Font Mono
+#    position = 0, -40
+#    halign = center
+#    valign = center
+#}
--- a/home/hyprland/hyprlock_magicman.conf
+++ b/home/hyprland/hyprlock_magicman.conf
@@ -2,7 +2,7 @@ source = ~/.cache/wal/colors-hyprland.conf
 # BACKGROUND
 background {
    monitor =
-    path = ~/wallpapers/current
+    path = /tmp/lockscreen/eDP-1.png
    blur_passes = 3
    contrast = 0.8916
    brightness = 0.8172
@@ -66,13 +66,13 @@ label {
 # Battery level
 label {
    monitor =
-    text = cmd[update:1000] echo "$(batlvl)" 
+    text = cmd[update:1000] echo "$(batlvl)"
    color = $foreground
    #color = rgba(255, 255, 255, 0.6)
    font_size = 18
    # font_family = JetBrainsMono, Font Awesome 6 Free Solid
    font_family = JetBrains Mono Nerd Font Mono
-    position = 0, -50
+    position = 0, -20
    halign = center
    valign = bottom
 }
--- a/home/hyprland/magicman.nix
+++ b/home/hyprland/magicman.nix
@@ -1 +1,8 @@
-{ imports = [ ./hyprland_magicman.nix ./waybar ./xdg.nix ./cursor.nix ]; }
+{
+  imports = [
+    ./hyprland_magicman.nix
+    ./waybar
+    ./xdg.nix
+    ./cursor.nix
+  ];
+}
--- a/home/hyprland/prismo.nix
+++ b/home/hyprland/prismo.nix
@@ -1 +1,8 @@
-{ imports = [ ./hyprland_prismo.nix ./waybar ./xdg.nix ./cursor.nix ]; }
+{
+  imports = [
+    ./hyprland_prismo.nix
+    ./waybar
+    ./xdg.nix
+    ./cursor.nix
+  ];
+}
--- a/home/hyprland/waybar/arrhist.nix
+++ b/home/hyprland/waybar/arrhist.nix
@@ -0,0 +1,5 @@
+{ config, pkgs }:
+{
+  sops.secrets."sonarr_api_key" = { };
+  sops.secrets."radarr_api_key" = { };
+}
--- a/home/hyprland/waybar/arrhist.py
+++ b/home/hyprland/waybar/arrhist.py
@@ -0,0 +1,71 @@
+#!/usr/bin/env python3
+import json
+import os
+import requests
+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:
+        raise Exception("XDG_RUNTIME_DIR not set")
+    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/history/since"
+    url += f"?date={since.isoformat()}"
+    response = requests.get(url, headers=make_header(api_key))
+    response.raise_for_status()
+    data = response.json()
+
+    items = []
+    for item in data:
+        if item["eventType"] == "downloadFolderImported":
+            items.append(item["sourceTitle"])
+    return items
+
+def get_radarr_history(since: datetime|None=None):
+    api_key = get_radarr_key()
+    if not since:
+        since = datetime.combine(date.today()-timedelta(days=7),datetime.min.time())
+    url = f"{radarr_url()}/api/v3/history/since"
+    url += f"?date={since.isoformat()}"
+    response = requests.get(url, headers=make_header(api_key))
+    response.raise_for_status()
+    data = response.json()
+
+    items = []
+    for item in data:
+        if item["eventType"] == "downloadFolderImported":
+            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" + "\n".join(radarr_items) + "\n" + "Sonarr: \n" + "\n".join(sonarr_items)
+    }
+    print(json.dumps(output))
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@@ -1,4 +1,9 @@
-{ pkgs, lib, ... }:
+{
+  pkgs,
+  lib,
+  osConfig,
+  ...
+}:
 let
  flakestat = pkgs.writeShellApplication {
    name = "flakestat";
@@ -8,16 +13,33 @@ let
    ];
    text = builtins.readFile ./flakestat.sh;
  };
+  arrhist = pkgs.stdenv.mkDerivation {
+    name = "arrhist";
+    propagatedBuildInputs = [
+      (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [ requests ]))
+    ];
+    src = ./arrhist.py;
+    dontUnpack = true;
+    installPhase = "install -Dm755 ${./arrhist.py} $out/bin/arrhist";
+  };
+  withArrhist = if (osConfig.system.name == "gunter") then true else false;
+  withBattery = if (osConfig.system.name == "magicman") then true else false;
 in
 {
+  sops.secrets."sonarr_base_url" = { };
+  sops.secrets."sonarr_api_key" = { };
+  sops.secrets."radarr_base_url" = { };
+  sops.secrets."radarr_api_key" = { };
+
  xdg.configFile."waybar/macchiato.css" = {
-    source = pkgs.fetchFromGitHub
-      {
+    source =
+      pkgs.fetchFromGitHub {
        owner = "catppuccin";
        repo = "waybar";
        rev = "f74ab1eecf2dcaf22569b396eed53b2b2fbe8aff";
        sha256 = "WLJMA2X20E5PCPg0ZPtSop0bfmu+pLImP9t8A8V4QK8=";
-      } + "/themes/machiatto.css";
+      }
+      + "/themes/macchiato.css";
  };

  programs.waybar = {
@@ -27,18 +49,40 @@ in
      target = "graphical-session.target";
    };
    style = ''
+      @import "macchiato.css";
      * {
-        font-family: "FiraCodeNerdFont-Regular";
-        font-size: 14px;
-        font-weight: bold;
-        border-radius: 0px;
+        border: none;
+        font-family: "JetbrainsMono Nerd Font";
+        font-size: 15px;
        transition-property: background-color;
        transition-duration: 0.5s;
+        color: @text;
+        border-radius: 10px;
+        min-height: 10px;
      }
+
+      window#waybar {
+        background-color: @surface2;
+        border-radius: 0px;
+      }
+
+      window#waybar.hidden {
+        opacity: 0.2;
+      }
+
+      #window {
+        margin-top: 6px;
+        padding-left: 10px;
+        padding-right: 10px;
+        border-radius: 0px;
+        transition: none;
+        color: transparent;
+        background-color: @surface2;
+      }
+
      @keyframes blink_red {
        to {
-          background-color: rgb(242, 143, 173);
-          color: rgb(26, 24, 38);
+          background-color: @red;
        }
      }
      .warning,
@@ -50,49 +94,43 @@ in
        animation-iteration-count: infinite;
        animation-direction: alternate;
      }
-      window#waybar {
-        background-color: transparent;
-      }
-      window > box {
-        margin-left: 0px;
-        margin-right: 0px;
-        margin-top: 0px;
-        border-bottom: 2px solid @color1;
-        background-color: @background;
-      }
      #workspaces {
-        padding-left: 0px;
-        padding-right: 4px;
+        padding-left: 12px;
+        padding-right: 12px;
+        background-color: @base;
      }
      #workspaces button {
-        padding-top: 5px;
-        padding-bottom: 5px;
-        padding-left: 6px;
-        padding-right: 6px;
-        color: @color1;
+        padding-left: 12px;
+        padding-right: 12px;
      }
      #workspaces button.active {
-        background-color: @color1;
-        color: rgb(26, 24, 38);
+        background-color: @surface2;
      }
      #workspaces button.urgent {
-        color: rgb(26, 24, 38);
+        color: alpha(@red, 0.4);
      }
      #workspaces button:hover {
-        background-color: #b38dac;
-        color: rgb(26, 24, 38);
+        background-color: @surface2;
      }
      tooltip {
-        background: #3b4253;
+        background-color: @base;
      }
      tooltip label {
-        color: #e4e8ef;
+        color: @text;
      }
      #custom-launcher {
-        font-size: 20px;
-        padding-left: 8px;
-        padding-right: 6px;
-        color: #7ebae4;
+        font-size: 15px;
+        padding-left: 5px;
+        padding-right: 12px;
+        background-color: @base;
+      }
+      .modules-right {
+        background-color: @base;
+        border-radius: 10px 0px 0px 10px;
+      }
+      .modules-left {
+        background-color: @base;
+        border-radius: 0px 10px 10px 0px;
      }
      #mode,
      #clock,
@@ -108,119 +146,120 @@ in
      #battery,
      #custom-powermenu,
      #custom-flakestat,
-      #custom-cava-internal {
-        padding-left: 10px;
-        padding-right: 10px;
-        color: @color1;
-      }
-      #network.disconnected {
-        color: #cccccc;
+      #custom-arrhist {
+        padding-left: 12px;
+        padding-right: 12px;
      }
      #battery.charging,
      #battery.full,
      #battery.discharging {
-        color: #cf876f;
+        color: @maroon;
      }
      #battery.critical:not(.charging) {
-        color: #d6dce7;
-      }
-      #custom-powermenu {
-        color: #bd6069;
-      }
-      #tray {
-        padding-right: 8px;
-        padding-left: 10px;
-      }
-      #tray menu {
-        background: #3b4252;
-        color: #dee2ea;
-      }
-      #mpd.paused {
-        color: rgb(192, 202, 245);
-        font-style: italic;
-      }
-      #mpd.stopped {
-        background: transparent;
-      }
-      #mpd {
-        color: #e4e8ef;
-      }
-      #custom-cava-internal {
-        font-family: "Hack Nerd Font";
+        color: @red;
      }
    '';
-    settings = [{
-      "layer" = "top";
-      "position" = "top";
-      modules-left = [ "custom/launcher" "hyprland/workspaces" ];
-      modules-center = [ "clock" ];
-      modules-right =
-        [ "custom/flakestat" "pulseaudio" "pulseaudio#microphone" "memory" "cpu" "tray" "battery" ];
-      "custom/launcher" = {
-        "format" = " ";
-        "on-click" = "pkill rofi || ~/.config/rofi/launcher.sh";
-        "tooltip" = false;
-      };
-      "hyprland/workspaces" = {
-        "format" = "{name}";
-        "on-click" = "activate";
-        "on-scroll-up" = "hyprctl dispatch workspace e+1";
-        "on-scroll-down" = "hyprctl dispatch workspace e-1";
-      };
-      "pulseaudio" = {
-        "scroll-step" = 5;
-        "format" = "{icon} {volume}%";
-        "format-muted" = "";
-        "format-icons" = { "default" = [ "" "" "" ]; };
-        "on-click" = "pamixer -t";
-      };
-      "pulseaudio#microphone" = {
-        "format" = "{format_source}";
-        "format-source" = " {volume}%";
-        "format-source-muted" = "";
-        "on-click" = "pamixer --default-source -t";
-        "on-scroll-up" = "pamixer --default-source -i 5";
-        "on-scroll-down" = "pamixer --default-source -d 5";
-        "scroll-step" = 5;
-        "on-click-right" = "pavucontrol";
-      };
-      "clock" = {
-        "interval" = 1;
-        "format" = "{:%H:%M %A %b %d}";
-        "tooltip" = true;
-      };
-      "memory" = {
-        "interval" = 3;
-        "format" = " {percentage}%";
-        "states" = { "warning" = 85; };
-      };
-      "cpu" = {
-        "interval" = 3;
-        "format" = " {usage}%";
-      };
-      "tray" = {
-        "icon-size" = 15;
-        "spacing" = 6;
-      };
-      "battery" = {
-        "interval" = 60;
-        "states" = {
-          "warning" = 20;
-          "critical" = 5;
-        };
-        "format" = "{icon} {capacity}%";
-        "format-icons" = [
-          ""
-          ""
-          ""
-          ""
-          ""
-        ];
-      };
-      "custom/flakestat" = {
-        "exec" = "${flakestat}/bin/flakestat";
-        "interval" = 600;
-      };
-    }];
+    settings = [
+      (
+        let
+          volInterval = if (osConfig.system.name == "gunter") then "5" else "1";
+        in
+        {
+          "layer" = "top";
+          "position" = "top";
+          modules-left = [ "custom/flakestat" ];
+          modules-center = [ "hyprland/workspaces" ];
+          modules-right = [
+            (lib.mkIf (withArrhist) "custom/arrhist")
+            "pulseaudio"
+            "pulseaudio#microphone"
+            "memory"
+            "cpu"
+            (lib.mkIf (withBattery) "battery")
+            "clock"
+            "tray"
+          ];
+          "hyprland/workspaces" = {
+            "format" = "{name}";
+            "on-click" = "activate";
+            "on-scroll-up" = "hyprctl dispatch workspace e+1";
+            "on-scroll-down" = "hyprctl dispatch workspace e-1";
+          };
+          "pulseaudio" = {
+            "scroll-step" = 5;
+            "format" = "{icon} {volume}%";
+            "format-muted" = "";
+            "format-icons" = {
+              "default" = [
+                ""
+                ""
+                ""
+              ];
+            };
+            "on-scroll-up" = "pamixer -i ${volInterval}";
+            "on-scroll-down" = "pamixer -d ${volInterval}";
+            "on-click" = "pamixer -t";
+          };
+          "pulseaudio#microphone" = {
+            "format" = "{format_source}";
+            "format-source" = " {volume}%";
+            "format-source-muted" = "";
+            "on-click" = "pamixer --default-source -t";
+            "on-scroll-up" = "pamixer --default-source -i ${volInterval}";
+            "on-scroll-down" = "pamixer --default-source -d ${volInterval}";
+            "scroll-step" = 5;
+            "on-click-right" = "pavucontrol";
+          };
+          "clock" = {
+            "interval" = 1;
+            "format" = "{:%H:%M %A %b %d}";
+            "tooltip" = true;
+          };
+          "memory" = {
+            "interval" = 3;
+            "format" = " {percentage}%";
+            "states" = {
+              "warning" = 85;
+            };
+          };
+          "cpu" = {
+            "interval" = 3;
+            "format" = " {usage}%";
+          };
+          "tray" = {
+            "icon-size" = 15;
+            "spacing" = 6;
+          };
+          "battery" = {
+            "interval" = 60;
+            "states" = {
+              "warning" = 20;
+              "critical" = 5;
+            };
+            "format" = "{icon} {capacity}%";
+            "format-icons" = [
+              ""
+              ""
+              ""
+              ""
+              ""
+            ];
+          };
+          "custom/flakestat" = {
+            "exec" = "${flakestat}/bin/flakestat";
+            "format" = "  {}";
+            "return-type" = "json";
+            "interval" = 600;
+          };
+        }
+        // lib.optionalAttrs (withArrhist) {
+          "custom/arrhist" = {
+            "exec" = "${arrhist}/bin/arrhist";
+            "return-type" = "json";
+            "interval" = 600;
+          };
+        }
+      )
+    ];
  };
 }
--- a/home/hyprland/waybar/flakestat.sh
+++ b/home/hyprland/waybar/flakestat.sh
@@ -1,25 +1,55 @@
 #!/usr/bin/env bash
+set -eo pipefail
+
+# Args:
+# $1 text
+# $2 tooltip
+# $3 error-code
+print_output() {
+    local text="$1"
+    local tooltip="$2"
+    local error_code="$3"
+
+    if [ -z "$error_code" ]; then
+        output=$(jq -n \
+            --arg text "$text" \
+            --arg tooltip "$tooltip" \
+            --unbuffered \
+            --compact-output \
+            '{text: $text, tooltip: $tooltip}')
+    else
+        output=$(jq -n \
+            --arg text "$text" \
+            --arg tooltip "$tooltip" \
+            --unbuffered \
+            --compact-output \
+            '{text: $text, tooltip: $tooltip}')
+    fi
+    
+    echo "$output"
+}

 FLAKE_DIR="/home/torjus/nixos"
 NIXPKGS_DIR="/home/torjus/git/nixpkgs"

 flake_metadata=$(nix flake metadata --json "$FLAKE_DIR" 2>/dev/null)

-stable_input=$(echo "$flake_metadata" | jq '.locks.nodes.root.inputs.nixpkgs')
-stable_rev=$(echo "$flake_metadata" | jq -r ".locks.nodes.$stable_input.locked.rev")
-stable_branch=$(echo "$flake_metadata" | jq -r ".locks.nodes.$stable_input.original.ref")
-
-unstable_input=$(echo "$flake_metadata" | jq '.locks.nodes.root.inputs."nixpkgs-unstable"')
+unstable_input=$(echo "$flake_metadata" | jq '.locks.nodes.root.inputs.nixpkgs')
 unstable_rev=$(echo "$flake_metadata" | jq -r ".locks.nodes.$unstable_input.locked.rev")
 unstable_branch=$(echo "$flake_metadata" | jq -r ".locks.nodes.$unstable_input.original.ref")

-cd "$NIXPKGS_DIR" || exit 1
-git fetch -q
-git switch -q "$stable_branch"
-git pull -q
-stable_commit_count=$(git rev-list "$stable_rev..HEAD"|wc -l)
-git switch -q "$unstable_branch"
-git pull -q
-unstable_commit_count=$(git rev-list "$unstable_rev..HEAD"|wc -l)
+cd "$NIXPKGS_DIR" || print_output "?" "Could not find git repo dir" 1
+if ! git fetch -q --all; then
+    print_output "?" "Unable to fetch commits" 1
+    exit 1
+fi

-echo "$stable_commit_count|$unstable_commit_count"
+if ! unstable_commit_count=$(git rev-list --count "$unstable_rev..origin/$unstable_branch"); then
+    print_output "?" "Unable to list commits" 1
+    exit 1
+fi
+
+text="$unstable_commit_count"
+tooltip="${unstable_branch}: ${unstable_commit_count}"
+
+print_output "$text" "$tooltip" 0
--- a/home/hyprland/waybar/waybar.nix
+++ b/home/hyprland/waybar/waybar.nix
@@ -1,201 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.waybar = {
-    enable = true;
-    systemd = {
-      enable = false; # disable it,autostart it in hyprland conf
-      target = "graphical-session.target";
-    };
-    style = ''
-      * {
-        font-family: "FiraCodeNerdFont-Regular";
-        font-size: 14px;
-        font-weight: bold;
-        border-radius: 0px;
-        transition-property: background-color;
-        transition-duration: 0.5s;
-      }
-      @keyframes blink_red {
-        to {
-          background-color: rgb(242, 143, 173);
-          color: rgb(26, 24, 38);
-        }
-      }
-      .warning,
-      .critical,
-      .urgent {
-        animation-name: blink_red;
-        animation-duration: 1s;
-        animation-timing-function: linear;
-        animation-iteration-count: infinite;
-        animation-direction: alternate;
-      }
-      window#waybar {
-        background-color: transparent;
-      }
-      window > box {
-        margin-left: 0px;
-        margin-right: 0px;
-        margin-top: 0px;
-        border-bottom: 2px solid @color1;
-        background-color: @background;
-      }
-      #workspaces {
-        padding-left: 0px;
-        padding-right: 4px;
-      }
-      #workspaces button {
-        padding-top: 5px;
-        padding-bottom: 5px;
-        padding-left: 6px;
-        padding-right: 6px;
-        color: @color1;
-      }
-      #workspaces button.active {
-        background-color: @color1;
-        color: rgb(26, 24, 38);
-      }
-      #workspaces button.urgent {
-        color: rgb(26, 24, 38);
-      }
-      #workspaces button:hover {
-        background-color: #b38dac;
-        color: rgb(26, 24, 38);
-      }
-      tooltip {
-        background: #3b4253;
-      }
-      tooltip label {
-        color: #e4e8ef;
-      }
-      #custom-launcher {
-        font-size: 20px;
-        padding-left: 8px;
-        padding-right: 6px;
-        color: #7ebae4;
-      }
-      #mode,
-      #clock,
-      #memory,
-      #temperature,
-      #cpu,
-      #mpd,
-      #custom-wall,
-      #temperature,
-      #backlight,
-      #pulseaudio,
-      #network,
-      #battery,
-      #custom-powermenu,
-      #custom-cava-internal {
-        padding-left: 10px;
-        padding-right: 10px;
-        color: @color1;
-      }
-      #network.disconnected {
-        color: #cccccc;
-      }
-      #battery.charging,
-      #battery.full,
-      #battery.discharging {
-        color: #cf876f;
-      }
-      #battery.critical:not(.charging) {
-        color: #d6dce7;
-      }
-      #custom-powermenu {
-        color: #bd6069;
-      }
-      #tray {
-        padding-right: 8px;
-        padding-left: 10px;
-      }
-      #tray menu {
-        background: #3b4252;
-        color: #dee2ea;
-      }
-      #mpd.paused {
-        color: rgb(192, 202, 245);
-        font-style: italic;
-      }
-      #mpd.stopped {
-        background: transparent;
-      }
-      #mpd {
-        color: #e4e8ef;
-      }
-      #custom-cava-internal {
-        font-family: "Hack Nerd Font";
-      }
-    '';
-    settings = [{
-      "layer" = "top";
-      "position" = "top";
-      modules-left = [ "custom/launcher" "hyprland/workspaces" ];
-      modules-center = [ "clock" ];
-      modules-right =
-        [ "pulseaudio" "pulseaudio#microphone" "memory" "cpu" "tray" "battery" ];
-      "custom/launcher" = {
-        "format" = " ";
-        "on-click" = "pkill rofi || ~/.config/rofi/launcher.sh";
-        "tooltip" = false;
-      };
-      "hyprland/workspaces" = {
-        "format" = "{name}";
-        "on-click" = "activate";
-        "on-scroll-up" = "hyprctl dispatch workspace e+1";
-        "on-scroll-down" = "hyprctl dispatch workspace e-1";
-      };
-      "pulseaudio" = {
-        "scroll-step" = 5;
-        "format" = "{icon} {volume}%";
-        "format-muted" = "";
-        "format-icons" = { "default" = [ "" "" "" ]; };
-        "on-click" = "pamixer -t";
-      };
-      "pulseaudio#microphone" = {
-        "format" = "{format_source}";
-        "format-source" = " {volume}%";
-        "format-source-muted" = "";
-        "on-click" = "pamixer --default-source -t";
-        "on-scroll-up" = "pamixer --default-source -i 5";
-        "on-scroll-down" = "pamixer --default-source -d 5";
-        "scroll-step" = 5;
-        "on-click-right" = "pavucontrol";
-      };
-      "clock" = {
-        "interval" = 1;
-        "format" = "{:%H:%M %A %b %d}";
-        "tooltip" = true;
-      };
-      "memory" = {
-        "interval" = 3;
-        "format" = " {percentage}%";
-        "states" = { "warning" = 85; };
-      };
-      "cpu" = {
-        "interval" = 3;
-        "format" = " {usage}%";
-      };
-      "tray" = {
-        "icon-size" = 15;
-        "spacing" = 6;
-      };
-      "battery" = {
-        "interval" = 60;
-        "states" = {
-          "warning" = 30;
-          "critical" = 5;
-        };
-        "format" = "{icon} {capacity}%";
-        "format-icons" = [
-          ""
-          ""
-          ""
-          ""
-          ""
-        ];
-      };
-    }];
-  };
-}
--- a/home/hyprland/xdg.nix
+++ b/home/hyprland/xdg.nix
@@ -1,4 +1,5 @@
-{ config, ... }: {
+{ config, ... }:
+{
  xdg.configFile = {
    "hypr/hyprpaper.conf" = {
      source = config.lib.file.mkOutOfStoreSymlink ./. + "/hyprpaper.conf";
--- a/home/i3/default.nix
+++ b/home/i3/default.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
  mod = "Mod4";
 in
--- a/home/magicman.nix
+++ b/home/magicman.nix
@@ -1,38 +1,49 @@
-{ pkgs, inputs, user, ... }: {
+{
+  pkgs,
+  inputs,
+  user,
+  ...
+}:
+{
  imports = [ inputs.home-manager.nixosModules.home-manager ];
  home-manager = {
    useUserPackages = true;
    useGlobalPkgs = true;
-    extraSpecialArgs = { inherit pkgs inputs user; };
-    users.${user} = { pkgs, ... }: {
-      imports = [
-        inputs.sops-nix.homeManagerModules.sops
-        ./sops
-        ./editor/neovim
-        ./programs/firefox
-        ./programs/tmux
-        ./programs/dunst
-        ./programs/kitty
-        ./programs/rofi
-        ./programs/obs-studio
-        ./programs/vscode
-        ./programs/pywal
-        ./scripts
-        ./scripts/batlvl.nix
-        ./zsh
-        ./packages
-        ./hyprland/magicman.nix
-        ./ssh
-      ];
-      firefox.enable = true;
-      tmux.enable = true;
-      hyprland.enable = true;
-      home = {
-        username = "${user}";
-        homeDirectory = "/home/${user}";
-        stateVersion = "23.11";
-      };
-      programs.home-manager.enable = true;
+    extraSpecialArgs = {
+      inherit pkgs inputs user;
    };
+    users.${user} =
+      { pkgs, ... }:
+      {
+        imports = [
+          inputs.sops-nix.homeManagerModules.sops
+          ./sops
+          ./editor/neovim
+          ./programs/firefox
+          ./programs/tmux
+          ./programs/dunst
+          ./programs/kitty
+          ./programs/rofi
+          ./programs/obs-studio
+          ./programs/vscode
+          ./programs/pywal
+          ./programs/zellij
+          ./scripts
+          ./scripts/batlvl.nix
+          ./zsh
+          ./packages
+          ./hyprland/magicman.nix
+          ./ssh
+        ];
+        firefox.enable = true;
+        tmux.enable = true;
+        hyprland.enable = true;
+        home = {
+          username = "${user}";
+          homeDirectory = "/home/${user}";
+          stateVersion = "23.11";
+        };
+        programs.home-manager.enable = true;
+      };
  };
 }
--- a/home/packages/default.nix
+++ b/home/packages/default.nix
@@ -1,36 +1,41 @@
-{ pkgs, ... }:
+{ pkgs, osConfig, ... }:
 let
-  my-pomodoro = pkgs.callPackage ../../packages/open-pomodoro.nix { };
+  withCuda = if (osConfig.system.name == "gunter") then true else false;
 in
 {
+  imports = [
+    ./zoom.nix
+  ];
  home.packages = with pkgs; [
-    # My own packages
-    my-pomodoro
-
-    # Generic tools
+    # CLI utils
+    act
    age
-    alacritty
-    unstable.btop
-    # (unstable.btop.override {
-    #   cudaSupport = true;
-    # })
+    bat
    bzip2
    croc
+    devenv
+    distrobox
+    dust
    easyeffects
    eza
    fd
    ffmpeg
    file
-    go-task
+    fzf
    glib
+    grimblast
+    ijq
+    incus
    jq
    kitty
    kubectl
+    lazygit
+    lf
    ncdu
+    nvd
+    nurl
    nwg-look
-    mumble
-    mpv
-    pamixer
+    most
    pinentry
    pre-commit
    pulseaudio
@@ -38,35 +43,37 @@ in
    rbw
    restic
    ripgrep
-    rofi-rbw-wayland
    sops
-    spotify
-    spicetify-cli
    sshfs
-    unstable.devenv
-    unstable.ventoy
-    discord
-
-    # k8s tools
-    unstable.talosctl
-    unstable.k9s
-    unstable.cilium-cli
-    unstable.kubernetes-helm
-    unstable.cmctl
-    unstable.krew
-
-    # steam
-    # steam-run
-    # steamcmd
-    # gamescope
+    tea
+    tldr
    tokei
    unzip
-    yt-dlp
-    unstable.zoom-us
-    unstable.vmware-horizon-client
+    ventoy
+    wtype

-    # Editors
-    # vscode
+    # Non-CLI stuff
+    alacritty
+    discord
+    feh
+    krita
+    mpv
+    mumble
+    pamixer
+    rofi-rbw-wayland
+    spicetify-cli
+    spotify
+    virt-manager
+    vmware-horizon-client
+    yt-dlp
+
+    # k8s tools
+    cilium-cli
+    cmctl
+    k9s
+    krew
+    kubernetes-helm
+    talosctl

    # Go stuff
    go
@@ -79,10 +86,12 @@ in
    typescript

    # Py stuff
-    (unstable.python312.withPackages (p: with p; [
-      requests
-      ipython
-    ]))
+    (python312.withPackages (
+      p: with p; [
+        requests
+        ipython
+      ]
+    ))
    poetry
    ruff

@@ -91,10 +100,19 @@ in
    cargo
    rust-analyzer

-    # blender
-    unstable.blender
-
    # Homemade shit
    ghettoptt
+    huecli
+    nixprstatus
+
+    # Stuff with overrides
+    # Btop
+    (btop.override { cudaSupport = withCuda; })
+    # PrismLauncher
+    prismlauncher
+
+    # From nix-packages flake
+    path-of-building-beta
+    awakened-poe-trade
  ];
 }
--- a/home/packages/zoom.nix
+++ b/home/packages/zoom.nix
@@ -0,0 +1,16 @@
+{ pkgs, lib, ... }:
+let
+  version = "6.2.6.2503";
+  zoom-override = pkgs.zoom-us.overrideAttrs (old: {
+    inherit version;
+    src = pkgs.fetchurl {
+      url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
+      hash = "sha256-qhymegXkXSl9fK/5klSi5uRPwFVN88QH/5EVGaBUbfc=";
+    };
+  });
+in
+{
+  home.packages = [
+    (lib.warn "Using overridden zoom version" zoom-override)
+  ];
+}
--- a/home/prismo.nix
+++ b/home/prismo.nix
@@ -1,38 +1,48 @@
-{ pkgs, inputs, user, ... }: {
+{
+  pkgs,
+  inputs,
+  user,
+  ...
+}:
+{
  imports = [ inputs.home-manager.nixosModules.home-manager ];
  home-manager = {
    useUserPackages = true;
    useGlobalPkgs = true;
-    extraSpecialArgs = { inherit pkgs inputs user; };
-    users.${user} = { pkgs, ... }: {
-      imports = [
-        inputs.sops-nix.homeManagerModules.sops
-        ./sops
-        ./editor/neovim
-        ./programs/firefox
-        ./programs/tmux
-        ./programs/dunst
-        ./programs/kitty
-        ./programs/rofi
-        ./programs/obs-studio
-        ./programs/vscode
-        ./scripts
-        ./zsh
-        ./packages
-        ./hyprland
-        ./ssh
-        ./services/backup-home.nix
-        ./services/ghettoptt.nix
-      ];
-      firefox.enable = true;
-      tmux.enable = true;
-      hyprland.enable = true;
-      home = {
-        username = "${user}";
-        homeDirectory = "/home/${user}";
-        stateVersion = "23.11";
-      };
-      programs.home-manager.enable = true;
+    extraSpecialArgs = {
+      inherit pkgs inputs user;
    };
+    users.${user} =
+      { pkgs, ... }:
+      {
+        imports = [
+          inputs.sops-nix.homeManagerModules.sops
+          ./sops
+          ./editor/neovim
+          ./programs/firefox
+          ./programs/tmux
+          ./programs/dunst
+          ./programs/kitty
+          ./programs/rofi
+          ./programs/obs-studio
+          ./programs/vscode
+          ./scripts
+          ./zsh
+          ./packages
+          ./hyprland/hyprland_prismo.nix
+          ./ssh
+          ./services/backup-home.nix
+          ./services/ghettoptt.nix
+        ];
+        firefox.enable = true;
+        tmux.enable = true;
+        hyprland.enable = true;
+        home = {
+          username = "${user}";
+          homeDirectory = "/home/${user}";
+          stateVersion = "23.11";
+        };
+        programs.home-manager.enable = true;
+      };
  };
 }
--- a/home/programs/dunst/default.nix
+++ b/home/programs/dunst/default.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

 {
  services.dunst = {
@@ -11,7 +16,7 @@
      global = {
        rounded = "yes";
        origin = "top-right";
-        monitor = "3";
+        monitor = "4";
        alignment = "left";
        vertical_alignment = "center";
        width = "400";
@@ -36,7 +41,7 @@
        corner_radius = 10;
        # follow = "mouse";
        font = "Source Sans Pro 10";
-        format = "<b>%s</b>\\n%b"; #format = "<span foreground='#f3f4f5'><b>%s %p</b></span>\n%b"
+        format = "<b>%s</b>\\n%b"; # format = "<span foreground='#f3f4f5'><b>%s %p</b></span>\n%b"
        frame_color = "#232323";
        frame_width = 1;
        offset = "15x15";
@@ -57,7 +62,9 @@
        browser = "/usr/bin/env firefox -new-tab";
      };

-      fullscreen_delay_everything = { fullscreen = "delay"; };
+      fullscreen_delay_everything = {
+        fullscreen = "delay";
+      };

      urgency_critical = {
        background = "#d64e4e";
--- a/home/programs/firefox/default.nix
+++ b/home/programs/firefox/default.nix
@@ -1,6 +1,17 @@
-{ pkgs, config, lib, inputs, user, ... }: {
+{
+  pkgs,
+  config,
+  lib,
+  inputs,
+  user,
+  ...
+}:
+{
  options.firefox.enable = lib.mkEnableOption "Firefox";

-  config =
-    lib.mkIf config.firefox.enable { programs.firefox = { enable = true; }; };
+  config = lib.mkIf config.firefox.enable {
+    programs.firefox = {
+      enable = true;
+    };
+  };
 }
--- a/home/programs/git/default.nix
+++ b/home/programs/git/default.nix
@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+{
+  programs.git = {
+    enable = true;
+    userName = "Torjus Håkestad";
+    userEmail = "torjus@usit.uio.no";
+
+    lfs.enable = true;
+
+    signing = {
+      key = "~/.ssh/id_ed25519.pub";
+      signByDefault = true;
+    };
+
+    includes = [
+      {
+        contents = {
+          gpg.format = "ssh";
+        };
+      }
+    ];
+  };
+}
--- a/home/programs/kitty/default.nix
+++ b/home/programs/kitty/default.nix
@@ -1,24 +1,27 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+{
  xdg.configFile."kitty/kitty.conf" = {
    source = config.lib.file.mkOutOfStoreSymlink ./. + "/kitty.conf";
    target = "kitty/kitty.conf";
  };
  xdg.configFile."kitty/themes/macchiato.conf" = {
-    source = pkgs.fetchFromGitHub
-      {
+    source =
+      pkgs.fetchFromGitHub {
        owner = "catppuccin";
        repo = "kitty";
        rev = "d7d61716a83cd135344cbb353af9d197c5d7cec1";
        sha256 = "mRFa+40fuJCUrR1o4zMi7AlgjRtFmii4fNsQyD8hIjM=";
-      } + "/themes/macchiato.conf";
+      }
+      + "/themes/macchiato.conf";
  };
  xdg.configFile."kitty/themes/latte.conf" = {
-    source = pkgs.fetchFromGitHub
-      {
+    source =
+      pkgs.fetchFromGitHub {
        owner = "catppuccin";
        repo = "kitty";
        rev = "d7d61716a83cd135344cbb353af9d197c5d7cec1";
        sha256 = "mRFa+40fuJCUrR1o4zMi7AlgjRtFmii4fNsQyD8hIjM=";
-      } + "/themes/latte.conf";
+      }
+      + "/themes/latte.conf";
  };
 }
--- a/home/programs/kitty/kitty.conf
+++ b/home/programs/kitty/kitty.conf
@@ -20,4 +20,8 @@ font_size 14.0
 # Window padding
 window_padding_width 10

+# Zoom mapping
+map ctrl+kp_add change_font_size all +2.0
+map ctrl+kp_minus change_font_size all -2.0
+
 include themes/macchiato.conf
--- a/home/programs/obs-studio/default.nix
+++ b/home/programs/obs-studio/default.nix
@@ -1,25 +1,46 @@
-{ pkgs, ... }:
-# let
-#   obs-backgroundremoval_1_1_10 = (pkgs.obs-studio-plugins.obs-backgroundremoval.overrideAttrs {
-#     version = "1.1.10";
-#     src = pkgs.fetchFromGitHub {
-#       owner = "occ-ai";
-#       repo = "obs-backgroundremoval";
-#       rev = "1.1.10";
-#       hash = "sha256-6OTtmjXS3fiorEPUSjjqrS8u9fVJnnZZoD722W3JQO8=";
-#     };
-#   }).override {
-#     onnxruntime = pkgs.unstable.onnxruntime;
-#   };
-# in
+{
+  pkgs,
+  lib,
+  osConfig,
+  ...
+}:
+let
+  withCuda = osConfig.system.name == "gunter";
+
+  onnxruntime-gpu = (pkgs.onnxruntime.override { cudaSupport = withCuda; }).overrideAttrs (old: {
+    # TODO: Remove when fixed in nixpkgs
+    # https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/development/libraries/onnxruntime/default.nix#L154
+    buildInputs = old.buildInputs ++ [ pkgs.cudaPackages.nccl ];
+  });
+
+  obs-backgrounremoval-gpu = (
+    (pkgs.obs-studio-plugins.obs-backgroundremoval.override { onnxruntime = onnxruntime-gpu; })
+    .overrideAttrs
+      (old: {
+        version = "1.1.14-beta";
+        src = pkgs.fetchFromGitHub {
+          owner = "occ-ai";
+          repo = "obs-backgroundremoval";
+          rev = "012a7f45fe4cb5363abee654d05c5cba4235feb5";
+          hash = "sha256-ud9RfnbMXfOaIhkUYG7zyR4SxZhj3rZd9b4+8P4jBYs=";
+        };
+        cmakeFlags =
+          if withCuda then
+            (lib.lists.remove "-DDISABLE_ONNXRUNTIME_GPU=ON" old.cmakeFlags)
+          else
+            old.cmakeFlags;
+      })
+  );
+in
 {
  programs.obs-studio = {
    enable = true;
-    plugins = with pkgs.obs-studio-plugins; [
-      obs-backgroundremoval
-      obs-pipewire-audio-capture
-      obs-shaderfilter
-    ];
-    #plugins = [ obs-backgroundremoval_1_1_10 ];
+    plugins =
+      with pkgs.obs-studio-plugins;
+      [
+        obs-pipewire-audio-capture
+        obs-shaderfilter
+      ]
+      ++ lib.optionals withCuda [ obs-backgrounremoval-gpu ];
  };
 }
--- a/home/programs/pywal/default.nix
+++ b/home/programs/pywal/default.nix
@@ -1,26 +1,28 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+{
  programs.pywal.enable = true;

  xdg.configFile = {
    "wal/templates/colors-hyprland.conf" = {
-      text = ''$foreground = 0xff{foreground.strip}
-$background = 0xff{background.strip}
-$color0 = 0xff{color0.strip}
-$color1 = 0xff{color1.strip}
-$color2 = 0xff{color2.strip}
-$color3 = 0xff{color3.strip}
-$color4 = 0xff{color4.strip}
-$color5 = 0xff{color5.strip}
-$color6 = 0xff{color6.strip}
-$color7 = 0xff{color7.strip}
-$color8 = 0xff{color8.strip}
-$color9 = 0xff{color9.strip}
-$color10 = 0xff{color10.strip}
-$color11 = 0xff{color11.strip}
-$color12 = 0xff{color12.strip}
-$color13 = 0xff{color13.strip}
-$color14 = 0xff{color14.strip}
-$color15 = 0xff{color15.strip}
+      text = ''
+        $foreground = 0xff{foreground.strip}
+        $background = 0xff{background.strip}
+        $color0 = 0xff{color0.strip}
+        $color1 = 0xff{color1.strip}
+        $color2 = 0xff{color2.strip}
+        $color3 = 0xff{color3.strip}
+        $color4 = 0xff{color4.strip}
+        $color5 = 0xff{color5.strip}
+        $color6 = 0xff{color6.strip}
+        $color7 = 0xff{color7.strip}
+        $color8 = 0xff{color8.strip}
+        $color9 = 0xff{color9.strip}
+        $color10 = 0xff{color10.strip}
+        $color11 = 0xff{color11.strip}
+        $color12 = 0xff{color12.strip}
+        $color13 = 0xff{color13.strip}
+        $color14 = 0xff{color14.strip}
+        $color15 = 0xff{color15.strip}
      '';
    };
  };
--- a/home/programs/rofi/default.nix
+++ b/home/programs/rofi/default.nix
@@ -1,24 +1,27 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+{
  xdg.configFile."rofi/config.rasi" = {
    source = ./config.rasi;
  };

  xdg.configFile."rofi/macchiato.rasi" = {
-    source = pkgs.fetchFromGitHub
-      {
+    source =
+      pkgs.fetchFromGitHub {
        owner = "catppuccin";
        repo = "rofi";
        rev = "5350da41a11814f950c3354f090b90d4674a95ce";
        sha256 = "DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY=";
-      } + "/basic/.local/share/rofi/themes/catppuccin-macchiato.rasi";
+      }
+      + "/basic/.local/share/rofi/themes/catppuccin-macchiato.rasi";
  };
  xdg.configFile."rofi/latte.rasi" = {
-    source = pkgs.fetchFromGitHub
-      {
+    source =
+      pkgs.fetchFromGitHub {
        owner = "catppuccin";
        repo = "rofi";
        rev = "5350da41a11814f950c3354f090b90d4674a95ce";
        sha256 = "DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY=";
-      } + "/basic/.local/share/rofi/themes/catppuccin-latte.rasi";
+      }
+      + "/basic/.local/share/rofi/themes/catppuccin-latte.rasi";
  };
 }
--- a/home/programs/tmux/default.nix
+++ b/home/programs/tmux/default.nix
@@ -1,7 +1,14 @@
-{ pkgs, lib, config, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 with lib;
-let cfg = config.tmux.enable;
-in {
+let
+  cfg = config.tmux.enable;
+in
+{
  options.tmux.enable = mkEnableOption "tmux";
  config = mkIf cfg {
    programs.tmux = {
--- a/home/programs/vscode/default.nix
+++ b/home/programs/vscode/default.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, lib, ... }:
+{
  programs.vscode = {
    enable = true;
    enableUpdateCheck = true;
--- a/home/programs/zellij/default.nix
+++ b/home/programs/zellij/default.nix
@@ -0,0 +1,8 @@
+{ ... }:
+{
+  programs.zellij = {
+    enable = true;
+    # enableZshIntegration = true;
+    settings = { };
+  };
+}
--- a/home/scripts/batlvl.nix
+++ b/home/scripts/batlvl.nix
@@ -2,13 +2,10 @@
 let
  batlvl = pkgs.writeShellApplication {
    name = "batlvl";
-    runtimeInputs = [
-    ];
+    runtimeInputs = [ ];
    text = builtins.readFile ./batlvl.sh;
  };
 in
 {
-  home.packages = [
-    batlvl
-  ];
+  home.packages = [ batlvl ];
 }
--- a/home/scripts/default.nix
+++ b/home/scripts/default.nix
@@ -1,4 +1,6 @@
-{ pkgs, config, ... }: {
+{ pkgs, config, ... }:
+{
+  imports = [ ./lockhelper.nix ];
  home.file.".local/bin/hl-no-opacity" = {
    source = ./hl-no-opacity.sh;
    executable = true;
--- a/home/scripts/lockhelper.nix
+++ b/home/scripts/lockhelper.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+let
+  lockhelper = pkgs.writeShellApplication {
+    name = "lockhelper";
+    runtimeInputs = with pkgs; [
+      grim
+      jq
+    ];
+    text = (builtins.readFile ./lockhelper.sh);
+  };
+in
+{
+  home.packages = [ lockhelper ];
+}
--- a/home/scripts/lockhelper.sh
+++ b/home/scripts/lockhelper.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+mkdir -p /tmp/lockscreen || true
+
+monitors=$(hyprctl monitors -j | jq -r '.[] | select( .name | contains ("DP")) | .name')
+
+while IFS= read -r m; do
+    grim -o "$m" "/tmp/lockscreen/$m.png" || true
+done <<< "$monitors"
+
+# Only lock if not already running
+if [ -z "$(pgrep hyprlock)" ] 
+then 
+    exec hyprlock
+else
+    echo "Already locked"
+fi 
--- a/home/scripts/randomwp.sh
+++ b/home/scripts/randomwp.sh
@@ -17,7 +17,7 @@ if [ "$#" -eq 1 ]; then
        echo "$wallpaper_path is an invalid wallpaper"
    fi
 else
-    wallpaper_path=$(find "$WALLPAPER_DIR" -mindepth 1 | grep png| sort -R | tail -n 1)
+    wallpaper_path=$(find "$WALLPAPER_DIR" -mindepth 1 | grep png| grep -v current| sort -R | tail -n 1)
 fi


@@ -39,8 +39,8 @@ if command -v wal &> /dev/null; then
    wal -i "$wallpaper_path"
 fi

-unlink "$WALLPAPER_DIR/current" || true
-ln -s "$wallpaper_path" "$WALLPAPER_DIR/current"
+unlink "$WALLPAPER_DIR/current.png" || true
+ln -s "$wallpaper_path" "$WALLPAPER_DIR/current.png"

 for monitor in $(hyprctl monitors | grep 'Monitor' | awk '{ print $2 }'); do
    hyprctl hyprpaper wallpaper "$monitor,$wallpaper_path"
--- a/home/services/backup-home.nix
+++ b/home/services/backup-home.nix
@@ -14,10 +14,15 @@ let
      echo "========== BACKUP HOME STARTING =========="
      export RESTIC_PASSWORD="gunter.home.2rjus.net"
      export RESTIC_REPOSITORY="rest:http://10.69.12.52:8000/gunter.home.2rjus.net"
-      GOTIFY_TOKEN=$(<"$XDG_RUNTIME_DIR/secrets/gotify_backup_home")
+      SECRET_PATH="$XDG_CONFIG_HOME/sops-nix/secrets/gotify_backup_home"

-      if [ -z "$GOTIFY_TOKEN" ]; then
-        notify-send -u critical "Backup issue" "No Gotify token found"
+      if ! [ -f "$SECRET_PATH" ]; then
+        notify-send -u critical "Backup issue" "Secret file for gotify token does not exist"
+      else
+        GOTIFY_TOKEN=$(<"$SECRET_PATH")
+        if [ -z "$GOTIFY_TOKEN" ]; then
+          notify-send -u critical "Backup issue" "No Gotify token found"
+        fi
      fi

      # Send start notification
@@ -85,13 +90,15 @@ let
  };
 in
 {
-
  sops.secrets."gotify_backup_home" = { };

  systemd.user.services.backup-home = {
    Unit = {
      Description = "Backup home directory";
-      After = [ "network.target" "sops-nix.service" ];
+      After = [
+        "network.target"
+        "sops-nix.service"
+      ];
    };
    Service = {
      Type = "oneshot";
@@ -108,7 +115,10 @@ in
      Persistent = true;
    };
    Install = {
-      WantedBy = [ "timers.target" "graphical-session.target" ];
+      WantedBy = [
+        "timers.target"
+        "graphical-session.target"
+      ];
    };
  };
 }
--- a/home/sops/default.nix
+++ b/home/sops/default.nix
@@ -1,4 +1,5 @@
-{ user, ... }: {
+{ user, ... }:
+{
  sops = {
    age.keyFile = "/home/${user}/.config/sops/age/keys.txt";
    defaultSopsFile = ../../secrets/torjus/secret.yaml;
--- a/home/ssh/config.nix
+++ b/home/ssh/config.nix
@@ -0,0 +1,44 @@
+{
+  pkgs,
+  lib,
+  osConfig,
+  ...
+}:
+let
+  eduroam-active = pkgs.writeShellApplication {
+    name = "eduroam-active";
+    runtimeInputs = with pkgs; [
+      networkmanager
+    ];
+    text = ''
+      nmcli -g GENERAL.STATE c s interface|grep -q -E '\bactiv'
+    '';
+  };
+in
+{
+  programs.ssh = {
+    enable = true;
+    controlMaster = "auto";
+
+    matchBlocks = {
+      "bmo.uio.no-on-eduroam" = (
+        lib.mkIf (osConfig.system.name == "magicman") (
+          lib.hm.dag.entryBefore [ "bmo.uio.no" ] {
+            match = "host bmo.uio.no exec \"nmcli -g GENERAL.STATE c s eduroam|grep -q -E '\\bactiv'\"";
+            hostname = "bmo.uio.no";
+            forwardAgent = false;
+          }
+        )
+      );
+
+      "bmo.uio.no" = {
+        setEnv = {
+          # TERM = "xterm-256color";
+        };
+        hostname = "bmo.uio.no";
+        forwardAgent = false;
+        proxyJump = "torjus@rlogin.uio.no";
+      };
+    };
+  };
+}
--- a/home/ssh/default.nix
+++ b/home/ssh/default.nix
@@ -1 +1 @@
-{ imports = [ ./gunter.nix ]; }
+{ imports = [ ./config.nix ]; }
--- a/home/ssh/gunter.nix
+++ b/home/ssh/gunter.nix
@@ -1,15 +0,0 @@
-{ pkgs, ... }: {
-  programs.ssh = {
-    enable = true;
-    controlMaster = "auto";
-
-    matchBlocks."bmo.uio.no" = {
-      setEnv = {
-        # TERM = "xterm-256color";
-      };
-      hostname = "bmo.uio.no";
-      forwardAgent = false;
-      proxyJump = "torjus@rlogin.uio.no";
-    };
-  };
-}
--- a/home/zsh/default.nix
+++ b/home/zsh/default.nix
@@ -1,13 +1,28 @@
-{ user, pkgs, ... }: {
+{ user, pkgs, ... }:
+{
  home.packages = with pkgs; [ fd ];
+  programs.direnv = {
+    enable = true;
+    enableZshIntegration = true;
+    package = pkgs.direnv;
+    nix-direnv = {
+      enable = true;
+      package = pkgs.nix-direnv;
+    };
+  };
+  programs.zoxide = {
+    enable = true;
+    enableZshIntegration = true;
+  };
  programs.zsh = {
    enable = true;
    autocd = false;
-    enableAutosuggestions = true;
    enableCompletion = true;
+    autosuggestion.enable = true;
    syntaxHighlighting.enable = true;
    shellAliases = {
      nrebuild = "sudo nixos-rebuild switch --flake /home/${user}/nixos";
+      ndiffbuild = "sudo nixos-rebuild build --flake /home/${user}/nixos && nvd diff /run/current-system /home/${user}/nixos/result";
    };
    initExtra = ''
      bindkey -v
@@ -21,13 +36,18 @@

      # Aliases
      alias ls=eza
-      alias find=fd
    '';
    zplug = {
      enable = true;
      plugins = [
-        ({ name = "plugins/git"; tags = [ "from:oh-my-zsh" ]; })
-        ({ name = "modules/prompt"; tags = [ "from:prezto" ]; })
+        ({
+          name = "plugins/git";
+          tags = [ "from:oh-my-zsh" ];
+        })
+        ({
+          name = "modules/prompt";
+          tags = [ "from:prezto" ];
+        })
      ];
    };
  };
--- a/hosts/gunter/configuration.nix
+++ b/hosts/gunter/configuration.nix
@@ -1,4 +1,10 @@
-{ config, inputs, pkgs, ... }:
+{
+  config,
+  lib,
+  inputs,
+  pkgs,
+  ...
+}:

 {
  imports = [
@@ -12,10 +18,15 @@
  sops.age.generateKey = true;
  sops.secrets."gotify_tokens/backup-home" = { };

+  # Enable microcode updates
+  hardware.enableRedistributableFirmware = true;
+
  # Bootloader stuff
  boot = {
    # Kernel stuff
+    # kernelPackages = pkgs.linuxPackages_xanmod_latest;
    kernelPackages = pkgs.linuxPackages_latest;
+    # kernelPackages = lib.warn "Pinned to kernel 6.10 due to nvidia fbdev trouble!" pkgs.linuxPackages_6_10;
    kernelParams = [
      "quiet"
      "splash"
@@ -23,7 +34,6 @@
    ];

    extraModprobeConfig = ''
-      options nvidia NVreg_RegistryDwords="PowerMizerEnable=0x1; PerfLevelSrc=0x2222; PowerMizerLevel=0x3; PowerMizerDefault=0x3; PowerMizerDefaultAC=0x3"
      options v4l2loopback exclusive_caps=1 card_label="Virtual Camera"
    '';

@@ -32,7 +42,9 @@
      enable = true;
      configurationLimit = 10;
    };
-    loader.efi = { canTouchEfiVariables = true; };
+    loader.efi = {
+      canTouchEfiVariables = true;
+    };
    supportedFilesystems = [ "nfs" ];
  };

@@ -47,11 +59,9 @@
  # Set time stuff
  time.timeZone = "Europe/Oslo";

-  # Enable opengl
-  hardware.opengl = {
+  # Enable graphics
+  hardware.graphics = {
    enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
    extraPackages = with pkgs; [
      vaapiVdpau
      nvidia-vaapi-driver
@@ -63,10 +73,18 @@
    modesetting.enable = true;
    powerManagement.enable = false;
    powerManagement.finegrained = false;
-    open = false;
-    nvidiaSettings = true;
+    open = true;
+    nvidiaSettings = false;

-    package = config.boot.kernelPackages.nvidiaPackages.stable;
+    package = config.boot.kernelPackages.nvidiaPackages.latest;
+    # package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
+    #   version = "560.28.03";
+    #   sha256_64bit = "sha256-martv18vngYBJw1IFUCAaYr+uc65KtlHAMdLMdtQJ+Y=";
+    #   sha256_aarch64 = lib.fakeHash;
+    #   openSha256 = "sha256-asGpqOpU0tIO9QqceA8XRn5L27OiBFuI9RZ1NjSVwaM=";
+    #   settingsSha256 = lib.fakeHash;
+    #   persistencedSha256 = lib.fakeSha256;
+    # };
  };

  # Setup hyprland
@@ -86,7 +104,7 @@
  programs.hyprland = {
    enable = true;
    xwayland.enable = true;
-    portalPackage = pkgs.unstable.xdg-desktop-portal-hyprland;
+    portalPackage = pkgs.xdg-desktop-portal-hyprland;
  };

  # Setup common XDG env vars
@@ -103,15 +121,30 @@
  xdg.portal = {
    enable = true;
    xdgOpenUsePortal = true;
-    extraPortals = (with pkgs; [
-      # unstable.xdg-desktop-portal-hyprland
-      xdg-desktop-portal-gtk
-    ]);
+    extraPortals = (
+      with pkgs;
+      [
+        # unstable.xdg-desktop-portal-hyprland
+        xdg-desktop-portal-gtk
+      ]
+    );
  };

  # Enable flakes
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-  nix.settings.trusted-users = [ "root" "torjus" ];
+  nix.settings = {
+    experimental-features = [
+      "nix-command"
+      "flakes"
+    ];
+    trusted-users = [
+      "root"
+      "torjus"
+    ];
+    substituters = [ "https://cuda-maintainers.cachix.org" ];
+    trusted-public-keys = [
+      "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
+    ];
+  };

  nixpkgs.config.allowUnfree = true;
  # Install system-wide packages
@@ -124,6 +157,7 @@
    wget
    v4l-utils
    nmap
+    (lib.mkIf (config.system.name == "gunter") pciutils)

    # X shit
    # xorg.xorgserver
--- a/hosts/gunter/default.nix
+++ b/hosts/gunter/default.nix
@@ -1,9 +1,17 @@
-{ inputs, self, pks, ... }: {
+{
+  inputs,
+  self,
+  pks,
+  ...
+}:
+{
  imports = [
    ./configuration.nix
    ./hardware-configuration.nix
    ./steamuser.nix
    ./nfs.nix
+    ./ollama.nix
+    ./streamdeck.nix
    ../../system
    ../../home/gunter.nix
  ];
--- a/hosts/gunter/hardware-configuration.nix
+++ b/hosts/gunter/hardware-configuration.nix
@@ -1,37 +1,45 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:

 {
-  imports =
-    [
-      (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];

-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" "v4l2loopback" ];
-  boot.extraModulePackages = with config.boot.kernelPackages; [
-    v4l2loopback
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [
+    "kvm-amd"
+    "v4l2loopback"
+  ];
+  boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];

-  fileSystems."/" =
-    {
-      device = "/dev/disk/by-uuid/a7d4b697-fffa-4bcb-9dd7-cbbd6121a50c";
-      fsType = "xfs";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/a7d4b697-fffa-4bcb-9dd7-cbbd6121a50c";
+    fsType = "xfs";
+  };

  boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/be82b184-3cc7-483b-9069-f7797f51c853";

-  fileSystems."/boot" =
-    {
-      device = "/dev/disk/by-uuid/DC0C-AAB3";
-      fsType = "vfat";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/DC0C-AAB3";
+    fsType = "vfat";
+  };

-  swapDevices =
-    [{ device = "/dev/disk/by-uuid/2284e9c6-c168-4d4f-ba6a-d270f1ae245d"; }];
+  swapDevices = [ { device = "/dev/disk/by-uuid/2284e9c6-c168-4d4f-ba6a-d270f1ae245d"; } ];

  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
  # (the default) this is the recommended approach. When using systemd-networkd it's
--- a/hosts/gunter/nfs.nix
+++ b/hosts/gunter/nfs.nix
@@ -1,22 +1,25 @@
-{ pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
-    nfs-utils
-  ];
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [ nfs-utils ];
  services.rpcbind.enable = true;
-  systemd.mounts = [{
-    type = "nfs";
-    mountConfig = {
-      Options = "rw,soft,noatime";
-    };
-    what = "nas.home.2rjus.net:/mnt/hdd-pool/media";
-    where = "/mnt/nas/media";
-  }];
+  systemd.mounts = [
+    {
+      type = "nfs";
+      mountConfig = {
+        Options = "rw,soft,noatime";
+      };
+      what = "nas.home.2rjus.net:/mnt/hdd-pool/media";
+      where = "/mnt/nas/media";
+    }
+  ];

-  systemd.automounts = [{
-    wantedBy = [ "multi-user.target" ];
-    automountConfig = {
-      TimeoutIdleSec = "5min";
-    };
-    where = "/mnt/nas/media";
-  }];
+  systemd.automounts = [
+    {
+      wantedBy = [ "multi-user.target" ];
+      automountConfig = {
+        TimeoutIdleSec = "5min";
+      };
+      where = "/mnt/nas/media";
+    }
+  ];
 }
--- a/hosts/gunter/ollama.nix
+++ b/hosts/gunter/ollama.nix
@@ -0,0 +1,17 @@
+{ pkgs, lib, ... }:
+{
+  services.ollama = {
+    enable = true;
+    acceleration = "cuda";
+  };
+  services.open-webui = {
+    enable = true;
+    environment = {
+      DO_NOT_TRACK = "True";
+      SCARF_NO_ANALYTICS = "True";
+      OLLAMA_API_BASE_URL = "http://127.0.0.1:11434";
+      WEBUI_AUTH = "False";
+    };
+    port = 11444;
+  };
+}
--- a/hosts/gunter/steamuser.nix
+++ b/hosts/gunter/steamuser.nix
@@ -1,9 +1,10 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
  environment.shells = with pkgs; [ zsh ];

  services.xserver.desktopManager.xfce.enable = true;
  programs.steam.enable = true;
-
+  programs.gamemode.enable = true;
  services.flatpak.enable = true;

  users.users.steam = {
--- a/hosts/gunter/streamdeck.nix
+++ b/hosts/gunter/streamdeck.nix
@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+  programs.streamcontroller.enable = true;
+}
--- a/hosts/magicman/configuration.nix
+++ b/hosts/magicman/configuration.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

 {
  imports = [ ./hardware-configuration.nix ];
@@ -15,15 +20,18 @@
  ];
  boot.kernelPackages = pkgs.linuxPackages_latest;

-  boot.loader.systemd-boot = { enable = true; };
-  boot.loader.efi = { canTouchEfiVariables = true; };
+  boot.loader.systemd-boot = {
+    enable = true;
+    configurationLimit = 3;
+  };
+  boot.loader.efi = {
+    canTouchEfiVariables = true;
+  };

  boot.initrd.systemd.enable = true;
  boot.plymouth = {
    enable = true;
-    themePackages = with pkgs; [
-      catppuccin-plymouth
-    ];
+    themePackages = with pkgs; [ catppuccin-plymouth ];
    theme = "catppuccin-macchiato";
    extraConfig = ''
      UseFirmwareBackground=false
@@ -42,7 +50,7 @@
  time.timeZone = "Europe/Oslo";

  # Enable opengl
-  hardware.opengl = {
+  hardware.graphics = {
    enable = true;
    extraPackages = with pkgs; [
      intel-media-driver
@@ -51,6 +59,23 @@
    ];
  };

+  # Bluetooth stuff
+  services.blueman.enable = true;
+  hardware.bluetooth.enable = true;
+  services.pipewire.wireplumber.extraConfig = {
+    "monitor.bluez.properties" = {
+      "bluez5.enable-sbc-xq" = true;
+      "bluez5.enable-msbc" = true;
+      "bluez5.enable-hw-volume" = true;
+      "bluez5.roles" = [
+        "hsp_hs"
+        "hsp_ag"
+        "hfp_hf"
+        "hfp_ag"
+      ];
+    };
+  };
+
  # Setup hyprland
  services.xserver.enable = true;
  services.xserver.displayManager = {
@@ -86,17 +111,26 @@
  xdg.portal = {
    enable = true;
    xdgOpenUsePortal = true;
-    extraPortals = (with pkgs; [
-      # xdg-desktop-portal-hyprland
-      xdg-desktop-portal-gtk
-    ]);
+    extraPortals = (
+      with pkgs;
+      [
+        # xdg-desktop-portal-hyprland
+        xdg-desktop-portal-gtk
+      ]
+    );
  };

  programs.steam.enable = true;

  # Enable flakes
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-  nix.settings.trusted-users = [ "root" "torjus" ];
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
+  nix.settings.trusted-users = [
+    "root"
+    "torjus"
+  ];

  nixpkgs.config.allowUnfree = true;
  # Install system-wide packages
--- a/hosts/magicman/default.nix
+++ b/hosts/magicman/default.nix
@@ -1,4 +1,10 @@
-{ inputs, self, pks, ... }: {
+{
+  inputs,
+  self,
+  pks,
+  ...
+}:
+{
  imports = [
    ./configuration.nix
    ./hardware-configuration.nix
--- a/hosts/magicman/hardware-configuration.nix
+++ b/hosts/magicman/hardware-configuration.nix
@@ -1,35 +1,42 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:

 {
-  imports =
-    [
-      (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];

-  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "thunderbolt"
+    "nvme"
+    "usb_storage"
+    "sd_mod"
+    "sdhci_pci"
+  ];
  boot.initrd.kernelModules = [ "i915" ];
  boot.kernelModules = [ "kvm-intel" ];
  boot.extraModulePackages = [ ];

-  fileSystems."/" =
-    {
-      device = "/dev/disk/by-uuid/31b20f4c-24bb-4fd1-9a3e-8ccc19fe3d64";
-      fsType = "xfs";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/31b20f4c-24bb-4fd1-9a3e-8ccc19fe3d64";
+    fsType = "xfs";
+  };

  boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/4bbadd2c-94dd-4d80-94bf-9332d24b57bd";

-  fileSystems."/boot" =
-    {
-      device = "/dev/disk/by-uuid/7FF3-B061";
-      fsType = "vfat";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/7FF3-B061";
+    fsType = "vfat";
+  };

-  swapDevices =
-    [{ device = "/dev/disk/by-uuid/6f2c4906-ad88-4d7e-88ec-61cdda41ce28"; }];
+  swapDevices = [ { device = "/dev/disk/by-uuid/6f2c4906-ad88-4d7e-88ec-61cdda41ce28"; } ];

  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
  # (the default) this is the recommended approach. When using systemd-networkd it's
--- a/hosts/prismo/configuration.nix
+++ b/hosts/prismo/configuration.nix
@@ -1,15 +1,19 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

 {
  imports = [ ./hardware-configuration.nix ];

  # Sops stuff
-  sops.defaultSopsFile = ../../secrets/gunter/secrets.yaml;
+  sops.defaultSopsFile = ../../secrets/prismo/secrets.yaml;
  sops.age.keyFile = "/var/lib/sops-nix/key.txt";
  sops.age.generateKey = true;
  sops.secrets."gotify_tokens/backup-home" = { };

-
  # Bootloader stuff
  boot.kernelParams = [
    "quiet"
@@ -20,7 +24,9 @@
    enable = true;
    configurationLimit = 10;
  };
-  boot.loader.efi = { canTouchEfiVariables = true; };
+  boot.loader.efi = {
+    canTouchEfiVariables = true;
+  };

  # Networking stuff
  networking.hostName = "prismo"; # Define your hostname.
@@ -34,7 +40,7 @@
  time.timeZone = "Europe/Oslo";

  # Enable opengl
-  hardware.opengl = {
+  hardware.graphics = {
    enable = true;
    extraPackages = with pkgs; [
      intel-media-driver
@@ -65,14 +71,20 @@
  xdg.portal = {
    enable = true;
    xdgOpenUsePortal = true;
-    extraPortals = (with pkgs; [
-      xdg-desktop-portal-hyprland
-      xdg-desktop-portal-gtk
-    ]);
+    extraPortals = (
+      with pkgs;
+      [
+        xdg-desktop-portal-hyprland
+        xdg-desktop-portal-gtk
+      ]
+    );
  };

  # Enable flakes
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];

  nixpkgs.config.allowUnfree = true;
  # Install system-wide packages
--- a/hosts/prismo/default.nix
+++ b/hosts/prismo/default.nix
@@ -1,8 +1,14 @@
-{ inputs, self, pks, ... }: {
+{
+  inputs,
+  self,
+  pks,
+  ...
+}:
+{
  imports = [
    ./configuration.nix
    ./hardware-configuration.nix
    ../../system
-    ../../home
+    ../../home/prismo.nix
  ];
 }
--- a/hosts/prismo/hardware-configuration.nix
+++ b/hosts/prismo/hardware-configuration.nix
@@ -1,19 +1,29 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:

 {
  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];

  boot = {
    initrd = {
-      availableKernelModules =
-        [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+      availableKernelModules = [
+        "xhci_pci"
+        "ahci"
+        "usb_storage"
+        "sd_mod"
+        "rtsx_pci_sdmmc"
+      ];
      kernelModules = [ ];

-      luks.devices."cryptroot".device =
-        "/dev/disk/by-uuid/f71b0ace-f38f-435f-a07a-007f9cfe4919";
+      luks.devices."cryptroot".device = "/dev/disk/by-uuid/f71b0ace-f38f-435f-a07a-007f9cfe4919";
    };
    kernelModules = [ "kvm-intel" ];
    extraModulePackages = [ ];
@@ -29,8 +39,7 @@
    fsType = "vfat";
  };

-  swapDevices =
-    [{ device = "/dev/disk/by-uuid/67da36a8-69df-4541-88cd-cba7cbc40b4c"; }];
+  swapDevices = [ { device = "/dev/disk/by-uuid/67da36a8-69df-4541-88cd-cba7cbc40b4c"; } ];

  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
  # (the default) this is the recommended approach. When using systemd-networkd it's
@@ -41,6 +50,5 @@
  # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode =
-    lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
--- a/packages/open-pomodoro.nix
+++ b/packages/open-pomodoro.nix
@@ -1,4 +1,9 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+}:

 buildGoModule rec {
  pname = "openpomodoro-cli";
@@ -13,7 +18,10 @@ buildGoModule rec {

  vendorHash = "sha256-BR9d/PMQ1ZUYWSDO5ID2bkTN+A+VbaLTlz5t0vbkO60=";

-  ldflags = [ "-s" "-w" ];
+  ldflags = [
+    "-s"
+    "-w"
+  ];

  GOWORK = "off";

--- a/scripts/update-pob.sh
+++ b/scripts/update-pob.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+set -eo pipefail
+# set -x
+
+# TODO: Update pobfrontend as well?
+
+if [ -z "$1" ]; then
+    nurl_output=$(nurl -j https://github.com/PathOfBuildingCommunity/PathOfBuilding 2>/dev/null)
+    rev=$(jq '.args.rev' <<< "$nurl_output")
+else
+    nurl_output=$(nurl -j https://github.com/PathOfBuildingCommunity/PathOfBuilding "$1" 2>/dev/null)
+fi
+
+hash=$(jq '.args.hash' <<< "$nurl_output" | sed 's/\//\\\//g')
+echo "Updating pob to $rev"
+
+# Find lines to replace
+rev_line_numbers=$(grep -Fn "rev =" packages/pob.nix| cut -d":" -f1)
+rev_line_data=$(head -n1 <<< "$rev_line_numbers")
+sed -i "${rev_line_data}s/.*/  rev = $rev;/" packages/pob.nix
+
+hash_line_numbers=$(grep -Fn "hash =" packages/pob.nix| cut -d":" -f1)
+hash_line_data=$(head -n1 <<< "$hash_line_numbers")
+sed -i "${hash_line_data}s/.*/  hash = $hash;/" packages/pob.nix
+
+nixfmt packages/pob.nix
--- a/secrets/magicman/secrets.yaml
+++ b/secrets/magicman/secrets.yaml
@@ -0,0 +1,30 @@
+test: ENC[AES256_GCM,data:hEW/,iv:23IEALBiMHgXZedT7tHFsxF8UenCLqESJ3DkbUCWMxI=,tag:p7haTXzRt/eCa9ueNrbQcw==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1lznyk4ee7e7x8n92cq2n87kz9920473ks5u9jlhd3dczfzq4wamqept56u
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2dHNNR0pyZ1hDcmxwdFRV
+            UzlSSm5nN0xkdk41dE1zbmZTa1FYVUl6d1RVCmpueUptV1NFVC9FR3g1djl6M1Za
+            K0ZYd3dhWHRBSkdONmlDaFl2RHk1TUEKLS0tIFFqRFd5K0YxaFRKdFVCOFpvODBu
+            L1V4MDV6WVFzVXhPcHNnNXJLVGx5WlkKBTUY5W4+h3VaKidz+a++hs5J0J3GhfXP
+            0NWAVIjiQQsEhfEyZcCsrdnOL038HCANaS1EWOCfyY+D7GPCzj6DUQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1stlqqspmt5fepyz35udrwr5avf9zuju79f787p26pu2d2j08yqps2q2t2c
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNNDY4cnBIb2h3aUNuNkdk
+            aWdjV3hFK3A5T05vQWtYc0VyY3BTSm12VzFNCkpIekF4Y3pKbEtaY3ZRNUI4eUlM
+            azhvelZjOWM0ZkFrRzlEenNJSG1KS2MKLS0tIE1Oek1oSUVZdm5maE9uSlJqN0lR
+            SGkzUkFuSUpzcWNsWVJRYW1RbTI5TGMKCirJOv9CxOjwiuORC0XTH3SwaMz37jC/
+            wITW1GrMnbt1QM0cF08ybu7IKpMo8CzH1iyPduaVLG7AyniaNTlDFQ==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-10-07T20:32:06Z"
+    mac: ENC[AES256_GCM,data:RGLh077dYLkltn82+iTzKe00gwlodeL40OHm/66ZHemE8tYqFJ+A971R37sEJA3QLAm8MtN9glaNz9PZvBwwimIW4ZrkZhSREYaM83WQyDoceqbiv5J79elq35OsMwJPelmW5kKdW1d6r+aPTP6QyR1qq8L3x7ncoK690tnbtA8=,iv:mbXVZQ5FasPuN6I8VN26KPcews7fYUxL5VB+q+WI/NI=,tag:pFku2TL4CPfpetG2ebgbxA==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.0
--- a/secrets/prismo/secrets.yaml
+++ b/secrets/prismo/secrets.yaml
@@ -0,0 +1,21 @@
+test: ENC[AES256_GCM,data:MtSN,iv:ag/LDkk0DgE6QPjB/08RhEw3LzQHDOkRH0/4OBn8KUU=,tag:FeiJfjtbd4MCwNmCezH44A==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1lznyk4ee7e7x8n92cq2n87kz9920473ks5u9jlhd3dczfzq4wamqept56u
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhaGtaL0tkVFFuTk9ka0Rz
+            bHRpN0UyZFQxTG1ZSTRxSmI4eHJhbVM1ZWs0Cmx5UkdrSFNsRGU1eWRyU0hEcElH
+            WWJLWHdNTVR4RVpGYlcwMlJ4b2J5eHcKLS0tIGkrTWpNdVdERHpvaHZRdGxHN1Mr
+            WDJGWFA1M2kxQ1hHKzRwRTY4WUZwN2MKQIT//FEdXYWfEkI1knDD3uN+KMaIDtmR
+            H64031YMvAh67fVGekRv72S5DWzrft/Zr2libKpsN7T4G9fxGihhEw==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-10-02T20:56:45Z"
+    mac: ENC[AES256_GCM,data:WQKHFMPmEvDTHS4eYYVcpsX7j8Xef9SV0VKNAbQh0hnZPMJEll4jtzR8sub2tUEt9/I1PvngXMWz6pPmINwOKRI+L3+gTSdg9QgPiikjE6wDA2qbpv9pd14uH22ABmCjkTeEZ9R+b9KbBl0GtMQof1sdTL9nUDrr9Fyfrr/UXs4=,iv:4DgDhwb2ksh2THtR/H5PiO57vF4yKSZ6FyCjWBqCQQI=,tag:dczk4ZAI8k6dareobGmt/w==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.0
--- a/secrets/torjus/secret.yaml
+++ b/secrets/torjus/secret.yaml
@@ -1,4 +1,8 @@
 gotify_backup_home: ENC[AES256_GCM,data:DV22pltF1db7mP8dK4fb,iv:487nKwVToOX2KSBmz3pp1T0wwi2JTMZzwH2arp8DatA=,tag:uVmONZ1fznTXDxySh+xXvA==,type:str]
+sonarr_api_key: ENC[AES256_GCM,data:mg19hxs+DY6wsLjt4FupjavwmnmMJAP2Us5i1Rt/yyk=,iv:6thnP4JSsi51IdEdKXX60OeT2Xr5qMplwsKlk8XTOg8=,tag:cAkhxe2Fjdudzy/WZ6bNqg==,type:str]
+sonarr_base_url: ENC[AES256_GCM,data:0HiHIX4KcPEE62Ti1fLH230rC1A7xYg=,iv:mkAnl6t2H5xP9RPjTsbSZkfbrgli/7XKnPE5aGuZpTo=,tag:P2osFM60Jk8qkXJgLaGpjg==,type:str]
+radarr_api_key: ENC[AES256_GCM,data:Db1ISKTF+m2H1on55/4vdGticfqBdxfIzKHBxC9LAx4=,iv:NhiG4SmsRYIunW1ljFbxeHvRoi9fOVE+9DJn6kmZ6oI=,tag:DoJzo56CW3kJlySYmB8NYQ==,type:str]
+radarr_base_url: ENC[AES256_GCM,data:3UgOPQMblYhm0ysRB6VVosvZToIM5IA=,iv:o/s0bVBrjrma2Df2LlCCFL5Ks80063/4mABc6vzDrYg=,tag:eHKntLPM9yRRkMfIWSpIdg==,type:str]
 sops:
    kms: []
    gcp_kms: []
@@ -14,8 +18,8 @@ sops:
            Q3gxalhGVjNlS3B3YlFsK0VQMUFITEUKE87+RpOG6ucXHHQ0DMQ9F3yo0n1aXbv7
            OX5ibHU7RroUQwFmDj87u59VUTvpWRQjsBW4c4WrZRk9KcjwinZZZQ==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-06T20:24:35Z"
-    mac: ENC[AES256_GCM,data:1+fxim6Z9BLqpxRVUse5yfGyv5Y1OYLnWjuw//WtPU1Y1noXQC2SapbqaMgrJo5wDddom41RnOnJw7wjXLmA4cKndcrmotpXQIq1gYFrQtDoVuZjhcBzbY4rQiHUsMtQHQXFvn9SpreO5RMz9o5Zl25cWe1txH0K/DqavHlh+1c=,iv:1sWteDKqcDTPBfnFVSVO0V1JBfw9aj2OC/K0mVbwsdI=,tag:/AlPi/Y0Ztd6KghctMD9jg==,type:str]
+    lastmodified: "2024-04-25T19:19:54Z"
+    mac: ENC[AES256_GCM,data:VGBiDi71DHAXLhi7XC0XSTqnSwcJXv1Lj53qriFER7BXXZNPUdbeknlYR+KMdL3hgKGiK+ElWK5foDAy6jpl1H3U7Y9B4d40pVZSzEoN+fCwUgfP+yym1HwKZZoJok2ksXZIL4MZyZSNS+ONjDeFEcyHobIx8pRThxic3CcvptI=,iv:QwnFcYeIWibx5q8C/ur1eE8F9vbyGHg5raInDHBoyVs=,tag:JJWEYAyVhfny4hWrKBAKig==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1
--- a/system/default.nix
+++ b/system/default.nix
@@ -1 +1,14 @@
-{ imports = [ ./podman.nix ./fonts.nix ./users.nix ./services.nix ./security.nix ]; }
+{
+  imports = [
+    ./fonts.nix
+    ./fwupd.nix
+    ./git.nix
+    ./greetd.nix
+    ./libvirt.nix
+    ./podman.nix
+    ./security.nix
+    ./services.nix
+    ./users.nix
+    ./label.nix
+  ];
+}
--- a/system/fonts.nix
+++ b/system/fonts.nix
@@ -1,15 +1,23 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
  environment.systemPackages = with pkgs; [ twemoji-color-font ];
  fonts.packages = with pkgs; [
    fira-code
    fira-code-symbols
-    nerdfonts
+    font-awesome
+    (nerdfonts.override {
+      fonts = [
+        "JetBrainsMono"
+        "FiraCode"
+        "DroidSansMono"
+        "DejaVuSansMono"
+      ];
+    })
    noto-fonts
-    noto-fonts-cjk
+    noto-fonts-cjk-sans
    noto-fonts-emoji
    noto-fonts-monochrome-emoji
    source-sans-pro
    twemoji-color-font
-    font-awesome
  ];
 }
--- a/system/fwupd.nix
+++ b/system/fwupd.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  services.fwupd = {
+    enable = true;
+  };
+}
--- a/system/git.nix
+++ b/system/git.nix
@@ -0,0 +1,7 @@
+{ ... }:
+{
+  programs.git = {
+    enable = true;
+    lfs.enable = true;
+  };
+}
--- a/system/greetd.nix
+++ b/system/greetd.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+{
+  services.greetd = {
+    enable = true;
+    settings = {
+      default_session = {
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd \"dbus-run-session Hyprland\"";
+        user = "greeter";
+      };
+    };
+  };
+}
--- a/system/label.nix
+++ b/system/label.nix
@@ -0,0 +1,19 @@
+{
+  self,
+  ...
+}:
+let
+  flakeRev = if (self ? shortRev) then self.shortRev else "dirty";
+  flakeMod = if (self ? lastModifiedDate) then self.lastModifiedDate else "";
+  flakeRevCount = if (self ? revCount) then builtins.toString self.revCount else "";
+  tagGit = "rev:" + flakeRev + ":" + flakeRevCount;
+  tagMod = "mod:" + flakeMod;
+  label = flakeRevCount + "-" + flakeRev;
+in
+{
+  system.nixos.tags = [
+    tagGit
+    tagMod
+  ];
+  system.nixos.label = label;
+}
--- a/system/libvirt.nix
+++ b/system/libvirt.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+{
+  virtualisation.libvirtd = {
+    enable = true;
+    qemu = {
+      package = pkgs.qemu_kvm;
+      runAsRoot = true;
+      swtpm.enable = true;
+      ovmf = {
+        enable = true;
+      };
+    };
+  };
+}
--- a/system/monitoring.nix
+++ b/system/monitoring.nix
@@ -29,5 +29,9 @@
    wantedBy = [ "multi-user.target" ];
  };

-  networking.firewall.allowedTCPPorts = [ 9100 9558 8989 ];
+  networking.firewall.allowedTCPPorts = [
+    9100
+    9558
+    8989
+  ];
 }
--- a/system/podman.nix
+++ b/system/podman.nix
@@ -2,9 +2,11 @@

 {
  virtualisation = {
+    containers.enable = true;
    podman = {
      enable = true;
      dockerCompat = true;
+      defaultNetwork.settings.dns_enabled = true;
    };
  };
 }
--- a/system/security.nix
+++ b/system/security.nix
@@ -1,10 +1,14 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
  # Enable sudo
  security.sudo = {
    enable = true;
    wheelNeedsPassword = false;
  };

+  # Enable polkit
+  security.polkit.enable = true;
+
  # Enable rtkit
  security.rtkit.enable = true;
 }
--- a/system/services.nix
+++ b/system/services.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
  services = {
    dbus.enable = true;
    pipewire = {
@@ -7,5 +8,11 @@
      alsa.support32Bit = true;
      pulse.enable = true;
    };
+
+    locate = {
+      enable = true;
+      package = pkgs.plocate;
+      localuser = null;
+    };
  };
 }
--- a/system/users.nix
+++ b/system/users.nix
@@ -12,9 +12,16 @@
    home = "/home/torjus";
    description = "Torjus";
    shell = pkgs.zsh;
-    extraGroups = [ "wheel" "input" "networkmanager" "video" ];
-    # Install some user packages
-    packages = with pkgs; [
+    extraGroups = [
+      "wheel"
+      "input"
+      "networkmanager"
+      "video"
+      "gamemode"
+      "libvirtd"
+      "podman"
    ];
+    # Install some user packages
+    packages = with pkgs; [ ];
  };
 }