Use ip addresses instead of hosts

Restrict connection source for keys
Merge remote-tracking branch 'origin/master' into build-farm
2024-08-19 16:01:37 +02:00 · 2024-08-17 17:41:28 +02:00 · 2024-08-17 17:18:18 +02:00 · 2024-08-17 17:12:42 +02:00 · 2024-08-17 17:03:36 +02:00 · 2024-08-17 17:02:41 +02:00
7 changed files with 209 additions and 193 deletions
--- a/flake.lock
+++ b/flake.lock
@ -115,14 +115,17 @@
    },
    "crane_3": {
      "inputs": {
-        "nixpkgs": "nixpkgs_5"
+        "flake-compat": "flake-compat_3",
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": "nixpkgs_5",
+        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1724006180,
-        "narHash": "sha256-PVxPj0Ga2fMYMtcT9ARCthF+4U71YkOT7ZjgD/vf1Aw=",
+        "lastModified": 1697334144,
+        "narHash": "sha256-gcOxnHEgBcn8mGXgNkTvZ1BLAANZZj+IZzb9QnQt7bc=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "7ce92819802bc583b7e82ebc08013a530f22209f",
+        "rev": "4dcf584de14beff8dd0c030ac54e185fd3b72023",
        "type": "github"
      },
      "original": {
@ -172,11 +175,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1724377159,
-        "narHash": "sha256-ixjje1JO8ucKT41hs6n2NCde1Vc0+Zc2p2gUbJpCsMw=",
+        "lastModified": 1718730147,
+        "narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "3e47b7a86c19142bd3675da49d6acef488b4dac1",
+        "rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c",
        "type": "github"
      },
      "original": {
@ -208,7 +211,7 @@
    },
    "deploy-rs": {
      "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_4",
        "nixpkgs": "nixpkgs_6",
        "utils": "utils"
      },
@ -228,7 +231,7 @@
    },
    "dtth-phanpy": {
      "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_4",
        "nixpkgs": "nixpkgs_7"
      },
      "locked": {
@ -301,6 +304,22 @@
      }
    },
    "flake-compat_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696267196,
+        "narHash": "sha256-AAQ/2sD+0D18bb8hKuEEVpHUYD1GmO2Uh/taFamn6XQ=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "4f910c9827911b1ec2bf26b5a062cd09f8d89f85",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_4": {
      "flake": false,
      "locked": {
        "lastModified": 1696426674,
@ -316,7 +335,7 @@
        "type": "github"
      }
    },
