Compare commits

..
14 changed files with 199 additions and 183 deletions

211
flake.lock generated
View file

@ -54,11 +54,11 @@
"base16-helix": { "base16-helix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1776754714, "lastModified": 1760703920,
"narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=", "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-helix", "repo": "base16-helix",
"rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581", "rev": "d646af9b7d14bff08824538164af99d0c521b185",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -130,11 +130,11 @@
}, },
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1765145449, "lastModified": 1754269165,
"narHash": "sha256-aBVHGWWRzSpfL++LubA0CwOOQ64WNLegrYHwsVuVN7A=", "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "69f538cdce5955fcd47abfed4395dc6d5194c1c5", "rev": "444e81206df3f7d92780680e45858e31d2f07a08",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -206,11 +206,11 @@
"firefox-gnome-theme": { "firefox-gnome-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1779670703, "lastModified": 1764873433,
"narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=", "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
"owner": "rafaelmardojai", "owner": "rafaelmardojai",
"repo": "firefox-gnome-theme", "repo": "firefox-gnome-theme",
"rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9", "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -222,11 +222,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1761588595, "lastModified": 1747046372,
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -268,6 +268,27 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"lanzaboote",
"nixpkgs"
]
},
"locked": {
"lastModified": 1754091436,
"narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"fromYaml": { "fromYaml": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -288,7 +309,7 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"lanzaboote", "lanzaboote",
"pre-commit", "pre-commit-hooks-nix",
"nixpkgs" "nixpkgs"
] ]
}, },
@ -309,18 +330,20 @@
"gnome-shell": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.gnome.org",
"lastModified": 1767737596, "lastModified": 1767737596,
"narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
"owner": "GNOME", "owner": "GNOME",
"repo": "gnome-shell", "repo": "gnome-shell",
"rev": "ef02db02bf0ff342734d525b5767814770d85b49", "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
"type": "github" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.gnome.org",
"owner": "GNOME", "owner": "GNOME",
"ref": "gnome-49",
"repo": "gnome-shell", "repo": "gnome-shell",
"rev": "ef02db02bf0ff342734d525b5767814770d85b49", "type": "gitlab"
"type": "github"
} }
}, },
"home-manager": { "home-manager": {
@ -330,16 +353,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1779726825, "lastModified": 1778905220,
"narHash": "sha256-RUkMrREjKDQrA+dA9+xZviGAxM5W1aVdyOr/bSYpHrE=", "narHash": "sha256-ox/5IHc8uwy6UTw6N7Shp6uCHIgu/S2PsWeuXsOHSo8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b179bde238977f7d4454fc770b1a727eaf55111c", "rev": "d1686dc7d36cbd1234cb226ad6ef97e882716acb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-26.05", "ref": "release-25.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -356,11 +379,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1779885470, "lastModified": 1779389374,
"narHash": "sha256-eXkIlzY7OCWW0P9RTi+B3UBKy1SU6cELNwEy50TVZkg=", "narHash": "sha256-u/ygppXPZc3VshRDhU9MY3Zc2pJn9QlWvmZiEEefJvA=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "dfc944d5faf4da8b9a4852806c3a2c32b2c46532", "rev": "0884a5496015472afad97972a7c12fc1cd06a59e",
"revCount": 777, "revCount": 547,
"type": "git", "type": "git",
"url": "https://git.berlin.ccc.de/vinzenz/hyperhive.git" "url": "https://git.berlin.ccc.de/vinzenz/hyperhive.git"
}, },
@ -369,46 +392,28 @@
"url": "https://git.berlin.ccc.de/vinzenz/hyperhive.git" "url": "https://git.berlin.ccc.de/vinzenz/hyperhive.git"
} }
}, },
"hyperhive-website": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1779905524,
"narHash": "sha256-qhPwDaNHsmIRoe+rMUAc0C842LaHWnE6TkH4y+ru86g=",
"ref": "refs/heads/main",
"rev": "3b4900690dbc8e28e3c4e4e907ece870cdbff1a4",
"revCount": 10,
"type": "git",
"url": "https://forge.darkest.space/hyperhive/website.git"
},
"original": {
"type": "git",
"url": "https://forge.darkest.space/hyperhive/website.git"
}
},
"lanzaboote": { "lanzaboote": {
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"pre-commit": "pre-commit", "pre-commit-hooks-nix": "pre-commit-hooks-nix",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1765382359, "lastModified": 1762205063,
"narHash": "sha256-RJmgVDzjRI18BWVogG6wpsl1UCuV6ui8qr4DJ1LfWZ8=", "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "e8c096ade12ec9130ff931b0f0e25d2f1bc63607", "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "v1.0.0", "ref": "v0.4.3",
"repo": "lanzaboote", "repo": "lanzaboote",
"type": "github" "type": "github"
} }
@ -470,11 +475,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1779748545, "lastModified": 1778942403,
"narHash": "sha256-AbRQrrpcNTBUoIf7Kc1qsdhsRLtZ0DDw+udm+8NWlJk=", "narHash": "sha256-SPCWvqeVySTNUgX/shARpRl5fi/NnkObUgDGR/Aco4c=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "3754a033e05c750ef46fe4f078d79b826c4f9287", "rev": "daefca3370581223fedc24d0101c4915a3689f9e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -503,11 +508,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1779374863, "lastModified": 1778858756,
"narHash": "sha256-qKWgJ2MUODpg+b8tOwWMdMKREvs8TdGBz63SHaQZCeA=", "narHash": "sha256-9VvAHNoi2wd0fxLfJOPChZMS7l6rhCtAJmpd59Hv5rw=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "4294948cf1c70c50e938383c2c865d7ca455ac7e", "rev": "cd5ac3e5e04bb5a11276d3c755fa25242818e05f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -538,11 +543,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1779855493, "lastModified": 1778990260,
"narHash": "sha256-03zI9JM/tz+APwMvVgKXSeLhAM0oev+58/Xs//4+Bbg=", "narHash": "sha256-IE5biNRhbQdrziKZbbS47ELDyv38mI4hdFf9zMq6meU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "70518f6c1987061b291bb53abfd7846d6838c23f", "rev": "357e5e238302b5908f033b828c5f1d8b3d73b4e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -668,11 +673,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1779786838, "lastModified": 1778869304,
"narHash": "sha256-0geHoGiR5f8qiXg+gO4rSF6Up6Var+kKqiOv9AO/uUc=", "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f44f7788c891fbe5542177df78374f8cdab10e8f", "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -684,16 +689,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1779622335, "lastModified": 1778737229,
"narHash": "sha256-ViA62qtL5za7V3d5I8OA9q9JcFhsVAiL5jVHwEclWqk=", "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "705e9929918b43bd7b715dc0a878ac870449bb03", "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-26.05", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -747,11 +752,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1779900588, "lastModified": 1779047312,
"narHash": "sha256-b/yda4uMmjpw4uhXI4d0JNv09WtGoXis2JjD5l1Qbts=", "narHash": "sha256-Q4CSXZehRX3CKnXXaHc2nCMjK9lgZR2Leu5DTwe1Vnw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "dd8bdde89853bfb3eae0eb28e3d3a9320b3b8a3c", "rev": "8070eab81003118a0d3cde9c316aca3b2c21533e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -760,9 +765,12 @@
"type": "github" "type": "github"
} }
}, },
"pre-commit": { "pre-commit-hooks-nix": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": [
"lanzaboote",
"flake-compat"
],
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"lanzaboote", "lanzaboote",
@ -770,11 +778,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765016596, "lastModified": 1750779888,
"narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -809,7 +817,6 @@
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"home-manager": "home-manager", "home-manager": "home-manager",
"hyperhive": "hyperhive", "hyperhive": "hyperhive",
"hyperhive-website": "hyperhive-website",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"naersk": "naersk_2", "naersk": "naersk_2",
"niri": "niri", "niri": "niri",
@ -871,11 +878,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765075567, "lastModified": 1761791894,
"narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", "rev": "59c45eb69d9222a4362673141e00ff77842cd219",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -977,22 +984,23 @@
"nur" "nur"
], ],
"systems": "systems", "systems": "systems",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes", "tinted-schemes": "tinted-schemes",
"tinted-tmux": "tinted-tmux", "tinted-tmux": "tinted-tmux",
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1779835981, "lastModified": 1778680496,
"narHash": "sha256-3VQklog/kSD9dw6uj6ElSfq3qwEHQWHCThR/cGcJ5Dc=", "narHash": "sha256-tUq1WASV0dHLv3j18log8V6Esq0NYkXuzNH2EHsstcg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "stylix", "repo": "stylix",
"rev": "d7ba76c960a84333a7a1fc62ccf84a266086903a", "rev": "fc5bec2e44678eeaa221d566d447a0257a884737",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "master", "ref": "release-25.11",
"repo": "stylix", "repo": "stylix",
"type": "github" "type": "github"
} }
@ -1012,6 +1020,23 @@
"type": "github" "type": "github"
} }
}, },
"tinted-foot": {
"flake": false,
"locked": {
"lastModified": 1726913040,
"narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
}
},
"tinted-kitty": { "tinted-kitty": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -1031,11 +1056,11 @@
"tinted-schemes": { "tinted-schemes": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1777806186, "lastModified": 1767817087,
"narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=", "narHash": "sha256-eGE8OYoK6HzhJt/7bOiNV2cx01IdIrHL7gXgjkHRdNo=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "schemes", "repo": "schemes",
"rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795", "rev": "bd99656235aab343e3d597bf196df9bc67429507",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1047,11 +1072,11 @@
"tinted-tmux": { "tinted-tmux": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1778379944, "lastModified": 1767489635,
"narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=", "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-tmux", "repo": "tinted-tmux",
"rev": "fe0203a198690e71a5ff11e08812a4673de3678d", "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1063,11 +1088,11 @@
"tinted-zed": { "tinted-zed": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1778378178, "lastModified": 1767488740,
"narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=", "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-zed", "repo": "base16-zed",
"rev": "9cd816033ff969415b190722cddf134e78a5665f", "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1158,11 +1183,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1779745227, "lastModified": 1773622265,
"narHash": "sha256-yqY7RtEJGJiENzR0GwL6q69tSAy6xAAmAcLuIhLjPf8=", "narHash": "sha256-wToKwH7IgWdGLMSIWksEDs4eumR6UbbsuPQ42r0oTXQ=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "5d1efbc9dc3ab1c10160b656e0247f3325daf0f2", "rev": "a879e5e0896a326adc79c474bf457b8b99011027",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,10 +1,10 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-26.05"; url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -20,12 +20,8 @@
nixpkgs-unstable.follows = "nixpkgs-unstable"; nixpkgs-unstable.follows = "nixpkgs-unstable";
}; };
}; };
hyperhive-website = {
url = "git+https://forge.darkest.space/hyperhive/website.git";
inputs.nixpkgs.follows = "nixpkgs";
};
lanzaboote = { lanzaboote = {
url = "github:nix-community/lanzaboote/v1.0.0"; url = "github:nix-community/lanzaboote/v0.4.3";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
naersk = { naersk = {
@ -85,8 +81,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
stylix = { stylix = {
#url = "github:nix-community/stylix/release-26.05"; url = "github:nix-community/stylix/release-25.11";
url = "github:nix-community/stylix/master";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
nur.follows = "nur"; nur.follows = "nur";

View file

@ -104,7 +104,5 @@
}; };
services.poweralertd.enable = true; services.poweralertd.enable = true;
gtk.gtk4.theme = null;
}; };
} }

View file

@ -2,58 +2,60 @@
config.programs.ssh = { config.programs.ssh = {
enable = true; enable = true;
enableDefaultConfig = false; enableDefaultConfig = false;
settings = { matchBlocks = {
"vpn2 hetzner-vpn2" = { "vpn2" = {
HostName = "2a01:4f8:c013:65dd::1"; host = "vpn2 hetzner-vpn2";
User = "root"; hostname = "2a01:4f8:c013:65dd::1";
user = "root";
}; };
"openwrt openwrt.lan" = { "openwrt" = {
HostName = "openwrt.lan"; host = "openwrt openwrt.lan";
User = "root"; hostname = "openwrt.lan";
user = "root";
}; };
"openwrt-ts" = { "openwrt-ts" = {
HostName = "openwrt.donkey-pentatonic.ts.net"; hostname = "openwrt.donkey-pentatonic.ts.net";
Port = 2222; port = 2222;
User = "root"; user = "root";
}; };
"openwrt-j" = { "openwrt-j" = {
HostName = "openwrt.donkey-pentatonic.ts.net"; hostname = "openwrt.donkey-pentatonic.ts.net";
ProxyJump = "vpn1"; proxyJump = "vpn1";
Port = 2222; port = 2222;
User = "root"; user = "root";
}; };
"pc2-power" = { "pc2-power" = {
HostName = "openwrt.donkey-pentatonic.ts.net"; hostname = "openwrt.donkey-pentatonic.ts.net";
ProxyJump = "vpn1"; proxyJump = "vpn1";
Port = 2222; port = 2222;
User = "pc2-power"; user = "pc2-power";
}; };
"avd-power" = { "avd-power" = {
# HostName = "2001:678:560:23:9833:63ff:fe2d:f477" # hostname = "2001:678:560:23:9833:63ff:fe2d:f477"
# HostName = "195.160.172.25"; # hostname = "195.160.172.25";
HostName = "avd-jumphost.club.berlin.ccc.de"; hostname = "avd-jumphost.club.berlin.ccc.de";
User = "power"; user = "power";
}; };
"avd" = { "avd" = {
HostName = "avd.club.berlin.ccc.de"; hostname = "avd.club.berlin.ccc.de";
User = "vinzenz"; user = "vinzenz";
}; };
"builder.berlin.ccc.de" = { "builder.berlin.ccc.de" = {
HostName = "195.160.172.36"; hostname = "195.160.172.36";
User = "root"; user = "root";
}; };
"cccb.zerforschen.plus" = { "cccb.zerforschen.plus" = {
HostName = "2a01:4f8:c013:cbdd::1"; hostname = "2a01:4f8:c013:cbdd::1";
User = "root"; user = "root";
}; };
"berlin.ccc.de" = { "berlin.ccc.de" = {
HostName = "195.160.173.9"; hostname = "195.160.173.9";
User = "deploy"; user = "deploy";
Port = 31337; port = 31337;
}; };
"forgejo-runner-1" = { "forgejo-runner-1" = {
HostName = "forgejo-runner-1.dev.zerforschen.plus"; hostname = "forgejo-runner-1.dev.zerforschen.plus";
User = "root"; user = "root";
}; };
}; };
}; };

