Compare commits

..

No commits in common. "57cd8d8ff5bab392c1e7348d6525e4617b118c14" and "249bf0fbc22536a7b35de96b83f0ec239ab7258b" have entirely different histories.

3 changed files with 40 additions and 42 deletions

22
nixos/flake.lock generated
View file

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

View file

@ -2,37 +2,38 @@
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 = { nixpkgs, ... }@inputs: { outputs =
nixosConfigurations = { { nixpkgs, ... }@inputs:
tongfang = nixpkgs.lib.nixosSystem { {
specialArgs = { inherit inputs; }; nixosConfigurations = {
modules = [ tongfang = nixpkgs.lib.nixosSystem {
./hardware/tongfang.nix specialArgs = { inherit inputs; };
./configuration.nix modules = [
./users.nix ./hardware/tongfang.nix
./packages.nix ./configuration.nix
./services.nix ./users.nix
./modules/bootloader.nix ./packages.nix
./modules/fonts.nix ./services.nix
]; ./modules/bootloader.nix
}; ./modules/fonts.nix
qemu = nixpkgs.lib.nixosSystem { ];
specialArgs = { inherit inputs; }; };
modules = [ qemu = nixpkgs.lib.nixosSystem {
./hardware/qemu.nix specialArgs = { inherit inputs; };
./modules/kde.nix modules = [
./modules/configuration.nix ./hardware/qemu.nix
./modules/display-manager.nix ./modules/kde.nix
./modules/greeter.nix ./modules/configuration.nix
./modules/networking.nix ./modules/display-manager.nix
./modules/nix-settings.nix ./modules/greeter.nix
./modules/users.nix ./modules/networking.nix
]; ./modules/nix-settings.nix
./modules/users.nix
];
};
}; };
}; };
};
} }

View file

@ -72,7 +72,8 @@ in {
enableDefaultPackages = true; enableDefaultPackages = true;
packages = with pkgs; [ packages = with pkgs; [
jetbrains-mono jetbrains-mono
noto-fonts.JetBrainsMono nerdfonts
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)