diff --git a/nix/.config/nix-darwin/flake.nix b/nix-darwin/.config/nix-darwin/flake.nix similarity index 96% rename from nix/.config/nix-darwin/flake.nix rename to nix-darwin/.config/nix-darwin/flake.nix index 20f9df3..9b9fe41 100644 --- a/nix/.config/nix-darwin/flake.nix +++ b/nix-darwin/.config/nix-darwin/flake.nix @@ -23,7 +23,7 @@ # Dynamically set the home directory users.users.${username} = { - home = builtins.getEnv "HOME"; + home = "/Users/jfraeys/"; shell = pkgs.zsh; }; @@ -32,9 +32,10 @@ mkalias neovim wezterm git ripgrep fd pyenv mos teams docker docker-compose atac gh rustup sd sphinx starship stow tree zoxide spotify direnv unibilium uv zathura raycast skim eza fzf zsh gettext python3 pyright ruff lua luarocks bat go openssl + ]; - # Nerd Font package for Meslo font - (pkgs.nerdfonts.override { fonts = [ "Meslo" ]; }) + fonts.packages = with pkgs; [ + nerd-fonts.meslo ]; # Homebrew configuration @@ -120,7 +121,7 @@ # Enable alternative shell support in nix-darwin. programs.zsh = { - enable = false; + enable = true; shellInit = '' export LUA_PATH="$HOME/.luarocks/share/lua/5.4/?.lua;$HOME/.luarocks/share/lua/5.4/?/init.lua;;" export LUA_CPATH="$HOME/.luarocks/lib/lua/5.4/?.so;;" @@ -141,7 +142,7 @@ nix.settings.experimental-features = "nix-command flakes"; # Set state version to match nix-darwin version - system.stateVersion = "5"; + system.stateVersion = 5; # Enable Touch ID for sudo security.pam.enableSudoTouchIdAuth = true; diff --git a/nix/.config/nix-darwin/home.nix b/nix-darwin/.config/nix-darwin/home.nix similarity index 57% rename from nix/.config/nix-darwin/home.nix rename to nix-darwin/.config/nix-darwin/home.nix index 3e89c42..899a0e2 100644 --- a/nix/.config/nix-darwin/home.nix +++ b/nix-darwin/.config/nix-darwin/home.nix @@ -3,7 +3,7 @@ { # General home configuration home.username = "jfraeys"; - home.homeDirectory = builtins.getEnv "HOME"; # Dynamically get the HOME environment variable + home.homeDirectory = "/Users/jfraeys/"; home.stateVersion = "23.05"; # Match your NixOS/Home Manager version. # Define packages to install @@ -21,15 +21,16 @@ # File management home.file = { - ".zshrc".source = "${config.home.homeDirectory}/.dotfiles/zsh/.zshrc"; - ".zshenv".source = "${config.home.homeDirectory}/.dotfiles/zsh/.zshenv"; - ".zprofile".source = "${config.home.homeDirectory}/.dotfiles/zsh/.zprofile"; - ".fzf.zsh".source = "${config.home.homeDirectory}/.dotfiles/zsh/.fzf.zsh"; - ".condarc".source = "${config.home.homeDirectory}/.dotfiles/conda/.condarc"; - ".config/wezterm".source = "${config.home.homeDirectory}/.dotfiles/wezterm"; - ".config/starship".source = "${config.home.homeDirectory}/.dotfiles/starship"; - ".config/nvim".source = "${config.home.homeDirectory}/.dotfiles/nvim"; - ".config/aerospace".source = "${config.home.homeDirectory}/.dotfiles/aerospace"; + ".zshrc".source = ~/.dotfiles/zsh/.zshrc; + ".zshenv".source = ~/.dotfiles/zsh/.zshenv; + ".zprofile".source = ~/.dotfiles/zsh/.zprofile; + ".fzf.zsh".source = ~/.dotfiles/zsh/.fzf.zsh; + ".config/wezterm".source = ~/.dotfiles/wezterm; + ".config/starship".source = ~/.dotfiles/starship; + ".config/nvim".source = ~/.dotfiles/nvim; + ".config/aerospace".source = ~/.dotfiles/aerospace; + ".config/gh".source = ~/.dotfiles/gh; + ".config/nix-darwin".source = ~/.dotfiles/nixi-darwin; }; # Session variables diff --git a/nix/.config/nix-darwin/user.nix b/nix-darwin/.config/nix-darwin/user.nix similarity index 100% rename from nix/.config/nix-darwin/user.nix rename to nix-darwin/.config/nix-darwin/user.nix diff --git a/nix/.config/nix-darwin/flake.lock b/nix/.config/nix-darwin/flake.lock deleted file mode 100644 index 726fda8..0000000 --- a/nix/.config/nix-darwin/flake.lock +++ /dev/null @@ -1,188 +0,0 @@ -{ - "nodes": { - "brew-src": { - "flake": false, - "locked": { - "lastModified": 1731323744, - "narHash": "sha256-SxUQm4cTHcaoPQHoXe26ZV8cZiMWBGow8MjE4L+MckM=", - "owner": "Homebrew", - "repo": "brew", - "rev": "254bf3fe9d8fa2e1b2fb55dbcf535b2d870180c4", - "type": "github" - }, - "original": { - "owner": "Homebrew", - "ref": "4.4.5", - "repo": "brew", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733175814, - "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "bf23fe41082aa0289c209169302afd3397092f22", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733105089, - "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", - "owner": "LnL7", - "repo": "nix-darwin", - "rev": "c6b65d946097baf3915dd51373251de98199280d", - "type": "github" - }, - "original": { - "owner": "LnL7", - "repo": "nix-darwin", - "type": "github" - } - }, - "nix-darwin_2": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1716329735, - "narHash": "sha256-ap51w+VqG21vuzyQ04WrhI2YbWHd3UGz0e7dc/QQmoA=", - "owner": "LnL7", - "repo": "nix-darwin", - "rev": "eac4f25028c1975a939c8f8fba95c12f8a25e01c", - "type": "github" - }, - "original": { - "owner": "LnL7", - "repo": "nix-darwin", - "type": "github" - } - }, - "nix-homebrew": { - "inputs": { - "brew-src": "brew-src", - "flake-utils": "flake-utils", - "nix-darwin": "nix-darwin_2", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1732145543, - "narHash": "sha256-VRQh/lvCSko9YV7haXyPt7DSp+EkgjjBv/9U4cY9c50=", - "owner": "zhaofengli-wip", - "repo": "nix-homebrew", - "rev": "ac3945ee614f69ab89c6935b3f0567028de5f012", - "type": "github" - }, - "original": { - "owner": "zhaofengli-wip", - "repo": "nix-homebrew", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1687274257, - "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", - "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source", - "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1733097829, - "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "home-manager": "home-manager", - "nix-darwin": "nix-darwin", - "nix-homebrew": "nix-homebrew", - "nixpkgs": "nixpkgs_3" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -}