diff --git a/configs/home-manager/kitty.nix b/configs/home-manager/kitty.nix index bdf33b7..8f45782 100644 --- a/configs/home-manager/kitty.nix +++ b/configs/home-manager/kitty.nix @@ -4,16 +4,12 @@ lib, ... }: { - home.packages = with pkgs; [ - fira-code - # monocraft - # miracode - nerd-fonts.symbols-only - ]; - programs.kitty = { enable = true; - font.name = "FiraCode"; + font = { + package = pkgs.nerd-fonts.fira-code; + name = "FiraCode Nerd Font"; + }; themeFile = "gruvbox-dark"; settings = { background_opacity = "0.8"; diff --git a/flake.lock b/flake.lock index 997ce82..1fbd88a 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1754348197, - "narHash": "sha256-sVl/KDJR7X0bmRc/ccmuAy9HgcQXnnIaiOCWbSGvRPA=", + "lastModified": 1752457707, + "narHash": "sha256-DQtwJ6uJaJU7HN6QNwqjMBGtQSPkY37ywmH63c2D4lE=", "owner": "9001", "repo": "copyparty", - "rev": "b664ebb01f28094749e233ac70795ccd11fed253", + "rev": "56d3bcf515ba1d180a32cf511a2bcc5a7378f964", "type": "github" }, "original": { @@ -56,11 +56,11 @@ ] }, "locked": { - "lastModified": 1753140376, - "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", + "lastModified": 1752541678, + "narHash": "sha256-dyhGzkld6jPqnT/UfGV2oqe7tYn7hppAqFvF3GZTyXY=", "owner": "nix-community", "repo": "disko", - "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", + "rev": "2bf3421f7fed5c84d9392b62dcb9d76ef09796a7", "type": "github" }, "original": { @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1754365350, - "narHash": "sha256-NLWIkn1qM0wxtZu/2NXRaujWJ4Y1PSZlc7h0y6pOzOQ=", + "lastModified": 1752603129, + "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", "owner": "nix-community", "repo": "home-manager", - "rev": "c5d7e957397ecb7d48b99c928611c6e780db1b56", + "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1754316476, - "narHash": "sha256-Ry1gd1BQrNVJJfT11cpVP0FY8XFMx4DJV2IDp01CH9w=", + "lastModified": 1752048960, + "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9368056b73efb46eb14fd4667b99e0f81b805f28", + "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1754326498, - "narHash": "sha256-3ynDaygIzQYlBZFHGDeQzXmPkX2ILeZ0wWJ84FR4g7E=", + "lastModified": 1752199438, + "narHash": "sha256-xSBMmGtq8K4Qv80TMqREmESCAsRLJRHAbFH2T/2Bf1Y=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "ca55236cd9ef3cdea29b51a0b52a9402c60e9a27", + "rev": "d34d9412556d3a896e294534ccd25f53b6822e80", "type": "github" }, "original": { @@ -196,11 +196,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { @@ -218,10 +218,10 @@ ] }, "locked": { - "lastModified": 1754380994, - "narHash": "sha256-Xp6GS4oqJ58dPw/cx8FT5ZExO/v5gu/tqrFjPTp1Iv8=", + "lastModified": 1752613174, + "narHash": "sha256-k/Z36iSpCRB4f9c0Ym+IHK5FqCnC9ltyFTSFb9jg0J4=", "ref": "refs/heads/main", - "rev": "5782f851c84c4ee72b9e3c7d13fb15825f213fb5", + "rev": "0ac2012975fed694a21ea2bf884ab77500222549", "shallow": true, "type": "git", "url": "ssh://forgejo@git.venberg.xyz/Gabe/nvim-config.git" @@ -255,11 +255,11 @@ ] }, "locked": { - "lastModified": 1754328224, - "narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=", + "lastModified": 1752544651, + "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", "owner": "mic92", "repo": "sops-nix", - "rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4", + "rev": "2c8def626f54708a9c38a5861866660395bb3461", "type": "github" }, "original": { diff --git a/hosts/cirrostratus/default.nix b/hosts/cirrostratus/default.nix index a83ddc6..4ea0bbc 100644 --- a/hosts/cirrostratus/default.nix +++ b/hosts/cirrostratus/default.nix @@ -92,7 +92,7 @@ inputs.nixpkgs.lib.nixosSystem { }; }; imports = [ - ../../roles/home-manager/minimal-terminal.nix + ../../roles/home-manager/terminal.nix ../../configs/home-manager/common.nix ]; }; diff --git a/packages/aarch64-iso.nix b/packages/aarch64-iso.nix index 3943d95..603ca9c 100644 --- a/packages/aarch64-iso.nix +++ b/packages/aarch64-iso.nix @@ -76,7 +76,7 @@ console.packages = options.console.packages.default ++ [pkgs.terminus_font]; # ISO naming. - image.fileName = "${config.isoImage.isoBaseName}-${pkgs.stdenv.hostPlatform.system}.iso"; + isoImage.isoName = "${config.isoImage.isoBaseName}-${pkgs.stdenv.hostPlatform.system}.iso"; # EFI booting isoImage.makeEfiBootable = true; diff --git a/packages/iso.nix b/packages/iso.nix index f28e0cd..e79cdaf 100644 --- a/packages/iso.nix +++ b/packages/iso.nix @@ -74,7 +74,7 @@ console.packages = options.console.packages.default ++ [pkgs.terminus_font]; # ISO naming. - image.fileName = "${config.isoImage.isoBaseName}-${pkgs.stdenv.hostPlatform.system}.iso"; + isoImage.isoName = "${config.isoImage.isoBaseName}-${pkgs.stdenv.hostPlatform.system}.iso"; # EFI booting isoImage.makeEfiBootable = true;