Add nixos-unstable-small to temporarily override pyside6

Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/d37f154dba0d4c015f17a24314e89b77a7ba5ff3?narHash=sha256-abW1g8UKSn/44j6EA60u0TWqC/ar8%2BYM9Z8YdUmOCLg%3D' (2024-11-19)
  → 'github:nix-community/home-manager/a46e702093a5c46e192243edbd977d5749e7f294?narHash=sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo%3D' (2024-11-19)

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# nixfmt all
+90ccaa07bd0dc2235af7fdd37909e17f637e9cab

.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

.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

.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

.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

.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

.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:

README.md

@@ -1 +1,8 @@
-# My NixOS config
+# My nixos configurations
+
+Configurations for:
+
+* gunter
+* magicman
+* prismo
+

flake.lock

@@ -36,6 +36,42 @@
         "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": [
@@ -43,11 +79,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717379603,
+        "lastModified": 1728602333,
-        "narHash": "sha256-f8NEofUM/2fbjsVlBUhq6usC4fjM9EdrsKT7Sw4v2X8=",
+        "narHash": "sha256-sKbnng/g4ijuKcjShBi7oPxyUrCnMJDDy17U9W/TuMg=",
         "ref": "master",
-        "rev": "e3daec2670586a3835f38b4dfef26af84bc58276",
+        "rev": "84fcfdde62de9888d3af8bcb0d7134137b276b55",
-        "revCount": 14,
+        "revCount": 23,
         "type": "git",
         "url": "https://git.t-juice.club/torjus/ghettoptt"
       },
@@ -64,11 +100,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720188602,
+        "lastModified": 1732025103,
-        "narHash": "sha256-lC3byBmhVZFzWl/dCic8+cKUEEAXAswWOYjq4paFmbo=",
+        "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e3582e5151498bc4d757e8361431ace8529e7bb7",
+        "rev": "a46e702093a5c46e192243edbd977d5749e7f294",
         "type": "github"
       },
       "original": {
@@ -86,11 +122,11 @@
         "poetry2nix": "poetry2nix"
       },
       "locked": {
-        "lastModified": 1719348353,
+        "lastModified": 1728336978,
-        "narHash": "sha256-eUThbF7xY25QlAQbwbKjvKwVZ47RDgd82ShMc2hIvLw=",
+        "narHash": "sha256-7FX4K8QBH/9jiYyCMs2JyCTzlx1/D5Cw6upaFThSVg4=",
         "ref": "master",
-        "rev": "9c1cd1d31fc33bf1b4c2ed8fc0c64f373818fcbd",
+        "rev": "700ece0bada9833fcfd3b6ce698cd74bc00e4493",
-        "revCount": 15,
+        "revCount": 22,
         "type": "git",
         "url": "https://git.t-juice.club/torjus/huecli"
       },
@@ -122,13 +158,56 @@
         "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": 1720031269,
