diff --git a/flake.nix b/flake.nix index 82a0a84..535f97a 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Starter Configuration with secrets (removed) for MacOS and NixOS"; inputs = { nixpkgs = { - url = "github:nixos/nixpkgs//nixpkgs-25.05-darwin"; + url = "github:nixos/nixpkgs//nixpkgs-25.11-darwin"; }; home-manager = { url = "github:nix-community/home-manager"; @@ -11,7 +11,7 @@ url = "github:nix-community/nixd"; }; darwin = { - url = "github:nix-darwin/nix-darwin/nix-darwin-25.05"; + url = "github:nix-darwin/nix-darwin/nix-darwin-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-homebrew = { diff --git a/hosts/nixos/default.nix b/hosts/nixos/default.nix index 1d2c03f..a907a7a 100644 --- a/hosts/nixos/default.nix +++ b/hosts/nixos/default.nix @@ -330,7 +330,7 @@ in jetbrains-mono font-awesome noto-fonts - noto-fonts-emoji + noto-fonts-color-emoji ]; environment.systemPackages = with pkgs; [ diff --git a/modules/darwin/casks.nix b/modules/darwin/casks.nix index ba2aa57..cc16ed7 100644 --- a/modules/darwin/casks.nix +++ b/modules/darwin/casks.nix @@ -49,29 +49,22 @@ _: # Productivity Tools "1Password" - #"zotero" "gpg-suite" - #"home-assistant" - #"Fantastical" - #"Remarkable" "mailmate" "spamsieve" "macdown" "calibre" - # "superslicer" # Removed in favor of OrcaSlicer "orcaslicer" "element" - # "mqtt-explorer" "virtualbox" - # "autodesk-fusion" #fails to install "qmk-toolbox" "dbeaver-community" "sqlitestudio" - # "wireshark" # Browsers "google-chrome" "firefox" + "tor-browser" ] diff --git a/modules/shared/home-manager.nix b/modules/shared/home-manager.nix index 4f8b5e6..56326fa 100644 --- a/modules/shared/home-manager.nix +++ b/modules/shared/home-manager.nix @@ -88,12 +88,11 @@ in git = { enable = true; ignores = [ "*.swp" ]; - userName = name; - userEmail = email; + lfs = { enable = true; }; - extraConfig = { + settings = { init.defaultBranch = "main"; core = { editor = "vim"; @@ -102,6 +101,10 @@ in commit.gpgsign = false; pull.rebase = true; rebase.autoStash = true; + user = { + name = name; + email = email; + }; }; }; diff --git a/modules/shared/packages.nix b/modules/shared/packages.nix index 4dd22de..8e4dd10 100644 --- a/modules/shared/packages.nix +++ b/modules/shared/packages.nix @@ -63,16 +63,15 @@ with pkgs; font-awesome hack-font noto-fonts - noto-fonts-emoji + noto-fonts-color-emoji meslo-lgs-nf # Node.js development tools nodePackages.npm # globally install npm nodePackages.prettier - nodejs + # Text and terminal utilities - xquartz xterm htop @@ -153,6 +152,7 @@ pidgin rubyPackages_3_4.kramdown-rfc2629 zotero + tex-fmt (texlive.combine { inherit (texlive) @@ -176,6 +176,7 @@ pidgin footmisc geometry ifmtarg + latexmk lipsum lualatex-math makecell