View file

@ -49,7 +49,7 @@
}; };
}; };
container = { container = {
format = "[$symbol$name]"; format = "\[$symbol$name\]";
}; };
directory = { directory = {
format = "$path[( $read_only)]($read_only_style)"; format = "$path[( $read_only)]($read_only_style)";
@ -91,7 +91,7 @@
package = { package = {
symbol = "󰏗"; symbol = "󰏗";
format = "$symbol$version "; format = "$symbol$version ";
version_format = "\${raw}"; version_format = "$\{raw\}";
}; };
rust = { rust = {
symbol = "󱘗"; symbol = "󱘗";
@ -100,7 +100,7 @@
}; };
nix_shell = { nix_shell = {
symbol = ""; symbol = "";
format = "$symbol( ($name))"; format = "$symbol( \($name\))";
}; };
status = { status = {

View file

@ -6,7 +6,7 @@
in in
{ {
enable = true; enable = true;
systemdTargets = [ "graphical-session.target" ]; systemdTarget = "graphical-session.target";
timeouts = [ timeouts = [
{ {
timeout = 30; timeout = 30;
@ -17,8 +17,11 @@
command = "${pkgs.systemd}/bin/systemctl suspend"; command = "${pkgs.systemd}/bin/systemctl suspend";
} }
]; ];
events = { events = [
before-sleep = "${pkgs.playerctl}/bin/playerctl pause; ${lock-command}"; {
}; event = "before-sleep";
command = "${pkgs.playerctl}/bin/playerctl pause; ${lock-command}";
}
];
}; };
} }

View file

@ -5,8 +5,9 @@
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
ELECTRON_OZONE_PLATFORM_HINT = "auto"; ELECTRON_OZONE_PLATFORM_HINT = "auto";
}; };
programs.vscodium = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscodium;
profiles.default = { profiles.default = {
enableUpdateCheck = false; enableUpdateCheck = false;
extensions = extensions =
@ -82,16 +83,16 @@
"dotnetAcquisitionExtension.sharedExistingDotnetPath" = "dotnetAcquisitionExtension.sharedExistingDotnetPath" =
"${lib.getBin pkgs.dotnetCorePackages.sdk_9_0}/bin/dotnet"; "${lib.getBin pkgs.dotnetCorePackages.sdk_9_0}/bin/dotnet";
"[makefile]" = { "\[makefile\]" = {
"editor.insertSpaces" = false; "editor.insertSpaces" = false;
"editor.detectIndentation" = false; "editor.detectIndentation" = false;
}; };
"[nix]" = { "\[nix\]" = {
"editor.formatOnSave" = false; "editor.formatOnSave" = false;
}; };
"[css]" = { "\[css\]" = {
"editor.formatOnSave" = false; "editor.formatOnSave" = false;
}; };
}; };