+        "lastModified": 1731676054,
-        "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
+        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
+        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
         "type": "github"
       },
       "original": {
@@ -138,52 +217,59 @@
         "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": 1719957072,
+        "lastModified": 1731755305,
-        "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=",
+        "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105",
+        "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs-stable_2": {
+    "nixprstatus": {
+      "inputs": {
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "poetry2nix": "poetry2nix_2"
+      },
       "locked": {
-        "lastModified": 1719720450,
+        "lastModified": 1729118937,
-        "narHash": "sha256-57+R2Uj3wPeDeq8p8un19tzFFlgWiXJ8PbzgKtBgBX8=",
+        "narHash": "sha256-7xYCJXTh92OpKwfshYYnxrWmfNjqaH9SzQ0stuBARVM=",
-        "owner": "NixOS",
+        "ref": "master",
-        "repo": "nixpkgs",
+        "rev": "58b113d934f5d62f27dc50439b89fece4eb621f5",
-        "rev": "78f8641796edff3bfabbf1ef5029deadfe4a21d0",
+        "revCount": 37,
-        "type": "github"
+        "type": "git",
+        "url": "https://git.t-juice.club/torjus/nixprstatus"
       },
       "original": {
-        "owner": "NixOS",
+        "ref": "master",
-        "ref": "release-24.05",
+        "type": "git",
-        "repo": "nixpkgs",
+        "url": "https://git.t-juice.club/torjus/nixprstatus"
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1719468428,
-        "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
       }
     },
     "poetry2nix": {
@@ -198,11 +284,36 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1718285706,
+        "lastModified": 1724208502,
-        "narHash": "sha256-DScsBM+kZvxOva7QegfdtleebMXh30XPxDQr/1IGKYo=",
+        "narHash": "sha256-TCRcEPSfgAw/t7kClmlr23s591N06mQCrhzlAO7cyFw=",
         "owner": "nix-community",
         "repo": "poetry2nix",
-        "rev": "a5be1bbbe0af0266147a88e0ec43b18c722f2bb9",
+        "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": {
@@ -216,22 +327,26 @@
         "ghettoptt": "ghettoptt",
         "home-manager": "home-manager",
         "huecli": "huecli",
+        "nix-packages": "nix-packages",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-small": "nixpkgs-small",
         "nixpkgs-stable": "nixpkgs-stable",
+        "nixprstatus": "nixprstatus",
         "sops-nix": "sops-nix"
       }
     },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": [
-        "nixpkgs-stable": "nixpkgs-stable_2"
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1720187017,
+        "lastModified": 1731954233,
-        "narHash": "sha256-Zq+T1Bvd0ShZB9XM+bP0VJK3HjsSVQBLolkaCLBQnfQ=",
+        "narHash": "sha256-vvXx1m2Rsw7MkbKJdpcICzz4YPgZPApGKQGhNZfkhOI=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "1b11e208cee97c47677439625dc22e5289dcdead",
+        "rev": "e39947d0ee8e341fa7108bd02a33cdfa24a1360e",
         "type": "github"
       },
       "original": {
@@ -284,6 +399,50 @@
         "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": [
@@ -293,11 +452,33 @@
         ]
       },
       "locked": {
-        "lastModified": 1717850719,
+        "lastModified": 1719749022,
-        "narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=",
+        "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed",
+        "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": {

flake.nix

@@ -2,14 +2,19 @@
   description = "Torjus nixos config flake";
 
   inputs = {
-    # nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-24.11";
-    nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-23.11";
+    #nixpkgs-master.url = "github:nixos/nixpkgs?ref=master";
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    nixpkgs-small.url = "github:nixos/nixpkgs?ref=nixos-unstable-small";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    sops-nix.url = "github:Mic92/sops-nix";
+    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";
@@ -18,16 +23,29 @@
       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";
+    };
   };
 
   outputs =
-    { self
+    {
-    , nixpkgs
+      self,
-    , nixpkgs-stable
+      nixpkgs,
-    , sops-nix
+      # nixpkgs-master,
-    , ghettoptt
+      nixpkgs-stable,
-    , huecli
+      nixpkgs-small,
-    , ...
+      nixprstatus,
+      sops-nix,
+      ghettoptt,
+      huecli,
+      nix-packages,
+      ...
     }@inputs:
     let
       system = "x86_64-linux";
@@ -38,60 +56,108 @@
           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 {
+      forAllSystems =
-        pkgs = import nixpkgs { inherit system; };
+        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; };
+          specialArgs = {
-          modules = [ ./hosts/prismo ];
+            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 = [
+              { config, pkgs, ... }:
-                overlay-stable
+              {
-                ghettoptt.overlays.default
+                nixpkgs.overlays = commonOverlays;
-                huecli.overlays.default
+              }
-              ];
+            )
-            })
             ./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 = [
+              { config, pkgs, ... }:
-                overlay-stable
+              {
-                ghettoptt.overlays.default
+                nixpkgs.overlays = commonOverlays;
-                huecli.overlays.default
+              }
-              ];
+            )
-            })
             ./hosts/gunter
             sops-nix.nixosModules.sops
           ];
         };
       };
-      devShells = forAllSystems ({ pkgs }: {
+      devShells = forAllSystems (
-        default = pkgs.mkShell {
+        { pkgs }:
-          packages = with pkgs; [
+        {
-            pre-commit
+          default = pkgs.mkShell {
-          ];
+            packages = with pkgs; [
-        };
+              act
-      });
+              actionlint
+              yamllint
+            ];
+          };
+        }
+      );
     };
 }

home/editor/neovim/default.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   programs = {
     neovim = {
       enable = true;
@@ -34,6 +35,8 @@
           p.tree-sitter-c
           p.tree-sitter-cmake
           p.tree-sitter-cpp
+          p.tree-sitter-markdown
+          p.tree-sitter-markdown-inline
         ]))
       ];
       extraLuaConfig = ''
@@ -45,7 +48,7 @@
   };
   home.packages = with pkgs; [
     # nix stuff
-    nixpkgs-fmt
+    nixfmt-rfc-style
     statix
 
     # LSPs
@@ -58,6 +61,7 @@
     lua-language-server
     clang-tools
     zls
+    ruff
   ];
   home.sessionVariables.EDITOR = "nvim";
 }

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 = {
 		},
@@ -127,7 +129,48 @@ 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++

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; };
+    extraSpecialArgs = {
-    users.${user} = { pkgs, ... }: {
+      inherit pkgs inputs user;
-      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;
     };
+    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;
+      };
   };
 }

home/hyprland/cursor.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   home.pointerCursor = {
     gtk.enable = true;
     # x11.enable = true;

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
+  ];
+}

home/hyprland/hypridle.nix

