From 706cb95010bf3431ec3e91cc0b2338f5ed9613cc Mon Sep 17 00:00:00 2001 From: Elias Almqvist Date: Thu, 25 Jul 2024 14:13:59 -0700 Subject: [PATCH] more stuff --- nix-darwin/configuration.nix | 16 ++++++ nix-darwin/flake.nix | 63 ++++++--------------- nix-darwin/home.nix | 105 +++++++++++++++++++++++++---------- 3 files changed, 107 insertions(+), 77 deletions(-) create mode 100644 nix-darwin/configuration.nix diff --git a/nix-darwin/configuration.nix b/nix-darwin/configuration.nix new file mode 100644 index 0000000..a58fbe5 --- /dev/null +++ b/nix-darwin/configuration.nix @@ -0,0 +1,16 @@ +{ pkgs, ... }: + +{ + # System-wide configuration + environment.systemPackages = with pkgs; [ + # Add any system-wide packages here + ]; + + services.nix-daemon.enable = true; + nix.package = pkgs.nix; + + system.defaults.dock.autohide = true; + system.defaults.finder.AppleShowAllExtensions = true; + + # Add more system configurations as needed +} diff --git a/nix-darwin/flake.nix b/nix-darwin/flake.nix index 1079b68..01111e5 100644 --- a/nix-darwin/flake.nix +++ b/nix-darwin/flake.nix @@ -1,54 +1,23 @@ -{ config, pkgs, ... }: - { - home.username = "elal"; - home.homeDirectory = "/Users/elal"; - home.stateVersion = "22.11"; - - programs.home-manager.enable = true; - - home.packages = with pkgs; [ - alacritty - neovim - zsh - oh-my-zsh - skhd - yabai - ]; - - programs.alacritty = { - enable = true; - # Add any Alacritty-specific configurations here - }; + description = "Home Manager configuration"; - programs.neovim = { - enable = true; - # Add any Neovim-specific configurations here - }; - - programs.zsh = { - enable = true; - oh-my-zsh = { - enable = true; - theme = "lambda"; + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; }; - # Add any other Zsh-specific configurations here }; - home.file.".config/skhd/skhdrc".text = '' - # Add your skhd keybindings here - ''; + outputs = { nixpkgs, home-manager, ... }: + let + system = "aarch64-darwin"; + pkgs = nixpkgs.legacyPackages.${system}; + in { + homeConfigurations.elal = home-manager.lib.homeManagerConfiguration { + inherit pkgs; - home.file.".config/yabai/yabairc".text = '' - # Add your yabai configuration here - ''; - - # Optionally, you can add Homebrew integration if needed - # homebrew = { - # enable = true; - # onActivation.autoUpdate = true; - # onActivation.cleanup = "zap"; - # brews = []; - # casks = []; - # }; + modules = [ ./home.nix ]; + }; + }; } diff --git a/nix-darwin/home.nix b/nix-darwin/home.nix index c8bfff4..a4df2e4 100644 --- a/nix-darwin/home.nix +++ b/nix-darwin/home.nix @@ -1,56 +1,101 @@ { config, pkgs, ... }: { + # Home Manager needs a bit of information about you and the paths it should + # manage. home.username = "elal"; home.homeDirectory = "/Users/elal"; - home.stateVersion = "22.11"; - programs.home-manager.enable = true; + # This value determines the Home Manager release that your configuration is + # compatible with. This helps avoid breakage when a new Home Manager release + # introduces backwards incompatible changes. + # + # You should not change this value, even if you update Home Manager. If you do + # want to update the value, then make sure to first check the Home Manager + # release notes. + home.stateVersion = "24.05"; # Please read the comment before changing. + + # The home.packages option allows you to install Nix packages into your + # environment. + home.packages = [ + # # Adds the 'hello' command to your environment. It prints a friendly + # # "Hello, world!" when run. + # pkgs.hello + + # # It is sometimes useful to fine-tune packages, for example, by applying + # # overrides. You can do that directly here, just don't forget the + # # parentheses. Maybe you want to install Nerd Fonts with a limited number of + # # fonts? + # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) - home.packages = with pkgs; [ + # # You can also create simple shell scripts directly inside your + # # configuration. For example, this adds a command 'my-hello' to your + # # environment: + # (pkgs.writeShellScriptBin "my-hello" '' + # echo "Hello, ${config.home.username}!" + # '') alacritty neovim zsh oh-my-zsh - skhd yabai + skhd ]; - programs.alacritty = { - enable = true; - # Add any Alacritty-specific configurations here + # Home Manager is pretty good at managing dotfiles. The primary way to manage + # plain files is through 'home.file'. + home.file = { + # # Building this configuration will create a copy of 'dotfiles/screenrc' in + # # the Nix store. Activating the configuration will then make '~/.screenrc' a + # # symlink to the Nix store copy. + # ".screenrc".source = dotfiles/screenrc; + + # # You can also set the file content immediately. + # ".gradle/gradle.properties".text = '' + # org.gradle.console=verbose + # org.gradle.daemon.idletimeout=3600000 + # ''; }; - programs.neovim = { - enable = true; - viAlias = true; - vimAlias = true; - # Add any Neovim-specific configurations here + # Home Manager can also manage your environment variables through + # 'home.sessionVariables'. These will be explicitly sourced when using a + # shell provided by Home Manager. If you don't want to manage your shell + # through Home Manager then you have to manually source 'hm-session-vars.sh' + # located at either + # + # ~/.nix-profile/etc/profile.d/hm-session-vars.sh + # + # or + # + # ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh + # + # or + # + # /etc/profiles/per-user/elal/etc/profile.d/hm-session-vars.sh + # + home.sessionVariables = { + # EDITOR = "emacs"; }; - programs.zsh = { + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; + + programs.zsh = { enable = true; oh-my-zsh = { enable = true; theme = "lambda"; + plugins = [ "git" "macos" ]; }; - # Add any other Zsh-specific configurations here }; - home.file.".config/skhd/skhdrc".text = '' - # Add your skhd keybindings here - ''; - - home.file.".config/yabai/yabairc".text = '' - # Add your yabai configuration here - ''; - - # Optionally, you can add Homebrew integration if needed - # homebrew = { - # enable = true; - # onActivation.autoUpdate = true; - # onActivation.cleanup = "zap"; - # brews = []; - # casks = []; - # }; + programs.alacritty = { + enable = true; + }; + + programs.neovim = { + enable = true; + viAlias = true; + vimAlias = true; + }; }