diff --git a/.zshenv b/.zshenv deleted file mode 100644 index ad0584c..0000000 --- a/.zshenv +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env zsh - -ZDOTDIR=~/.config/zsh -. $ZDOTDIR/.zshenv diff --git a/README.md b/README.md index 84a5a83..42fd2ef 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # dotfiles -My personal dotfiles repo. Auto-updating, super-fast loading with `zinit`, and a nice Powerlevel10k theme. Also includes some nice status icons for personal, work, and containerized environments. +My personal dotfiles repo. diff --git a/config/fish/conf.d/mise.fish b/config/fish/conf.d/mise.fish deleted file mode 100644 index be03f31..0000000 --- a/config/fish/conf.d/mise.fish +++ /dev/null @@ -1,2 +0,0 @@ -mise activate --shims fish | source -mise activate fish | source diff --git a/config/mise/config.toml b/config/mise/config.toml deleted file mode 100644 index 60e9664..0000000 --- a/config/mise/config.toml +++ /dev/null @@ -1,4 +0,0 @@ -[tools] -node = "22" - -[settings] diff --git a/config/zed/settings.json b/config/zed/settings.json index 6a42ede..e2e6220 100644 --- a/config/zed/settings.json +++ b/config/zed/settings.json @@ -26,7 +26,7 @@ "fast-mode": "off", "mode": "agent", "reasoning_effort": "medium", - "model": "gpt-5.6-sol" + "model": "gpt-5.6-terra" }, "favorite_config_option_values": { "reasoning_effort": ["medium", "low"], diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..bf807fe --- /dev/null +++ b/flake.lock @@ -0,0 +1,71 @@ +{ + "nodes": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1785119570, + "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-26.05", + "repo": "home-manager", + "type": "github" + } + }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1783744694, + "narHash": "sha256-2cp6N3rrwnGYLTx9l6N+NI+kwrCWxvJUbj5WJhvB29A=", + "owner": "nix-darwin", + "repo": "nix-darwin", + "rev": "c3e90c89649b07d1a96e4b9dd6cd0d6e44b91a74", + "type": "github" + }, + "original": { + "owner": "nix-darwin", + "ref": "nix-darwin-26.05", + "repo": "nix-darwin", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1785067121, + "narHash": "sha256-rdJdWxAcg5fnntU4DjPivPdVEN4F+VJavw+UWpEMeUI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "329c3d2af6d1b618705150ea39f72c15eb4e613e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-26.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "nix-darwin": "nix-darwin", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..41c6ebe --- /dev/null +++ b/flake.nix @@ -0,0 +1,68 @@ +{ + description = "Chris's system flake"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-26.05-darwin"; + nix-darwin.url = "github:nix-darwin/nix-darwin/nix-darwin-26.05"; + nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; + home-manager.url = "github:nix-community/home-manager/release-26.05"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; + }; + + outputs = inputs@{ self, nix-darwin, nixpkgs, home-manager, ... }: + let + configuration = { pkgs, ... }: { + # List packages installed in system profile. To search by name, run: + # $ nix-env -qaP | grep wget + environment.systemPackages = + with pkgs; [ + vim + nil + nixd + ]; + + homebrew = {}; + + # Necessary for using flakes on this system. + nix.settings.experimental-features = "nix-command flakes"; + + # Fish shell setup + programs.fish.enable = true; + environment.shells = [ pkgs.fish ]; + users.users.chrisvanderloo = { + home = "/Users/chrisvanderloo"; + shell = pkgs.fish; + }; + + # Enable Touch ID authentication for sudo + security.pam.services.sudo_local.touchIdAuth = true; + + # Set Git commit hash for darwin-version. + system.configurationRevision = self.rev or self.dirtyRev or null; + + # Used for backwards compatibility, please read the changelog before changing. + # $ darwin-rebuild changelog + system.stateVersion = 6; + + # The platform the configuration will be used on. + nixpkgs.hostPlatform = "aarch64-darwin"; + }; + in + { + # Build darwin flake using: + # $ darwin-rebuild build --flake .#Chriss-MacBook-Pro-14 + darwinConfigurations."Chriss-MacBook-Pro-14" = nix-darwin.lib.darwinSystem { + modules = [ + configuration + ]; + }; + # homeConfigurations."chris@pi" = home-manager.lib.homeManagerConfiguration { + # pkgs = nixpkgs.legacyPackages.aarch64-linux; + + # modules = [ + # ./modules/home/shell.nix + # ./modules/home/roles/personal.nix + # ]; + # }; + }; +}