Lock file maintenance

.gitea/workflows/build.yml

@@ -12,17 +12,17 @@ jobs:
   build-nixos:
     runs-on: ubuntu-latest
     steps: 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       
       - name: "Install Nix ❄️"
-        uses: cachix/install-nix-action@v31
+        uses: cachix/install-nix-action@v30
 
     #  - uses: DeterminateSystems/nix-installer-action@v4
-      - uses: DeterminateSystems/magic-nix-cache-action@v13
+      - uses: DeterminateSystems/magic-nix-cache-action@v9
-      - uses: DeterminateSystems/flake-checker-action@v12
+      - uses: DeterminateSystems/flake-checker-action@v9
 
       - name: "Install Cachix ❄️"
-        uses: cachix/cachix-action@v16
+        uses: cachix/cachix-action@v15
         with:
           name: helcel
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"

.gitea/workflows/update.yml

@@ -13,15 +13,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Install nix
-        uses: DeterminateSystems/nix-installer-action@v20
+        uses: DeterminateSystems/nix-installer-action@v16
         with:
           github-token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
           extra_nix_config: |
             experimental-features = nix-command flakes            
       - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@v27
+        uses: DeterminateSystems/update-flake-lock@v24
         with:
           token: ${{ secrets.GT_TOKEN_FOR_UPDATES }}
           pr-title: "[chore] Update flake.lock"

flake.lock

@@ -1,5 +1,38 @@
 {
   "nodes": {
+    "aquamarine": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739103745,
+        "narHash": "sha256-c53dcRaw0F4Os9WD05HwIRs9kTDZw4Mxe1XK4edEALo=",
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "rev": "a3dda0d10ce9aa1d1dfb7a6c139ea8c2872c74bd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "type": "github"
+      }
+    },
     "arion": {
       "inputs": {
         "flake-parts": "flake-parts",
@@ -9,11 +42,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745165725,
+        "lastModified": 1733918465,
-        "narHash": "sha256-OnHV8Us04vRsWM0uL1cQez8DumhRi6yE+4K4VLtH6Ws=",
+        "narHash": "sha256-hSuGa8Hh67EHr2x812Ay6WFyFT2BGKn+zk+FJWeKXPg=",
         "owner": "hercules-ci",
         "repo": "arion",
-        "rev": "4f59059633b14364b994503b179a701f5e6cfb90",
+        "rev": "f01c95c10f9d4f04bb08d97b3233b530b180f12e",
         "type": "github"
       },
       "original": {
@@ -45,11 +78,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757430124,
+        "lastModified": 1739548217,
-        "narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=",
+        "narHash": "sha256-rlv64erpr36xdmMDPgf9rhRXBYZ0BZb5nrw2ZPSk1sQ=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196",
+        "rev": "678b22642abde2ee77ae2218ab41d802f010e5b0",
         "type": "github"
       },
       "original": {
@@ -59,6 +92,22 @@
         "type": "github"
       }
     },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -101,13 +150,35 @@
         "type": "github"
       }
     },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
     "hardware": {
       "locked": {
-        "lastModified": 1757775351,
+        "lastModified": 1738816619,
-        "narHash": "sha256-xWsxmNHwt9jV/yFJqzsNeilpH4BR8MPe44Yt0eaGAIM=",
+        "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "f89c620d3d6e584d98280b48f0af7be4f8506ab5",
+        "rev": "2eccff41bab80839b1d25b303b53d339fbb07087",
         "type": "github"
       },
       "original": {
@@ -139,20 +210,283 @@
         ]
       },
       "locked": {
-        "lastModified": 1757808926,
+        "lastModified": 1739570999,
-        "narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=",
+        "narHash": "sha256-eCc0/Q4bPpe4/AS+uzIrHLJcR6BxPQ69q2kD0/Qe6rU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f21d9167782c086a33ad53e2311854a8f13c281e",
+        "rev": "254d47082e23dbf72fdeca1da6fe1da420f478d8",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.05",
+        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
     },