-    "flake-compat_4": {
+    "flake-compat_5": {
      "flake": false,
      "locked": {
        "lastModified": 1673956053,
@ -332,7 +351,7 @@
        "type": "github"
      }
    },
-    "flake-compat_5": {
+    "flake-compat_6": {
      "locked": {
        "lastModified": 1688025799,
        "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=",
@ -434,11 +453,11 @@
        "nixpkgs-lib": "nixpkgs-lib_2"
      },
      "locked": {
-        "lastModified": 1722555600,
-        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+        "lastModified": 1706830856,
+        "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+        "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
        "type": "github"
      },
      "original": {
@ -462,6 +481,24 @@
        "type": "github"
      }
    },
+    "flake-utils_10": {
+      "inputs": {
+        "systems": "systems_9"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
    "flake-utils_2": {
      "inputs": {
        "systems": "systems"
@ -482,25 +519,7 @@
    },
    "flake-utils_3": {
      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_4": {
-      "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_2"
      },
      "locked": {
        "lastModified": 1694529238,
@ -516,16 +535,34 @@
        "type": "github"
      }
    },
+    "flake-utils_4": {
+      "inputs": {
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
    "flake-utils_5": {
      "inputs": {
        "systems": "systems_5"
      },
      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
        "type": "github"
      },
      "original": {
@ -539,11 +576,11 @@
        "systems": "systems_6"
      },
      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
        "type": "github"
      },
      "original": {
@ -571,21 +608,6 @@
      }
    },
    "flake-utils_8": {
-      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_9": {
      "inputs": {
        "systems": "systems_8"
      },
@ -603,6 +625,21 @@
        "type": "github"
      }
    },
+    "flake-utils_9": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
    "flakey-profile": {
      "locked": {
        "lastModified": 1712898590,
@ -742,11 +779,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723986931,
-        "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
+        "lastModified": 1722462338,
+        "narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
+        "rev": "6e090576c4824b16e8759ebca3958c5b09659ee8",
        "type": "github"
      },
      "original": {
@ -790,14 +827,14 @@
    "lanzaboote": {
      "inputs": {
        "crane": "crane_4",
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_5",
        "flake-parts": "flake-parts_4",
-        "flake-utils": "flake-utils_5",
+        "flake-utils": "flake-utils_6",
        "nixpkgs": [
          "nixpkgs"
        ],
        "pre-commit-hooks-nix": "pre-commit-hooks-nix",
-        "rust-overlay": "rust-overlay"
+        "rust-overlay": "rust-overlay_2"
      },
      "locked": {
        "lastModified": 1682802423,
@ -830,7 +867,7 @@
    },
    "lix-module": {
      "inputs": {
-        "flake-utils": "flake-utils_6",
+        "flake-utils": "flake-utils_7",
        "flakey-profile": "flakey-profile",
        "lix": "lix",
        "nixpkgs": [
@ -851,7 +888,7 @@
    },
    "mpd-mpris": {
      "inputs": {
-        "flake-utils": "flake-utils_7",
+        "flake-utils": "flake-utils_8",
        "nixpkgs": [
          "nixpkgs"
        ]
@ -888,15 +925,14 @@
    "nix-gaming": {
      "inputs": {
        "flake-parts": "flake-parts_5",
-        "nixpkgs": "nixpkgs_8",
-        "umu": "umu"
+        "nixpkgs": "nixpkgs_8"
      },
      "locked": {
-        "lastModified": 1723945279,
-        "narHash": "sha256-3W+/u3v/e0dTOxht6wW6pL+kr44e8Amb8A1Z3Bx8BUE=",
+        "lastModified": 1716686274,
+        "narHash": "sha256-4JiRUWtoEMrfq38jG4O+NP6rcQIhKxEclnSkHvywnf0=",
        "owner": "fufexan",
        "repo": "nix-gaming",
-        "rev": "bcf8116981cc332c2734d4c82a034f115780853d",
+        "rev": "83a47c12d3493f7eb876250d0298d1566a965ce4",
        "type": "github"
      },
      "original": {
@ -922,11 +958,11 @@
    },
    "nixos-m1": {
      "inputs": {
-        "flake-compat": "flake-compat_5",
+        "flake-compat": "flake-compat_6",
        "nixpkgs": [
          "nixpkgs"
        ],
-        "rust-overlay": "rust-overlay_2"
+        "rust-overlay": "rust-overlay_3"
      },
      "locked": {
        "lastModified": 1700436815,
@ -978,14 +1014,20 @@
    },
    "nixpkgs-lib_2": {
      "locked": {
-        "lastModified": 1722555339,
-        "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
+        "dir": "lib",
+        "lastModified": 1706550542,
+        "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
+        "type": "github"
      },
      "original": {
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
+        "dir": "lib",
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
      }
    },
    "nixpkgs-stable": {
@ -1022,11 +1064,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1725910328,
-        "narHash": "sha256-n9pCtzGZ0httmTwMuEbi5E78UQ4ZbQMr1pzi5N0LAG8=",
+        "lastModified": 1723703277,
+        "narHash": "sha256-nk0RaUB5f68BwtXAYy3WAjqFhVKqIl9Z89RGycTa2vk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "5775c2583f1801df7b790bf7f7d710a19bac66f4",
+        "rev": "8b908192e64224420e2d59dfd9b2e4309e154c5d",
        "type": "github"
      },
      "original": {
@ -1038,11 +1080,11 @@
    },
    "nixpkgs_10": {
      "locked": {
-        "lastModified": 1724224976,
-        "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
+        "lastModified": 1718530797,
+        "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
+        "rev": "b60ebf54c15553b393d144357375ea956f89e9a9",
        "type": "github"
      },
      "original": {
@ -1102,11 +1144,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1722640603,
-        "narHash": "sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX+d7rqnDUoRaY=",
+        "lastModified": 1696261572,
+        "narHash": "sha256-s8TtSYJ1LBpuITXjbPLUPyxzAKw35LhETcajJjCS5f0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "81610abc161d4021b29199aa464d6a1a521e0cc9",
+        "rev": "0c7ffbc66e6d78c50c38e717ec91a2a14e0622fb",
        "type": "github"
      },
      "original": {
@ -1150,11 +1192,11 @@
    },
    "nixpkgs_8": {
      "locked": {
-        "lastModified": 1723856861,
-        "narHash": "sha256-OTDg91+Zzs2SpU3csK4xVdSQFoG8cK1lNUwKmTqERyE=",
+        "lastModified": 1708751719,
+        "narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "cd7b95ee3725af7113bacbce91dd6549cee58ca5",
+        "rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89",
        "type": "github"
      },
      "original": {
@ -1166,11 +1208,11 @@
    },
    "nixpkgs_9": {
      "locked": {
-        "lastModified": 1725826545,
-        "narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=",
+        "lastModified": 1723556749,
+        "narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9",
+        "rev": "4a92571f9207810b559c9eac203d1f4d79830073",
        "type": "github"
      },
      "original": {
@ -1180,6 +1222,21 @@
        "type": "github"
      }
    },
+    "nur": {
+      "locked": {
+        "lastModified": 1697363080,
+        "narHash": "sha256-/49Rh5mohp0ZD6HaNbDn9oIsLt+d7Tzbc/BGkb/7o+g=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "5771ba6f22db037b037a8bdd82acc5467c965c7e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
    "pre-commit-hooks-nix": {
      "inputs": {
        "flake-compat": [
@ -1219,7 +1276,7 @@
        "darwin": "darwin",
        "deploy-rs": "deploy-rs",
        "dtth-phanpy": "dtth-phanpy",
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_5",
        "home-manager": "home-manager",
        "home-manager-unstable": "home-manager-unstable",
        "kak-lsp": "kak-lsp",
@ -1232,7 +1289,7 @@
        "nixos-m1": "nixos-m1",
        "nixpkgs": "nixpkgs_9",
        "nixpkgs-unstable": "nixpkgs-unstable",
-        "rust-overlay": "rust-overlay_3",
+        "nur": "nur",
        "secrets": "secrets",
        "sops-nix": "sops-nix",
        "youmubot": "youmubot"
@ -1256,6 +1313,31 @@
      }
    },
    "rust-overlay": {
+      "inputs": {
+        "flake-utils": [
+          "crane",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "crane",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1696299134,
+        "narHash": "sha256-RS77cAa0N+Sfj5EmKbm5IdncNXaBCE1BSSQvUE8exvo=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "611ccdceed92b4d94ae75328148d84ee4a5b462d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_2": {
      "inputs": {
        "flake-utils": [
          "lanzaboote",
@ -1280,7 +1362,7 @@
        "type": "github"
      }
    },
-    "rust-overlay_2": {
+    "rust-overlay_3": {
      "flake": false,
      "locked": {
        "lastModified": 1686795910,
@ -1296,50 +1378,9 @@
        "type": "github"
      }
    },
-    "rust-overlay_3": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1724466314,
-        "narHash": "sha256-ltKuK6shQ64uej1mYNtBsDYxttUNFiv9AcHqk0+0NQM=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "2b5b3edd96ef336b00622dcabc13788fdef9e3ca",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "rust-overlay_4": {
-      "inputs": {
-        "nixpkgs": [
-          "youmubot",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1724466314,
-        "narHash": "sha256-ltKuK6shQ64uej1mYNtBsDYxttUNFiv9AcHqk0+0NQM=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "2b5b3edd96ef336b00622dcabc13788fdef9e3ca",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
    "secrets": {
      "inputs": {
-        "flake-utils": "flake-utils_8"
+        "flake-utils": "flake-utils_9"
      },
      "locked": {
        "lastModified": 1693981285,
@ -1498,34 +1539,24 @@
        "type": "github"
      }
    },
-    "umu": {
-      "inputs": {
-        "nixpkgs": [
-          "nix-gaming",
-          "nixpkgs"
-        ]
-      },
+    "systems_9": {
      "locked": {
-        "dir": "packaging/nix",
-        "lastModified": 1723697867,
-        "narHash": "sha256-LTfbJXR8x35oZ8Mo3R0WTVEp9toWpVfzD21xCSr64IM=",
-        "ref": "refs/heads/main",
-        "rev": "c71a45ad53036f4c668bcbe1be7a49f9d3460151",
-        "revCount": 699,
-        "submodules": true,
-        "type": "git",
-        "url": "https://github.com/Open-Wine-Components/umu-launcher/"
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
      },
      "original": {
-        "dir": "packaging/nix",
-        "submodules": true,
-        "type": "git",
-        "url": "https://github.com/Open-Wine-Components/umu-launcher/"
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
      }
    },
    "utils": {
      "inputs": {
-        "systems": "systems_2"
+        "systems": "systems_3"
      },
      "locked": {
        "lastModified": 1701680307,
@ -1544,16 +1575,15 @@
    "youmubot": {
      "inputs": {
        "crane": "crane_5",
-        "flake-utils": "flake-utils_9",
-        "nixpkgs": "nixpkgs_10",
-        "rust-overlay": "rust-overlay_4"
+        "flake-utils": "flake-utils_10",
+        "nixpkgs": "nixpkgs_10"
      },
      "locked": {
-        "lastModified": 1726330095,
-        "narHash": "sha256-5Qhb4stOM8gbasfALX7Zaw7Q6OZZm2PjBC/8dYAOR8g=",
+        "lastModified": 1722866694,
+        "narHash": "sha256-yDNqFvkBauxOvecASnAUYohui0mQslcppNKMhWHvECk=",
        "owner": "natsukagami",
        "repo": "youmubot",
-        "rev": "76fd6c803d9c50a3ad677218dad249f596efe760",
+        "rev": "7565a6e5c572063c73c0dfa7627c0a517d52fe5c",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -15,6 +15,7 @@
    sops-nix.inputs.nixpkgs.follows = "nixpkgs-unstable";
    sops-nix.inputs.nixpkgs-stable.follows = "nixpkgs";
    deploy-rs.url = "github:Serokell/deploy-rs";
+    nur.url = "github:nix-community/NUR";

    # --- Secure boot
    lanzaboote = {
@ -25,10 +26,6 @@
    # --- Build tools
    flake-utils.url = github:numtide/flake-utils;
    crane.url = github:ipetkov/crane;
-    rust-overlay = {
-      url = "github:oxalica/rust-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
    arion.url = github:hercules-ci/arion;
    lix-module = {
      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
@ -63,7 +60,7 @@
    secrets.url = "git+ssh://git@github.com/natsukagami/nix-deploy-secrets";
  };

-  outputs = { self, darwin, nixpkgs, nixpkgs-unstable, home-manager, deploy-rs, sops-nix, ... }@inputs:
+  outputs = { self, darwin, nixpkgs, nixpkgs-unstable, home-manager, deploy-rs, sops-nix, nur, ... }@inputs:
    let
      overlays = import ./overlay.nix inputs;
      lib = nixpkgs.lib;
@ -88,20 +85,6 @@
          trusted-public-keys = [ "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" ];
        };
        environment.systemPackages = [ inputs.nix-gaming.packages.${pkgs.hostPlatform.system}.osu-stable ];
-        programs.gamemode = {
-          enable = true;
-          enableRenice = true;
-          settings = {
-            general = {
-              renice = 10;
-            };
-
-            custom = {
-              start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'";
-              end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'";
-            };
-          };
-        };
      };

      # Common Nix modules
--- a/home/config.nix
+++ b/home/config.nix
@ -1,3 +1,8 @@
 {
  allowUnfree = true;
+  packageOverrides = pkgs: {
+    nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {
+      inherit pkgs;
+    };
+  };
 }
--- a/home/modules/programs/openconnect-epfl.nix
+++ b/home/modules/programs/openconnect-epfl.nix
@ -4,15 +4,13 @@ let
    name = "openconnect-epfl";
    runtimeInputs = with pkgs; [ openconnect rbw ];
    text = ''
-      METHOD="Microsoft Entra ID"
-      RBW_ENTRY="EPFL Microsoft Auth"
-      GASPAR_PASSWORD=$(rbw get "$RBW_ENTRY")
-      GASPAR_TOKEN=$(rbw code "$RBW_ENTRY")
+      GASPAR_PASSWORD=$(rbw get gaspar)
+      GASPAR_TOKEN=$(rbw code gaspar)

-      printf "\n%s\n%s\n%s\n" "$METHOD" "$GASPAR_PASSWORD" "$GASPAR_TOKEN" | command sudo openconnect \
+      printf "%s\n%s\n" "$GASPAR_PASSWORD" "$GASPAR_TOKEN" | sudo openconnect \
          --passwd-on-stdin \
-          -u "pham" \
-          --useragent='AnyConnect' \
+          -u pham \
+           --useragent='AnyConnect' \
          "https://vpn.epfl.ch"
    '';
  };
--- a/home/osu.nix
+++ b/home/osu.nix
@ -5,10 +5,10 @@ let
  osu-pkg = with pkgs; with lib;
    appimageTools.wrapType2 rec {
      pname = "osu-lazer-bin";
-      version = "2024.906.2";
+      version = "2024.817.0";
      src = fetchurl {
        url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
-        sha256 = "1ddnac72xk9zsi9pmxg72xd3piq6s5hgh7vzb09mh4r5mkfd22fd";
+        sha256 = "1qzyfyciyv38flkac6v3ym5vpgr9m9h1z5hg5pz6s9h9gb8q7fq2";
      };
      extraPkgs = pkgs: with pkgs; [ icu ];

--- a/modules/common/linux/default.nix
+++ b/modules/common/linux/default.nix
@ -273,7 +273,7 @@ in
    services.tailscale.enable = true;

    ## Time and Region
-    time.timeZone = lib.mkDefault "Europe/Zurich";
+    time.timeZone = "Europe/Zurich";
    # Select internationalisation properties.
    console.keyMap = "jp106"; # Console key layout
    i18n.defaultLocale = "ja_JP.UTF-8";
--- a/overlay.nix
+++ b/overlay.nix
@ -1,4 +1,4 @@
-{ nixpkgs, nixpkgs-unstable, ... }@inputs:
+{ nixpkgs, nixpkgs-unstable, nur, ... }@inputs:
 let
  overlay-unstable = final: prev: {
    stable = import nixpkgs { config.allowUnfree = true; system = prev.system; };
@ -133,7 +133,6 @@ in
  # inputs.swayfx.inputs.scenefx.overlays.override
  # inputs.swayfx.overlays.override
  inputs.mpd-mpris.overlays.default
-  inputs.rust-overlay.overlays.default
  inputs.youmubot.overlays.default

  (import ./overlays/openrazer)
@ -144,6 +143,7 @@ in
  overlay-versioning
  overlay-libs
  overlay-rust-is-dumb
+  nur.overlay

  (import ./packages/common)
Author	SHA1	Message	Date
Natsu Kagami	e9977076f5	Use ip addresses instead of hosts	2024-08-19 16:01:37 +02:00
Natsu Kagami	28d891f4e2	Restrict connection source for keys	2024-08-17 17:41:28 +02:00
Natsu Kagami	0fe0bb0367	Merge remote-tracking branch 'origin/master' into build-farm	2024-08-17 17:18:18 +02:00
Natsu Kagami	db89a58ff0	Add cloud to build-farm	2024-08-17 17:12:42 +02:00
Natsu Kagami	ac5a4a333d	Update osu	2024-08-17 17:03:36 +02:00
Natsu Kagami	0000e6383e	Set up framework for build-farm	2024-08-17 17:02:41 +02:00
Natsu Kagami	8153320a71	Make harmonia build	2024-08-16 17:12:05 +02:00
Natsu Kagami	733388ec86	Switch nix-serve for harmonia	2024-08-16 17:03:12 +02:00
Natsu Kagami	e79217aa02	Make builder privileged	2024-08-16 16:35:00 +02:00
Natsu Kagami	17fcc7e58f	Set up private-key for yoga build farm	2024-08-16 16:30:58 +02:00
Natsu Kagami	7f98f816dd	Set up build farm for home & yoga	2024-08-16 16:16:14 +02:00