ft: flakify the configuration · hauleth.dev/dotfiles@99f2e37

+3 -3

Makefile

··· 2 2 3 3 all: nix $(TARGETS) 4 4 5 - nix: check 5 + nix: 6 6 @printf "%s\t" $@ 7 - @stow -t "${HOME}" -R "$@" 2> /dev/null && printf "\033[32m✓" || printf "\033[31m✗" 7 + @printf "\033[32m✓" || printf "\033[31m✗" 8 8 @printf "\033[m\n" 9 - @darwin-rebuild switch -I "${HOME}/.config/nixpkgs/darwin/configuration.nix" 9 + @darwin-rebuild switch --flake dotfiles 10 10 11 11 $(TARGETS): check 12 12 @printf "%s\t" $@

+6 -6

flake.lock

··· 28 28 ] 29 29 }, 30 30 "locked": { 31 - "lastModified": 1640117230, 32 - "narHash": "sha256-W7LXeJavyIzNfNaoEsK65sEaCGqE9MVWvK0xSzNR4ls=", 31 + "lastModified": 1648278671, 32 + "narHash": "sha256-1WrR9ex+rKTjZtODNUZQhkWYUprtfOkjOyo9YWL2NMs=", 33 33 "owner": "lnl7", 34 34 "repo": "nix-darwin", 35 - "rev": "5851d9613edf8b2279746c7e5b9faac55ff17e8a", 35 + "rev": "4fdbb8168f61d31d3f90bb0d07f48de709c4fe79", 36 36 "type": "github" 37 37 }, 38 38 "original": { ··· 59 59 }, 60 60 "nixpkgs": { 61 61 "locked": { 62 - "lastModified": 1640418986, 63 - "narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=", 62 + "lastModified": 1648219316, 63 + "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", 64 64 "owner": "NixOS", 65 65 "repo": "nixpkgs", 66 - "rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2", 66 + "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", 67 67 "type": "github" 68 68 }, 69 69 "original": {

+10 -36

flake.nix

··· 16 16 outputs = 17 17 { self, darwin, nixpkgs, agnoster }: 18 18 let 19 - configuration = { pkgs, ... }: { 19 + overlays = { pkgs, ... }: { 20 20 nixpkgs.overlays = [ 21 21 agnoster.overlay 22 - (self: super: { nix-direnv = super.nix-direnv.override { enableFlakes = true; }; } ) 23 22 ]; 24 - 25 - environment.variables = { 26 - EDITOR = "nvim"; 27 - LESS = "-SRFXi"; 28 - ERL_FLAGS = "-kernel shell_history enabled"; 29 - }; 30 - 31 - launchd.user.agents.plan-sync.serviceConfig = { 32 - ProgramArguments = [ 33 - "/usr/bin/curl" 34 - "--netrc-optional" 35 - "-F" "plan=</Users/hauleth/.plan" 36 - "https://plan.cat/stdin" 37 - ]; 38 - 39 - WatchPaths = [ 40 - "/Users/hauleth/.plan" 41 - ]; 42 - 43 - StandardErrorPath = "/Users/hauleth/.local/state/launchd/logs/plan-sync.stderr"; 44 - }; 45 - 46 - nix.package = pkgs.nixFlakes; 47 - nix.extraOptions = '' 48 - gc-keep-derivations = true 49 - gc-keep-outputs = true 50 - 51 - keep-outputs = true 52 - keep-derivations = true 53 - 54 - experimental-features = nix-command flakes 55 - ''; 56 23 }; 24 + version = { ... }: { system.stateVersion = 4; }; 57 25 in { 58 26 darwinConfigurations."NiunioBook" = darwin.lib.darwinSystem { 59 27 system = "x86_64-darwin"; 60 28 modules = [ 61 - configuration 62 - ./nix/.config/nixpkgs/darwin/configuration.nix 29 + overlays 30 + ./nix/nix.nix 31 + ./nix/system.nix 32 + ./nix/services.nix 33 + ./nix/fonts.nix 34 + ./nix/environment.nix 35 + version 63 36 ]; 37 + inputs = { inherit self; }; 64 38 }; 65 39 66 40 # for convenience

+6

git/.config/git/config

··· 109 109 thread = true 110 110 supersscc = self 111 111 112 + [gpg] 113 + ; format = ssh 114 + 115 + [gpg.ssh] 116 + defaultKeyCommand = "ssh-add -L" 117 + 112 118 # vim: ft=gitconfig noexpandtab sw=8

-44

nix/.config/nix/registry.json

··· 1 - { 2 - "flakes": [ 3 - { 4 - "from": { 5 - "id": "dotfiles", 6 - "type": "indirect" 7 - }, 8 - "to": { 9 - "path": "/Users/hauleth/Workspace/hauleth/dotfiles", 10 - "type": "path" 11 - } 12 - }, 13 - { 14 - "from": { 15 - "id": "nixpkgs", 16 - "ref": "nixpkgs-unstable", 17 - "type": "indirect" 18 - }, 19 - "to": { 20 - "lastModified": 1636886446, 21 - "narHash": "sha256-4xsVM2H8CG3d/3V+GqDDLDOmb3kdrugbqKVyrg8Q/zc=", 22 - "owner": "NixOS", 23 - "repo": "nixpkgs", 24 - "rev": "5cb226a06c49f7a2d02863d0b5786a310599df6b", 25 - "type": "github" 26 - } 27 - }, 28 - { 29 - "from": { 30 - "id": "nixpkgs", 31 - "type": "indirect" 32 - }, 33 - "to": { 34 - "lastModified": 1640418986, 35 - "narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=", 36 - "owner": "NixOS", 37 - "repo": "nixpkgs", 38 - "rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2", 39 - "type": "github" 40 - } 41 - } 42 - ], 43 - "version": 2 44 - }

-128

nix/.config/nixpkgs/darwin/configuration.nix

··· 1 - { config, pkgs, ... }: 2 - 3 - { 4 - nixpkgs.config.allowUnfree = true; 5 - nixpkgs.overlays = [ 6 - (import ../overlays/encpipe.nix) 7 - (import ../overlays/fonts.nix) 8 - (import ../overlays/git-riff.nix) 9 - (import ../overlays/comby.nix) 10 - ]; 11 - 12 - system.defaults.dock.autohide = true; 13 - 14 - system.keyboard.enableKeyMapping = true; 15 - system.keyboard.remapCapsLockToControl = true; 16 - 17 - # List packages installed in system profile. To search by name, run: 18 - # $ nix-env -qaP | grep wget 19 - environment.systemPackages = with pkgs; [ 20 - _1password 21 - age 22 - bat 23 - comby 24 - coreutils 25 - curlie 26 - direnv 27 - nix-direnv 28 - entr 29 - findutils 30 - fzy 31 - fishPlugins.agnoster 32 - git-lfs 33 - git-gone 34 - git-branchless 35 - git-revise 36 - gitAndTools.diff-so-fancy 37 - gitAndTools.git-imerge 38 - gitAndTools.git-test 39 - gitAndTools.git-chglog 40 - gitAndTools.hub 41 - gitAndTools.tig 42 - git 43 - gh 44 - glab 45 - # git-riff 46 - gnupg 47 - imagemagick 48 - jq 49 - lnav 50 - neovim 51 - neovim-remote 52 - noti 53 - pinentry_mac 54 - qmk 55 - ripgrep 56 - universal-ctags 57 - # w3m 58 - # watchman 59 - weechat 60 - ]; 61 - 62 - environment.shells = [ pkgs.fish ]; 63 - 64 - fonts.enableFontDir = true; 65 - fonts.fonts = with pkgs; [ 66 - lato 67 - iosevka-ss09 68 - iosevka-ss09-term 69 - ]; 70 - 71 - # Auto upgrade nix package and the daemon service. 72 - # services.nix-daemon = { 73 - # enable = true; 74 - # }; 75 - 76 - services.dnsmasq = { 77 - enable = true; 78 - port = 35353; 79 - addresses = { 80 - localhost = "127.0.0.1"; 81 - }; 82 - }; 83 - 84 - programs.gnupg.agent = { 85 - enable = true; 86 - enableSSHSupport = true; 87 - }; 88 - 89 - programs.fish = { 90 - enable = true; 91 - 92 - shellAliases = { 93 - git = "LC_CTYPE=UTF-8 LANG=C hub"; 94 - g = "git"; 95 - e = "$EDITOR"; 96 - }; 97 - 98 - shellInit = '' 99 - source (${pkgs.direnv}/bin/direnv hook fish | psub) 100 - 101 - set -gx XDG_RUNTIME_DIR (getconf DARWIN_USER_TEMP_DIR) 102 - set -gx MIX_XDG 1 103 - 104 - test -e $HOME/.iterm2_shell_integration.fish ; and source $HOME/.iterm2_shell_integration.fish 105 - 106 - ulimit -n 10480 107 - ''; 108 - }; 109 - 110 - # nix.useSandbox = true; 111 - nix.sandboxPaths = [ 112 - "/System/Library/Frameworks" 113 - "/System/Library/PrivateFrameworks" 114 - "/usr/lib" 115 - "/private/tmp" 116 - "/private/var/tmp" 117 - "/usr/bin/env" 118 - ]; 119 - 120 - # Used for backwards compatibility, please read the changelog before changing. 121 - # $ darwin-rebuild changelog 122 - system.stateVersion = 4; 123 - 124 - # You should generally set this to the total number of logical cores in your system. 125 - # $ sysctl -n hw.ncpu 126 - nix.maxJobs = 8; 127 - nix.buildCores = 8; 128 - }

-33

nix/.config/nixpkgs/overlays/comby.nix

··· 1 - final: prev: 2 - 3 - with prev; 4 - 5 - { 6 - comby = stdenv.mkDerivation rec { 7 - pname = "comby"; 8 - version = "1.0.0"; 9 - 10 - nativeBuildInputs = [ autoPatchelfHook ]; 11 - 12 - buildInputs = [ pcre ]; 13 - 14 - src = fetchurl { 15 - url = "https://github.com/comby-tools/comby/releases/download/${version}/comby-${version}-x86_64-macos.tar.gz"; 16 - sha256 = "0p9qna7sbgxfi8m0mr83nbx6jwp4jg9xrvqgwibk1wvhj1d33nvp"; 17 - }; 18 - 19 - dontBuild = true; 20 - dontUnpack = true; 21 - 22 - installPhase = '' 23 - mkdir -p $out/bin 24 - tar xzf $src 25 - mv comby-$version-x86_64-macos $out/bin/comby 26 - ''; 27 - 28 - postFixup = let libpath = lib.makeLibraryPath [ pcre ]; 29 - in '' 30 - install_name_tool -change /usr/local/opt/pcre/lib/libpcre.1.dylib ${libpath}/libpcre.1.dylib $out/bin/comby 31 - ''; 32 - }; 33 - }

-39

nix/.config/nixpkgs/overlays/encpipe.nix

··· 1 - self: super: 2 - 3 - with super; 4 - 5 - let 6 - libhydrogen = fetchFromGitHub { 7 - name = "libhydrogen"; 8 - 9 - owner = "jedisct1"; 10 - repo = "libhydrogen"; 11 - # url = "https://github.com/jedisct1/libhydrogen.git"; 12 - rev = "c879a1d572de4bb2d3bd90516f449557eb156c96"; 13 - sha256 = "1b1bqwpws4n0y2qm9k5a55jynakq7gdqqqqbxakfrrlfwj7hjn4d"; 14 - }; 15 - encpipe = self.stdenv.mkDerivation rec { 16 - name = "encpipe-${version}"; 17 - version = "0.5"; 18 - 19 - nativeBuildInputs = [ git ]; 20 - 21 - preBuild = '' 22 - cp -R ${libhydrogen}/* ext/libhydrogen 23 - buildFlagsArray+=(CFLAGS="-O3 -march=native -fno-exceptions -I. -Iext/libhydrogen") 24 - ''; 25 - 26 - installFlags = [ "PREFIX=$(out)" ]; 27 - 28 - src = fetchFromGitHub { 29 - owner = "jedisct1"; 30 - repo = "encpipe"; 31 - # url = "https://github.com/jedisct1/encpipe.git"; 32 - rev = "9abbb95ab6c51b5fb85db7c5ea65843b4d788aae"; 33 - sha256 = "05rv6a5zgzf1i5nn7mzi6sg47papkdfj8jpj7dnjv4hq752i3mhs"; 34 - }; 35 - }; 36 - in 37 - { 38 - inherit encpipe; 39 - }

-33

nix/.config/nixpkgs/overlays/fonts.nix

··· 1 - self: super: 2 - 3 - # @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 4 - # 0123456789 ABC.DEF.GHI.JKL.MNO.PQRS.TUV.WXYZ ß <=`¶^$#%' 5 - 6 - let 7 - design = [ 8 - "ss09" 9 - "calt-logic" 10 - "v-dollar-open" 11 - "v-g-singlestorey" 12 - "v-l-zshaped" 13 - "v-percent-dots" 14 - "v-y-straight" 15 - "v-zero-slashed" 16 - ]; 17 - iosevka-ss09 = super.iosevka.override { 18 - set = "ss09"; 19 - privateBuildPlan = { 20 - family = "Iosevka"; 21 - inherit design; 22 - }; 23 - }; 24 - iosevka-ss09-term = super.iosevka.override { 25 - set = "ss09-term"; 26 - privateBuildPlan = { 27 - family = "Iosevka Term"; 28 - design = design ++ [ "term" ]; 29 - }; 30 - }; 31 - in { 32 - inherit iosevka-ss09 iosevka-ss09-term; 33 - }

-27

nix/.config/nixpkgs/overlays/git-riff.nix

··· 1 - self: super: 2 - 3 - with super; 4 - 5 - let 6 - git-riff = self.stdenv.mkDerivation rec { 7 - name = "git-riff"; 8 - version = "1.0"; 9 - 10 - src = fetchFromGitHub { 11 - owner = "hauleth"; 12 - repo = "git-riff"; 13 - rev = "ab17fec9cca47cc3c89575e74257a51dec005711"; 14 - sha256 = "1g86z701yxn9whvkhpaqvmxim4hhhy4qrkjxi7fgzhjzmsamzkxw"; 15 - }; 16 - 17 - dontBuild = true; 18 - 19 - installPhase = '' 20 - mkdir -p $out/bin 21 - mv git-riff $out/bin/git-riff 22 - chmod +x $out/bin/git-riff 23 - ''; 24 - }; 25 - in { 26 - inherit git-riff; 27 - }

-17

nix/.config/nixpkgs/overlays/mkcert.nix

··· 1 - self: super: 2 - 3 - { 4 - mkcert = self.buildGoPackage rec { 5 - name = "mkcert-${version}"; 6 - version = "1.3.0"; 7 - 8 - goPackagePath = "github.com/FiloSottile/mkcert"; 9 - 10 - src = self.fetchFromGitHub { 11 - owner = "FiloSottile"; 12 - repo = "mkcert"; 13 - rev = "99e15e29f975e5fa7c897e04015aeba30b692749"; 14 - sha256 = "1aadnsx5pfmryf8mgxg9g0i083dm1pmrc6v4ln2mm3n89wwqc9b7"; 15 - }; 16 - }; 17 - }

-21

nix/.config/nixpkgs/overlays/zig-bin.nix

··· 1 - final: prev: 2 - 3 - { 4 - zig-bin = prev.stdenv.mkDerivation rec { 5 - pname = "zig"; 6 - version = "0.8.0"; 7 - 8 - src = prev.fetchurl { 9 - url = "https://ziglang.org/download/${version}/zig-macos-x86_64-${version}.tar.xz"; 10 - sha256 = "1gkgpii5p67xk1gfajqvkdlnwqih1lylvp4m0czi08ybnmh977r7"; 11 - }; 12 - 13 - dontBuild = true; 14 - 15 - installPhase = '' 16 - mkdir -p $out/bin 17 - mv zig $out/bin/zig 18 - mv lib $out/lib 19 - ''; 20 - }; 21 - }

+102

nix/environment.nix

··· 1 + { config, pkgs, ... }: 2 + 3 + { 4 + nixpkgs.overlays = let 5 + flaked-nix-direnv = final: prev: { 6 + nix-direnv = prev.nix-direnv.override { enableFlakes = true; }; 7 + }; 8 + in [ 9 + flaked-nix-direnv 10 + ]; 11 + 12 + # List packages installed in system profile. To search by name, run: 13 + # $ nix search nixpkgs wget 14 + environment.systemPackages = with pkgs; 15 + let 16 + fswatch = pkgs.writeShellApplication { 17 + name = "fswatch"; 18 + 19 + runtimeInputs = [pkgs.entr pkgs.ripgrep]; 20 + 21 + text = '' 22 + rg -l -t "$1" "" | entr -p echo /_ 23 + ''; 24 + }; 25 + in [ 26 + _1password 27 + age 28 + bat 29 + comby 30 + coreutils 31 + curlie 32 + direnv 33 + nix-direnv 34 + entr 35 + findutils 36 + fzy 37 + fswatch 38 + fishPlugins.agnoster 39 + git-lfs 40 + git-gone 41 + git-branchless 42 + git-revise 43 + gitAndTools.diff-so-fancy 44 + gitAndTools.git-imerge 45 + gitAndTools.git-test 46 + gitAndTools.git-chglog 47 + gitAndTools.hub 48 + gitAndTools.tig 49 + git 50 + gh 51 + glab 52 + # git-riff 53 + gnupg 54 + imagemagick 55 + jq 56 + lnav 57 + lima 58 + neovim 59 + neovim-remote 60 + noti 61 + pinentry_mac 62 + qmk 63 + ripgrep 64 + universal-ctags 65 + # w3m 66 + # watchman 67 + weechat 68 + ]; 69 + 70 + environment.shells = [ pkgs.fish ]; 71 + 72 + environment.variables = { 73 + EDITOR = "nvim"; 74 + LESS = "-SRFXi"; 75 + ERL_FLAGS = "-kernel shell_history enabled"; 76 + }; 77 + 78 + programs.fish = { 79 + enable = true; 80 + 81 + shellAliases = { 82 + git = "LC_CTYPE=UTF-8 LANG=C hub"; 83 + g = "git"; 84 + }; 85 + 86 + shellInit = '' 87 + source (${pkgs.direnv}/bin/direnv hook fish | psub) 88 + source (${pkgs.lima}/bin/limactl completion fish | psub) 89 + 90 + set -gx XDG_RUNTIME_DIR (getconf DARWIN_USER_TEMP_DIR) 91 + set -gx MIX_XDG 1 92 + 93 + test -e $HOME/.iterm2_shell_integration.fish ; and source $HOME/.iterm2_shell_integration.fish 94 + 95 + function e --wraps nvim --description 'Run $EDITOR' 96 + eval $EDITOR $argv 97 + end 98 + 99 + ulimit -n 10480 100 + ''; 101 + }; 102 + }

+14

nix/fonts.nix

··· 1 + { pkgs, ... }: 2 + 3 + { 4 + nixpkgs.overlays = [ 5 + (import ./overlays/fonts) 6 + ]; 7 + 8 + fonts.enableFontDir = true; 9 + fonts.fonts = with pkgs; [ 10 + lato 11 + iosevka-ss09 12 + iosevka-ss09-term 13 + ]; 14 + }

+31

nix/nix.nix

··· 1 + { pkgs, ... }: 2 + 3 + { 4 + nixpkgs.config.allowUnfree = true; 5 + 6 + # You should generally set this to the total number of logical cores in your system. 7 + # $ sysctl -n hw.ncpu 8 + nix.maxJobs = 8; 9 + nix.buildCores = 8; 10 + 11 + nix.package = pkgs.nixFlakes; 12 + nix.extraOptions = '' 13 + gc-keep-derivations = true 14 + gc-keep-outputs = true 15 + 16 + keep-outputs = true 17 + keep-derivations = true 18 + 19 + experimental-features = nix-command flakes 20 + ''; 21 + 22 + # nix.useSandbox = true; 23 + nix.sandboxPaths = [ 24 + "/System/Library/Frameworks" 25 + "/System/Library/PrivateFrameworks" 26 + "/usr/lib" 27 + "/private/tmp" 28 + "/private/var/tmp" 29 + "/usr/bin/env" 30 + ]; 31 + }

+37

nix/services.nix

··· 1 + { pkgs, ... }: 2 + 3 + { 4 + # Auto upgrade nix package and the daemon service. 5 + # services.nix-daemon = { 6 + # enable = true; 7 + # }; 8 + 9 + services.dnsmasq = { 10 + enable = true; 11 + port = 35353; 12 + addresses = { 13 + localhost = "127.0.0.1"; 14 + }; 15 + }; 16 + 17 + programs.gnupg.agent = { 18 + enable = true; 19 + enableSSHSupport = true; 20 + }; 21 + 22 + # Automatically watch `~/.plan` and update https://plan.cat/~hauleth on change 23 + launchd.user.agents.plan-sync.serviceConfig = { 24 + ProgramArguments = [ 25 + "/usr/bin/curl" 26 + "--netrc-optional" 27 + "-F" "plan=</Users/hauleth/.plan" 28 + "https://plan.cat/stdin" 29 + ]; 30 + 31 + WatchPaths = [ 32 + "/Users/hauleth/.plan" 33 + ]; 34 + 35 + StandardErrorPath = "/Users/hauleth/.local/state/launchd/logs/plan-sync.stderr"; 36 + }; 37 + }

+12

nix/system.nix

··· 1 + { config, pkgs, ... }: 2 + 3 + { 4 + system = { 5 + defaults.dock.autohide = true; 6 + 7 + keyboard = { 8 + enableKeyMapping = true; 9 + remapCapsLockToControl = true; 10 + }; 11 + }; 12 + }

+1 -1

vim/.config/nvim/fnl/langclient.fnl

··· 21 21 (fn on_attach [client] 22 22 (logger.inspect client) 23 23 (augroup lsp-diagnostics 24 - (on CursorHold :* (vim.lsp.diagnostic.show_line_diagnostics))) 24 + (on CursorHold :* (vim.diagnostic.open_float nil))) 25 25 (when (capable? client :hover) 26 26 (bmap :n :K #(vim.lsp.buf.hover))) 27 27 (when (capable? client :goto_definition)

+2 -2

vim/.config/nvim/fnl/startup.fnl

··· 232 232 {:ensure_installed :maintained 233 233 :highlight { 234 234 :enable true 235 - :disable [:elixir] 236 - ; :additional_vim_regex_highlighting [:elixir :erlang :rust] 235 + ;:disable [:elixir] 236 + :additional_vim_regex_highlighting [:jinja :elixir :erlang :rust] 237 237 } 238 238 :matchup {:enable true} 239 239 :indent {:enable true}}))

Configure Feed

Configure Feed