diff --git a/flake.lock b/flake.lock index 9d35b51..793d90f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,12 +1,15 @@ { "nodes": { "catppuccin": { + "inputs": { + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1721784420, - "narHash": "sha256-bgF6fN4Qgk7NErFKGuuqWXcLORsiykTYyqMUFRiAUBY=", + "lastModified": 1737579274, + "narHash": "sha256-8kBIYfn8TI9jbffhDNS12SdbQHb9ITXflwcgIJBeGqw=", "owner": "catppuccin", "repo": "nix", - "rev": "8bdb55cc1c13f572b6e4307a3c0d64f1ae286a4f", + "rev": "06f0ea19334bcc8112e6d671fd53e61f9e3ad63a", "type": "github" }, "original": { @@ -22,11 +25,11 @@ ] }, "locked": { - "lastModified": 1721804110, - "narHash": "sha256-i4jINRazBKPqlaS+qhlP+kV/UHEq3vs5itfpblqu4ZM=", + "lastModified": 1737762889, + "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", "owner": "nix-community", "repo": "home-manager", - "rev": "af70fc502a15d7e1e4c5a4c4fc8e06c2ec561e0c", + "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", "type": "github" }, "original": { @@ -37,11 +40,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1721562059, - "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -55,7 +74,7 @@ "inputs": { "catppuccin": "catppuccin", "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" } } }, diff --git a/home-manager/packages/kitty.nix b/home-manager/packages/kitty.nix index ac34fa4..b071f86 100644 --- a/home-manager/packages/kitty.nix +++ b/home-manager/packages/kitty.nix @@ -3,10 +3,9 @@ { programs.kitty = { enable = true; - theme = "Catppuccin-Mocha"; font = { name = "FiraCode Nerd Font"; - package = pkgs.fira-code-nerdfont; + package = pkgs.nerd-fonts.fira-code; size = 14; }; settings = { diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index 51fe1b6..eefd3b9 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -23,6 +23,7 @@ mission-center nvtop alacritty + nerd-fonts.fira-code ]; nixpkgs.config.allowUnfree = true; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index b2ac280..0984d3f 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -4,8 +4,8 @@ imports = [ # Include the results of the hardware scan. ./hardware/hardware.nix - # ./environments/plasma-wayland.nix - ./environments/gnome.nix + ./environments/plasma-wayland.nix + # ./environments/gnome.nix ./users/luxzi.nix ./services/services.nix ./programs/programs.nix diff --git a/nixos/programs/programs.nix b/nixos/programs/programs.nix index 68581da..6b2b27c 100644 --- a/nixos/programs/programs.nix +++ b/nixos/programs/programs.nix @@ -14,7 +14,7 @@ curl git neovim - fira-code-nerdfont + nerd-fonts.fira-code cmake ninja libgcc