opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update flake.lock file dependencies

Browse source
This commit is contained in:
Oliver Davies 2024-12-05 19:33:06 +00:00
parent ed50cf8f1e
commit ca9c039575
5 changed files with 23 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
flake.lock
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732645828, "lastModified": 1733168902,
"narHash": "sha256-+4U2I2653JvPFxcux837ulwYS864QvEueIljUkwytsk=", "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "869ba3a87486289a4197b52a6c9e7222edf00b3e", "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -27,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732025103, "lastModified": 1733175814,
"narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a46e702093a5c46e192243edbd977d5749e7f294", "rev": "bf23fe41082aa0289c209169302afd3397092f22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -43,11 +43,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1731797098, "lastModified": 1733139194,
"narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", "narHash": "sha256-PVQW9ovo0CJbhuhCsrhFJGGdD1euwUornspKpBIgdok=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", "rev": "c6c90887f84c02ce9ebf33b95ca79ef45007bf88",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -59,11 +59,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1732014248, "lastModified": 1733015953,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -75,11 +75,11 @@
}, },
"nixpkgs-2405": { "nixpkgs-2405": {
"locked": { "locked": {
"lastModified": 1731797254, "lastModified": 1733016324,
"narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", "narHash": "sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", "rev": "7e1ca67996afd8233d9033edd26e442836cc2ad6",
"type": "github" "type": "github"
}, },
"original": { "original": {

14
nix/lib/theme/default.nix
View file

@ -1,12 +1,2 @@
{ pkgs, ... }: # TODO Remove this file.
{ { ... }: { }
fonts = {
monospace = {
name = "MesloLGSDZ Nerd Font Mono";
# fc-list : family | sort | grep "Nerd Font"
package = pkgs.nerdfonts.override { fonts = [ "Meslo" ]; };
size = "10";
};
};
}

12
nix/modules/home-manager/features/desktop/alacritty.nix
View file

@ -1,16 +1,9 @@
{ {
config, config,
lib, lib,
pkgs,
self,
... ...
}: }:
let
inherit (lib) strings;
inherit (strings) toInt;
theme = import "${self}/nix/lib/theme" { inherit pkgs; };
in
{ {
options.features.desktop.alacritty.enable = lib.mkEnableOption "Enable Alacritty"; options.features.desktop.alacritty.enable = lib.mkEnableOption "Enable Alacritty";
@ -29,11 +22,10 @@ in
}; };
font = { font = {
size = toInt "${theme.fonts.monospace.size}"; size = 14;
bold.style = "Regular"; bold.style = "Regular";
normal.family = "${theme.fonts.monospace.name}"; normal.family = "JetBrainsMono Nerd Font Mono";
}; };
terminal.shell = { terminal.shell = {

25
nix/modules/nixos/fonts.nix
View file

@ -4,33 +4,16 @@ let
theme = import ../../lib/theme { inherit pkgs; }; theme = import ../../lib/theme { inherit pkgs; };
in in
{ {
environment.systemPackages = with pkgs; [
terminus_font
terminus_font_ttf
];
fonts = { fonts = {
fontconfig = { fontconfig = {
enable = true; enable = true;
defaultFonts = { defaultFonts = {
monospace = [ theme.fonts.monospace.name ]; # monospace = [];
}; };
}; };
packages = packages = with pkgs; [
with pkgs; nerd-fonts.jetbrains-mono
[ ];
(nerdfonts.override {
fonts = [
"AnonymousPro"
"FiraCode"
"GeistMono"
"IntelOneMono"
"Iosevka"
"JetBrainsMono"
];
})
]
++ [ theme.fonts.monospace.package ];
}; };
} }

2
nix/modules/nixos/i3.nix
View file

@ -192,8 +192,6 @@ in
} }
]; ];
fonts.names = [ "${theme.fonts.monospace.name}" ];
gaps = { gaps = {
smartBorders = "on"; smartBorders = "on";
smartGaps = true; smartGaps = true;