Compare commits

..

2 commits

Author SHA1 Message Date
Bart van der Braak
57cd8d8ff5 Update nerd-fonts to only include Jet Brains Mono 2025-05-24 17:23:21 +02:00
Bart van der Braak
5ce17a639f Update flake to use 25.05 2025-05-24 15:46:43 +02:00
3 changed files with 42 additions and 40 deletions

22
nixos/flake.lock generated
View file

@ -23,14 +23,18 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 0, "lastModified": 1747953325,
"narHash": "sha256-vH5mXxEvZeoGNkqKoCluhTGfoeXCZ1seYhC2pbMN0sg=", "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=",
"path": "/nix/store/zd5dgszslv09jzybcpf25gpl12s6r2d9-source", "owner": "NixOS",
"type": "path" "repo": "nixpkgs",
"rev": "55d1f923c480dadce40f5231feb472e81b0bab48",
"type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "NixOS",
"type": "indirect" "ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
@ -61,11 +65,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1748060564, "lastModified": 1748090150,
"narHash": "sha256-KTceiwnQm5MFAjtQtSp2/lkodwSd2jub/wCYfVGIFKI=", "narHash": "sha256-WrcGLv4Q94B2eG+jj5EckQfItR4zTAz/8uX2to4bU4g=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "1963b92737b62652fa85e1dfc57d5f4c6d28aea4", "rev": "d25f7e7fc5a2ebcb4c41924b4755eec642e6f18d",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -2,38 +2,37 @@
description = "Bart's NixOS Configuration"; description = "Bart's NixOS Configuration";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
zen-browser.url = "github:0xc000022070/zen-browser-flake"; zen-browser.url = "github:0xc000022070/zen-browser-flake";
}; };
outputs = outputs = { nixpkgs, ... }@inputs: {
{ nixpkgs, ... }@inputs: nixosConfigurations = {
{ tongfang = nixpkgs.lib.nixosSystem {
nixosConfigurations = { specialArgs = { inherit inputs; };
tongfang = nixpkgs.lib.nixosSystem { modules = [
specialArgs = { inherit inputs; }; ./hardware/tongfang.nix
modules = [ ./configuration.nix
./hardware/tongfang.nix ./users.nix
./configuration.nix ./packages.nix
./users.nix ./services.nix
./packages.nix ./modules/bootloader.nix
./services.nix ./modules/fonts.nix
./modules/bootloader.nix ];
./modules/fonts.nix };
]; qemu = nixpkgs.lib.nixosSystem {
}; specialArgs = { inherit inputs; };
qemu = nixpkgs.lib.nixosSystem { modules = [
specialArgs = { inherit inputs; }; ./hardware/qemu.nix
modules = [ ./modules/kde.nix
./hardware/qemu.nix ./modules/configuration.nix
./modules/kde.nix ./modules/display-manager.nix
./modules/configuration.nix ./modules/greeter.nix
./modules/display-manager.nix ./modules/networking.nix
./modules/greeter.nix ./modules/nix-settings.nix
./modules/networking.nix ./modules/users.nix
./modules/nix-settings.nix ];
./modules/users.nix
];
};
}; };
}; };
};
} }

View file

@ -72,8 +72,7 @@ in {
enableDefaultPackages = true; enableDefaultPackages = true;
packages = with pkgs; [ packages = with pkgs; [
jetbrains-mono jetbrains-mono
nerdfonts noto-fonts.JetBrainsMono
noto-fonts
noto-fonts-emoji noto-fonts-emoji
(makeAppleFont "sf-pro" "SF Pro Fonts.pkg" fontSources.sf-pro) (makeAppleFont "sf-pro" "SF Pro Fonts.pkg" fontSources.sf-pro)
(makeAppleFont "sf-compact" "SF Compact Fonts.pkg" fontSources.sf-compact) (makeAppleFont "sf-compact" "SF Compact Fonts.pkg" fontSources.sf-compact)