remember to import the fonts also

This commit is contained in:
Geir Okkenhaug Jerstad 2025-06-10 21:59:00 +02:00
parent aea88565bd
commit 1fd6de2551
2 changed files with 56 additions and 51 deletions

View file

@ -25,6 +25,8 @@
../../modules/desktop/sway.nix ../../modules/desktop/sway.nix
../../modules/desktop/niri.nix ../../modules/desktop/niri.nix
# Fonts
../../modules/desktop/fonts.nix
# Development tools # Development tools
../../modules/development/tools.nix ../../modules/development/tools.nix
@ -50,7 +52,7 @@
path = "/boot"; path = "/boot";
} }
]; ];
}; # ZFS services for this machine }; # ZFS services for this machine
services.zfs = { services.zfs = {
autoScrub.enable = true; autoScrub.enable = true;
trim.enable = true; trim.enable = true;

View file

@ -1,25 +1,27 @@
# Primary User Configuration - geir # Primary User Configuration - geir
# Main user account for development and desktop use # Main user account for development and desktop use
{ config, pkgs, ... }:
let
# Import custom packages from the flake
homeLabPackages = import ../../packages { inherit pkgs; };
in
{ {
config,
pkgs,
...
}: let
# Import custom packages from the flake
homeLabPackages = import ../../packages {inherit pkgs;};
in {
users.users.geir = { users.users.geir = {
description = "Geir Okkenhaug Jerstad - Primary User"; description = "Geir Okkenhaug Jerstad - Primary User";
isNormalUser = true; isNormalUser = true;
# User groups for development and desktop use # User groups for development and desktop use
extraGroups = [ extraGroups = [
"wheel" # sudo access "wheel" # sudo access
"networkmanager" # network management "networkmanager" # network management
"libvirt" # virtualization "libvirt" # virtualization
"incus-admin" # container management "incus-admin" # container management
"podman" # container runtime "podman" # container runtime
"audio" # audio devices "audio" # audio devices
"video" # video devices "video" # video devices
"render" # GPU access "render" # GPU access
]; ];
shell = pkgs.zsh; shell = pkgs.zsh;
@ -49,7 +51,8 @@ in
firefox firefox
chromium chromium
vesktop vesktop
vivaldi vivaldi-ffmpeg-codecs vivaldi
vivaldi-ffmpeg-codecs
# Shell Enhancement & Fun # Shell Enhancement & Fun
nerdfetch nerdfetch
@ -113,7 +116,7 @@ in
TERMINAL = "kitty"; TERMINAL = "kitty";
# Git configuration # Git configuration
GIT_EDITOR = "emacs"; GIT_EDITOR = "nano";
}; };
# Comprehensive zsh configuration for geir # Comprehensive zsh configuration for geir
@ -149,7 +152,7 @@ in
histFile = "$HOME/.histfile"; histFile = "$HOME/.histfile";
# Shell options # Shell options
setOptions = [ "autocd" "extendedglob" ]; setOptions = ["autocd" "extendedglob"];
# Interactive shell initialization # Interactive shell initialization
interactiveShellInit = '' interactiveShellInit = ''