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