diff --git a/flake.lock b/flake.lock index 3a1c4b8..107b007 100644 --- a/flake.lock +++ b/flake.lock @@ -37,24 +37,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "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" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -62,16 +44,16 @@ ] }, "locked": { - "lastModified": 1733572789, - "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", + "lastModified": 1751468302, + "narHash": "sha256-tWosziZTT039x6PgEZUhzGlV8oLvdDmIgKTE8ESMaEA=", "owner": "nix-community", "repo": "home-manager", - "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", + "rev": "501cfec8277f931a9c9af9f23d3105c537faeafe", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -79,38 +61,37 @@ "nixos-wsl": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1720391164, - "narHash": "sha256-RrJsSelbJ/SCrnCH0yLEvgVSKVoG7b45Qhf/6fOiQ8I=", + "lastModified": 1739577062, + "narHash": "sha256-u/trdPzJO8UotNq48RbG7m6Pe8761IEMCOY0QidNjY4=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "05098ab6e48684c573d7033bd583b1eea2f5f851", + "rev": "0b2b8b31f69f24e9a75b4b18a32c771a48612d5e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "2405.5.4", + "ref": "2411.6.0", "repo": "NixOS-WSL", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1733550349, - "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", + "lastModified": 1751582995, + "narHash": "sha256-u7ubvtxdTnFPpV27AHpgoKn7qHuE7sgWgza/1oj5nzA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", + "rev": "7a732ed41ca0dd64b4b71b563ab9805a80a7d693", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -159,21 +140,6 @@ "nur": "nur" } }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 5f5d66a..febc6bf 100644 --- a/flake.nix +++ b/flake.nix @@ -3,16 +3,16 @@ inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nur = { url = "github:nix-community/NUR"; }; home-manager = { - url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; nixos-wsl = { - url = "github:nix-community/NixOS-WSL/2405.5.4"; + url = "github:nix-community/NixOS-WSL/2411.6.0"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/src/system/machines/server/system.nix b/src/system/machines/server/system.nix index eabe5a2..b7b63ed 100644 --- a/src/system/machines/server/system.nix +++ b/src/system/machines/server/system.nix @@ -68,8 +68,7 @@ ]; fonts.packages = with pkgs; [ - terminus_font - terminus-nerdfont + nerd-fonts.terminess-ttf ]; security.sudo = { diff --git a/src/system/modules/bitcoin/default.nix b/src/system/modules/bitcoin/default.nix index ef092ac..f4570c4 100644 --- a/src/system/modules/bitcoin/default.nix +++ b/src/system/modules/bitcoin/default.nix @@ -13,10 +13,10 @@ in nixpkgs.overlays = [ (final: prev: { bitcoind = prev.bitcoind.overrideAttrs (old: rec { - version = "28.0"; + version = "29.0"; src = fetchTarball { url = "https://github.com/bitcoin/bitcoin/archive/refs/tags/v${version}.tar.gz"; - sha256 = "sha256-LLtw6pMyqIJ3IWHiK4P3XoifLojB9yMNMo+MGNFGuRY="; + sha256 = "sha256-XvoqYA5RYXbOjeidxV4Wxb8DhYv6Hz510XNMhmWkV1Y="; }; }); }) diff --git a/src/system/modules/nginx/default.nix b/src/system/modules/nginx/default.nix index 085ee08..6145a87 100644 --- a/src/system/modules/nginx/default.nix +++ b/src/system/modules/nginx/default.nix @@ -45,11 +45,11 @@ in defaults = { email = "${config.user.email}"; validMinDays = 90; + listenHTTP = ":80"; }; certs = { "ramos.codes" = { extraDomainNames = attrNames config.services.nginx.virtualHosts; - listenHTTP = ":80"; }; }; }; diff --git a/src/user/modules/security/modules/gpg/default.nix b/src/user/modules/security/modules/gpg/default.nix index 52a48ea..fcaa905 100644 --- a/src/user/modules/security/modules/gpg/default.nix +++ b/src/user/modules/security/modules/gpg/default.nix @@ -41,7 +41,7 @@ in enableBashIntegration = true; enableScDaemon = true; - pinentryPackage = + pinentry.package = if gui.enable then pkgs.pinentry-gnome3 else