@@ -1,8 +1,12 @@
-{ config, osConfig, pkgs, ... }: {
+{
+  config,
+  osConfig,
+  pkgs,
+  ...
+}:
+{
 
-  home.packages = with pkgs; [
+  home.packages = with pkgs; [ hypridle ];
-    hypridle
-  ];
   xdg.configFile = {
     "hypr/hypridle.conf" = {
       source = config.lib.file.mkOutOfStoreSymlink ./. + "/hypridle_${osConfig.system.name}.conf";

home/hyprland/hyprland_gunter.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
@@ -51,6 +57,10 @@
           follow_mouse = 1;
         };
 
+        cursor = {
+          no_hardware_cursors = true;
+        };
+
         env = [
           "LIBVA_DRIVER_NAME,nvidia"
           "XDG_SESSION_TYPE,wayland"
@@ -81,14 +91,17 @@
 
         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"
           ];
         };
@@ -111,18 +124,22 @@
         ];
 
         workspace = [
-          "name:T, monitor:$mon_top, persistent:true, default:true"
+          "name:T1, monitor:$mon_top, persistent:true, default:true"
-          "name:L, monitor:$mon_left, persistent:true, default:true"
+          "name:T2, monitor:$mon_top, persistent:true, default:false"
-          "name:R, monitor:$mon_right, persistent:true, default:true"
+          "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:true"
+          "name:c2, monitor:$mon_center, persistent:true, default:false"
-          "name:c3, monitor:$mon_center, persistent:true, default:true"
+          "name:c3, monitor:$mon_center, persistent:true, default:false"
-          "name:c4, monitor:$mon_center, persistent:true, default:true"
+          "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 = [
@@ -175,6 +192,9 @@
           # ",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:c1"
           "$mainMod,2,workspace,name:c2"
@@ -201,6 +221,7 @@
           "hyprpaper & sleep 10 && randomwp"
           "easyeffects --gapplication-service"
           "hypridle"
+          "streamcontroller -b"
           # "dunst"
         ];
       };

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
@@ -30,17 +36,13 @@
         "$shiftMainMod" = "SUPER_SHIFT";
         "$term" = "kitty";
 
-        monitor = [
+        monitor = [ "eDP-1,1920x1080@60,0x0,1" ];
-          "eDP-1,1920x1080@60,0x0,1"
-        ];
         input = {
           kb_layout = "no";
           follow_mouse = 1;
         };
 
-        env = [
+        env = [ "XDG_SESSION_TYPE,wayland" ];
-          "XDG_SESSION_TYPE,wayland"
-        ];
 
         decoration = {
           rounding = 10;
@@ -97,9 +99,7 @@
           "special:special, on-created-empty:kitty, rounding:true, decorate:false, border:false"
         ];
 
-        bindm = [
+        bindm = [ "ALT,mouse:272,movewindow" ];
-          "ALT,mouse:272,movewindow"
-        ];
 
         bindr = [
           # mumble ptt release

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 = [
+        env = [ "XDG_SESSION_TYPE,wayland" ];
-          "XDG_SESSION_TYPE,wayland"
-        ];
 
         decoration = {
           rounding = 0;
@@ -92,9 +94,7 @@
           "name:main 2, monitor:$mon_center, persistent:true, default:true"
         ];
 
-        bindm = [
+        bindm = [ "ALT,mouse:272,movewindow" ];
-          "ALT,mouse:272,movewindow"
-        ];
 
         bindr = [
           # mumble ptt release

home/hyprland/hyprlock.nix

@@ -1,8 +1,12 @@
-{ config, osConfig, pkgs, ... }: {
+{
+  config,
+  osConfig,
+  pkgs,
+  ...
+}:
+{
 
-  home.packages = with pkgs; [
+  home.packages = with pkgs; [ hyprlock ];
-    hyprlock
-  ];
   xdg.configFile = {
     "hypr/hyprlock.conf" = {
       source = config.lib.file.mkOutOfStoreSymlink ./. + "/hyprlock_${osConfig.system.name}.conf";

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
+  ];
+}

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
+  ];
+}

home/hyprland/waybar/default.nix

@@ -1,4 +1,9 @@
-{ pkgs, lib, osConfig, ... }:
+{
+  pkgs,
+  lib,
+  osConfig,
+  ...
+}:
 let
   flakestat = pkgs.writeShellApplication {
     name = "flakestat";
@@ -11,9 +16,7 @@ let
   arrhist = pkgs.stdenv.mkDerivation {
     name = "arrhist";
     propagatedBuildInputs = [
-      (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [
+      (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [ requests ]))
-        requests
-      ]))
     ];
     src = ./arrhist.py;
     dontUnpack = true;
@@ -29,13 +32,14 @@ in
   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/macchiato.css";
+      }
+      + "/themes/macchiato.css";
   };
 
   programs.waybar = {
@@ -165,17 +169,16 @@ in
           "position" = "top";
           modules-left = [ "custom/flakestat" ];
           modules-center = [ "hyprland/workspaces" ];
-          modules-right =
+          modules-right = [
-            [
+            (lib.mkIf (withArrhist) "custom/arrhist")
-              (lib.mkIf (withArrhist) "custom/arrhist")
+            "pulseaudio"
-              "pulseaudio"
+            "pulseaudio#microphone"
-              "pulseaudio#microphone"
+            "memory"
-              "memory"
+            "cpu"
-              "cpu"
+            (lib.mkIf (withBattery) "battery")
-              (lib.mkIf (withBattery) "battery")
+            "clock"
-              "clock"
+            "tray"
-              "tray"
+          ];
-            ];
           "hyprland/workspaces" = {
             "format" = "{name}";
             "on-click" = "activate";
@@ -186,7 +189,13 @@ in
             "scroll-step" = 5;
             "format" = "{icon} {volume}%";
             "format-muted" = "";
-            "format-icons" = { "default" = [ "" "" "" ]; };
+            "format-icons" = {
+              "default" = [
+                ""
+                ""
+                ""
+              ];
+            };
             "on-scroll-up" = "pamixer -i ${volInterval}";
             "on-scroll-down" = "pamixer -d ${volInterval}";
             "on-click" = "pamixer -t";
@@ -209,7 +218,9 @@ in
           "memory" = {
             "interval" = 3;
             "format" = " {percentage}%";
-            "states" = { "warning" = 85; };
+            "states" = {
+              "warning" = 85;
+            };
           };
           "cpu" = {
             "interval" = 3;
@@ -240,7 +251,8 @@ in
             "return-type" = "json";
             "interval" = 600;
           };
-        } // lib.optionalAttrs (withArrhist) {
+        }
+        // lib.optionalAttrs (withArrhist) {
           "custom/arrhist" = {
             "exec" = "${arrhist}/bin/arrhist";
             "return-type" = "json";

home/hyprland/waybar/flakestat.sh

@@ -1,4 +1,33 @@
 #!/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"
@@ -9,18 +38,18 @@ 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
+cd "$NIXPKGS_DIR" || print_output "?" "Could not find git repo dir" 1
-git fetch -q --all
+if ! git fetch -q --all; then
-unstable_commit_count=$(git rev-list --count "$unstable_rev..origin/$unstable_branch")
+    print_output "?" "Unable to fetch commits" 1
+    exit 1
+fi
+
+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}"
 
