From 0ee6e8294dce857438dc720b2d63bf899d333be3 Mon Sep 17 00:00:00 2001 From: Tobias Ostner Date: Tue, 12 Sep 2023 12:01:31 +0200 Subject: [PATCH] Configure nix darwin --- .config/nix/flake.lock | 70 ++++++++++++++++++++++++++++++++++++++++++ .config/nix/flake.nix | 39 ++++++++++++++++++++--- .gitignore | 1 + 3 files changed, 106 insertions(+), 4 deletions(-) create mode 100644 .config/nix/flake.lock diff --git a/.config/nix/flake.lock b/.config/nix/flake.lock new file mode 100644 index 0000000..5e99790 --- /dev/null +++ b/.config/nix/flake.lock @@ -0,0 +1,70 @@ +{ + "nodes": { + "darwin": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1692248770, + "narHash": "sha256-tZeFpETKQGbgnaSIO1AGWD27IyTcBm4D+A9d7ulQ4NM=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "511177ffe8226c78c9cf6a92a7b5f2df3684956b", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1694375657, + "narHash": "sha256-32X8dcty4vPXx+D4yJPQZBo5hJ1NQikALhevGv6elO4=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "f7848d3e5f15ed02e3f286029697e41ee31662d7", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "master", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1694343207, + "narHash": "sha256-jWi7OwFxU5Owi4k2JmiL1sa/OuBCQtpaAesuj5LXC8w=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "78058d810644f5ed276804ce7ea9e82d92bee293", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "darwin": "darwin", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/.config/nix/flake.nix b/.config/nix/flake.nix index 9d0f463..c4fa3a8 100644 --- a/.config/nix/flake.nix +++ b/.config/nix/flake.nix @@ -13,21 +13,52 @@ pkgs = import inputs.nixpkgs { system = "aarch64-darwin"; }; modules = [ ({ pkgs, ... }: { - programs.zhs.enable = true; + programs.zsh.enable = true; programs.fish.enable = true; environment.shells = [ pkgs.bash pkgs.zsh pkgs.fish ]; environment.loginShell = pkgs.fish; - nix-extraOptions = '' + nix.extraOptions = '' experimental-features = nix-command flakes ''; - systemPackages = [ pkgs.coreutils ]; services.nix-daemon.enable = true; system.defaults.finder.AppleShowAllExtensions = true; - system.defaults.finder.FXShowPosixPathInTitle = true; system.defaults.dock.autohide = true; system.defaults.NSGlobalDomain.InitialKeyRepeat = 14; system.defaults.NSGlobalDomain.KeyRepeat = 1; + users.users.tobi.home = "/Users/tobi"; }) + inputs.home-manager.darwinModules.home-manager + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + users.tobi.imports = [ + ({ pkgs, ... }: { + home.stateVersion = "23.11"; + home.packages = [ + pkgs.ripgrep + pkgs.fd + pkgs.curl + pkgs.less + ]; + home.sessionVariables = { + PAGER = "less"; + CLICOLOR = 1; + EDITOR = "emacs"; + }; + programs.bat.enable = true; + programs.git.enable = true; + programs.fish.enable = true; + programs.fish.shellAliases = { ls = "ls --color=auto -F"; }; + programs.starship.enable = true; + programs.alacritty = { + enable = true; + settings.font.size = 16; + }; + }) + ]; + }; + } ]; }; }; diff --git a/.gitignore b/.gitignore index f9d2c3a..b20b198 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /.emacs.d/chatgpt/ /.emacs.d/tabsession.el /.emacs.d/fontaine-latest-state.eld +/.config/nix/result