View file

@ -158,9 +158,8 @@
backlight = { backlight = {
device = "intel_backlight"; device = "intel_backlight";
format = "{percent}% "; format = "{percent}% ";
# `light` removed in nixpkgs 26.05; migrate to brightnessctl when re-enabling backlight module on-scroll-down = "light -U 1";
# on-scroll-down = "light -U 1"; on-scroll-up = "light -A 1";
# on-scroll-up = "light -A 1";
}; };
cpu = { cpu = {
interval = 1; interval = 1;

View file

@ -2,8 +2,9 @@
{ {
config = { config = {
home.sessionVariables.NIXOS_OZONE_WL = "1"; home.sessionVariables.NIXOS_OZONE_WL = "1";
programs.vscodium = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscodium;
profiles.default = { profiles.default = {
enableUpdateCheck = false; enableUpdateCheck = false;
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
@ -51,12 +52,12 @@
"nix.formatterPath" = "${lib.getBin pkgs.nixfmt-rfc-style}/bin/nixfmt"; "nix.formatterPath" = "${lib.getBin pkgs.nixfmt-rfc-style}/bin/nixfmt";
"[makefile]" = { "\[makefile\]" = {
"editor.insertSpaces" = false; "editor.insertSpaces" = false;
"editor.detectIndentation" = false; "editor.detectIndentation" = false;
}; };
"[nix]" = { "\[nix\]" = {
"editor.formatOnSave" = false; "editor.formatOnSave" = false;
}; };
}; };

View file

@ -72,10 +72,7 @@ forDevice (
# keep-sorted start # keep-sorted start
autoupdate.enable = true; autoupdate.enable = true;
distributedBuilds.enable = true; distributedBuilds.enable = true;
extraCaches = { extraCaches.enable = true;
enable = true;
homeManager = home-manager-users != { };
};
git.enable = true; git.enable = true;
globalinstalls.enable = true; globalinstalls.enable = true;
lixIsNix.enable = true; lixIsNix.enable = true;

View file

@ -1,4 +1,4 @@
{ pkgs, hyperhive-website, ... }: { pkgs, ... }:
let let
blog-domain-socket = "/run/nginx/blog.sock"; blog-domain-socket = "/run/nginx/blog.sock";
anubis-domain-socket = "/run/anubis/anubis-main/anubis.sock"; anubis-domain-socket = "/run/anubis/anubis-main/anubis.sock";
@ -41,12 +41,6 @@ in
} }
]; ];
}; };
"hyperhive.darkest.space" = {
addSSL = true;
enableACME = true;
root = hyperhive-website.packages.${pkgs.stdenv.hostPlatform.system}.default;
};
}; };
}; };

