format home
This commit is contained in:
parent
91c1519146
commit
622d60963d
@ -1,20 +1,27 @@
|
|||||||
{ inputs, config, pkgs, lib, unstablePkgs, ... }:
|
{
|
||||||
let
|
inputs,
|
||||||
userName = "jaci";
|
config,
|
||||||
fullName = "Jaci Anderson";
|
pkgs,
|
||||||
email = "jaci.s.anderson@gmail.com";
|
lib,
|
||||||
in
|
unstablePkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
userName = "jaci";
|
||||||
|
fullName = "Jaci Anderson";
|
||||||
|
email = "jaci.s.anderson@gmail.com";
|
||||||
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../../shared/modules/apps/firefox/firefox.nix
|
../../../shared/modules/apps/firefox/firefox.nix
|
||||||
../../../shared/modules/apps/ghostty.nix
|
../../../shared/modules/apps/ghostty.nix
|
||||||
../../../shared/modules/apps/helix.nix
|
../../../shared/modules/apps/helix.nix
|
||||||
../../../shared/modules/home-manager/git-autosync.nix
|
../../../shared/modules/home-manager/git-autosync.nix
|
||||||
../../../shared/modules/home-manager/noctalia.nix
|
../../../shared/modules/home-manager/noctalia.nix
|
||||||
../../../shared/modules/home-manager/json2nix.nix
|
../../../shared/modules/home-manager/json2nix.nix
|
||||||
../../../shared/modules/home-manager/style-preview.nix
|
../../../shared/modules/home-manager/style-preview.nix
|
||||||
../niri/niri_home.nix
|
../niri/niri_home.nix
|
||||||
./programs.nix
|
./programs.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
home.username = userName;
|
home.username = userName;
|
||||||
@ -72,33 +79,48 @@
|
|||||||
# Static symlinks
|
# Static symlinks
|
||||||
home.file = lib.mkMerge [
|
home.file = lib.mkMerge [
|
||||||
# Shared dotfiles
|
# Shared dotfiles
|
||||||
(let
|
(
|
||||||
sharedDotfilesPath = ../../../shared/dotfiles;
|
let
|
||||||
in
|
sharedDotfilesPath = ../../../shared/dotfiles;
|
||||||
|
in
|
||||||
if builtins.pathExists sharedDotfilesPath then
|
if builtins.pathExists sharedDotfilesPath then
|
||||||
builtins.listToAttrs (map (name: {
|
builtins.listToAttrs (
|
||||||
name = "${config.xdg.configHome}/${name}";
|
map (name: {
|
||||||
value = { source = lib.mkDefault (sharedDotfilesPath + "/${name}"); };
|
name = "${config.xdg.configHome}/${name}";
|
||||||
}) (builtins.attrNames (builtins.readDir sharedDotfilesPath)))
|
value = {
|
||||||
else {})
|
source = lib.mkDefault (sharedDotfilesPath + "/${name}");
|
||||||
|
};
|
||||||
|
}) (builtins.attrNames (builtins.readDir sharedDotfilesPath))
|
||||||
|
)
|
||||||
|
else
|
||||||
|
{ }
|
||||||
|
)
|
||||||
# Add local dotfiles, overriding from local over shared
|
# Add local dotfiles, overriding from local over shared
|
||||||
(let
|
(
|
||||||
localDotfilesPath = ../../dotfiles;
|
let
|
||||||
in
|
localDotfilesPath = ../../dotfiles;
|
||||||
if builtins.pathExists localDotfilesPath && builtins.readDir localDotfilesPath != {} then
|
in
|
||||||
builtins.listToAttrs (map (name: {
|
if builtins.pathExists localDotfilesPath && builtins.readDir localDotfilesPath != { } then
|
||||||
name = "${config.xdg.configHome}/${name}";
|
builtins.listToAttrs (
|
||||||
value = { source = localDotfilesPath + "/${name}"; };
|
map (name: {
|
||||||
}) (builtins.attrNames (builtins.readDir localDotfilesPath)))
|
name = "${config.xdg.configHome}/${name}";
|
||||||
else {})
|
value = {
|
||||||
{
|
source = localDotfilesPath + "/${name}";
|
||||||
".face".source = ./face.png;
|
};
|
||||||
}
|
}) (builtins.attrNames (builtins.readDir localDotfilesPath))
|
||||||
|
)
|
||||||
|
else
|
||||||
|
{ }
|
||||||
|
)
|
||||||
|
{
|
||||||
|
".face".source = ./face.png;
|
||||||
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
# 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,41 +169,44 @@
|
|||||||
|
|
||||||
# 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 = {
|
||||||
|
enable = true;
|
||||||
|
oh-my-zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
oh-my-zsh = {
|
plugins = [ "git" ];
|
||||||
enable = true;
|
theme = "fox";
|
||||||
plugins = [ "git" ];
|
};
|
||||||
theme = "fox";
|
initContent = ''
|
||||||
};
|
# History
|
||||||
initContent = ''
|
HISTSIZE=10000
|
||||||
# History
|
SAVEHIST=10000
|
||||||
HISTSIZE=10000
|
setopt SHARE_HISTORY
|
||||||
SAVEHIST=10000
|
setopt APPEND_HISTORY
|
||||||
setopt SHARE_HISTORY
|
|
||||||
setopt APPEND_HISTORY
|
|
||||||
|
|
||||||
# integrate ssh-agent from gnome keyring
|
# integrate ssh-agent from gnome keyring
|
||||||
export SSH_AUTH_SOCK=/run/user/$UID/gcr/ssh
|
export SSH_AUTH_SOCK=/run/user/$UID/gcr/ssh
|
||||||
|
|
||||||
# Better Unix Aliases
|
# Better Unix Aliases
|
||||||
alias ls="lsd"
|
alias ls="lsd"
|
||||||
alias l="lsd --almost-all --long"
|
alias l="lsd --almost-all --long"
|
||||||
alias llm="lsd --timesort --long"
|
alias llm="lsd --timesort --long"
|
||||||
alias lS="lsd --oneline --classic"
|
alias lS="lsd --oneline --classic"
|
||||||
alias lt="lsd --tree --depth=2"
|
alias lt="lsd --tree --depth=2"
|
||||||
alias cat="bat --paging=never"
|
alias cat="bat --paging=never"
|
||||||
alias rm="rm -i"
|
alias rm="rm -i"
|
||||||
'';
|
'';
|
||||||
profileExtra = ''
|
profileExtra = ''
|
||||||
export XDG_DATA_DIRS=$XDG_DATA_DIRS:/usr/share:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share
|
export XDG_DATA_DIRS=$XDG_DATA_DIRS:/usr/share:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share
|
||||||
'';
|
'';
|
||||||
syntaxHighlighting = {
|
syntaxHighlighting = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Stylix handles Qt and GTK theming
|
# Stylix handles Qt and GTK theming
|
||||||
@ -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 = "/";
|
||||||
@ -784,5 +817,5 @@
|
|||||||
monitorWidgets = [ ];
|
monitorWidgets = [ ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user