+    "hyprcursor": {
+      "inputs": {
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1738664950,
+        "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=",
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "type": "github"
+      }
+    },
+    "hyprgraphics": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739049071,
+        "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=",
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "type": "github"
+      }
+    },
+    "hyprland": {
+      "inputs": {
+        "aquamarine": "aquamarine",
+        "hyprcursor": "hyprcursor",
+        "hyprgraphics": "hyprgraphics",
+        "hyprland-protocols": "hyprland-protocols",
+        "hyprland-qtutils": "hyprland-qtutils",
+        "hyprlang": "hyprlang",
+        "hyprutils": "hyprutils",
+        "hyprwayland-scanner": "hyprwayland-scanner",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "pre-commit-hooks": "pre-commit-hooks",
+        "systems": "systems",
+        "xdph": "xdph"
+      },
+      "locked": {
+        "lastModified": 1739665242,
+        "narHash": "sha256-eKIMpBXaGrB/V/afS4pjropo50FgLE1t1W2aMI4/mhA=",
+        "ref": "refs/heads/main",
+        "rev": "897ee276dc0a8a6b11a8102b225a9e969faac0bf",
+        "revCount": 5823,
+        "submodules": true,
+        "type": "git",
+        "url": "https://github.com/hyprwm/Hyprland"
+      },
+      "original": {
+        "submodules": true,
+        "type": "git",
+        "url": "https://github.com/hyprwm/Hyprland"
+      }
+    },
+    "hyprland-protocols": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1738422629,
+        "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=",
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "type": "github"
+      }
+    },
+    "hyprland-qt-support": {
+      "inputs": {
+        "hyprlang": [
+          "hyprland",
+          "hyprland-qtutils",
+          "hyprlang"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "hyprland-qtutils",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "hyprland-qtutils",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737634706,
+        "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=",
+        "owner": "hyprwm",
+        "repo": "hyprland-qt-support",
+        "rev": "8810df502cdee755993cb803eba7b23f189db795",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-qt-support",
+        "type": "github"
+      }
+    },
+    "hyprland-qtutils": {
+      "inputs": {
+        "hyprland-qt-support": "hyprland-qt-support",
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprland-qtutils",
+          "hyprlang",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739048983,
+        "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=",
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "type": "github"
+      }
+    },
+    "hyprlang": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739048914,
+        "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "a7334904d591f38757c46fbe2ab68651877d9099",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
+    "hyprutils": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739048933,
+        "narHash": "sha256-ck6MaoYvISBQKqZR+HcxXnx0wOhyCauxfVMaV5zhJxQ=",
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "rev": "e4e018a2ca6f5a9c33511973454199e1c7c85499",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "type": "github"
+      }
+    },
+    "hyprwayland-scanner": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739049028,
+        "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=",
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "rev": "04146df74a8d5ec0b579657307be01f1e241125f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "type": "github"
+      }
+    },
     "nix-colors": {
       "inputs": {
         "base16-schemes": "base16-schemes",
@@ -174,11 +508,11 @@
     },
     "nixUnstable": {
       "locked": {
-        "lastModified": 1757746433,
+        "lastModified": 1739451785,
-        "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=",
+        "narHash": "sha256-3ebRdThRic9bHMuNi2IAA/ek9b32bsy8F5R4SvGTIog=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d",
+        "rev": "1128e89fd5e11bb25aedbfc287733c6502202ea9",
         "type": "github"
       },
       "original": {
@@ -190,16 +524,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1757545623,
+        "lastModified": 1739484910,
-        "narHash": "sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ=",
+        "narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8cd5ce828d5d1d16feff37340171a98fc3bf6526",
+        "rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -221,11 +555,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1757745802,
+        "lastModified": 1739446958,
-        "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
+        "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
+        "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
         "type": "github"
       },
       "original": {
@@ -238,14 +572,15 @@
     "nur": {
       "inputs": {
         "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_2",
+        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1757814651,
+        "lastModified": 1739669254,
-        "narHash": "sha256-uLqKqHb5Yqa+41ciUWl1hP5AbwOVXevTvnH7px/GLRI=",
+        "narHash": "sha256-081l707GpIdFlnY7wA6Qa4hvfkbO/BVxNZPK9WgvLhE=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "4d74a5dbb4bca00730d6215b537d70ce17e0dede",
+        "rev": "84bb49a5943bded2f83ce483c5102bea01ba6d5e",
         "type": "github"
       },
       "original": {
@@ -254,17 +589,42 @@
         "type": "github"
       }
     },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737465171,
+        "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "arion": "arion",
         "darwin": "darwin",
         "hardware": "hardware",
         "home-manager": "home-manager",
+        "hyprland": "hyprland",
         "nix-colors": "nix-colors",
         "nixUnstable": "nixUnstable",
         "nixpkgs": "nixpkgs",
         "nur": "nur",
-        "sops-nix": "sops-nix"
+        "sops-nix": "sops-nix",
+        "umu": "umu"
       }
     },
     "sops-nix": {
@@ -274,11 +634,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757503115,
+        "lastModified": 1739262228,
-        "narHash": "sha256-S9F6bHUBh+CFEUalv/qxNImRapCxvSnOzWBUZgK1zDU=",
+        "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "0bf793823386187dff101ee2a9d4ed26de8bbf8c",
+        "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975",
         "type": "github"
       },
       "original": {
@@ -286,6 +646,107 @@
         "repo": "sops-nix",
         "type": "github"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733222881,
+        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
+    "umu": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "dir": "packaging/nix",
+        "lastModified": 1739600212,
+        "narHash": "sha256-ai1gK6Q08/Y+QwS1jwPBIUI5Z3EjVg5UIiiNafscSlQ=",
+        "ref": "refs/heads/main",
+        "rev": "e9438ae2f5f046421e355789345d9981b7c3f9d8",
+        "revCount": 989,
+        "submodules": true,
+        "type": "git",
+        "url": "https://github.com/Open-Wine-Components/umu-launcher/"
+      },
+      "original": {
+        "dir": "packaging/nix",
+        "submodules": true,
+        "type": "git",
+        "url": "https://github.com/Open-Wine-Components/umu-launcher/"
+      }
+    },
+    "xdph": {
+      "inputs": {
+        "hyprland-protocols": [
+          "hyprland",
+          "hyprland-protocols"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737634991,
+        "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=",
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -3,12 +3,12 @@
   inputs = {
     # Trick renovate into working: "github:NixOS/nixpkgs/nixpkgs-unstable"
     nixUnstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
     hardware.url = "github:nixos/nixos-hardware";
     nur.url = "github:nix-community/nur";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.05";
+      url = "github:nix-community/home-manager/release-24.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -17,10 +17,15 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # hyprland = {
+    hyprland = {
-    #   url = "github:hyprwm/Hyprland";
+      url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
-    #   inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
-    # };
+    };
+    umu = {
+      url =
+        "git+https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix&submodules=1";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";

generator.nix

@@ -29,7 +29,7 @@
                   syscfg
                   { usercfg = userConfig; }
                   inputs.nix-colors.homeManagerModule
-                  # inputs.hyprland.homeManagerModules.default
+                  inputs.hyprland.homeManagerModules.default
                   inputs.sops-nix.homeManagerModules.sops
                 ];
               }) syscfg.syscfg.users);

modules/home/base/default.nix

@@ -13,9 +13,9 @@
 
 
   #SOPS
-  # sops.defaultSopsFile = ./sops/${config.usercfg.username}.yaml;
+  sops.defaultSopsFile = ./sops/${config.usercfg.username}.yaml;
-  # sops.age.keyFile = "/var/lib/sops-nix/age-key.txt";
+  sops.age.keyFile = "/var/lib/sops-nix/age-key.txt";
-  # sops.age.generateKey = true;
+  sops.age.generateKey = true;
-  # sops.secrets."github_user_key" = { };
+  sops.secrets."github_user_key" = { };
-  # sops.secrets."curse_forge_key" = { };
+  sops.secrets."curse_forge_key" = { };
 }

modules/home/cli/zsh/default.nix

@@ -14,7 +14,7 @@ in {
       "ssh" = "TERM=xterm-256color  ${pkgs.openssh}/bin/ssh";
       "top" = "btop";
     };
-    initContent = ''
+    initExtra = ''
       sopsu() {nix-shell -p sops --run "sops updatekeys $1";}
       sopsn() {nix-shell -p sops --run "sops $1";}
     '';

modules/home/gui/apps/develop/default.nix

@@ -2,6 +2,6 @@
   imports = [ ./vscodium ];
 
   config = lib.mkIf (config.syscfg.make.develop) {
-    home.packages = with pkgs; [ blender godot_4 openscad-unstable bambu-studio pandoc];
+    home.packages = with pkgs; [ blender godot_4 openscad bambu-studio ];
   };
 }

modules/home/gui/apps/develop/vscodium/default.nix

@@ -4,8 +4,7 @@
     programs.vscode = {
       enable = true;
       package = pkgs.vscodium;
-      #profiles.default = {
+      extensions = with pkgs.vscode-extensions; [
-        profiles.default.extensions = with pkgs.vscode-extensions; [
         bbenoist.nix
         esbenp.prettier-vscode
         golang.go
@@ -13,7 +12,6 @@
         ms-vscode.cpptools
         dbaeumer.vscode-eslint
       ];
-      #};
     };
   };
 }

modules/home/gui/base/default.nix

@@ -14,9 +14,7 @@
       pavucontrol
       keepassxc
       nextcloud-client
-
       gramps
-      sweethome3d.application
     ];
   };
 }

modules/home/gui/games/default.nix

@@ -7,7 +7,7 @@
     home.packages = with pkgs; [
 
       #games
-      # steam
+      steam
       gamemode
       gamescope
       mangohud
@@ -15,8 +15,8 @@
       openttd-jgrpp
       bottles
       lutris
-      unstable.umu-launcher
+      inputs.umu.packages.${pkgs.system}.umu
-      # wine
+      wine
     ];
   };
 

modules/home/gui/theme/gtk-theme-gen.nix

