Progress nixpkgs to 25.05
Update nerdfont naming convention accordingly
This commit is contained in:
parent
95a8af3e89
commit
6ccfdadeb5
4 changed files with 25 additions and 22 deletions
8
flake.lock
generated
8
flake.lock
generated
|
|
@ -592,16 +592,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_8": {
|
"nixpkgs_8": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739357830,
|
"lastModified": 1752620740,
|
||||||
"narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=",
|
"narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a",
|
"rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-24.11",
|
"ref": "nixos-25.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,7 @@
|
||||||
description = "Emile's Nix Dotfiles";
|
description = "Emile's Nix Dotfiles";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
# nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
|
|
||||||
|
|
||||||
#home-manager = {
|
#home-manager = {
|
||||||
# url = "github:nix-community/home-manager";
|
# url = "github:nix-community/home-manager";
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
home-manager = builtins.fetchTarball {
|
home-manager = builtins.fetchTarball {
|
||||||
url = "https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz";
|
url = "https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz";
|
||||||
sha256 = "0gjfa3bv0m0kymxqla9iih11gjb6czyj942v34pyc7xy4qsx898k";
|
sha256 = "0z94i2ig7wcm63fp1wkpp6r4458g2bj3r7ijlfapxihqybpgvng5";
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -351,20 +351,24 @@ in {
|
||||||
# ----- FONTS -----
|
# ----- FONTS -----
|
||||||
fonts = {
|
fonts = {
|
||||||
enableDefaultPackages = true; # no clue what this line does tbh
|
enableDefaultPackages = true; # no clue what this line does tbh
|
||||||
packages = with pkgs; [
|
packages = with pkgs;
|
||||||
#(nerdfonts.override {
|
[
|
||||||
# fonts = [
|
#(nerdfonts.override {
|
||||||
# "Cousine"
|
# fonts = [
|
||||||
# "Iosevka"
|
# "Cousine"
|
||||||
# "JetBrainsMono"
|
# "Iosevka"
|
||||||
# ];
|
# "JetBrainsMono"
|
||||||
# })
|
# ];
|
||||||
nerdfonts
|
# })
|
||||||
geist-font # for my hyprlock theme
|
# nerdfonts
|
||||||
|
geist-font # for my hyprlock theme
|
||||||
|
|
||||||
# texlive maintains a noto-emoji flake
|
# texlive maintains a noto-emoji flake
|
||||||
texlivePackages.noto-emoji
|
texlivePackages.noto-emoji
|
||||||
];
|
]
|
||||||
|
++ builtins.filter lib.attrsets.isDerivation (
|
||||||
|
builtins.attrValues pkgs.nerd-fonts
|
||||||
|
);
|
||||||
|
|
||||||
# TODO: change my default fonts
|
# TODO: change my default fonts
|
||||||
fontconfig = {
|
fontconfig = {
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
}: let
|
}: let
|
||||||
home-manager = builtins.fetchTarball {
|
home-manager = builtins.fetchTarball {
|
||||||
url = "https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz";
|
url = "https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz";
|
||||||
sha256 = "1mwq9mzyw1al03z4q2ifbp6d0f0sx9f128xxazwrm62z0rcgv4na";
|
sha256 = "0z94i2ig7wcm63fp1wkpp6r4458g2bj3r7ijlfapxihqybpgvng5";
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue