diff --git a/flake.lock b/flake.lock index 6035116..b21cb3e 100644 --- a/flake.lock +++ b/flake.lock @@ -54,11 +54,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1776754714, - "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -130,11 +130,11 @@ }, "crane": { "locked": { - "lastModified": 1765145449, - "narHash": "sha256-aBVHGWWRzSpfL++LubA0CwOOQ64WNLegrYHwsVuVN7A=", + "lastModified": 1754269165, + "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", "owner": "ipetkov", "repo": "crane", - "rev": "69f538cdce5955fcd47abfed4395dc6d5194c1c5", + "rev": "444e81206df3f7d92780680e45858e31d2f07a08", "type": "github" }, "original": { @@ -206,11 +206,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1779670703, - "narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=", + "lastModified": 1764873433, + "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9", + "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -268,6 +268,27 @@ "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": { "flake": false, "locked": { @@ -288,7 +309,7 @@ "inputs": { "nixpkgs": [ "lanzaboote", - "pre-commit", + "pre-commit-hooks-nix", "nixpkgs" ] }, @@ -309,18 +330,20 @@ "gnome-shell": { "flake": false, "locked": { + "host": "gitlab.gnome.org", "lastModified": 1767737596, "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "github" + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", + "ref": "gnome-49", "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "github" + "type": "gitlab" } }, "home-manager": { @@ -330,16 +353,16 @@ ] }, "locked": { - "lastModified": 1779726825, - "narHash": "sha256-RUkMrREjKDQrA+dA9+xZviGAxM5W1aVdyOr/bSYpHrE=", + "lastModified": 1778905220, + "narHash": "sha256-ox/5IHc8uwy6UTw6N7Shp6uCHIgu/S2PsWeuXsOHSo8=", "owner": "nix-community", "repo": "home-manager", - "rev": "b179bde238977f7d4454fc770b1a727eaf55111c", + "rev": "d1686dc7d36cbd1234cb226ad6ef97e882716acb", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-26.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -356,11 +379,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1779885470, - "narHash": "sha256-eXkIlzY7OCWW0P9RTi+B3UBKy1SU6cELNwEy50TVZkg=", + "lastModified": 1779389374, + "narHash": "sha256-u/ygppXPZc3VshRDhU9MY3Zc2pJn9QlWvmZiEEefJvA=", "ref": "refs/heads/main", - "rev": "dfc944d5faf4da8b9a4852806c3a2c32b2c46532", - "revCount": 777, + "rev": "0884a5496015472afad97972a7c12fc1cd06a59e", + "revCount": 547, "type": "git", "url": "https://git.berlin.ccc.de/vinzenz/hyperhive.git" }, @@ -369,46 +392,28 @@ "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": { "inputs": { "crane": "crane", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ], - "pre-commit": "pre-commit", + "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1765382359, - "narHash": "sha256-RJmgVDzjRI18BWVogG6wpsl1UCuV6ui8qr4DJ1LfWZ8=", + "lastModified": 1762205063, + "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e8c096ade12ec9130ff931b0f0e25d2f1bc63607", + "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v1.0.0", + "ref": "v0.4.3", "repo": "lanzaboote", "type": "github" } @@ -470,11 +475,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1779748545, - "narHash": "sha256-AbRQrrpcNTBUoIf7Kc1qsdhsRLtZ0DDw+udm+8NWlJk=", + "lastModified": 1778942403, + "narHash": "sha256-SPCWvqeVySTNUgX/shARpRl5fi/NnkObUgDGR/Aco4c=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3754a033e05c750ef46fe4f078d79b826c4f9287", + "rev": "daefca3370581223fedc24d0101c4915a3689f9e", "type": "github" }, "original": { @@ -503,11 +508,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1779374863, - "narHash": "sha256-qKWgJ2MUODpg+b8tOwWMdMKREvs8TdGBz63SHaQZCeA=", + "lastModified": 1778858756, + "narHash": "sha256-9VvAHNoi2wd0fxLfJOPChZMS7l6rhCtAJmpd59Hv5rw=", "owner": "YaLTeR", "repo": "niri", - "rev": "4294948cf1c70c50e938383c2c865d7ca455ac7e", + "rev": "cd5ac3e5e04bb5a11276d3c755fa25242818e05f", "type": "github" }, "original": { @@ -538,11 +543,11 @@ ] }, "locked": { - "lastModified": 1779855493, - "narHash": "sha256-03zI9JM/tz+APwMvVgKXSeLhAM0oev+58/Xs//4+Bbg=", + "lastModified": 1778990260, + "narHash": "sha256-IE5biNRhbQdrziKZbbS47ELDyv38mI4hdFf9zMq6meU=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "70518f6c1987061b291bb53abfd7846d6838c23f", + "rev": "357e5e238302b5908f033b828c5f1d8b3d73b4e0", "type": "github" }, "original": { @@ -668,11 +673,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1779786838, - "narHash": "sha256-0geHoGiR5f8qiXg+gO4rSF6Up6Var+kKqiOv9AO/uUc=", + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f44f7788c891fbe5542177df78374f8cdab10e8f", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "github" }, "original": { @@ -684,16 +689,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1779622335, - "narHash": "sha256-ViA62qtL5za7V3d5I8OA9q9JcFhsVAiL5jVHwEclWqk=", + "lastModified": 1778737229, + "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "705e9929918b43bd7b715dc0a878ac870449bb03", + "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-26.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -747,11 +752,11 @@ ] }, "locked": { - "lastModified": 1779900588, - "narHash": "sha256-b/yda4uMmjpw4uhXI4d0JNv09WtGoXis2JjD5l1Qbts=", + "lastModified": 1779047312, + "narHash": "sha256-Q4CSXZehRX3CKnXXaHc2nCMjK9lgZR2Leu5DTwe1Vnw=", "owner": "nix-community", "repo": "NUR", - "rev": "dd8bdde89853bfb3eae0eb28e3d3a9320b3b8a3c", + "rev": "8070eab81003118a0d3cde9c316aca3b2c21533e", "type": "github" }, "original": { @@ -760,9 +765,12 @@ "type": "github" } }, - "pre-commit": { + "pre-commit-hooks-nix": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": [ + "lanzaboote", + "flake-compat" + ], "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", @@ -770,11 +778,11 @@ ] }, "locked": { - "lastModified": 1765016596, - "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -809,7 +817,6 @@ "flake-parts": "flake-parts", "home-manager": "home-manager", "hyperhive": "hyperhive", - "hyperhive-website": "hyperhive-website", "lanzaboote": "lanzaboote", "naersk": "naersk_2", "niri": "niri", @@ -871,11 +878,11 @@ ] }, "locked": { - "lastModified": 1765075567, - "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", + "lastModified": 1761791894, + "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", + "rev": "59c45eb69d9222a4362673141e00ff77842cd219", "type": "github" }, "original": { @@ -977,22 +984,23 @@ "nur" ], "systems": "systems", + "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1779835981, - "narHash": "sha256-3VQklog/kSD9dw6uj6ElSfq3qwEHQWHCThR/cGcJ5Dc=", + "lastModified": 1778680496, + "narHash": "sha256-tUq1WASV0dHLv3j18log8V6Esq0NYkXuzNH2EHsstcg=", "owner": "nix-community", "repo": "stylix", - "rev": "d7ba76c960a84333a7a1fc62ccf84a266086903a", + "rev": "fc5bec2e44678eeaa221d566d447a0257a884737", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", + "ref": "release-25.11", "repo": "stylix", "type": "github" } @@ -1012,6 +1020,23 @@ "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": { "flake": false, "locked": { @@ -1031,11 +1056,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1777806186, - "narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=", + "lastModified": 1767817087, + "narHash": "sha256-eGE8OYoK6HzhJt/7bOiNV2cx01IdIrHL7gXgjkHRdNo=", "owner": "tinted-theming", "repo": "schemes", - "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795", + "rev": "bd99656235aab343e3d597bf196df9bc67429507", "type": "github" }, "original": { @@ -1047,11 +1072,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1778379944, - "narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=", + "lastModified": 1767489635, + "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "fe0203a198690e71a5ff11e08812a4673de3678d", + "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", "type": "github" }, "original": { @@ -1063,11 +1088,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1778378178, - "narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=", + "lastModified": 1767488740, + "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "9cd816033ff969415b190722cddf134e78a5665f", + "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", "type": "github" }, "original": { @@ -1158,11 +1183,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1779745227, - "narHash": "sha256-yqY7RtEJGJiENzR0GwL6q69tSAy6xAAmAcLuIhLjPf8=", + "lastModified": 1773622265, + "narHash": "sha256-wToKwH7IgWdGLMSIWksEDs4eumR6UbbsuPQ42r0oTXQ=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "5d1efbc9dc3ab1c10160b656e0247f3325daf0f2", + "rev": "a879e5e0896a326adc79c474bf457b8b99011027", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 212e0aa..78e118d 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { 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"; home-manager = { - url = "github:nix-community/home-manager/release-26.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -20,12 +20,8 @@ nixpkgs-unstable.follows = "nixpkgs-unstable"; }; }; - hyperhive-website = { - url = "git+https://forge.darkest.space/hyperhive/website.git"; - inputs.nixpkgs.follows = "nixpkgs"; - }; lanzaboote = { - url = "github:nix-community/lanzaboote/v1.0.0"; + url = "github:nix-community/lanzaboote/v0.4.3"; inputs.nixpkgs.follows = "nixpkgs"; }; naersk = { @@ -85,8 +81,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; stylix = { - #url = "github:nix-community/stylix/release-26.05"; - url = "github:nix-community/stylix/master"; + url = "github:nix-community/stylix/release-25.11"; inputs = { nixpkgs.follows = "nixpkgs"; nur.follows = "nur"; diff --git a/homeConfigurations/muede/default.nix b/homeConfigurations/muede/default.nix index 331d291..0c6f563 100644 --- a/homeConfigurations/muede/default.nix +++ b/homeConfigurations/muede/default.nix @@ -104,7 +104,5 @@ }; services.poweralertd.enable = true; - - gtk.gtk4.theme = null; }; } diff --git a/homeConfigurations/muede/ssh.nix b/homeConfigurations/muede/ssh.nix index 8f85661..8643fc9 100644 --- a/homeConfigurations/muede/ssh.nix +++ b/homeConfigurations/muede/ssh.nix @@ -2,58 +2,60 @@ config.programs.ssh = { enable = true; enableDefaultConfig = false; - settings = { - "vpn2 hetzner-vpn2" = { - HostName = "2a01:4f8:c013:65dd::1"; - User = "root"; + matchBlocks = { + "vpn2" = { + host = "vpn2 hetzner-vpn2"; + hostname = "2a01:4f8:c013:65dd::1"; + user = "root"; }; - "openwrt openwrt.lan" = { - HostName = "openwrt.lan"; - User = "root"; + "openwrt" = { + host = "openwrt openwrt.lan"; + hostname = "openwrt.lan"; + user = "root"; }; "openwrt-ts" = { - HostName = "openwrt.donkey-pentatonic.ts.net"; - Port = 2222; - User = "root"; + hostname = "openwrt.donkey-pentatonic.ts.net"; + port = 2222; + user = "root"; }; "openwrt-j" = { - HostName = "openwrt.donkey-pentatonic.ts.net"; - ProxyJump = "vpn1"; - Port = 2222; - User = "root"; + hostname = "openwrt.donkey-pentatonic.ts.net"; + proxyJump = "vpn1"; + port = 2222; + user = "root"; }; "pc2-power" = { - HostName = "openwrt.donkey-pentatonic.ts.net"; - ProxyJump = "vpn1"; - Port = 2222; - User = "pc2-power"; + hostname = "openwrt.donkey-pentatonic.ts.net"; + proxyJump = "vpn1"; + port = 2222; + user = "pc2-power"; }; "avd-power" = { - # HostName = "2001:678:560:23:9833:63ff:fe2d:f477" - # HostName = "195.160.172.25"; - HostName = "avd-jumphost.club.berlin.ccc.de"; - User = "power"; + # hostname = "2001:678:560:23:9833:63ff:fe2d:f477" + # hostname = "195.160.172.25"; + hostname = "avd-jumphost.club.berlin.ccc.de"; + user = "power"; }; "avd" = { - HostName = "avd.club.berlin.ccc.de"; - User = "vinzenz"; + hostname = "avd.club.berlin.ccc.de"; + user = "vinzenz"; }; "builder.berlin.ccc.de" = { - HostName = "195.160.172.36"; - User = "root"; + hostname = "195.160.172.36"; + user = "root"; }; "cccb.zerforschen.plus" = { - HostName = "2a01:4f8:c013:cbdd::1"; - User = "root"; + hostname = "2a01:4f8:c013:cbdd::1"; + user = "root"; }; "berlin.ccc.de" = { - HostName = "195.160.173.9"; - User = "deploy"; - Port = 31337; + hostname = "195.160.173.9"; + user = "deploy"; + port = 31337; }; "forgejo-runner-1" = { - HostName = "forgejo-runner-1.dev.zerforschen.plus"; - User = "root"; + hostname = "forgejo-runner-1.dev.zerforschen.plus"; + user = "root"; }; }; }; diff --git a/homeConfigurations/muede/starship.nix b/homeConfigurations/muede/starship.nix index f80a84c..1550aac 100644 --- a/homeConfigurations/muede/starship.nix +++ b/homeConfigurations/muede/starship.nix @@ -49,7 +49,7 @@ }; }; container = { - format = "[$symbol$name]"; + format = "\[$symbol$name\]"; }; directory = { format = "$path[( $read_only)]($read_only_style)"; @@ -91,7 +91,7 @@ package = { symbol = "󰏗"; format = "$symbol$version "; - version_format = "\${raw}"; + version_format = "$\{raw\}"; }; rust = { symbol = "󱘗"; @@ -100,7 +100,7 @@ }; nix_shell = { symbol = ""; - format = "$symbol( ($name))"; + format = "$symbol( \($name\))"; }; status = { diff --git a/homeConfigurations/muede/swayidle.nix b/homeConfigurations/muede/swayidle.nix index 166c471..73029e6 100644 --- a/homeConfigurations/muede/swayidle.nix +++ b/homeConfigurations/muede/swayidle.nix @@ -6,7 +6,7 @@ in { enable = true; - systemdTargets = [ "graphical-session.target" ]; + systemdTarget = "graphical-session.target"; timeouts = [ { timeout = 30; @@ -17,8 +17,11 @@ command = "${pkgs.systemd}/bin/systemctl suspend"; } ]; - events = { - before-sleep = "${pkgs.playerctl}/bin/playerctl pause; ${lock-command}"; - }; + events = [ + { + event = "before-sleep"; + command = "${pkgs.playerctl}/bin/playerctl pause; ${lock-command}"; + } + ]; }; } diff --git a/homeConfigurations/muede/vscode.nix b/homeConfigurations/muede/vscode.nix index 1580392..b7e01ab 100644 --- a/homeConfigurations/muede/vscode.nix +++ b/homeConfigurations/muede/vscode.nix @@ -5,8 +5,9 @@ NIXOS_OZONE_WL = "1"; ELECTRON_OZONE_PLATFORM_HINT = "auto"; }; - programs.vscodium = { + programs.vscode = { enable = true; + package = pkgs.vscodium; profiles.default = { enableUpdateCheck = false; extensions = @@ -82,16 +83,16 @@ "dotnetAcquisitionExtension.sharedExistingDotnetPath" = "${lib.getBin pkgs.dotnetCorePackages.sdk_9_0}/bin/dotnet"; - "[makefile]" = { + "\[makefile\]" = { "editor.insertSpaces" = false; "editor.detectIndentation" = false; }; - "[nix]" = { + "\[nix\]" = { "editor.formatOnSave" = false; }; - "[css]" = { + "\[css\]" = { "editor.formatOnSave" = false; }; }; diff --git a/homeConfigurations/muede/waybar.nix b/homeConfigurations/muede/waybar.nix index 817d405..1f014e2 100644 --- a/homeConfigurations/muede/waybar.nix +++ b/homeConfigurations/muede/waybar.nix @@ -158,9 +158,8 @@ backlight = { device = "intel_backlight"; format = "{percent}%  "; - # `light` removed in nixpkgs 26.05; migrate to brightnessctl when re-enabling backlight module - # on-scroll-down = "light -U 1"; - # on-scroll-up = "light -A 1"; + on-scroll-down = "light -U 1"; + on-scroll-up = "light -A 1"; }; cpu = { interval = 1; diff --git a/homeConfigurations/ronja/vscode.nix b/homeConfigurations/ronja/vscode.nix index c4498eb..5226411 100644 --- a/homeConfigurations/ronja/vscode.nix +++ b/homeConfigurations/ronja/vscode.nix @@ -2,8 +2,9 @@ { config = { home.sessionVariables.NIXOS_OZONE_WL = "1"; - programs.vscodium = { + programs.vscode = { enable = true; + package = pkgs.vscodium; profiles.default = { enableUpdateCheck = false; extensions = with pkgs.vscode-extensions; [ @@ -51,12 +52,12 @@ "nix.formatterPath" = "${lib.getBin pkgs.nixfmt-rfc-style}/bin/nixfmt"; - "[makefile]" = { + "\[makefile\]" = { "editor.insertSpaces" = false; "editor.detectIndentation" = false; }; - "[nix]" = { + "\[nix\]" = { "editor.formatOnSave" = false; }; }; diff --git a/nixosConfigurations.nix b/nixosConfigurations.nix index 6f6edce..6082283 100644 --- a/nixosConfigurations.nix +++ b/nixosConfigurations.nix @@ -72,10 +72,7 @@ forDevice ( # keep-sorted start autoupdate.enable = true; distributedBuilds.enable = true; - extraCaches = { - enable = true; - homeManager = home-manager-users != { }; - }; + extraCaches.enable = true; git.enable = true; globalinstalls.enable = true; lixIsNix.enable = true; diff --git a/nixosConfigurations/hetzner-vpn2/nginx.nix b/nixosConfigurations/hetzner-vpn2/nginx.nix index 6c57361..aa399aa 100644 --- a/nixosConfigurations/hetzner-vpn2/nginx.nix +++ b/nixosConfigurations/hetzner-vpn2/nginx.nix @@ -1,4 +1,4 @@ -{ pkgs, hyperhive-website, ... }: +{ pkgs, ... }: let blog-domain-socket = "/run/nginx/blog.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; - }; }; }; diff --git a/nixosConfigurations/muede-lpt2/default.nix b/nixosConfigurations/muede-lpt2/default.nix index ae0591d..367a7df 100644 --- a/nixosConfigurations/muede-lpt2/default.nix +++ b/nixosConfigurations/muede-lpt2/default.nix @@ -1,4 +1,4 @@ -{ self, pkgs, ... }: +{ self, ... }: { imports = [ ./containers.nix @@ -38,9 +38,16 @@ "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.light` removed in nixpkgs 26.05; replace with brightnessctl or hardware.acpilight when re-enabling - environment.systemPackages = [ pkgs.android-tools ]; + programs = { + adb.enable = true; + light = { + enable = true; + brightnessKeys = { + enable = true; + step = 5; + }; + }; + }; networking.firewall.allowedTCPPorts = [ 8776 diff --git a/nixosModules/extra-caches.nix b/nixosModules/extra-caches.nix index 8c45ede..6a72755 100644 --- a/nixosModules/extra-caches.nix +++ b/nixosModules/extra-caches.nix @@ -1,33 +1,27 @@ { lib, config, ... }: -let - cfg = config.my.extraCaches; -in { - options.my.extraCaches = { - enable = lib.mkEnableOption "extra Nix binary caches"; - homeManager = lib.mkEnableOption "the home-manager (nix-community) binary cache"; - }; + options.my.extraCaches.enable = lib.mkEnableOption "extra Nix binary caches"; - config = lib.mkIf cfg.enable { + config = lib.mkIf config.my.extraCaches.enable { nix.settings = { substituters = [ # keep-sorted start "https://cache.lix.systems" "https://cache.nixos.org/" "https://niri.cachix.org" + "https://nix-community.cachix.org" "https://nixos-raspberrypi.cachix.org" # keep-sorted end - ] - ++ lib.optional cfg.homeManager "https://nix-community.cachix.org"; + ]; trusted-public-keys = [ # keep-sorted start "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI=" # keep-sorted end - ] - ++ lib.optional cfg.homeManager "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="; + ]; }; }; } diff --git a/nixosModules/wine-gaming.nix b/nixosModules/wine-gaming.nix index fb7d279..58b0099 100644 --- a/nixosModules/wine-gaming.nix +++ b/nixosModules/wine-gaming.nix @@ -19,8 +19,8 @@ }; environment.systemPackages = with pkgs; [ - wineWow64Packages.stagingFull - wineWow64Packages.fonts + wineWowPackages.stagingFull + wineWowPackages.fonts winetricks dxvk mangohud