diff --git a/common/users.nix b/common/users.nix index 4ce99b0..f73c044 100644 --- a/common/users.nix +++ b/common/users.nix @@ -12,6 +12,7 @@ in sansSerif = [ "Sarasa UI SC" ]; monospace = [ "Sarasa Mono SC" ]; }; + fontDir.enable = true; packages = with pkgs; [ sarasa-gothic noto-fonts-emoji @@ -20,70 +21,72 @@ in home-manager = { useGlobalPkgs = true; - users.${usr} = { - home = { - packages = with pkgs; [ - dua - fd - nil - nixpkgs-fmt - rclone - sops - ]; - stateVersion = config.system.stateVersion; - }; - programs = { - bat.enable = true; - bottom.enable = true; - direnv = { - enable = true; - nix-direnv.enable = true; - }; - eza = { - enable = true; - enableAliases = true; - }; - fish.enable = true; - fzf.enable = true; - git = { - enable = true; - extraConfig = { - core.autocrlf = "input"; - init.defaultBranch = "development"; - pull.rebase = false; - push.autoSetupRemote = true; - }; - ignores = [ - ".direnv" - ".envrc" + users.${usr} = { config, osConfig, pkgs, ... }: + { + home = { + file.".local/share/fonts".source = config.lib.file.mkOutOfStoreSymlink "/run/current-system/sw/share/X11/fonts"; + packages = with pkgs; [ + dua + fd + nil + nixpkgs-fmt + rclone + sops ]; - userEmail = config.constants.postMaster; - userName = config.constants.userName; + stateVersion = osConfig.system.stateVersion; }; - helix = { - enable = true; - defaultEditor = true; - settings = { - editor = { - lsp.display-inlay-hints = true; - soft-wrap.enable = true; + programs = { + bat.enable = true; + bottom.enable = true; + direnv = { + enable = true; + nix-direnv.enable = true; + }; + eza = { + enable = true; + enableAliases = true; + }; + fish.enable = true; + fzf.enable = true; + git = { + enable = true; + extraConfig = { + core.autocrlf = "input"; + init.defaultBranch = "development"; + pull.rebase = false; + push.autoSetupRemote = true; }; - theme = "base16_transparent"; + ignores = [ + ".direnv" + ".envrc" + ]; + userEmail = osConfig.constants.postMaster; + userName = osConfig.constants.userName; + }; + helix = { + enable = true; + defaultEditor = true; + settings = { + editor = { + lsp.display-inlay-hints = true; + soft-wrap.enable = true; + }; + theme = "base16_transparent"; + }; + }; + ripgrep.enable = true; + starship = { + enable = true; + enableTransience = true; + }; + tealdeer.enable = true; + zoxide = { + enable = true; + options = [ "--cmd cd" ]; }; }; - ripgrep.enable = true; - starship = { - enable = true; - enableTransience = true; - }; - tealdeer.enable = true; - zoxide = { - enable = true; - options = [ "--cmd cd" ]; - }; + xdg.enable = true; }; - xdg.enable = true; - }; }; programs.fish.enable = true; diff --git a/linux/blitzar/gui.nix b/linux/blitzar/gui.nix index 8f056b6..3690777 100644 --- a/linux/blitzar/gui.nix +++ b/linux/blitzar/gui.nix @@ -5,6 +5,7 @@ let usr = config.constants.userName; in { let xdgCfg = config.xdg; in { gtk = { enable = true; + gtk2.configLocation = "${xdgCfg.configHome}/gtk-2.0/gtkrc"; theme = { name = "Sweet-Dark"; package = pkgs.sweet;