format home

This commit is contained in:
Nathan Anderson 2026-02-15 16:34:17 -07:00
parent 91c1519146
commit 622d60963d

View File

@ -1,4 +1,11 @@
{ inputs, config, pkgs, lib, unstablePkgs, ... }:
{
inputs,
config,
pkgs,
lib,
unstablePkgs,
...
}:
let
userName = "jaci";
fullName = "Jaci Anderson";
@ -72,25 +79,39 @@
# Static symlinks
home.file = lib.mkMerge [
# Shared dotfiles
(let
(
let
sharedDotfilesPath = ../../../shared/dotfiles;
in
if builtins.pathExists sharedDotfilesPath then
builtins.listToAttrs (map (name: {
builtins.listToAttrs (
map (name: {
name = "${config.xdg.configHome}/${name}";
value = { source = lib.mkDefault (sharedDotfilesPath + "/${name}"); };
}) (builtins.attrNames (builtins.readDir sharedDotfilesPath)))
else {})
value = {
source = lib.mkDefault (sharedDotfilesPath + "/${name}");
};
}) (builtins.attrNames (builtins.readDir sharedDotfilesPath))
)
else
{ }
)
# Add local dotfiles, overriding from local over shared
(let
(
let
localDotfilesPath = ../../dotfiles;
in
if builtins.pathExists localDotfilesPath && builtins.readDir localDotfilesPath != { } then
builtins.listToAttrs (map (name: {
builtins.listToAttrs (
map (name: {
name = "${config.xdg.configHome}/${name}";
value = { source = localDotfilesPath + "/${name}"; };
}) (builtins.attrNames (builtins.readDir localDotfilesPath)))
else {})
value = {
source = localDotfilesPath + "/${name}";
};
}) (builtins.attrNames (builtins.readDir localDotfilesPath))
)
else
{ }
)
{
".face".source = ./face.png;
}
@ -98,7 +119,8 @@
# Active symlinks for live-edited config
xdg.configFile = {
"niri".source = config.lib.file.mkOutOfStoreSymlink "/home/${userName}/nixos/jaci/linked-dotfiles/niri";
"niri".source =
config.lib.file.mkOutOfStoreSymlink "/home/${userName}/nixos/jaci/linked-dotfiles/niri";
};
# Override Flatpak Steam to disable GPU acceleration (fixes black window on Niri)
@ -108,7 +130,10 @@
icon = "steam";
terminal = false;
categories = [ "Game" ];
mimeType = [ "x-scheme-handler/steam" "x-scheme-handler/steamlink" ];
mimeType = [
"x-scheme-handler/steam"
"x-scheme-handler/steamlink"
];
};
home.sessionVariables = {
@ -123,10 +148,18 @@
settings = {
user.name = fullName;
user.email = email;
init = { defaultBranch = "main"; };
pull = { ff = "only"; };
merge = { conflictStyle = "zdiff3"; };
push = { autoSetupRemote = "true"; };
init = {
defaultBranch = "main";
};
pull = {
ff = "only";
};
merge = {
conflictStyle = "zdiff3";
};
push = {
autoSetupRemote = "true";
};
};
};
@ -136,7 +169,10 @@
# enable saving ssh secrets (needed for private repos)
services.gnome-keyring.enable = true;
services.gnome-keyring.components = [ "ssh" "secrets" ];
services.gnome-keyring.components = [
"ssh"
"secrets"
];
# Zsh setup
programs.zsh = {
@ -230,9 +266,6 @@
tooltipFormat = "HH:mm ddd, MMM dd";
useCustomFont = false;
}
{
id = "plugin:weekly-calendar";
}
{
compactMode = true;
diskPath = "/";