-output=$(jq -n \
+print_output "$text" "$tooltip" 0
-    --arg text "$text" \
-    --arg tooltip "$tooltip" \
-    --unbuffered \
-    --compact-output \
-    '{text: $text, tooltip: $tooltip}')
-
-echo "$output"

home/hyprland/xdg.nix

@@ -1,4 +1,5 @@
-{ config, ... }: {
+{ config, ... }:
+{
   xdg.configFile = {
     "hypr/hyprpaper.conf" = {
       source = config.lib.file.mkOutOfStoreSymlink ./. + "/hyprpaper.conf";

home/i3/default.nix

@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   mod = "Mod4";
 in

home/magicman.nix

@@ -1,39 +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; };
+    extraSpecialArgs = {
-    users.${user} = { pkgs, ... }: {
+      inherit pkgs inputs user;
-      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;
     };
+    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;
+      };
   };
 }

home/packages/default.nix

@@ -3,8 +3,12 @@ let
   withCuda = if (osConfig.system.name == "gunter") then true else false;
 in
 {
+  imports = [
+    ./zoom.nix
+  ];
   home.packages = with pkgs; [
     # CLI utils
+    act
     age
     bat
     bzip2
@@ -19,16 +23,19 @@ in
     file
     fzf
     glib
-    go-task
     grimblast
     ijq
     incus
     jq
     kitty
     kubectl
+    lazygit
+    lf
     ncdu
     nvd
+    nurl
     nwg-look
+    most
     pinentry
     pre-commit
     pulseaudio
@@ -38,11 +45,12 @@ in
     ripgrep
     sops
     sshfs
+    tea
     tldr
     tokei
     unzip
     ventoy
-    zoxide
+    wtype
 
     # Non-CLI stuff
     alacritty
@@ -58,7 +66,6 @@ in
     virt-manager
     vmware-horizon-client
     yt-dlp
-    zoom-us
 
     # k8s tools
     cilium-cli
@@ -79,10 +86,12 @@ in
     typescript
 
     # Py stuff
-    (python312.withPackages (p: with p; [
+    (python312.withPackages (
-      requests
+      p: with p; [
-      ipython
+        requests
-    ]))
+        ipython
+      ]
+    ))
     poetry
     ruff
 
@@ -94,19 +103,16 @@ in
     # Homemade shit
     ghettoptt
     huecli
+    nixprstatus
 
     # Stuff with overrides
-    # Blender
-    (blender.override {
-      cudaSupport = withCuda;
-    })
     # Btop
-    (btop.override {
+    (btop.override { cudaSupport = withCuda; })
-      cudaSupport = withCuda;
-    })
     # PrismLauncher
-    (prismlauncher.override {
+    prismlauncher
-      withWaylandGLFW = true;
+
-    })
+    # From nix-packages flake
+    path-of-building-beta
+    awakened-poe-trade
   ];
 }

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)
+  ];
+}

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; };
+    extraSpecialArgs = {
-    users.${user} = { pkgs, ... }: {
+      inherit pkgs inputs user;
-      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;
     };
+    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;
+      };
   };
 }

