diff --git a/flake.lock b/flake.lock index 39eff6d..7b493a5 100644 --- a/flake.lock +++ b/flake.lock @@ -7,16 +7,16 @@ ] }, "locked": { - "lastModified": 1747020534, - "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=", + "lastModified": 1748226808, + "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca", + "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -78,11 +78,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1746904237, - "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": { @@ -94,16 +94,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746957726, - "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", + "lastModified": 1748162331, + "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", + "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -139,11 +139,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1746485181, - "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { @@ -160,11 +160,11 @@ ] }, "locked": { - "lastModified": 1747071553, - "narHash": "sha256-EMIzJ+F2DTuOSPD608HaAra9cah87Emz8GjYNGtxpLo=", + "lastModified": 1747710747, + "narHash": "sha256-7Nsmi7DOGaao/ev4huoXwuDMHFR5dCsOcz2OGxP9csU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "50065c8bee3f5c20d29bce19037447b2c2006c48", + "rev": "281cda71fda95e9dc5e0eb0887d4e53e894ca037", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9728d76..51c1816 100644 --- a/flake.nix +++ b/flake.nix @@ -3,11 +3,11 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; # Nixpkgs-unstable nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Home manager - home-manager.url = "github:nix-community/home-manager/release-24.11"; + home-manager.url = "github:nix-community/home-manager/release-25.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # Add sops for secret management sops-nix.url = "github:Mic92/sops-nix"; diff --git a/nixos/homeserver.nix b/nixos/homeserver.nix index 117de92..44bafdd 100644 --- a/nixos/homeserver.nix +++ b/nixos/homeserver.nix @@ -110,7 +110,7 @@ fontDir.enable = true; fontconfig.defaultFonts.monospace = ["MonaspiceArNerdFontMono"]; packages = [ - pkgs.nerdfonts + pkgs.nerd-fonts.monaspace ]; }; } diff --git a/nixos/worklaptop.nix b/nixos/worklaptop.nix index 2e8d6a3..67a90d7 100644 --- a/nixos/worklaptop.nix +++ b/nixos/worklaptop.nix @@ -112,7 +112,6 @@ # Configure console keymap console.keyMap = "ie"; - hardware.pulseaudio.enable = false; security.rtkit.enable = true; users.users.cianh = { diff --git a/nixos/worklaptop/services.nix b/nixos/worklaptop/services.nix index f3620ba..3d94ee7 100644 --- a/nixos/worklaptop/services.nix +++ b/nixos/worklaptop/services.nix @@ -17,6 +17,7 @@ variant = ""; }; }; + pulseaudio.enable = false; pipewire = { enable = true; alsa.enable = true; diff --git a/nixos/worklaptop/theming.nix b/nixos/worklaptop/theming.nix index 173fb47..2d462dd 100644 --- a/nixos/worklaptop/theming.nix +++ b/nixos/worklaptop/theming.nix @@ -27,7 +27,10 @@ packages = [ pkgs.corefonts pkgs.liberation_ttf - pkgs.nerdfonts + pkgs.nerd-fonts.monaspace + pkgs.nerd-fonts.inconsolata + pkgs.nerd-fonts.fira-code + pkgs.nerd-fonts.jetbrains-mono pkgs.nerd-font-patcher pkgs.noto-fonts pkgs.noto-fonts-color-emoji