diff --git a/devices/macbook/configuration.nix b/devices/macbook/configuration.nix index 12fb91a..c21a04f 100644 --- a/devices/macbook/configuration.nix +++ b/devices/macbook/configuration.nix @@ -1,108 +1,115 @@ -{pkgs, inputs, system, config, ...}: -let - my-emacs = pkgs.emacsNativeComp; -in{ +{ + pkgs, + inputs, + system, + config, + ... +}: let + my-emacs = pkgs.emacsNativeComp; +in { nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ - # terminal + # terminal ranger - (inputs.vimix.packages.${system}.default) + (inputs.vimix.packages.${system}.default) - # nix + # nix home-manager - nix-output-monitor + nix-output-monitor - # work tool - git - gnupg + # work tool + doppler + docker + git + gnupg (pass.withExtensions (exts: [exts.pass-otp])) - # emacs - my-emacs - fd - ripgrep + # emacs + my-emacs + fd + ripgrep - (writeShellScriptBin "drs" '' + (writeShellScriptBin "drs" '' darwin-rebuild switch --flake ~/.config/nixos '') ]; - homebrew = { - enable = true; - onActivation = { - autoUpdate = true; - cleanup = "zap"; - }; + homebrew = { + enable = true; + onActivation = { + autoUpdate = true; + cleanup = "zap"; + }; - brews = [ - # doom emacs - "fontconfig" - ]; + brews = [ + # doom emacs + "fontconfig" + ]; - casks = [ - # internet - "spotify" - "brave-browser" + casks = [ + # internet + "spotify" + "brave-browser" - # work - "slack" + # work + "slack" - # doom emacs - "font-symbols-only-nerd-font" - ]; - }; + # doom emacs + "font-symbols-only-nerd-font" + ]; + }; # Necessary for using flakes on this system. nix.settings.experimental-features = "nix-command flakes"; # Create /etc/zshrc that loads the nix-darwin environment. programs.zsh.enable = true; # default shell on catalina - programs.direnv.enable = true; - programs.gnupg.agent.enable = true; + programs.direnv.enable = true; + programs.gnupg.agent.enable = true; services.yabai = { enable = true; }; services.skhd.enable = true; -services.emacs = { - enable = true; - package = my-emacs; -}; + services.emacs = { + enable = true; + package = my-emacs; + }; # Used for backwards compatibility, please read the changelog before changing. # $ darwin-rebuild changelog system.stateVersion = 4; - ids.gids.nixbld = 350; - - system.defaults.dock = { - autohide = true; - persistent-apps = []; - show-recents = false; - static-only = true; - tilesize = 32; - }; + ids.gids.nixbld = 350; - system.defaults.menuExtraClock = { - Show24Hour = true; - }; + system.defaults.dock = { + autohide = true; + persistent-apps = []; + show-recents = false; + static-only = true; + tilesize = 32; + }; - launchd.user.agents.remap-keys = { + system.defaults.menuExtraClock = { + Show24Hour = true; + }; + + launchd.user.agents.remap-keys = { serviceConfig = { ProgramArguments = [ "/usr/bin/hidutil" "property" "--set" - ''{ - "UserKeyMapping":[ - {"HIDKeyboardModifierMappingSrc":0x700000039,"HIDKeyboardModifierMappingDst":0x7000000E7} - ] - }'' + '' { + "UserKeyMapping":[ + {"HIDKeyboardModifierMappingSrc":0x700000039,"HIDKeyboardModifierMappingDst":0x7000000E7} + ] + }'' ]; RunAtLoad = true; }; - }; + }; # The platform the configuration will be used on. nixpkgs.hostPlatform = system;