home/programs/dunst/default.nix

@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
   services.dunst = {
@@ -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";

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 =
+  config = lib.mkIf config.firefox.enable {
-    lib.mkIf config.firefox.enable { programs.firefox = { enable = true; }; };
+    programs.firefox = {
+      enable = true;
+    };
+  };
 }

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";
+        };
+      }
+    ];
+  };
+}

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";
   };
 }

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

home/programs/obs-studio/default.nix

@@ -1,31 +1,46 @@
-{ pkgs, lib, osConfig, ... }:
+{
+  pkgs,
+  lib,
+  osConfig,
+  ...
+}:
 let
-  withCuda = if (osConfig.system.name == "gunter") then true else false;
+  withCuda = osConfig.system.name == "gunter";
-  onnxruntime-gpu = (pkgs.onnxruntime.override {
+
-    cudaSupport = withCuda;
+  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;
+  obs-backgrounremoval-gpu = (
-  }).overrideAttrs (old: {
+    (pkgs.obs-studio-plugins.obs-backgroundremoval.override { onnxruntime = onnxruntime-gpu; })
-    version = "1.1.14-beta";
+    .overrideAttrs
-    src = pkgs.fetchFromGitHub {
+      (old: {
-      owner = "occ-ai";
+        version = "1.1.14-beta";
-      repo = "obs-backgroundremoval";
+        src = pkgs.fetchFromGitHub {
-      rev = "94be8c35fe077be93a6f5ef347a802295a36dddd";
+          owner = "occ-ai";
-      hash = "sha256-qnxDNeTWQYiRMqT6jNp8GC8ef6aaAAY+OXAak54dVc8=";
+          repo = "obs-backgroundremoval";
-    };
+          rev = "012a7f45fe4cb5363abee654d05c5cba4235feb5";
-    cmakeFlags =
+          hash = "sha256-ud9RfnbMXfOaIhkUYG7zyR4SxZhj3rZd9b4+8P4jBYs=";
-      if withCuda then
+        };
-        (lib.lists.remove "-DDISABLE_ONNXRUNTIME_GPU=ON" old.cmakeFlags)
+        cmakeFlags =
-      else old.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; [
+    plugins =
-      obs-pipewire-audio-capture
+      with pkgs.obs-studio-plugins;
-      obs-shaderfilter
+      [
-    ] ++ [ obs-backgrounremoval-gpu ];
+        obs-pipewire-audio-capture
+        obs-shaderfilter
+      ]
+      ++ lib.optionals withCuda [ obs-backgrounremoval-gpu ];
   };
 }

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}
+      text = ''
-$background = 0xff{background.strip}
+        $foreground = 0xff{foreground.strip}
-$color0 = 0xff{color0.strip}
+        $background = 0xff{background.strip}
-$color1 = 0xff{color1.strip}
+        $color0 = 0xff{color0.strip}
-$color2 = 0xff{color2.strip}
+        $color1 = 0xff{color1.strip}
-$color3 = 0xff{color3.strip}
+        $color2 = 0xff{color2.strip}
-$color4 = 0xff{color4.strip}
+        $color3 = 0xff{color3.strip}
-$color5 = 0xff{color5.strip}
+        $color4 = 0xff{color4.strip}
-$color6 = 0xff{color6.strip}
+        $color5 = 0xff{color5.strip}
-$color7 = 0xff{color7.strip}
+        $color6 = 0xff{color6.strip}
-$color8 = 0xff{color8.strip}
+        $color7 = 0xff{color7.strip}
-$color9 = 0xff{color9.strip}
+        $color8 = 0xff{color8.strip}
-$color10 = 0xff{color10.strip}
+        $color9 = 0xff{color9.strip}
-$color11 = 0xff{color11.strip}
+        $color10 = 0xff{color10.strip}
-$color12 = 0xff{color12.strip}
+        $color11 = 0xff{color11.strip}
-$color13 = 0xff{color13.strip}
+        $color12 = 0xff{color12.strip}
-$color14 = 0xff{color14.strip}
+        $color13 = 0xff{color13.strip}
-$color15 = 0xff{color15.strip}
+        $color14 = 0xff{color14.strip}
+        $color15 = 0xff{color15.strip}
       '';
     };
   };

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";
   };
 }

home/programs/tmux/default.nix

