format home

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

View File

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