View file

@ -1,4 +1,4 @@
{ self, pkgs, ... }: { self, ... }:
{ {
imports = [ imports = [
./containers.nix ./containers.nix
@ -38,9 +38,16 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv pc2 home roaming" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv pc2 home roaming"
]; ];
# `programs.adb` removed in nixpkgs 26.05 (systemd 258 handles uaccess); add pkgs.android-tools to systemPackages if adb is needed programs = {
# `programs.light` removed in nixpkgs 26.05; replace with brightnessctl or hardware.acpilight when re-enabling adb.enable = true;
environment.systemPackages = [ pkgs.android-tools ]; light = {
enable = true;
brightnessKeys = {
enable = true;
step = 5;
};
};
};
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [
8776 8776

View file

@ -1,33 +1,27 @@
{ lib, config, ... }: { lib, config, ... }:
let
cfg = config.my.extraCaches;
in
{ {
options.my.extraCaches = { options.my.extraCaches.enable = lib.mkEnableOption "extra Nix binary caches";
enable = lib.mkEnableOption "extra Nix binary caches";
homeManager = lib.mkEnableOption "the home-manager (nix-community) binary cache";
};
config = lib.mkIf cfg.enable { config = lib.mkIf config.my.extraCaches.enable {
nix.settings = { nix.settings = {
substituters = [ substituters = [
# keep-sorted start # keep-sorted start
"https://cache.lix.systems" "https://cache.lix.systems"
"https://cache.nixos.org/" "https://cache.nixos.org/"
"https://niri.cachix.org" "https://niri.cachix.org"
"https://nix-community.cachix.org"
"https://nixos-raspberrypi.cachix.org" "https://nixos-raspberrypi.cachix.org"
# keep-sorted end # keep-sorted end
] ];
++ lib.optional cfg.homeManager "https://nix-community.cachix.org";
trusted-public-keys = [ trusted-public-keys = [
# keep-sorted start # keep-sorted start
"cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964=" "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI=" "nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
# keep-sorted end # keep-sorted end
] ];
++ lib.optional cfg.homeManager "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=";
}; };
}; };
} }

View file

@ -19,8 +19,8 @@
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wineWow64Packages.stagingFull wineWowPackages.stagingFull
wineWow64Packages.fonts wineWowPackages.fonts
winetricks winetricks
dxvk dxvk
mangohud mangohud