@@ -1,7 +1,14 @@
-{ pkgs, lib, config, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 with lib;
-let cfg = config.tmux.enable;
+let
-in {
+  cfg = config.tmux.enable;
+in
+{
   options.tmux.enable = mkEnableOption "tmux";
   config = mkIf cfg {
     programs.tmux = {

home/programs/vscode/default.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, lib, ... }:
+{
   programs.vscode = {
     enable = true;
     enableUpdateCheck = true;

home/programs/zellij/default.nix

@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
   programs.zellij = {
     enable = true;
     # enableZshIntegration = true;

home/scripts/batlvl.nix

@@ -2,13 +2,10 @@
 let
   batlvl = pkgs.writeShellApplication {
     name = "batlvl";
-    runtimeInputs = [
+    runtimeInputs = [ ];
-    ];
     text = builtins.readFile ./batlvl.sh;
   };
 in
 {
-  home.packages = [
+  home.packages = [ batlvl ];
-    batlvl
-  ];
 }

home/scripts/default.nix

@@ -1,7 +1,6 @@
-{ pkgs, config, ... }: {
+{ pkgs, config, ... }:
-  imports = [
+{
-    ./lockhelper.nix
+  imports = [ ./lockhelper.nix ];
-  ];
   home.file.".local/bin/hl-no-opacity" = {
     source = ./hl-no-opacity.sh;
     executable = true;

home/scripts/lockhelper.nix

@@ -10,7 +10,5 @@ let
   };
 in
 {
-  home.packages = [
+  home.packages = [ lockhelper ];
-    lockhelper
-  ];
 }

home/services/backup-home.nix

@@ -95,7 +95,10 @@ in
   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";
@@ -112,7 +115,10 @@ in
       Persistent = true;
     };
     Install = {
-      WantedBy = [ "timers.target" "graphical-session.target" ];
+      WantedBy = [
+        "timers.target"
+        "graphical-session.target"
+      ];
     };
   };
 }

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;

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";
+      };
+    };
+  };
+}

home/ssh/default.nix

@@ -1 +1 @@
-{ imports = [ ./gunter.nix ]; }
+{ imports = [ ./config.nix ]; }

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";
-    };
-  };
-}

home/zsh/default.nix

@@ -1,4 +1,5 @@
-{ user, pkgs, ... }: {
+{ user, pkgs, ... }:
+{
   home.packages = with pkgs; [ fd ];
   programs.direnv = {
     enable = true;
@@ -9,6 +10,10 @@
       package = pkgs.nix-direnv;
     };
   };
+  programs.zoxide = {
+    enable = true;
+    enableZshIntegration = true;
+  };
   programs.zsh = {
     enable = true;
     autocd = false;
@@ -31,16 +36,18 @@
 
       # Aliases
       alias ls=eza
-      alias find=fd
-
-      # Init zoxide
-      eval "$(zoxide init zsh)"
     '';
     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" ];
+        })
       ];
     };
   };

hosts/gunter/configuration.nix

@@ -1,4 +1,10 @@
-{ config, lib, inputs, pkgs, ... }:
+{
+  config,
+  lib,
+  inputs,
+  pkgs,
+  ...
+}:
 
 {
   imports = [
@@ -12,21 +18,22 @@
   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"
       "rd.systemd.show_status=false"
-      "nvidia-drm.modeset=1"
-      "nvidia-drm.fbdev=1"
     ];
 
     extraModprobeConfig = ''
-      options nvidia NVreg_RegistryDwords="PowerMizerEnable=0x1; PerfLevelSrc=0x2222; PowerMizerLevel=0x3; PowerMizerDefault=0x3; PowerMizerDefaultAC=0x3"
       options v4l2loopback exclusive_caps=1 card_label="Virtual Camera"
     '';
 
@@ -35,7 +42,9 @@
       enable = true;
       configurationLimit = 10;
     };
-    loader.efi = { canTouchEfiVariables = true; };
+    loader.efi = {
+      canTouchEfiVariables = true;
+    };
     supportedFilesystems = [ "nfs" ];
   };
 
@@ -64,16 +73,16 @@
     modesetting.enable = true;
     powerManagement.enable = false;
     powerManagement.finegrained = false;
-    open = false;
+    open = true;
-    nvidiaSettings = true;
+    nvidiaSettings = false;
 
-    package = config.boot.kernelPackages.nvidiaPackages.beta;
+    package = config.boot.kernelPackages.nvidiaPackages.latest;
     # package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
-    #   version = "555.42.02";
+    #   version = "560.28.03";
-    #   sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk=";
+    #   sha256_64bit = "sha256-martv18vngYBJw1IFUCAaYr+uc65KtlHAMdLMdtQJ+Y=";
-    #   sha256_aarch64 = lib.fakeSha256;
+    #   sha256_aarch64 = lib.fakeHash;
-    #   openSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA=";
+    #   openSha256 = "sha256-asGpqOpU0tIO9QqceA8XRn5L27OiBFuI9RZ1NjSVwaM=";
-    #   settingsSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA=";
+    #   settingsSha256 = lib.fakeHash;
     #   persistencedSha256 = lib.fakeSha256;
     # };
   };
@@ -112,15 +121,30 @@
   xdg.portal = {
     enable = true;
     xdgOpenUsePortal = true;
-    extraPortals = (with pkgs; [
+    extraPortals = (
-      # unstable.xdg-desktop-portal-hyprland
+      with pkgs;
-      xdg-desktop-portal-gtk
+      [
-    ]);
+        # unstable.xdg-desktop-portal-hyprland
+        xdg-desktop-portal-gtk
+      ]
+    );
   };
 
   # Enable flakes
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nix.settings = {
-  nix.settings.trusted-users = [ "root" "torjus" ];
+    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

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
   ];

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 =
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-    [
-      (modulesPath + "/installer/scan/not-detected.nix")
-    ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
-  boot.initrd.kernelModules = [ ];
+    "nvme"
-  boot.kernelModules = [ "kvm-amd" "v4l2loopback" ];
+    "xhci_pci"
-  boot.extraModulePackages = with config.boot.kernelPackages; [
+    "ahci"
-    v4l2loopback
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
   ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [
+    "kvm-amd"
+    "v4l2loopback"
+  ];
+  boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    {
+    device = "/dev/disk/by-uuid/a7d4b697-fffa-4bcb-9dd7-cbbd6121a50c";
-      device = "/dev/disk/by-uuid/a7d4b697-fffa-4bcb-9dd7-cbbd6121a50c";
+    fsType = "xfs";
-      fsType = "xfs";
+  };
-    };
 
   boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/be82b184-3cc7-483b-9069-f7797f51c853";
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    {
+    device = "/dev/disk/by-uuid/DC0C-AAB3";
-      device = "/dev/disk/by-uuid/DC0C-AAB3";
+    fsType = "vfat";
-      fsType = "vfat";
+  };
-    };
 
-  swapDevices =
+  swapDevices = [ { device = "/dev/disk/by-uuid/2284e9c6-c168-4d4f-ba6a-d270f1ae245d"; } ];
-    [{ 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

hosts/gunter/nfs.nix

@@ -1,22 +1,25 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
-  environment.systemPackages = with pkgs; [
+{
-    nfs-utils
+  environment.systemPackages = with pkgs; [ nfs-utils ];
-  ];
   services.rpcbind.enable = true;
-  systemd.mounts = [{
+  systemd.mounts = [
-    type = "nfs";
+    {
-    mountConfig = {
+      type = "nfs";
-      Options = "rw,soft,noatime";
+      mountConfig = {
-    };
+        Options = "rw,soft,noatime";
-    what = "nas.home.2rjus.net:/mnt/hdd-pool/media";
+      };
-    where = "/mnt/nas/media";
+      what = "nas.home.2rjus.net:/mnt/hdd-pool/media";
-  }];
+      where = "/mnt/nas/media";
+    }
+  ];
 
-  systemd.automounts = [{
+  systemd.automounts = [
-    wantedBy = [ "multi-user.target" ];
+    {
-    automountConfig = {
+      wantedBy = [ "multi-user.target" ];
-      TimeoutIdleSec = "5min";
+      automountConfig = {
-    };
+        TimeoutIdleSec = "5min";
-    where = "/mnt/nas/media";
+      };
-  }];
+      where = "/mnt/nas/media";
+    }
+  ];
 }

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;
+  };
+}

hosts/gunter/steamuser.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   environment.shells = with pkgs; [ zsh ];
 
   services.xserver.desktopManager.xfce.enable = true;

hosts/gunter/streamdeck.nix

@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+  programs.streamcontroller.enable = true;
+}

hosts/magicman/configuration.nix

@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
   imports = [ ./hardware-configuration.nix ];
@@ -19,14 +24,14 @@
     enable = true;
     configurationLimit = 3;
   };
-  boot.loader.efi = { canTouchEfiVariables = true; };
+  boot.loader.efi = {
+    canTouchEfiVariables = true;
+  };
 
   boot.initrd.systemd.enable = true;
   boot.plymouth = {
     enable = true;
-    themePackages = with pkgs; [
+    themePackages = with pkgs; [ catppuccin-plymouth ];
-      catppuccin-plymouth
-    ];
     theme = "catppuccin-macchiato";
     extraConfig = ''
       UseFirmwareBackground=false
@@ -45,7 +50,7 @@
   time.timeZone = "Europe/Oslo";
 
   # Enable opengl
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
     extraPackages = with pkgs; [
       intel-media-driver
@@ -62,11 +67,15 @@
       "bluez5.enable-sbc-xq" = true;
       "bluez5.enable-msbc" = true;
       "bluez5.enable-hw-volume" = true;
-      "bluez5.roles" = [ "hsp_hs" "hsp_ag" "hfp_hf" "hfp_ag" ];
+      "bluez5.roles" = [
+        "hsp_hs"
+        "hsp_ag"
+        "hfp_hf"
+        "hfp_ag"
+      ];
     };
   };
 
