Better organisation of Flakes · hauleth.dev/dotfiles@1124ddd

+6 -7

flake.lock

··· 28 28 ] 29 29 }, 30 30 "locked": { 31 - "lastModified": 1648278671, 32 - "narHash": "sha256-1WrR9ex+rKTjZtODNUZQhkWYUprtfOkjOyo9YWL2NMs=", 31 + "lastModified": 1650399173, 32 + "narHash": "sha256-YYJDu6CxLGIrjnH6uAmPxqRmrgrqPhXNZHpZoqw3q5k=", 33 33 "owner": "lnl7", 34 34 "repo": "nix-darwin", 35 - "rev": "4fdbb8168f61d31d3f90bb0d07f48de709c4fe79", 35 + "rev": "2979028c51ba0ad7e2062dbdc1674be0f71092fc", 36 36 "type": "github" 37 37 }, 38 38 "original": { 39 39 "owner": "lnl7", 40 - "ref": "master", 41 40 "repo": "nix-darwin", 42 41 "type": "github" 43 42 } ··· 59 58 }, 60 59 "nixpkgs": { 61 60 "locked": { 62 - "lastModified": 1648219316, 63 - "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", 61 + "lastModified": 1650469885, 62 + "narHash": "sha256-BuILRZ6pzMnGey8/irbjGq1oo3vIvZa1pitSdZCmIXA=", 64 63 "owner": "NixOS", 65 64 "repo": "nixpkgs", 66 - "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", 65 + "rev": "df78cc4e2a46fca75d14508a5d2ed3494add28ff", 67 66 "type": "github" 68 67 }, 69 68 "original": {

+39 -27

flake.nix

··· 8 8 inputs.nixpkgs.follows = "nixpkgs"; 9 9 }; 10 10 darwin = { 11 - url = "github:lnl7/nix-darwin/master"; 11 + url = "github:lnl7/nix-darwin"; 12 12 inputs.nixpkgs.follows = "nixpkgs"; 13 13 }; 14 14 }; 15 15 16 - outputs = 17 - { self, darwin, nixpkgs, agnoster }: 18 - let 19 - overlays = { pkgs, ... }: { 20 - nixpkgs.overlays = [ 21 - agnoster.overlay 22 - ]; 23 - }; 24 - version = { ... }: { system.stateVersion = 4; }; 25 - in { 26 - darwinConfigurations."NiunioBook" = darwin.lib.darwinSystem { 27 - system = "x86_64-darwin"; 28 - modules = [ 29 - overlays 30 - ./nix/nix.nix 31 - ./nix/system.nix 32 - ./nix/services.nix 33 - ./nix/fonts.nix 34 - ./nix/environment.nix 35 - version 36 - ]; 37 - inputs = { inherit self; }; 38 - }; 16 + outputs = { 17 + self, 18 + darwin, 19 + nixpkgs, 20 + agnoster, 21 + }: { 22 + darwinConfigurations."NiunioBook" = darwin.lib.darwinSystem { 23 + system = "x86_64-darwin"; 24 + modules = [ 25 + ./nix/nix.nix 26 + ./nix/system.nix 27 + ./nix/services.nix 28 + ./nix/fonts.nix 29 + ./nix/environment.nix 30 + {system.stateVersion = 4;} 31 + ]; 32 + inputs = {inherit self agnoster;}; 33 + }; 39 34 40 - # for convenience 41 - darwinPackages = self.darwinConfigurations."NiunioBook".pkgs; 35 + # for convenience 36 + darwinPackages = self.darwinConfigurations."NiunioBook".pkgs; 37 + 38 + devShells."x86_64-darwin".default = let 39 + pkgs = nixpkgs.legacyPackages."x86_64-darwin"; 40 + in pkgs.mkShell { 41 + nativeBuildInputs = [ 42 + pkgs.alejandra 43 + # TODO: Remove it and manage all configuration from Nix 44 + pkgs.stow 45 + ]; 42 46 }; 43 - } 47 + 48 + templates = { 49 + elixir = { 50 + path = ./templates/elixir; 51 + description = "Basic requirements for Elixir applications"; 52 + }; 53 + }; 54 + }; 55 + }

+9 -1

git/.config/git/config

··· 40 40 [branch] 41 41 autoSetupRebase = always 42 42 [push] 43 - default = simple 43 + default = current 44 44 followTags = true 45 45 gpgSign = if-asked 46 46 [pull] 47 47 rebase = true 48 + twohead = ort 48 49 [merge] 49 50 ff = false 50 51 [rebase] ··· 83 84 indentHeuristic = true 84 85 algorithm = histogram 85 86 mnemonicPrefix = true 87 + tool = difftastic 86 88 87 89 [diff "markdown"] 88 90 xfuncname = "^(#+\\s+.*)$" 91 + 92 + [difftool] 93 + prompt = true 94 + 95 + [difftool "difftastic"] 96 + cmd = difft "$LOCAL" "$REMOTE" 89 97 90 98 [color] 91 99 ui = true

+38 -27

nix/environment.nix

··· 1 - { config, pkgs, ... }: 2 - 3 1 { 2 + config, 3 + pkgs, 4 + inputs, 5 + ... 6 + }: { 4 7 nixpkgs.overlays = let 5 8 flaked-nix-direnv = final: prev: { 6 - nix-direnv = prev.nix-direnv.override { enableFlakes = true; }; 9 + nix-direnv = prev.nix-direnv.override {enableFlakes = true;}; 7 10 }; 8 11 in [ 12 + inputs.agnoster.overlay 9 13 flaked-nix-direnv 10 14 ]; 11 15 12 16 # List packages installed in system profile. To search by name, run: 13 17 # $ nix search nixpkgs wget 14 - environment.systemPackages = with pkgs; 15 - let 16 - fswatch = pkgs.writeShellApplication { 17 - name = "fswatch"; 18 + environment.systemPackages = with pkgs; let 19 + fswatch = pkgs.writeShellApplication { 20 + name = "fswatch"; 18 21 19 - runtimeInputs = [pkgs.entr pkgs.ripgrep]; 22 + runtimeInputs = [pkgs.entr pkgs.ripgrep]; 20 23 21 - text = '' 22 - rg -l -t "$1" "" | entr -p echo /_ 23 - ''; 24 - }; 24 + text = '' 25 + rg -l -t "$1" "" | entr -p echo /_ 26 + ''; 27 + }; 25 28 in [ 26 29 _1password 27 30 age 31 + alejandra 28 32 bat 29 33 comby 30 34 coreutils 31 35 curlie 36 + difftastic 32 37 direnv 33 - nix-direnv 34 38 entr 35 39 findutils 40 + fishPlugins.agnoster 41 + fswatch 36 42 fzy 37 - fswatch 38 - fishPlugins.agnoster 39 - git-lfs 43 + git-branchless 40 44 git-gone 41 - git-branchless 45 + git-lfs 42 46 git-revise 43 47 gitAndTools.diff-so-fancy 44 48 gitAndTools.git-imerge 45 49 gitAndTools.git-test 50 + nix-direnv 46 51 gitAndTools.git-chglog 47 - gitAndTools.hub 48 52 gitAndTools.tig 49 53 git 50 54 gh ··· 67 71 weechat 68 72 ]; 69 73 70 - environment.shells = [ pkgs.fish ]; 74 + environment.shells = [pkgs.fish]; 71 75 72 76 environment.variables = { 73 77 EDITOR = "nvim"; ··· 79 83 enable = true; 80 84 81 85 shellAliases = { 82 - git = "LC_CTYPE=UTF-8 LANG=C hub"; 86 + git = "LC_CTYPE=UTF-8 LANG=C command git"; 83 87 g = "git"; 84 88 }; 89 + 90 + loginShellInit = "fish_add_path --move --prepend --path $HOME/.nix-profile/bin /run/wrappers/bin /etc/profiles/per-user/$USER/bin /nix/var/nix/profiles/default/bin /run/current-system/sw/bin"; 85 91 86 92 shellInit = '' 87 - source (${pkgs.direnv}/bin/direnv hook fish | psub) 88 - source (${pkgs.lima}/bin/limactl completion fish | psub) 89 - 90 93 set -gx XDG_RUNTIME_DIR (getconf DARWIN_USER_TEMP_DIR) 91 94 set -gx MIX_XDG 1 92 95 93 - test -e $HOME/.iterm2_shell_integration.fish ; and source $HOME/.iterm2_shell_integration.fish 94 - 95 96 function e --wraps nvim --description 'Run $EDITOR' 96 - eval $EDITOR $argv 97 + eval $EDITOR $argv 97 98 end 98 99 99 100 ulimit -n 10480 100 - ''; 101 + ''; 102 + 103 + interactiveShellInit = '' 104 + # use fish in nix run and nix-shell 105 + ${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source 106 + 107 + source (${pkgs.direnv}/bin/direnv hook fish | psub) 108 + source (${pkgs.lima}/bin/limactl completion fish | psub) 109 + 110 + test -e $HOME/.iterm2_shell_integration.fish ; and source $HOME/.iterm2_shell_integration.fish 111 + ''; 101 112 }; 102 113 }

+2 -4

nix/fonts.nix

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

+4 -7

nix/nix.nix

··· 1 - { pkgs, ... }: 2 - 3 - { 1 + {pkgs, ...}: { 4 2 nixpkgs.config.allowUnfree = true; 5 3 6 4 # You should generally set this to the total number of logical cores in your system. ··· 10 8 11 9 nix.package = pkgs.nixFlakes; 12 10 nix.extraOptions = '' 13 - gc-keep-derivations = true 14 - gc-keep-outputs = true 11 + auto-optimise-store = true 15 12 16 13 keep-outputs = true 17 - keep-derivations = true 14 + # keep-derivations = true 18 15 19 16 experimental-features = nix-command flakes 20 - ''; 17 + ''; 21 18 22 19 # nix.useSandbox = true; 23 20 nix.sandboxPaths = [

+2 -3

nix/services.nix

··· 1 - { pkgs, ... }: 2 - 3 1 { 4 2 # Auto upgrade nix package and the daemon service. 5 3 # services.nix-daemon = { ··· 24 22 ProgramArguments = [ 25 23 "/usr/bin/curl" 26 24 "--netrc-optional" 27 - "-F" "plan=</Users/hauleth/.plan" 25 + "-F" 26 + "plan=</Users/hauleth/.plan" 28 27 "https://plan.cat/stdin" 29 28 ]; 30 29

-2

nix/system.nix

··· 1 - { config, pkgs, ... }: 2 - 3 1 { 4 2 system = { 5 3 defaults.dock.autohide = true;

+25

templates/elixir/flake.nix

··· 1 + { 2 + description = "Elixir's application"; 3 + 4 + inputs.nixpkgs.url = "flake:nixpkgs"; 5 + inputs.flake-utils.url = "github:numtide/flake-utils"; 6 + 7 + outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system: 8 + let 9 + pkgs = nixpkgs.legacyPackages.${system}; 10 + erl = pkgs.beam.packages.erlangR24; 11 + in { 12 + # TODO: Add default package and overlay there 13 + 14 + devShell = pkgs.mkShell { 15 + nativeBuildInputs = [ 16 + erl.elixir 17 + erl.elixir_ls 18 + ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ 19 + pkgs.darwin.apple_sdk.frameworks.CoreFoundation 20 + pkgs.darwin.apple_sdk.frameworks.CoreServices 21 + ]; 22 + }; 23 + } 24 + ); 25 + }

+5 -9

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

··· 35 35 (when (capable? client :completion) 36 36 (bopt omnifunc "v:lua.vim.lsp.omnifunc"))) 37 37 38 - (fn nix-cmd [name cmd] 39 - ["nix-shell" 40 - "-E" "{ name }: let pkgs = import <nixpkgs> {}; projPkgs = (if (builtins.pathExists ./shell.nix) then (import ./shell.nix { inherit pkgs; }).passthru else {}); in pkgs.mkShell { buildInputs = [(if projPkgs ? ${name} then projPkgs.${name} else pkgs.${name})]; }" 41 - "--argstr" "name" name 42 - "--run" (or cmd name)]) 43 - 44 38 (local capabilities 45 39 (->> (vim.lsp.protocol.make_client_capabilities) 46 40 ((. (require :cmp_nvim_lsp) :update_capabilities)))) 47 41 48 - (lsp.rust_analyzer.setup {:cmd (nix-cmd "rust-analyzer") 49 - : capabilities 50 - : on_attach}) 42 + (lsp.rust_analyzer.setup {: capabilities 43 + : on_attach 44 + :settings { 45 + :trace {:server :verbose} 46 + }}) 51 47 52 48 (lsp.elixirls.setup {:cmd ["elixir-ls"] 53 49 : capabilities

+4 -13

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

··· 209 209 (augroup autoreload-envrc 210 210 (on BufWritePost ".envrc" (ex.silent "!direnv allow %")))) 211 211 212 + (. (require :orgmode) :setup_ts_grammar) 213 + 212 214 ; Setup Lua extensions 213 215 (let [setup (fn [package object] ((. (require package) :setup) object))] 214 - (let [parser-configs (. (require :nvim-treesitter.parsers) :get_parser_configs)] 215 - (tset (parser-configs) :org { 216 - :install_info { 217 - :url "https://github.com/milisims/tree-sitter-org" 218 - :revision "main" 219 - :files [ "src/parser.c" "src/scanner.cc" ]} 220 - :filetype "org"})) 221 216 (setup :startify 222 217 {:lists [{:type "sessions" :header [" Sessions"]} 223 218 {:type "commands" :header [" Wiki"]}] ··· 229 224 :fortune-use-unicode true}) 230 225 (setup :orgmode {}) 231 226 (setup :nvim-treesitter.configs 232 - {:ensure_installed :maintained 233 - :highlight { 234 - :enable true 235 - ;:disable [:elixir] 236 - :additional_vim_regex_highlighting [:jinja :elixir :erlang :rust] 237 - } 227 + {:ensure_installed :all 228 + :highlight {:enable true} 238 229 :matchup {:enable true} 239 230 :indent {:enable true}})) 240 231

Configure Feed

Configure Feed