aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiran Bastaja <mbastaja@sorre.xyz>2024-12-07 20:31:18 +0100
committerMiran Bastaja <mbastaja@sorre.xyz>2024-12-08 01:48:40 +0100
commit75e9cbeea42dff11c7f20e377628eccf42f8f89b (patch)
tree9d7510fc52f1e37e29e1d8373c0ca9f65a04d510
parent50bef4c4578cef94dca75fa9553bf6b890134639 (diff)
chore: update flake.lock
-rw-r--r--flake.lock146
-rw-r--r--share/cfg/foot.nix2
-rw-r--r--share/system/client-common.nix8
3 files changed, 99 insertions, 57 deletions
diff --git a/flake.lock b/flake.lock
index 2fe93d5..067b7f2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -27,11 +27,11 @@
]
},
"locked": {
- "lastModified": 1731549112,
- "narHash": "sha256-c9I3i1CwZ10SoM5npQQVnfwgvB86jAS3lT4ZqkRoSOI=",
+ "lastModified": 1733168902,
+ "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=",
"owner": "nix-community",
"repo": "disko",
- "rev": "5fd852c4155a689098095406500d0ae3d04654a8",
+ "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5",
"type": "github"
},
"original": {
@@ -48,11 +48,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1731574827,
- "narHash": "sha256-QneOtCpfBNkgJCs32Y8LaKDpontw7W9ATQxIW4qb6qc=",
+ "lastModified": 1733591475,
+ "narHash": "sha256-xdGGGZ8ZsTr6XbPb1N8pnK73hugkdlPwM5Iz8umcXTY=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "4639038b0f5e66e7d0f3d103b8e44ded3ab7e337",
+ "rev": "f583e3691e30db811c8a5b9d45cdf433dba1bccd",
"type": "github"
},
"original": {
@@ -68,7 +68,7 @@
"sorrepkgs",
"nixpkgs"
],
- "nixpkgs-stable": "nixpkgs-stable_4"
+ "nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
"lastModified": 1726161281,
@@ -102,6 +102,27 @@
},
"flake-parts": {
"inputs": {
+ "nixpkgs-lib": [
+ "nur",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1733312601,
+ "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
+ "flake-parts_2": {
+ "inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
@@ -201,11 +222,11 @@
]
},
"locked": {
- "lastModified": 1731535640,
- "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=",
+ "lastModified": 1733484277,
+ "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "35b055009afd0107b69c286fca34d2ad98940d57",
+ "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a",
"type": "github"
},
"original": {
@@ -267,11 +288,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1731319897,
- "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
+ "lastModified": 1733392399,
+ "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
+ "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
"type": "github"
},
"original": {
@@ -327,43 +348,43 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1731386116,
- "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=",
+ "lastModified": 1733412085,
+ "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "689fed12a013f56d4c4d3f612489634267d86529",
+ "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-24.05",
+ "ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": {
- "lastModified": 1730602179,
- "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=",
+ "lastModified": 1720386169,
+ "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c",
+ "rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "release-24.05",
+ "ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_3": {
"locked": {
- "lastModified": 1720386169,
- "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
+ "lastModified": 1725930920,
+ "narHash": "sha256-RVhD9hnlTT2nJzPHlAqrWqCkA7T6CYrP41IoVRkciZM=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
+ "rev": "44a71ff39c182edaf25a7ace5c9454e7cba2c658",
"type": "github"
},
"original": {
@@ -373,18 +394,18 @@
"type": "github"
}
},
- "nixpkgs-stable_4": {
+ "nixpkgs_2": {
"locked": {
- "lastModified": 1725930920,
- "narHash": "sha256-RVhD9hnlTT2nJzPHlAqrWqCkA7T6CYrP41IoVRkciZM=",
- "owner": "NixOS",
+ "lastModified": 1733392399,
+ "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
+ "owner": "nixos",
"repo": "nixpkgs",
- "rev": "44a71ff39c182edaf25a7ace5c9454e7cba2c658",
+ "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
"type": "github"
},
"original": {
- "owner": "NixOS",
- "ref": "nixos-24.05",
+ "owner": "nixos",
+ "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@@ -460,12 +481,17 @@
}
},
"nur": {
+ "inputs": {
+ "flake-parts": "flake-parts",
+ "nixpkgs": "nixpkgs_2",
+ "treefmt-nix": "treefmt-nix"
+ },
"locked": {
- "lastModified": 1731597103,
- "narHash": "sha256-6Q8G9D7MOC3r3OK8ah4ejeqQU3H1CumwjKBNiNF7Rgo=",
+ "lastModified": 1733589916,
+ "narHash": "sha256-ZHjk/6caiSypWWPeN0PhRhDpgwvB36f2aLZYOtfBlzo=",
"owner": "nix-community",
"repo": "nur",
- "rev": "37b0dad212626ccf8baa666de2b16dd011ffbfa2",
+ "rev": "8b6de353ee0f4cb1d12fae5abf0b3003c51677c0",
"type": "github"
},
"original": {
@@ -482,7 +508,7 @@
"sorre-website",
"nixpkgs"
],
- "nixpkgs-stable": "nixpkgs-stable_3"
+ "nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1724857454,
@@ -513,7 +539,7 @@
"sops-nix": "sops-nix",
"sorre-website": "sorre-website",
"sorrepkgs": "sorrepkgs",
- "treefmt-nix": "treefmt-nix_2"
+ "treefmt-nix": "treefmt-nix_3"
}
},
"rust-overlay": {
@@ -523,11 +549,11 @@
]
},
"locked": {
- "lastModified": 1731551344,
- "narHash": "sha256-wr8OOqgw7M1pWfe4W7WA5lErzOVMg3zvrrxx/dy/nPo=",
+ "lastModified": 1733538766,
+ "narHash": "sha256-FEDfBpM82XGdHDbLDJC4lV+QXSVN1rERt1MqtBGJZds=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "27570abfd3461875f11fc07c9b01c141a6332b4f",
+ "rev": "66526479b295ad238843a8a7367d2da7ec102757",
"type": "github"
},
"original": {
@@ -576,15 +602,14 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
- ],
- "nixpkgs-stable": "nixpkgs-stable_2"
+ ]
},
"locked": {
- "lastModified": 1731364708,
- "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=",
+ "lastModified": 1733128155,
+ "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "4c91d52db103e757fc25b58998b0576ae702d659",
+ "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856",
"type": "github"
},
"original": {
@@ -595,13 +620,13 @@
},
"sorre-website": {
"inputs": {
- "flake-parts": "flake-parts",
+ "flake-parts": "flake-parts_2",
"nixpkgs": [
"nixpkgs"
],
"no-style-please": "no-style-please",
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
- "treefmt-nix": "treefmt-nix"
+ "treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1725125290,
@@ -687,6 +712,27 @@
"treefmt-nix": {
"inputs": {
"nixpkgs": [
+ "nur",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1733222881,
+ "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
+ "owner": "numtide",
+ "repo": "treefmt-nix",
+ "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "treefmt-nix",
+ "type": "github"
+ }
+ },
+ "treefmt-nix_2": {
+ "inputs": {
+ "nixpkgs": [
"sorre-website",
"nixpkgs"
]
@@ -705,18 +751,18 @@
"type": "github"
}
},
- "treefmt-nix_2": {
+ "treefmt-nix_3": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
- "lastModified": 1730321837,
- "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
+ "lastModified": 1733440889,
+ "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
+ "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410",
"type": "github"
},
"original": {
diff --git a/share/cfg/foot.nix b/share/cfg/foot.nix
index 3545d0f..4ef5579 100644
--- a/share/cfg/foot.nix
+++ b/share/cfg/foot.nix
@@ -10,7 +10,7 @@ let
name = "foot-wrapped";
paths = [
pkgs.foot
- (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; })
+ pkgs.nerd-fonts.caskaydia-cove
];
};
in
diff --git a/share/system/client-common.nix b/share/system/client-common.nix
index e486da6..209b0a3 100644
--- a/share/system/client-common.nix
+++ b/share/system/client-common.nix
@@ -101,12 +101,8 @@
noto-fonts-cjk-sans
noto-fonts-emoji
proggyfonts
- (nerdfonts.override {
- fonts = [
- "FiraCode"
- "CascadiaCode"
- ];
- })
+ fira-code-nerdfont
+ nerd-fonts.caskaydia-cove
overpass
inter
];