@@ -11,8 +11,8 @@ in pkgs.stdenv.mkDerivation rec {
   src = pkgs.fetchFromGitHub {
     owner = "vinceliuice";
     repo = "Orchis-theme";
-    rev = "5b73376721cf307101e22d7031c1f4b1344d1f63";
+    rev = "be8b0aff92ed0741174b74c2ee10c74b15be0474";
-    sha256 = "sha256-+2/CsgJ+rdDpCp+r5B/zys3PtFgtnu+ohTEUOtJNd1Y=";
+    sha256 = "sha256-m7xh/1uIDh2BM0hTPA5QymXQt6yV7mM7Ivg5VaF2PvM=";
   };
 
   nativeBuildInputs = with pkgs; [ gtk3 sassc ];
@@ -22,43 +22,43 @@ in pkgs.stdenv.mkDerivation rec {
   preInstall = ''
     mkdir -p $out/share/themes
     cat > src/_sass/_color-palette-${scheme.slug}.scss << 'EOF'
-      $red-light: #${scheme.palette.low0F};
+      $red-light: #${scheme.palette.base0F};
-      $red-dark: #${scheme.palette.high0F};
+      $red-dark: #${scheme.palette.base0F};
 
-      $pink-light: #${scheme.palette.low0E};
+      $pink-light: #${scheme.palette.base0E};
-      $pink-dark: #${scheme.palette.high0E};
+      $pink-dark: #${scheme.palette.base0E};
 
-      $purple-light: #${scheme.palette.low0D};
+      $purple-light: #${scheme.palette.base0D};
-      $purple-dark: #${scheme.palette.high0D};
+      $purple-dark: #${scheme.palette.base0D};
 
-      $blue-light: #${scheme.palette.low0C};
+      $blue-light: #${scheme.palette.base0C};
-      $blue-dark: #${scheme.palette.high0C};
+      $blue-dark: #${scheme.palette.base0C};
 
-      $teal-light: #${scheme.palette.low0B};
+      $teal-light: #${scheme.palette.base0B};
-      $teal-dark: #${scheme.palette.high0B};
+      $teal-dark: #${scheme.palette.base0B};
 
-      $green-light: #${scheme.palette.low0A};
+      $green-light: #${scheme.palette.base0A};
-      $green-dark: #${scheme.palette.high0A};
+      $green-dark: #${scheme.palette.base0A};
-      $sea-light: #${scheme.palette.alt_low0B};
+      $sea-light: #${scheme.palette.base0B};
-      $sea-dark: #${scheme.palette.alt_high0B};
+      $sea-dark: #${scheme.palette.base0B};
 
-      $yellow-light: #${scheme.palette.low09};
+      $yellow-light: #${scheme.palette.base09};
-      $yellow-dark: #${scheme.palette.low09};
+      $yellow-dark: #${scheme.palette.base09};
 
-      $orange-light: #${scheme.palette.low08};
+      $orange-light: #${scheme.palette.base08};
-      $orange-dark: #${scheme.palette.high08};
+      $orange-dark: #${scheme.palette.base08};
 
       $grey-050: #${scheme.palette.base07};
       $grey-100: #${scheme.palette.base07};
-      $grey-150: #${scheme.palette.base06};
+      $grey-150: #${scheme.palette.base07};
       $grey-200: #${scheme.palette.base06};
-      $grey-250: #${scheme.palette.base05};
+      $grey-250: #${scheme.palette.base06};
       $grey-300: #${scheme.palette.base05};
-      $grey-350: #${scheme.palette.base04};
+      $grey-350: #${scheme.palette.base05};
       $grey-400: #${scheme.palette.base04};
-      $grey-450: #${scheme.palette.base03};
+      $grey-450: #${scheme.palette.base04};
       $grey-500: #${scheme.palette.base03};
-      $grey-550: #${scheme.palette.base02};
+      $grey-550: #${scheme.palette.base03};
       $grey-600: #${scheme.palette.base02};
       $grey-650: #${scheme.palette.base02};
       $grey-700: #${scheme.palette.base01};

modules/home/wayland/base/default.nix

@@ -42,8 +42,6 @@ in {
           [ "discord-402572971681644545.desktop" ];
         "x-scheme-handler/discord-696343075731144724" =
           [ "discord-696343075731144724.desktop" ];
-        "x-scheme-handler/tg" = [ "org.telegram.desktop.desktop" ];
-        "x-scheme-handler/tonsite" = [ "org.telegram.desktop.desktop" ];
         "x-scheme-handler/http" = [ "firefox.desktop" ];
         "x-scheme-handler/https" = [ "firefox.desktop" ];
         "x-scheme-handler/chrome" = [ "firefox.desktop" ];

modules/nixos/gui/audio/default.nix

@@ -3,8 +3,8 @@ let cfg = config.syscfg.make.gui;
 in {
   config = lib.mkIf cfg {
     # sound.enable = true;
+    hardware.pulseaudio.enable = false;
     security.rtkit.enable = true;
-    services.pulseaudio.enable = false; #25.05 change to services
     services.pipewire = {
       enable = true;
       alsa.enable = true;

modules/nixos/gui/games/default.nix

@@ -5,7 +5,6 @@ in {
     programs.steam = {
       enable = true;
       remotePlay.openFirewall = true;
-      extraCompatPackages = with pkgs;  [proton-ge-bin];
     };
   };
 }

modules/nixos/system/hw/power/default.nix

@@ -7,25 +7,9 @@
         STOP_CHARGE_THRESH_BAT0 = 90;
         CPU_SCALING_GOVERNOR_ON_AC = "performance";
         CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
-        MEM_SLEEP_ON_BAT = "deep";
       };
     };
 
-    powerManagement.enable = true;
-    # suspend to RAM (deep) rather than `s2idle`
-    boot.kernelParams = [ "mem_sleep_default=deep" ];
-    # suspend-then-hibernate
-    systemd.sleep.extraConfig = ''
-      HibernateDelaySec=30m
-      SuspendState=mem
-    '';
-
-    services.logind.lidSwitch = "suspend-then-hibernate";
-    # Hibernate on power button pressed
-    services.logind.powerKey = "hibernate";
-    services.logind.powerKeyLongPress = "poweroff";
-
-
     systemd.user.services.battery_monitor = {
       wants = [ "display-manager.service" ];
       wantedBy = [ "graphical-session.target" ];

modules/server/sops/default.nix

@@ -5,16 +5,6 @@
     owner = config.users.users.${config.syscfg.defaultUser}.name;
     group = config.users.users.${config.syscfg.defaultUser}.group;
   };
-  sops.secrets."iriy_ssh_pub" = {
-    mode = "0444";
-    owner = config.users.users.${config.syscfg.defaultUser}.name;
-    group = config.users.users.${config.syscfg.defaultUser}.group;
-  };
-  sops.secrets."valinor_ssh_pub" = {
-    mode = "0444";
-    owner = config.users.users.${config.syscfg.defaultUser}.name;
-    group = config.users.users.${config.syscfg.defaultUser}.group;
-  };
   sops.secrets."${config.syscfg.hostname}_wg_priv" = { };
   sops.secrets."${config.syscfg.hostname}_wg_pub" = { };
 }

modules/shared/colors/default.nix

@@ -1,5 +1,5 @@
 { config, ... }: {
-  imports = [ ./sorahiro.nix ];
+  imports = [ ./sorahiro_soft.nix ];
 
   colorScheme.palette.border-radius = "#8";
   colorScheme.palette.border-width = "#2";

modules/shared/colors/sorahiro.nix

@@ -1,67 +0,0 @@
-{ nix-colors, ... }: 
-let use_pastelle = true;
-in{
-  # usage:  a = "#${config.colorScheme.palette.base00}";
-
-  colorScheme = {
-    slug = "sorahiro";
-    name = "sorahiro";
-    author = "Soraefir @ Helcel";
-    variant = "dark";
-    palette = rec {
-      # Format: Name, Pantone, RAL
-      base00 = "#000000"; # Black / 419C / 9005
-      base01 = "#060a0f"; # Rich Black / 532C / 9005
-      base02 = "#212c38"; # Yankees Blue / 433C / 5011
-      base03 = "#3f5268"; # Police Blue  / 432C / 5000
-      base04 = "#617b9a"; # Slate Gray  / 5415C / 5014
-      base05 = "#90a7c1"; # Pewter Blue / 535C / 5024
-      base06 = "#c9d3df"; # Columbia Blue / 538C / 7047
-      base07 = "#fcfcfc"; # Lotion / 663C / 9016
-      alt00 = "#000000"; # Black / 419C / 9005
-      alt01 = "#0c0906"; # Vampire Black  / 419C / 9005
-      alt02 = "#312920"; # Pine Tree / 440C / 6022
-      alt03 = "#5b4e3e"; # Olive Drab Camouflage / 411C / 7013
-      alt04 = "#887660"; # Shadow / 404C / 7002
-      alt05 = "#b8a083"; # Pale Taupe / 480C / 1019
-      alt06 = "#e1cfb9"; # Desert Sand / 482C / 1015
-      alt07 = "#fcfcfc"; # Lotion / 663C / 9016
-
-      base08 = if use_pastelle then low08 else high08;
-      base09 = if use_pastelle then low09 else high09;
-      base0A = if use_pastelle then low0A else high0A;
-      base0B = if use_pastelle then low0B else high0B;
-      base0C = if use_pastelle then low0C else high0C;
-      base0D = if use_pastelle then low0D else high0D;
-      base0E = if use_pastelle then low0E else high0E;
-      base0F = if use_pastelle then low0F else high0F;
-
-      high08 = "#f09732"; # Deep Saffron / 804C / 1033
-      high09 = "#f2d831"; # Dandelion / 114C / 1016
-      high0A = "#98f12f"; # Green Lizard  / 375C / 6038
-      high0B = "#34f4f0"; # Fluorescent Blue  / 3252C / 6027
-      high0C = "#3193f5"; # Brilliant Azure / 2727C / 5015
-      high0D = "#c156f6"; # Blue-Violet / 2592C / 4006
-      high0E = "#f62ac0"; # Royal Pink / 807C / 4010
-      high0F = "#f42060"; # Deep Carmine Pink / 1925C / 3018
-      alt_high08 = "#f66824"; # Orange-Red / 165C / 2008
-      alt_high0B = "#41f3a4"; # Eucalyptus / 3395C / 6037
-      alt_high0C = "#2abef8"; # Spiro Disco Ball / 298C / 5012
-      alt_high0D = "#837ff5"; # Violets Are Blue / 814C / 4005
-
-      low08 = "#ffac56"; # Rajah  / 150C / 1017
-      low09 = "#feea74"; # Shandy  / 127C / 1016
-      low0A = "#bffe8a"; # Menthol  / 374C / 6018
-      low0B = "#4cfefa"; # Electric Blue / 3252C / 6027
-      low0C = "#62acfd"; # Blue Jeans / 279C / 5012
-      low0D = "#9b9bfd"; # Maximum Blue Purple  / 2715C / 4005
-      low0E = "#fe9bda"; # Lavender Rose / 223C / 4003
-      low0F = "#fc8999"; # Tulip / 1775C / 3014
-      alt_low08 = "#fe946a"; # Atomic Tangerine / 811C / 1034
-      alt_low0B = "#87febf"; # Aquamarine / 353C / 6019
-      alt_low0C = "#38c3fd"; # Picton Blue / 298C / 5012
-      alt_low0D = "#dca2ff"; # Mauve / 2572C / 4005
-
-    };
-  };
-}

modules/shared/colors/sorahiro_hard.nix

@@ -0,0 +1,29 @@
+{ nix-colors, ... }: {
+  # usage:  a = "#${config.colorScheme.palette.base00}";
+
+  colorScheme = {
+    slug = "sorahiro-hard";
+    name = "sorahiro-hard";
+    author = "Soraefir @ Helcel";
+    variant = "dark";
+    palette = {
+      # Format: Name, Pantone, RAL
+      base00 = "#030B12"; # Rich Black / 6C / 000-15-00
+      base01 = "#0C1D2E"; # Maastricht Blue / 5395C / 270-20-15
+      base02 = "#203A53"; # Japanese Indigo / 534C / 260-20-20
+      base03 = "#425F7C"; # Deep Space Sparkle / 7699C / 260-40-20
+      base04 = "#93A9BE"; # Pewter Blue / 535C / 260-70-15
+      base05 = "#B6C5D5"; # Pastel Blue / 5445C / 260-80-10
+      base06 = "#D6DFE8"; # Gainsboro / 642C / 260-90-05
+      base07 = "#F0F3F7"; # White / 656C / 290-92-05
+      base08 = "#F59331"; # Deep Saffron / 715C / 070-70-70
+      base09 = "#F5F531"; # Maximum Yellow / 394C / 100-80-80
+      base0A = "#93F531"; # French Lime / 7488C / 120-70-75
+      base0B = "#31F593"; # Eucalyptus / 3385C / 160-70-50
+      base0C = "#3193F5"; # Brilliant Azure / 2727C / 280-50-40
+      baseOD = "#9331F5"; # Blue-Violet / 7442C / 300-40-45
+      base0E = "#F53193"; # Royal Pink / 232C / 350-50-50
+      base0F = "#F53131"; # Deep Carmine Pink / 1788C / 040-50-70
+    };
+  };
+}

modules/shared/colors/sorahiro_soft.nix

@@ -0,0 +1,29 @@
+{ nix-colors, ... }: {
+  # usage:  a = "#${config.colorScheme.palette.base00}";
+
+  colorScheme = {
+    slug = "sorahiro-soft";
+    name = "sorahiro-soft";
+    author = "Soraefir @ Helcel";
+    variant = "dark";
+    palette = {
+      # Format: Name, Pantone, RAL
+      base00 = "#030B12"; # Rich Black / 6C / 000-15-00
+      base01 = "#0C1D2E"; # Maastricht Blue / 5395C / 270-20-15
+      base02 = "#203A53"; # Japanese Indigo / 534C / 260-20-20
+      base03 = "#425F7C"; # Deep Space Sparkle / 7699C / 260-40-20
+      base04 = "#93A9BE"; # Pewter Blue / 535C / 260-70-15
+      base05 = "#B6C5D5"; # Pastel Blue / 5445C / 260-80-10
+      base06 = "#D6DFE8"; # Gainsboro / 642C / 260-90-05
+      base07 = "#F0F3F7"; # White / 656C / 290-92-05
+      base08 = "#F5B97D"; # Mellow Apricot / 156C / 070-80-40
+      base09 = "#F5F57D"; # Sunny / 393C / 100-90-50
+      base0A = "#B9F57D"; # Yellow-Green / 373C / 120-80-60
+      base0B = "#7DF5B9"; # Aquamarine / 3375C / 150-80-40
+      base0C = "#7DB9F5"; # Light Azure / 278C / 250-70-30
+      base0D = "#B97DF5"; # Lavender / 2572C / 310-60-35
+      base0E = "#F57DB9"; # Persian Pink / 211C / 350-60-45
+      base0F = "#F57D7D"; # Light Coral / 170C / 030-60-50
+    };
+  };
+}

modules/shared/sops/common.yaml

@@ -4,7 +4,7 @@ valinor_wg_priv: ENC[AES256_GCM,data:1izZF+6G2Uc2MRBH56A07lexZEkyOiiFI4zltyoZco0
 valinor_wg_pub: ENC[AES256_GCM,data:noAhVF91HUwpU3lHl4knlmGkV0Zjbuc4TQhFhF7HjCbv1hdSycO17TDfgcw=,iv:82v169pOoCOwnOaqPTOMvtvOUJJEcXjPI9BzogC+UaI=,tag:NHIcOYD5mSnZ6kwZBAnXGg==,type:str]
 iriy_ssh_priv: ENC[AES256_GCM,data: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,iv:cM6fDDPdHQ0Xamv41gKvCQ3Oh70hCRaijXLA8n2rEEA=,tag:7CsbqkiNGv7W5lCrPK3CmQ==,type:str]
 iriy_ssh_pub: ENC[AES256_GCM,data:zjET00BIFhSI3/3bHO9d99VZLNqpGwWYuqhFvZAk6hYejOFRReCn3WKxXwEJh/IS8PYw1ARnj8DOpfYoRwhdofg+ap2/XMLE858B2cmgGQE5XZNftUryjmBV/WpWVECmAa/Dd6w71MACqZ9TDnt8Kkg5c0jtiGT7zg62/gMcjm/k531y1NDi4e8Jf7MFN9A/5nMpVDCpspZe42N2Lv+w0M2lhDrP4bjYTE9p7Klo27C7lt3vGahlNAjQBvx3o+309+4bSnE2hwTUkgwjN8YPx9qpV8v5XAfPEA3Syz4Qmhi6YpDnEsNPIVrmuGdNhrnprDQHJ8G04bHv51DXURf7Wtf8HSQUNVWXJoGb1jw5xzyiYEBB1Cu6VrRRHytQGtMMbQsIldoW7ISSo1jzRIPWJRMCYrY/4fneoALAXPN6u6VsYM+wtO6/1+A02KIz4uhHvt9c+iv2BNiJrwgHSdH2aY3JaOLEAI+wVQaf47WBfPIjfTzYsDx+kDNiflmBhENNWSqRnrXXLiAG0oVbbz0iuzA+C6w/gNc/t4L4foiMbeF3m9jVfFm3LrCmR1FJrGeA7ZSUAEQ6v55an+IbDMv7P9lUxgd7rsCj2M0elG2iDizV9vziFPOSJkplqzygxXZdo+In0pmRHUfWj06epacZjNdDxJHrakfhmWpGBvrwYRRp4/5p7/k2CToqj6UqedYen0S8M09JseHjNndr9/Oe2yJZYlzRhfq0ZDB1pzdVIiePcQ==,iv:nWWm3vecA7c5pv8bYrjjZk3VLHjKJI7c7ZPkK+pUqU4=,tag:Gfa5Izk6I3s/spA3GkXufQ==,type:str]
-iriy_wg_priv: ENC[AES256_GCM,data:QDQejoDiG2DF0gd6xBR5wygt6IrwRGBmLZtWQGjvhotgTElwgqzEmViQQOk=,iv:01NZ7b5q4A3SLaz6ywkNVZ2h5XLlC7WjrNAG1kDlXMw=,tag:spgZmC2t98i9fsq4ctx3mQ==,type:str]
+iriy_wg_priv: ENC[AES256_GCM,data:inng2niJrTXF3ld2T5Xs9t/64oDC8haJhpK1Iajpc60hMHWbenpqGRis7NM=,iv:E/cW6iwjbC3iKulvgBD5vXsjxh9A6nGO7Acr2DXAQps=,tag:CfHqE8u87xGDkzArZg3BnA==,type:str]
 iriy_wg_pub: ENC[AES256_GCM,data:/4yPr9+NKyU/84L1heVhVa5Mzu6/9bTRciL4V8v31J99Fh5ratZDufNt8AY=,iv:1PzTUsgt1YQPQAywSQqBUVm08++EA9rTdQF/puRJMs8=,tag:ew+bmkZmlj74/mzdBPiSDA==,type:str]
 avalon_ssh_priv: ENC[AES256_GCM,data:wTAQKXU=,iv:7x+5AnmbNde6lsr+y5MlkR7KoaOUSCGTCVwLECYxPHI=,tag:DkrosVUFtURFBuqQI0LxaQ==,type:bool]
 avalon_ssh_pub: ENC[AES256_GCM,data:22S09ak=,iv:Q5SU6BQw9j4HMyohQorIeNwGL0xLx8erm10gvPpHmCc=,tag:o02ZcLBSz35sqY9INyOMRw==,type:bool]
@@ -27,6 +27,10 @@ curse_forge_key: ENC[AES256_GCM,data:PhhwPhUys/WDzXb40iFlrUcwFEJVzi49vDlm5Hpc7IU
 github_user_key: ENC[AES256_GCM,data:RvBsQjWGd2qRCvBzcpMv8FIXGY/GiPd9o0x2Oq+NlbXxR2NMqNBNLw==,iv:99AcmOWFft7XQAn7YrGjZuCvz0M5wUkYeInsWwyeUFM=,tag:wkw2YQGi9j/8XtOFd8KhdQ==,type:str]
 wifi: ENC[AES256_GCM,data:c5kp+KTmzlvP5f6FAqfxNQHwib8M7aN5uMFN0qgHHfT6BTCL+y57OwkaguFftUA0WjNN+9jj7s6ShM4nDLxrQLqvpmQRfxH+yjnjy4R2wY4OB85zrgsxCD5QBiE8UvOSNWmrcUyc48bN7I+CH99c6c46zWTQvkJ/xh3G/qdt79GXdM302vf7nOC2GsMF/4ri1cx4uhfTyBpagS1vaxQAYYXAjQegVLb/kVWJm11vjz9bWj9xkgYRraYKeBGyqk4PqTfiH8xQWRe8Zpx/ONWG98JOBZYtbgE1HXlm9Vd7CPsyxc9c/rTi82BpkmqeIc9+EIHGGHg6xPh/lk5RPTX2GwwAFZuXoK32W25NraVmddKrz6Q85HQkAI4+xIyc+kLL8Z5yCniRvV264o3CVyBC78Uv0nZrv2Zgei4bZo+Y5wGcKEXxvG0u9JzQWlbrJR/e7/4/9cadXNuwqP5emrTeVkcqpPxv7av4vOQptBFLqSo8xdSpiO/QExbX8dwmpuQjK2L9hFziX/U7uLoRGDiqSHgaDkfQ6hb5qZGJRj/x7uzYy44HyOJRUCbd9qOpZcwdxTAX+IFFrMgZ5yVzxm/KhKrmds2UJxwCrJkRq5nCwUn/IrATtgSMYQi2UOkd8W0ue+7FubpA6dU7T74dWPq7mo6ZWP3H4tc5DM8Q4GhUDHHnvwMWuTgMBkGlYGRXDT7Kq3fO2/n/S7uAHMBqoQZYJwOnP8cEtsZii9L/1eF6yXWBOglWFzYErk+S+QeCqlYzJerEOqvBQbBiLEshmyD7KiI620CCxPxT2rt5wBPX4x0eEGEzXRvZPJ+wIXzpVRevcVK8jINotV/l4Y39pi5Z39ampJYyMZ+RXqvQixY2TBROL/VYYvJCzOBGzYrDzPt+X8GoHUbTyYrEQi2a+x4zgRO+XA+JkYciNL4+43NzkOlcC6S3vrhfWM7wiqIO+gC8zfkygKEvOo87LJtI/cOyYYdAc+nPkTQ7EOd1deJzmrhGWTMg6wdSnbhGH+sRlQE2hcX/sHcI3mCeOFzrL9tXDEPHiuaXqdDZTNTry9DEFM6xknEQiVByYXJ/RauTe7rQ4TIQqjXkXZAlYo7ORmJyJX988XS1311zoct2QjNGDF3jtUw8I2HOirx4v7dp3JWVNj6yey1AWMa0Mak9r9IppzjK78wHc5Z87enr2XzejUF6BjM/kvcrGDkR8EliTWF9yQ==,iv:qFNBP/00aqHfqcWMQIYQBT/dx9NqgeqcODCp+VOd5cA=,tag:e4LAZzm5L0pgfrxF/Mr01Q==,type:str]
 sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
     age:
         - recipient: age1sxzuhh2fcd4pmaz4mdqq95t683d32ft22w9t2r7pk258u0s8wymsqdj7lg
           enc: |
@@ -64,8 +68,8 @@ sops:
             STRtTVpVTCtVZ1FUNENqWFFVNTNuaVUKN6HRiZjTdENeif8dJ29urBxPXDaosjjY
             InN4Ko6YUaGfvB1DTrKIzrxOpsHS+XjisoGfT71tJwwEOoREklEO/A==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-09-06T13:14:21Z"
+    lastmodified: "2024-12-23T17:26:13Z"
-    mac: ENC[AES256_GCM,data:nsr9KS5VNuxltR3cMDfCXtpK/lFi4M2OwwcOCj+MmJ+AtyCn7reqjd/VlIb7vLhZfuqoPbbzObvzBzX8jrMuX3Idy/PrCKht0ilYC1dZW4I/TlFM2mkJdTuFbhiXwQUhUJ89yHqIFFHJbO4ld5WfOEzGdazM2YC1OwkyOPu25+4=,iv:y6Knr38jVd+nyOBEdn861AULzkwpa9NpRKobIIlyJFg=,tag:HrGm4dENtWFXAm6d0ydn/g==,type:str]
+    mac: ENC[AES256_GCM,data:W2vkjrc5oanMFloSLjdJ+oQyCD94oTHKXa15CaMrmR2bhemVMerXy4hx/MUZNSYGLv69t6gk2NSbzedgxBdb8VD9KZRdxpSu3bioXMpCJO3/PpVW5p7GxIRC25tsjB60USyjabkhgD//CYROLhheypt4XYtsU6LLTG3G63+yGBU=,iv:XiP09iJk3Z9n5eHopdnBd8PhswWeXKQ2626sWhQUChk=,tag:ZdQFMrxr4p8CTZiqiZk/Nw==,type:str]
     pgp:
         - created_at: "2023-04-20T10:20:17Z"
           enc: |-
@@ -88,4 +92,4 @@ sops:
             -----END PGP MESSAGE-----
           fp: 4E241635F8EDD2919D2FB44CA362EA0491E2EEA0
     unencrypted_suffix: _unencrypted
-    version: 3.10.2
+    version: 3.9.1

modules/shared/sops/default.nix

@@ -22,7 +22,7 @@ in {
     group = config.users.users.${config.syscfg.defaultUser}.group;
   };
   sops.secrets."${config.syscfg.hostname}_ssh_pub" = {
-    mode = "0444";
+    mode = "0400";
     owner = config.users.users.${config.syscfg.defaultUser}.name;
     group = config.users.users.${config.syscfg.defaultUser}.group;
   };

modules/shared/sops/mock.yaml

@@ -1,46 +1,30 @@
-ci_ssh_priv: ENC[AES256_GCM,data:OuWZVS+ul8ERoQHEH8Gq6GdHWY5E3spR0uRu7akTVHrr6vYPWZHdV/8fjqKvfHd+dAeymWXe2Li7NXfXQM+y4OH36r1z9DLstwD4ufUmoHZ/MIO6qlsugzYhMw==,iv:NbLyzilDIH5cT3SC0SLaOn0alxXSIyZ/4Tr1zSBjIjI=,tag:uOzoai0Rq6UthSkWHhw8Hg==,type:str]
+ci_ssh_priv: ENC[AES256_GCM,data:3Fd7HtFzD+0Pm0qnmaNeivSrEJnH6A3CzLrSyYD4J1rpdHCYdFB2hbZAB5HF3yeCMlyqnApGHxi+9jN8FI54SzwqJQAgSZvKrkBhrs4JIQxPU0ZhOQHvneWYnA==,iv:NbLyzilDIH5cT3SC0SLaOn0alxXSIyZ/4Tr1zSBjIjI=,tag:xGfI8QRlkj4OZDVuV21Kcg==,type:str]
-ci_ssh_pub: ENC[AES256_GCM,data:Lu2Ec+HylJzt/IMu1b8AKgGsjpZT7X628pjOYQ==,iv:VZOA/Q9zmbMnf9DsXN90er+tSnJ+syg3QabDuDal92Q=,tag:lef6MRtvgyntMrxphatqmg==,type:str]
+ci_ssh_pub: ENC[AES256_GCM,data:6BVY3GS9lMLR/dYNxyldcBJe1DrjG/yHjqfCIw==,iv:VZOA/Q9zmbMnf9DsXN90er+tSnJ+syg3QabDuDal92Q=,tag:+xwHADgq22cV5ai9xd6ceQ==,type:str]
-ci_wg_priv: ENC[AES256_GCM,data:IoCn7jrahiJBhKxPuGyexg==,iv:uHbrAq/mSQ6TtMqGhJez3d13u9ZK1S92w49ntXvbA3g=,tag:QrZghdiQbmC9pcjKtIuKug==,type:str]
+ci_wg_priv: ENC[AES256_GCM,data:uA4eiEhQbbhLkrTyhRX4Tg==,iv:uHbrAq/mSQ6TtMqGhJez3d13u9ZK1S92w49ntXvbA3g=,tag:KwjiYrnuQxrydVKKV4xN4A==,type:str]
-ci_wg_pub: ENC[AES256_GCM,data:FB+DBkwDizA3C/s1TCkn,iv:GD3xmJEyD9yZaV72GubGCBi8BW74zmSr2hOl123g0mM=,tag:v189CtpJV7OX0sB9OJaWLA==,type:str]
+ci_wg_pub: ENC[AES256_GCM,data:MBIdTEkyJBvbTtYrQYS8,iv:GD3xmJEyD9yZaV72GubGCBi8BW74zmSr2hOl123g0mM=,tag:ekUniuYPCSxwlmB1yUbo4w==,type:str]
-sandbox_ssh_priv: ENC[AES256_GCM,data:Wj/M/0VEfY7Ruix7nwi09obpX+w6G+gfGK4ZFTKkbpEEM2JyFnRHhWYQiBvBQOXahTGQ+zAnibCNcHSTCBa66XjMhtY865Hs6FovVCfgx0awTZcns26w5vqJdg==,iv:2NbVjpKTyyiY4rtC/A6s2nABo5p0VAWtzC6b6TrHkvI=,tag:CVi4i9MNi/cU64cn9s0DRA==,type:str]
+sandbox_ssh_priv: ENC[AES256_GCM,data:OG5ZsSQFEbUKLXtHF9MAHWYwnxBM0EyVyj54sPs9XEsFaRXq3WDa+ANnpVqBLtw6cPodLQHyJ5tY/Hr1rdINNGyLPEz/Zm3K7vz6iXUeThAKDhYaCH4vccFFtQ==,iv:2NbVjpKTyyiY4rtC/A6s2nABo5p0VAWtzC6b6TrHkvI=,tag:sO+SUMws8HncC9dmeiJPSg==,type:str]
-sandbox_ssh_pub: ENC[AES256_GCM,data:xbcGusta4qBO0hfmks+VCpN8N4dd/qGkGNREACVKxuSF,iv:/QMFyKaa3nOq1GrLNydq+Q8kS52fK6wsB3MioZN/qVM=,tag:WTZ2wlfBMmANw6EEWl5jew==,type:str]
+sandbox_ssh_pub: ENC[AES256_GCM,data:6bwJAmLuN0dhC8OiBW8qL2Ejt70a2ar02YTAqimnhcez,iv:/QMFyKaa3nOq1GrLNydq+Q8kS52fK6wsB3MioZN/qVM=,tag:XxcTX/REbHl5MKtRecjM2g==,type:str]
-sandbox_wg_priv: ENC[AES256_GCM,data:4trdnPhgjlUChATnNx9o3Q==,iv:3efDzVFVCqv6yCNgBEXfQ19oh2bZLPO8my33uBgviW0=,tag:Io1obSodHW/RWWIg8VS8Zg==,type:str]
+sandbox_wg_priv: ENC[AES256_GCM,data:8d+WCtyGoEH3/4q1DZImUw==,iv:3efDzVFVCqv6yCNgBEXfQ19oh2bZLPO8my33uBgviW0=,tag:+WNPB7b6tVTzDlSVziDO2w==,type:str]
-sandbox_wg_pub: ENC[AES256_GCM,data:7L4SJdDMi5DZHpLfR6cs,iv:UULKRJvU0lktwmKGcIP/sRAZb0j2e0iL40o3DkSv/+U=,tag:irsolwnnfOjhYfiyanjxjw==,type:str]
+sandbox_wg_pub: ENC[AES256_GCM,data:rpxkijFKzyKx3uhEa/+j,iv:UULKRJvU0lktwmKGcIP/sRAZb0j2e0iL40o3DkSv/+U=,tag:OWHbfFPbTY6l3Bu/og78Bg==,type:str]
-PGP_KEY: ENC[AES256_GCM,data:lwwHWksY+ea8D3z9,iv:/tOEukP7LiNhhdSw870vPeUGhN2lse2v1pZ5fJQglc0=,tag:225sf9GjXc8/NZgcXJIxZA==,type:str]
+PGP_KEY: ENC[AES256_GCM,data:IVhL/l0JSPcefX1z,iv:/tOEukP7LiNhhdSw870vPeUGhN2lse2v1pZ5fJQglc0=,tag:++NUJeRhsDE9eRsbKu8Ldw==,type:str]
-wifi: ENC[AES256_GCM,data:Z+pbGAekk26GD3zg4TXVacP4Nrh93HPEMNcT0I1YaA==,iv:oiWZvnKvWmF/6cRZpCLsuf1uPJig6toNla5uT3t2kyM=,tag:iS3sq8JZsNUby9pSxYPw5g==,type:str]
+wifi: ENC[AES256_GCM,data:SV3yNB/0dBqggh0kOKU98Nodd0VS4K8kTqg7aLyeAg==,iv:w4nspNxswHl2CZ7diPUzupzotfjskzp91NIq4f0v0UM=,tag:7nUHijRlEgyliWn2ZuZo/Q==,type:str]
 sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
     age:
         - recipient: age13qv9dn9806paqgpjwmmkwtdzvv4qpv0ulksq0epnn8ufaxeug5zskyas3z
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwKzJHRy9YOVN2ZFpJblBv
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZd0c5ZjZCb0Z6ZXlKaFph
-            dS9zUVpsNXhOQ2JLbUZqYXd5QkZmaFc1N1EwCjlpREM4REg1eTZybVZML25HdUtx
+            S25LcnFaM3NueUdxOEkwQWRVYjZwNEx1TnpVCkJ1RnJsV2IwNWd5RVJBU2pOUnRa
-            bU5vU1FBbUVLOVZzd0hnL1V6SVNXQm8KLS0tIE9QVFg1Umh2dkoyb0pzVlloQmV6
+            UEcrdDVHUnZ3Zng4UVNWZjNhSzRmRGcKLS0tIEpMMGJCZmkrcnFwWjM4ZVF6VmJN
-            c2RGcklkT3l2YzFjK1RTMDNpU09SMzAKjcTMPPeUHu4Dq/zXGSb4VYcGjrLdG0KE
+            aFplU05pYXpPQWZRY202bVhFd3pHdHcKfauUQhzuUwpoaSlky+PlsOTrVQjyCSxi
-            Jcpk1DrlpecK6GMaJ1vRiULs8qGlKFFyXqMhzgAx4jNQCoz7QLHDvg==
+            NYlJ7ScbxzJsqTqJbZnD+lbSdWK2XVKXy1Vn4hR0C0WF7g2Y7CU7tg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-09-06T13:37:03Z"
+    lastmodified: "2024-04-14T21:03:55Z"
-    mac: ENC[AES256_GCM,data:uI9yG3/jGNGn6yoN9W+9K/AUeSowe4Mb9vhh38pwkuKab9zXTFidCWyh1e0TEOsIHrhfK2GPc2fHwc309/la+CoiNxAIYtC4xmoCYxSGrDgbsZEONrusy9AEKpRCO8CqLYyLYaAG9sLqFyIz3GyEnS/j98V3LeemhFtS17J1VHI=,iv:x/7caaKnggoyEaCx5sf+zzSE+3d7atv+o9B1O3QX0Uc=,tag:Tzfs+ACx+4A6kxAZtVQ3KQ==,type:str]
+    mac: ENC[AES256_GCM,data:W9kM3AaHcZcqVtT4qRpMRYKgmA9pBikAPhdKiPR/Y+0MSjY4c9LPeTBeS1vZzUaTgRHmNh/ns6I9SBO36Hio5qI6m/pjNdr9GfFbBpbnY+5mer6YTitq47TVySC9v+BRkES4A34h1Ky5yvJSDlz2kJfO/WVWllaQd0dxq8rgAU8=,iv:cRxgGKhD6KqXKpK4E12lWIIj99hBFSmGzSIv9LmYEyg=,tag:QXcswnB7GavGrBy1dFpQlQ==,type:str]
-    pgp:
+    pgp: []
-        - created_at: "2025-09-06T13:36:03Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMA6R3Y9nD7qMBAQ//UtYJdgvi7DMZ6UC/kDcqB//R6FCyGB6o2mATXy1Ryfgl
-            p6WiK1HfNCb6lR46TOiwWYybo4E93ty1Vg5XCG1Yj/MYFYctHt+GbluBVCkTslRS
-            7XjpUF4a8vzuxc9pys8U2oqhANAcM/UAYlKBnSqjCI+0MiL2jhTPZ4LTKOK6N3hE
-            Uvh2dRAmshQf6VGmSA8/00cuSO6nTkIO2fZ4ihu+r/HCOqYI9LTS+pjRF9JKa8SZ
-            eXYYbym5Xl9d3w9O3OT9kbfkCxNb/pEwU/XPMQpW2KLHQKt8hC36TmAJKlQcK75n
-            1Ai3dP0cxnmdV412Amfzm159rrVIYcGHEeuDJXN0S6rmVSLALTlP+h1vMOuoASjm
-            cLGrEeuuByMaHwoxHWPvLZfIhh+h+PoRF8qkU9ThjjFxpwxx1djzez/FORxYIqMx
-            KIW2JiZVyaavklqu5hNQZ0QcFK558gnuEvzsTSDbMsJVuxmc9OPWW+VHemsAyKCv
-            KRJmrXEsxYD2E7JZn7LQra+gK3/k3txPYldPNaPtaMd31dhQa/QTKjh0rQwmdz+p
-            ADZFTnz4eoLcm8tIL7oH036Pcwt9ukJKptn9k3cXB3tyt0w7J6QY8Q8pfAAq7PrQ
-            ItVWZ94Q+qM0+kjNXPhUnV4JqV1bADBF0dygfzERZr8P2jeioHMmdU6ob9T40u7S
-            XgFyGqxKrst9WgIxGEpsk0mIE0eJKEUwH+oppFZp/7ajq9/Jr2x4aKFyPeJTUjsA
-            koi7NQcKSOwhzf9rYfk/n4HZM0BxXIzHJUEiYtB3QTuxg94PtE593TcggbWnHZM=
-            =SKIv
-            -----END PGP MESSAGE-----
-          fp: A362EA0491E2EEA0
     unencrypted_suffix: _unencrypted
-    version: 3.10.2
+    version: 3.8.1

overlays/bambu-studio/default.nix

@@ -1,10 +0,0 @@
-{ final, prev, ... }:
-prev.bambu-studio.overrideAttrs (oldAttrs: rec{
-    version = "02.00.01.50";
-    src = prev.fetchFromGitHub {
-        owner = "bambulab";
-        repo = "BambuStudio";
-        rev = "v${version}";
-        hash = "sha256-7mkrPl2CQSfc1lRjl1ilwxdYcK5iRU//QGKmdCicK30=";
-    };
-})

overlays/default.nix

@@ -4,7 +4,6 @@
     openttd-jgrpp = import ./openttd-jgrpp { inherit final prev; };
     yarn-berry = import ./yarn-berry { inherit final prev; };
     eww = import ./eww { inherit final prev; };
-    bambu-studio = import ./bambu-studio { inherit final prev; };
     wine = final.unstable.wineWow64Packages.unstableFull;
     unstable = import inputs.nixUnstable {
       system = final.system;

overlays/eww/default.nix

@@ -2,16 +2,16 @@
 let old = prev.eww;
 in final.rustPlatform.buildRustPackage rec {
   pname = "eww";
-  version = "98c220126d912b935987766f56650b55f3e226eb";
+  version = "8661abf2bf07f5a809fc995233d93810cc1ac871";
 
   src = prev.fetchFromGitHub {
     owner = "elkowar";
     repo = "eww";
     rev = "${version}";
-    hash = "sha256-zi+5G05aakh8GBdfHL1qcNo/15VEm5mXtHGgKMAyp1U=";
+    hash = "sha256-q82u3/pcP5T++TMdDmaeDKYuCyky1Bo5BjHY1/NVHbY=";
   };
 
-  cargoHash = "sha256-SEdr9nW5nBm1g6fjC5fZhqPbHQ7H6Kk0RL1V6OEQRdA=";
+  cargoHash = "sha256-wKTaskKRyPfzKSLxhfyn6DybmUVFMHV5MrixKUBhno4=";
 
   nativeBuildInputs = old.nativeBuildInputs;
   buildInputs = old.buildInputs ++ [ final.libdbusmenu-gtk3 ];

overlays/openttd-jgrpp/default.nix

@@ -1,10 +1,10 @@
 { final, prev, ... }:
 prev.openttd-jgrpp.overrideAttrs (old: rec {
-  version = "0.65.3";
+  version = "0.55.3";
   src = prev.fetchFromGitHub rec {
     owner = "JGRennison";
     repo = "OpenTTD-patches";
     rev = "jgrpp-${version}";
-    hash = "sha256-lmDkYrk7qjUSTtCQQCN/pbuLDt3+2RI1K8A1H1GJRjw=";
+    hash = "sha256-E1+pXpXNHOu9nPTGSY8baVaKf1Um6IGDjpi1MmENez8=";
   };
 })

shells/devsh/default.nix

@@ -22,7 +22,6 @@ pkgs.mkShell {
     pipenv
     scala
     sbt
-    cargo
 
     #LIBS
     openssl

systems/ci/hardware.nix

@@ -8,7 +8,7 @@
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "v4l2loopback" ];
   boot.extraModulePackages = with config.boot.kernelPackages;
-    [ v4l2loopback ];
+    [ v4l2loopback.out ];
 
   fileSystems."/" = {
     device = "NA";

systems/iriy/hardware.nix

@@ -7,10 +7,7 @@
   boot.kernelModules = [ "v4l2loopback" "kvm-amd" ];
   boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.extraModulePackages = with config.boot.kernelPackages;
-    [ v4l2loopback ];
+    [ v4l2loopback.out ];
-  boot.extraModprobeConfig = ''
-    options v4l2loopback devices=1 video_nr=1 card_label="VCam" exclusive_caps=1
-  '';
 
   boot.loader.systemd-boot.extraEntries = {
     "00-windows.conf" = ''

systems/sandbox/default.nix

@@ -2,10 +2,6 @@
   imports = [ ./hardware.nix ../../modules/server ];
 
   services.openssh.enable = true;
-  services.openssh.authorizedKeysFiles = [
-    config.sops.secrets."iriy_ssh_pub".path
-    config.sops.secrets."valinor_ssh_pub".path
-  ];
   users.users.root.openssh.authorizedKeys.keys = [
     "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC0GpKd62XMlO410/iYkNG8MHdGGaeMG3Gmsf3Pv3u2BllUzR9Dpym1ZOz2lwo3iK0FimcQpOiJqSIahO59HJl8jQ9BoQrJMXH7l2kuq1T09cMNWGjlzowg0LWKWOzoBzOwcheyW68OJGgkSfvk9BdshkUYTLVBXjiI9jo/8Qkcv1WLJJvJmDBDwnbYDQpODXCEDQ/t3YVubb+ocLmh40sDUffJLWZQXN6OFW9N5XxnvY7K5x9ci9GU4Reei40K8yDw2Hgi0njzijRdzie3MJlKPPawJ2TATu9LsGuxfx8bJXVx+mNxP0lhO8dOOhP7p0ozTxlJJY9ZWaKgOz3SzYNCgJ1gH7NtTBtSruXd6pfmErUmuJEAeMD6+QF3yJ5tnVFNPoSHqjP+oL3CgSRpmuvn7ChSSI3J3UVhLux165VtwIL7UhosO2mCqmn0Yk2mSBkB/L4ZiWFmO3vYdagYNQX7xZHzCJ5my8vomiT+DUGb2h/o1NetKwIZJiFAuHxKt3k= sora@valinor"
   ];

systems/valinor/hardware.nix

@@ -7,10 +7,7 @@
   boot.kernelModules = [ "v4l2loopback" "kvm-amd" ];
   #boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.extraModulePackages = with config.boot.kernelPackages;
-    [ v4l2loopback ];
+    [ v4l2loopback.out ];
-  boot.extraModprobeConfig = ''
-    options v4l2loopback devices=1 video_nr=1 card_label="VCam" exclusive_caps=1
-  '';
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/e9713f83-ee3a-4fb1-806f-594c3bab7006";