From 1c1615c5f8d52b10138b83c5a76bf0244058078f Mon Sep 17 00:00:00 2001 From: nyxerinys Date: Mon, 22 Jun 2026 15:54:59 -0500 Subject: [PATCH 01/13] re organize home --- flake.lock | 58 ++++++++++++++++++++++++++++++ flake.nix | 2 +- modules/home/default.nix | 16 +++++++++ modules/home/nyxerinys/default.nix | 4 +++ 4 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 modules/home/default.nix diff --git a/flake.lock b/flake.lock index 93f4685..56bbd1d 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,22 @@ { "nodes": { + "brew-src": { + "flake": false, + "locked": { + "lastModified": 1781226006, + "narHash": "sha256-w4ZTuOnhYiDxjaynrMTASzp802QblBWmo3wpB8wVN4Y=", + "owner": "Homebrew", + "repo": "brew", + "rev": "109191be4988470b51a60a5ef1998520aa24c01b", + "type": "github" + }, + "original": { + "owner": "Homebrew", + "ref": "6.0.1", + "repo": "brew", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -21,6 +38,27 @@ "type": "github" } }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1782154529, + "narHash": "sha256-mVdyS2SxbPGNHTJX4n4EUMT/S2BPyZJ/ZR2UhkJcSF4=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "af11a877f238208676b596a5b6c3f3d8dcf5a86b", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "master", + "repo": "home-manager", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -42,6 +80,24 @@ "type": "github" } }, + "nix-homebrew": { + "inputs": { + "brew-src": "brew-src" + }, + "locked": { + "lastModified": 1781389246, + "narHash": "sha256-ORqLAo/hoJdsZC7UPAuEHev6S0+XIqKEC7vjo5prz1k=", + "owner": "zhaofengli", + "repo": "nix-homebrew", + "rev": "de7953a08ed4bb9245be043e468561c17b89130d", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "repo": "nix-homebrew", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1781808408, @@ -81,7 +137,9 @@ }, "root": { "inputs": { + "home-manager": "home-manager", "nix-darwin": "nix-darwin", + "nix-homebrew": "nix-homebrew", "nixpkgs": "nixpkgs", "nur": "nur", "secrets": "secrets", diff --git a/flake.nix b/flake.nix index 6eb999f..b3a50e7 100644 --- a/flake.nix +++ b/flake.nix @@ -75,7 +75,7 @@ modules = [ # ./hosts/base.nix ./hosts/artemis - homeConf + ./modules/home ]; specialArgs = { inherit inputs; }; }; diff --git a/modules/home/default.nix b/modules/home/default.nix new file mode 100644 index 0000000..e44b06e --- /dev/null +++ b/modules/home/default.nix @@ -0,0 +1,16 @@ +{ inputs, ... }: + +{ + imports = [ + inputs.home-manager.darwinModules.home-manager + ]; + + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + users = { + "nyxerinys" = import ./nyxerinys; + }; + extraSpecialArgs = { inherit inputs; } + } +} \ No newline at end of file diff --git a/modules/home/nyxerinys/default.nix b/modules/home/nyxerinys/default.nix index fdc4c85..1e4cbd6 100644 --- a/modules/home/nyxerinys/default.nix +++ b/modules/home/nyxerinys/default.nix @@ -5,6 +5,10 @@ # paths it should manage. home.username = "nyxerinys"; home.homeDirectory = "/home/nyxerinys"; + home.packages = with pkgs; [ + discord + ]; + # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage From 0032452e8326c17cd6035fac8c1b09ef9b4a38f9 Mon Sep 17 00:00:00 2001 From: nyxerinys Date: Mon, 22 Jun 2026 15:56:10 -0500 Subject: [PATCH 02/13] semicolons --- modules/home/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/home/default.nix b/modules/home/default.nix index e44b06e..49c648c 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -11,6 +11,6 @@ users = { "nyxerinys" = import ./nyxerinys; }; - extraSpecialArgs = { inherit inputs; } - } + extraSpecialArgs = { inherit inputs; }; + }; } \ No newline at end of file From 489a217b821cf5c81d0bebee6cefb9dc760e5648 Mon Sep 17 00:00:00 2001 From: nyxerinys Date: Mon, 22 Jun 2026 17:38:17 -0500 Subject: [PATCH 03/13] home manager fully up --- flake.lock | 8 ++++---- flake.nix | 2 +- hosts/artemis/default.nix | 5 +++-- modules/home/nyxerinys/default.nix | 9 +++++++-- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 56bbd1d..182d15f 100644 --- a/flake.lock +++ b/flake.lock @@ -45,16 +45,16 @@ ] }, "locked": { - "lastModified": 1782154529, - "narHash": "sha256-mVdyS2SxbPGNHTJX4n4EUMT/S2BPyZJ/ZR2UhkJcSF4=", + "lastModified": 1781981105, + "narHash": "sha256-/1nNBbA7PrSQpTc9Qazkhl4kIPg+TNl0CjxS3UQJKlw=", "owner": "nix-community", "repo": "home-manager", - "rev": "af11a877f238208676b596a5b6c3f3d8dcf5a86b", + "rev": "7bfff44b465909f69a442701293bc0badcf476dc", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } diff --git a/flake.nix b/flake.nix index b3a50e7..f11e3a6 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ url = "github:zhaofengli/nix-homebrew"; }; home-manager = { - url = "github:nix-community/home-manager/master"; + url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; sops-nix = { diff --git a/hosts/artemis/default.nix b/hosts/artemis/default.nix index ae28d50..86780f2 100644 --- a/hosts/artemis/default.nix +++ b/hosts/artemis/default.nix @@ -9,6 +9,7 @@ ids.gids.nixbld = 350; programs.fish.enable = true; environment.etc."nix-darwin".source = "/Users/nyxerinys/nix-config"; + nixpkgs.config.allowUnfree = true; # Necessary for using flakes on this system. nix.settings.experimental-features = "nix-command flakes"; @@ -19,7 +20,7 @@ # The platform the configuration will be used on. nixpkgs.hostPlatform = "aarch64-darwin"; users.users.nyxerinys = { - name = "Nyx"; - home = "/Users/nyxerinys"; + name = "nyxerinys"; + home = "/Users/nyxerinys"; }; } \ No newline at end of file diff --git a/modules/home/nyxerinys/default.nix b/modules/home/nyxerinys/default.nix index 1e4cbd6..f04c7f1 100644 --- a/modules/home/nyxerinys/default.nix +++ b/modules/home/nyxerinys/default.nix @@ -1,10 +1,15 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { # Home Manager needs a bit of information about you and the # paths it should manage. home.username = "nyxerinys"; - home.homeDirectory = "/home/nyxerinys"; + home.homeDirectory = ( + if pkgs.stdenv.isDarwin then + "/Users/nyxerinys" + else + "/home/nyxerinys" + ); home.packages = with pkgs; [ discord ]; From ec612d76c06a5a2cfba91a086496223941190e3b Mon Sep 17 00:00:00 2001 From: nyxerinys Date: Mon, 22 Jun 2026 19:46:47 -0500 Subject: [PATCH 04/13] install steam --- modules/home/nyxerinys/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home/nyxerinys/default.nix b/modules/home/nyxerinys/default.nix index f04c7f1..b78e611 100644 --- a/modules/home/nyxerinys/default.nix +++ b/modules/home/nyxerinys/default.nix @@ -12,6 +12,7 @@ ); home.packages = with pkgs; [ discord + steam ]; From 346292ca5bd2dd42fb67445399399dfb5d7a152a Mon Sep 17 00:00:00 2001 From: nyxerinys Date: Mon, 22 Jun 2026 19:51:02 -0500 Subject: [PATCH 05/13] homebrew steam --- hosts/artemis/default.nix | 12 ++++++++++++ modules/home/nyxerinys/default.nix | 1 - 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/hosts/artemis/default.nix b/hosts/artemis/default.nix index 86780f2..19b5480 100644 --- a/hosts/artemis/default.nix +++ b/hosts/artemis/default.nix @@ -5,11 +5,23 @@ vscodium git ]; + + homebrew = { + enable = true; + onActivation.cleanup = "zap"; # Cleans packages not defined here + + # Use Mac Casks instead of standard Nix packages for GUI apps + casks = [ + "steam" # Native/Rosetta 2 macOS Steam Client + ]; + }; + security.pam.services.sudo_local.touchIdAuth = true; ids.gids.nixbld = 350; programs.fish.enable = true; environment.etc."nix-darwin".source = "/Users/nyxerinys/nix-config"; nixpkgs.config.allowUnfree = true; + nix.settings.extra-platforms = [ "x86_64-darwin" "aarch64-darwin" ]; # Necessary for using flakes on this system. nix.settings.experimental-features = "nix-command flakes"; diff --git a/modules/home/nyxerinys/default.nix b/modules/home/nyxerinys/default.nix index b78e611..f04c7f1 100644 --- a/modules/home/nyxerinys/default.nix +++ b/modules/home/nyxerinys/default.nix @@ -12,7 +12,6 @@ ); home.packages = with pkgs; [ discord - steam ]; From 4630408f49b2d7ffdeb01f4ad17dfc6fc1f7d886 Mon Sep 17 00:00:00 2001 From: nyxerinys Date: Mon, 22 Jun 2026 23:57:56 -0500 Subject: [PATCH 06/13] homebrew setup --- hosts/artemis/default.nix | 13 ++------- hosts/artemis/homebrew.nix | 47 ++++++++++++++++++++++++++++++ modules/home/nyxerinys/default.nix | 1 + 3 files changed, 51 insertions(+), 10 deletions(-) create mode 100644 hosts/artemis/homebrew.nix diff --git a/hosts/artemis/default.nix b/hosts/artemis/default.nix index 19b5480..452d4b8 100644 --- a/hosts/artemis/default.nix +++ b/hosts/artemis/default.nix @@ -1,21 +1,14 @@ { pkgs, lib, inputs, ... }: { + imports = [ + ./homebrew.nix + ]; environment.systemPackages = with pkgs; [ vscodium git ]; - homebrew = { - enable = true; - onActivation.cleanup = "zap"; # Cleans packages not defined here - - # Use Mac Casks instead of standard Nix packages for GUI apps - casks = [ - "steam" # Native/Rosetta 2 macOS Steam Client - ]; - }; - security.pam.services.sudo_local.touchIdAuth = true; ids.gids.nixbld = 350; programs.fish.enable = true; diff --git a/hosts/artemis/homebrew.nix b/hosts/artemis/homebrew.nix new file mode 100644 index 0000000..a016c57 --- /dev/null +++ b/hosts/artemis/homebrew.nix @@ -0,0 +1,47 @@ +{ inputs, ... }: +{ + imports = { + imports.nix-homebrew.darwinModules.nix-homebrew + }; + nix-homebrew = { + # Install Homebrew under the default prefix + enable = true; + + # Apple Silicon Only: Also install Homebrew under the default Intel prefix for Rosetta 2 + enableRosetta = true; + + # User owning the Homebrew prefix + user = "nyxerinys"; + + # Optional: Declarative tap management + taps = { + "homebrew/homebrew-core" = homebrew-core; + "homebrew/homebrew-cask" = homebrew-cask; + }; + + # Optional: Enable fully-declarative tap management + # + # With mutableTaps disabled, taps can no longer be added imperatively with `brew tap`. + mutableTaps = false; + + # Optional: Declarative Homebrew tap trust entries. + # + # Note: The trust entries are _not_ removed if you remove them from those lists! + # Use the `brew untrust` command to remove a trust entry. + trust = { + formulae = [ ]; + casks = [ ]; + commands = [ ]; + taps = [ ]; + }; + }; + homebrew = { + enable = true; + onActivation.cleanup = "zap"; # Cleans packages not defined here + + # Use Mac Casks instead of standard Nix packages for GUI apps + casks = [ + "steam" # Native/Rosetta 2 macOS Steam Client + ]; + }; +} \ No newline at end of file diff --git a/modules/home/nyxerinys/default.nix b/modules/home/nyxerinys/default.nix index f04c7f1..6845ce4 100644 --- a/modules/home/nyxerinys/default.nix +++ b/modules/home/nyxerinys/default.nix @@ -12,6 +12,7 @@ ); home.packages = with pkgs; [ discord + prismlauncher ]; From a47b350948122354491c069d649a8e0eb70105f2 Mon Sep 17 00:00:00 2001 From: nyxerinys Date: Mon, 22 Jun 2026 23:58:52 -0500 Subject: [PATCH 07/13] brackets not braces --- hosts/artemis/homebrew.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/artemis/homebrew.nix b/hosts/artemis/homebrew.nix index a016c57..76a30df 100644 --- a/hosts/artemis/homebrew.nix +++ b/hosts/artemis/homebrew.nix @@ -1,8 +1,8 @@ { inputs, ... }: { - imports = { + imports = [ imports.nix-homebrew.darwinModules.nix-homebrew - }; + ]; nix-homebrew = { # Install Homebrew under the default prefix enable = true; From ec8c132608dc46c1590f7e6fe05f4625b2e4ef49 Mon Sep 17 00:00:00 2001 From: nyxerinys Date: Tue, 23 Jun 2026 00:00:03 -0500 Subject: [PATCH 08/13] add core and cask --- flake.nix | 8 ++++++++ hosts/artemis/homebrew.nix | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index f11e3a6..009b9d9 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,14 @@ nix-homebrew = { url = "github:zhaofengli/nix-homebrew"; }; + homebrew-core = { + url = "github:homebrew/homebrew-core"; + flake = false; + }; + homebrew-cask = { + url = "github:homebrew/homebrew-cask"; + flake = false; + }; home-manager = { url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/artemis/homebrew.nix b/hosts/artemis/homebrew.nix index 76a30df..2acd7c6 100644 --- a/hosts/artemis/homebrew.nix +++ b/hosts/artemis/homebrew.nix @@ -15,8 +15,8 @@ # Optional: Declarative tap management taps = { - "homebrew/homebrew-core" = homebrew-core; - "homebrew/homebrew-cask" = homebrew-cask; + "homebrew/homebrew-core" = inputs.homebrew-core; + "homebrew/homebrew-cask" = inputs.homebrew-cask; }; # Optional: Enable fully-declarative tap management From 7ec9acae7f67456bcf6b91d542926ac752c27ea4 Mon Sep 17 00:00:00 2001 From: nyxerinys Date: Tue, 23 Jun 2026 00:00:38 -0500 Subject: [PATCH 09/13] inputs not imports --- flake.lock | 34 ++++++++++++++++++++++++++++++++++ hosts/artemis/homebrew.nix | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 182d15f..8dc3c38 100644 --- a/flake.lock +++ b/flake.lock @@ -59,6 +59,38 @@ "type": "github" } }, + "homebrew-cask": { + "flake": false, + "locked": { + "lastModified": 1782189722, + "narHash": "sha256-QcITIKAntdkgJVSOuVlJKqx4+KHBdJ70WgqjBfTimuI=", + "owner": "homebrew", + "repo": "homebrew-cask", + "rev": "3fc765b52036afb96959548c99ae252af80feead", + "type": "github" + }, + "original": { + "owner": "homebrew", + "repo": "homebrew-cask", + "type": "github" + } + }, + "homebrew-core": { + "flake": false, + "locked": { + "lastModified": 1782188147, + "narHash": "sha256-nMskIQImTBCY+4912nbs7jymt1cgdKcS34EQ21sldn4=", + "owner": "homebrew", + "repo": "homebrew-core", + "rev": "915bce047398f0401932c83e1dad1b827ffea5de", + "type": "github" + }, + "original": { + "owner": "homebrew", + "repo": "homebrew-core", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -138,6 +170,8 @@ "root": { "inputs": { "home-manager": "home-manager", + "homebrew-cask": "homebrew-cask", + "homebrew-core": "homebrew-core", "nix-darwin": "nix-darwin", "nix-homebrew": "nix-homebrew", "nixpkgs": "nixpkgs", diff --git a/hosts/artemis/homebrew.nix b/hosts/artemis/homebrew.nix index 2acd7c6..caca325 100644 --- a/hosts/artemis/homebrew.nix +++ b/hosts/artemis/homebrew.nix @@ -1,7 +1,7 @@ { inputs, ... }: { imports = [ - imports.nix-homebrew.darwinModules.nix-homebrew + inputs.nix-homebrew.darwinModules.nix-homebrew ]; nix-homebrew = { # Install Homebrew under the default prefix From af2460438ca165388ff6830eb471fcc9cca75050 Mon Sep 17 00:00:00 2001 From: nyxerinys Date: Tue, 23 Jun 2026 00:01:24 -0500 Subject: [PATCH 10/13] add primary user --- hosts/artemis/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/artemis/default.nix b/hosts/artemis/default.nix index 452d4b8..e86ec55 100644 --- a/hosts/artemis/default.nix +++ b/hosts/artemis/default.nix @@ -15,6 +15,7 @@ environment.etc."nix-darwin".source = "/Users/nyxerinys/nix-config"; nixpkgs.config.allowUnfree = true; nix.settings.extra-platforms = [ "x86_64-darwin" "aarch64-darwin" ]; + system.primaryUser = "nyxerinys" # Necessary for using flakes on this system. nix.settings.experimental-features = "nix-command flakes"; From 395638b4aae850e831cd4a13a69d2dd78da6e344 Mon Sep 17 00:00:00 2001 From: nyxerinys Date: Tue, 23 Jun 2026 00:01:47 -0500 Subject: [PATCH 11/13] semicolon --- hosts/artemis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/artemis/default.nix b/hosts/artemis/default.nix index e86ec55..405c012 100644 --- a/hosts/artemis/default.nix +++ b/hosts/artemis/default.nix @@ -15,7 +15,7 @@ environment.etc."nix-darwin".source = "/Users/nyxerinys/nix-config"; nixpkgs.config.allowUnfree = true; nix.settings.extra-platforms = [ "x86_64-darwin" "aarch64-darwin" ]; - system.primaryUser = "nyxerinys" + system.primaryUser = "nyxerinys"; # Necessary for using flakes on this system. nix.settings.experimental-features = "nix-command flakes"; From b934bef2c1ebc3e07c3214eeb91008f67451d6fc Mon Sep 17 00:00:00 2001 From: nyxerinys Date: Wed, 24 Jun 2026 22:46:06 -0500 Subject: [PATCH 12/13] move macos settings out --- hosts/artemis/default.nix | 4 ++-- hosts/artemis/homebrew.nix | 1 + hosts/artemis/macos.nix | 14 ++++++++++++++ modules/home/nyxerinys/default.nix | 1 - 4 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 hosts/artemis/macos.nix diff --git a/hosts/artemis/default.nix b/hosts/artemis/default.nix index 405c012..ee5cd82 100644 --- a/hosts/artemis/default.nix +++ b/hosts/artemis/default.nix @@ -3,6 +3,7 @@ { imports = [ ./homebrew.nix + ./macos.nix ]; environment.systemPackages = with pkgs; [ vscodium @@ -15,8 +16,7 @@ environment.etc."nix-darwin".source = "/Users/nyxerinys/nix-config"; nixpkgs.config.allowUnfree = true; nix.settings.extra-platforms = [ "x86_64-darwin" "aarch64-darwin" ]; - system.primaryUser = "nyxerinys"; - + # Necessary for using flakes on this system. nix.settings.experimental-features = "nix-command flakes"; # Used for backwards compatibility, please read the changelog before changing. diff --git a/hosts/artemis/homebrew.nix b/hosts/artemis/homebrew.nix index caca325..0b37909 100644 --- a/hosts/artemis/homebrew.nix +++ b/hosts/artemis/homebrew.nix @@ -42,6 +42,7 @@ # Use Mac Casks instead of standard Nix packages for GUI apps casks = [ "steam" # Native/Rosetta 2 macOS Steam Client + "discord" ]; }; } \ No newline at end of file diff --git a/hosts/artemis/macos.nix b/hosts/artemis/macos.nix new file mode 100644 index 0000000..bd261aa --- /dev/null +++ b/hosts/artemis/macos.nix @@ -0,0 +1,14 @@ +{ ... }: +{ + system = { + primaryUser = "nyxerinys"; + defaults = { + dock = { + autohide = true; + }; + controlcenter = { + BatteryShowPercentage = true; + }; + }; + }; +} \ No newline at end of file diff --git a/modules/home/nyxerinys/default.nix b/modules/home/nyxerinys/default.nix index 6845ce4..a3a9ba2 100644 --- a/modules/home/nyxerinys/default.nix +++ b/modules/home/nyxerinys/default.nix @@ -11,7 +11,6 @@ "/home/nyxerinys" ); home.packages = with pkgs; [ - discord prismlauncher ]; From beec57299c66a3ba4a4c22470e3390bf08de367d Mon Sep 17 00:00:00 2001 From: nyxerinys Date: Wed, 24 Jun 2026 23:44:49 -0500 Subject: [PATCH 13/13] add more macos settings --- hosts/artemis/macos.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/hosts/artemis/macos.nix b/hosts/artemis/macos.nix index bd261aa..65fa367 100644 --- a/hosts/artemis/macos.nix +++ b/hosts/artemis/macos.nix @@ -5,10 +5,30 @@ defaults = { dock = { autohide = true; + minimize-to-application = true; + mru-spaces = false; + mineffect = "scale"; + show-recents = false; }; controlcenter = { BatteryShowPercentage = true; }; + finder = { + _FXShowPosixPathInTitle = true; + _FXSortFoldersFirst = true; + _FXEnableColumnAutoSizing = true; + AppleShowAllExtensions = true; + AppleShowAllFiles = true; + FXEnableExtensionChangeWarning = false; + FXPreferredViewStyle = "Nlsv"; + FXDefaultSearchScope = "SCcf"; + NewWindowTarget = "Home"; + ShowExternalHardDrivesOnDesktop = false; + ShowHardDrivesOnDesktop = false; + ShowMountedServersOnDesktop = false; + ShowPathbar = true; + ShowStatusBar = true; + }; }; }; } \ No newline at end of file