-
   # Setup hyprland
   services.xserver.enable = true;
   services.xserver.displayManager = {
@@ -102,17 +111,26 @@
   xdg.portal = {
     enable = true;
     xdgOpenUsePortal = true;
-    extraPortals = (with pkgs; [
+    extraPortals = (
-      # xdg-desktop-portal-hyprland
+      with pkgs;
-      xdg-desktop-portal-gtk
+      [
-    ]);
+        # xdg-desktop-portal-hyprland
+        xdg-desktop-portal-gtk
+      ]
+    );
   };
 
   programs.steam.enable = true;
 
   # Enable flakes
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nix.settings.experimental-features = [
-  nix.settings.trusted-users = [ "root" "torjus" ];
+    "nix-command"
+    "flakes"
+  ];
+  nix.settings.trusted-users = [
+    "root"
+    "torjus"
+  ];
 
   nixpkgs.config.allowUnfree = true;
   # Install system-wide packages

hosts/magicman/default.nix

@@ -1,4 +1,10 @@
-{ inputs, self, pks, ... }: {
+{
+  inputs,
+  self,
+  pks,
+  ...
+}:
+{
   imports = [
     ./configuration.nix
     ./hardware-configuration.nix

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 =
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-    [
-      (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."/" =
+  fileSystems."/" = {
-    {
+    device = "/dev/disk/by-uuid/31b20f4c-24bb-4fd1-9a3e-8ccc19fe3d64";
-      device = "/dev/disk/by-uuid/31b20f4c-24bb-4fd1-9a3e-8ccc19fe3d64";
+    fsType = "xfs";
-      fsType = "xfs";
+  };
-    };
 
   boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/4bbadd2c-94dd-4d80-94bf-9332d24b57bd";
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    {
+    device = "/dev/disk/by-uuid/7FF3-B061";
-      device = "/dev/disk/by-uuid/7FF3-B061";
+    fsType = "vfat";
-      fsType = "vfat";
+  };
-    };
 
-  swapDevices =
+  swapDevices = [ { device = "/dev/disk/by-uuid/6f2c4906-ad88-4d7e-88ec-61cdda41ce28"; } ];
-    [{ 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

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; [
+    extraPortals = (
-      xdg-desktop-portal-hyprland
+      with pkgs;
-      xdg-desktop-portal-gtk
+      [
-    ]);
+        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

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
   ];
 }

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 =
+      availableKernelModules = [
-        [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+        "xhci_pci"
+        "ahci"
+        "usb_storage"
+        "sd_mod"
+        "rtsx_pci_sdmmc"
+      ];
       kernelModules = [ ];
 
-      luks.devices."cryptroot".device =
+      luks.devices."cryptroot".device = "/dev/disk/by-uuid/f71b0ace-f38f-435f-a07a-007f9cfe4919";
-        "/dev/disk/by-uuid/f71b0ace-f38f-435f-a07a-007f9cfe4919";
     };
     kernelModules = [ "kvm-intel" ];
     extraModulePackages = [ ];
@@ -29,8 +39,7 @@
     fsType = "vfat";
   };
 
-  swapDevices =
+  swapDevices = [ { device = "/dev/disk/by-uuid/67da36a8-69df-4541-88cd-cba7cbc40b4c"; } ];
-    [{ 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 =
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-    lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

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";
 

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

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

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

system/default.nix

@@ -1,12 +1,14 @@
 {
   imports = [
-    ./podman.nix
     ./fonts.nix
     ./fwupd.nix
-    ./users.nix
-    ./libvirt.nix
-    ./services.nix
-    ./security.nix
     ./git.nix
+    ./greetd.nix
+    ./libvirt.nix
+    ./podman.nix
+    ./security.nix
+    ./services.nix
+    ./users.nix
+    ./label.nix
   ];
 }

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
   ];
 }

system/fwupd.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   services.fwupd = {
     enable = true;
   };

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";
+      };
+    };
+  };
+}

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;
+}

system/monitoring.nix

@@ -29,5 +29,9 @@
     wantedBy = [ "multi-user.target" ];
   };
 
-  networking.firewall.allowedTCPPorts = [ 9100 9558 8989 ];
+  networking.firewall.allowedTCPPorts = [
+    9100
+    9558
+    8989
+  ];
 }

system/podman.nix

@@ -2,9 +2,11 @@
 
 {
   virtualisation = {
+    containers.enable = true;
     podman = {
       enable = true;
       dockerCompat = true;
+      defaultNetwork.settings.dns_enabled = true;
     };
   };
 }

system/security.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   # Enable sudo
   security.sudo = {
     enable = true;

system/services.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   services = {
     dbus.enable = true;
     pipewire = {

system/users.nix

@@ -19,9 +19,9 @@
       "video"
       "gamemode"
       "libvirtd"
+      "podman"
     ];
     # Install some user packages
-    packages = with pkgs; [
+    packages = with pkgs; [ ];
-    ];
   };
 }