hauleth.dev / dotfiles
this repo has no description
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

chore: temporarily disable neorg

Łukasz Niemier 77c83f63 bd70438f

+168 -91
+38
;w
··· 1 + { 2 + pkgs, 3 + ... 4 + }: let 5 + nvim = pkgs.neovim.override { 6 + configure = { 7 + # Add Fennel to Lua path and require basic implementation 8 + customRC = '' 9 + lua << EOF 10 + package.path = package.path .. ";${pkgs.luajitPackages.fennel}/share/lua/5.1/?.lua" 11 + require('basic') 12 + EOF 13 + ''; 14 + packages.vimPackages = with pkgs.vimPlugins; { 15 + start = [ 16 + packer-nvim 17 + nvim-treesitter.withAllGrammars 18 + vim-nickel 19 + # XXX: Currently broken 20 + # (neorg.overrideAttrs { 21 + # dependencies = [ 22 + # pkgs.luaPackages.lua-utils-nvim 23 + # plenary-nvim 24 + # nui-nvim 25 + # nvim-nio 26 + # ]; 27 + # }) 28 + # neorg-telescope 29 + ]; 30 + 31 + opt = []; 32 + }; 33 + }; 34 + }; 35 + in { 36 + environment.variables.EDITOR = "nvim"; 37 + environment.systemPackages = [nvim]; 38 + }
+31 -69
flake.lock
··· 68 68 ] 69 69 }, 70 70 "locked": { 71 - "lastModified": 1711763326, 72 - "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", 71 + "lastModified": 1713946171, 72 + "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", 73 73 "owner": "lnl7", 74 74 "repo": "nix-darwin", 75 - "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", 75 + "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", 76 76 "type": "github" 77 77 }, 78 78 "original": { ··· 104 104 "nixpkgs-lib": "nixpkgs-lib_2" 105 105 }, 106 106 "locked": { 107 - "lastModified": 1712014858, 108 - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", 107 + "lastModified": 1714641030, 108 + "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", 109 109 "owner": "hercules-ci", 110 110 "repo": "flake-parts", 111 - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", 111 + "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", 112 112 "type": "github" 113 113 }, 114 114 "original": { ··· 122 122 "nixpkgs-lib": "nixpkgs-lib_3" 123 123 }, 124 124 "locked": { 125 - "lastModified": 1701473968, 126 - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", 125 + "lastModified": 1712014858, 126 + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", 127 127 "owner": "hercules-ci", 128 128 "repo": "flake-parts", 129 - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", 129 + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", 130 130 "type": "github" 131 131 }, 132 132 "original": { ··· 168 168 "type": "github" 169 169 } 170 170 }, 171 - "git-branchless": { 172 - "inputs": { 173 - "nixpkgs": [ 174 - "nixpkgs" 175 - ] 176 - }, 177 - "locked": { 178 - "lastModified": 1711717363, 179 - "narHash": "sha256-VtPIPU7jsYCQuYDlvHugvsi41H+CA7VMMBbwccEHEMA=", 180 - "owner": "arxanas", 181 - "repo": "git-branchless", 182 - "rev": "3d8b480ad8006079eb97d73d9ef76a81924fd545", 183 - "type": "github" 184 - }, 185 - "original": { 186 - "owner": "arxanas", 187 - "repo": "git-branchless", 188 - "type": "github" 189 - } 190 - }, 191 171 "home-manager": { 192 172 "inputs": { 193 173 "nixpkgs": [ ··· 195 175 ] 196 176 }, 197 177 "locked": { 198 - "lastModified": 1712317700, 199 - "narHash": "sha256-rnkQ6qMhlxfjpCECkTMlFXHU/88QvC5KpdJWq5H6F1E=", 178 + "lastModified": 1714981474, 179 + "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", 200 180 "owner": "nix-community", 201 181 "repo": "home-manager", 202 - "rev": "782eed8bb64b27acaeb7c17be4a095c85e65717f", 182 + "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", 203 183 "type": "github" 204 184 }, 205 185 "original": { ··· 211 191 "lexical": { 212 192 "inputs": { 213 193 "flake-parts": "flake-parts_3", 214 - "nixpkgs": "nixpkgs_2", 194 + "nixpkgs": [ 195 + "nixpkgs" 196 + ], 215 197 "systems": "systems_2" 216 198 }, 217 199 "locked": { 218 - "lastModified": 1712209439, 219 - "narHash": "sha256-tbjbd6ij1TkeERwxG11WT77jVcWyGR9L5JnYtmdVpr8=", 200 + "lastModified": 1714757169, 201 + "narHash": "sha256-bLCxY5hFpnDzXnxwqSkc0GfOvb9PX+dsHCE99T6dDEM=", 220 202 "owner": "lexical-lsp", 221 203 "repo": "lexical", 222 - "rev": "07a132ae2d9827f8894bb26bda0a7351fa0912df", 204 + "rev": "0234cbcb5a886ac74247bf326d1b9af6fae353cc", 223 205 "type": "github" 224 206 }, 225 207 "original": { ··· 264 246 }, 265 247 "nixpkgs-lib_2": { 266 248 "locked": { 267 - "dir": "lib", 268 - "lastModified": 1711703276, 269 - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", 270 - "owner": "NixOS", 271 - "repo": "nixpkgs", 272 - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", 273 - "type": "github" 249 + "lastModified": 1714640452, 250 + "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", 251 + "type": "tarball", 252 + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" 274 253 }, 275 254 "original": { 276 - "dir": "lib", 277 - "owner": "NixOS", 278 - "ref": "nixos-unstable", 279 - "repo": "nixpkgs", 280 - "type": "github" 255 + "type": "tarball", 256 + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" 281 257 } 282 258 }, 283 259 "nixpkgs-lib_3": { 284 260 "locked": { 285 261 "dir": "lib", 286 - "lastModified": 1701253981, 287 - "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", 262 + "lastModified": 1711703276, 263 + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", 288 264 "owner": "NixOS", 289 265 "repo": "nixpkgs", 290 - "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", 266 + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", 291 267 "type": "github" 292 268 }, 293 269 "original": { ··· 300 276 }, 301 277 "nixpkgs_2": { 302 278 "locked": { 303 - "lastModified": 1699725108, 304 - "narHash": "sha256-NTiPW4jRC+9puakU4Vi8WpFEirhp92kTOSThuZke+FA=", 305 - "path": "/nix/store/1ryprai4bllkrna60cmcygxc4qyn79s1-source", 306 - "rev": "911ad1e67f458b6bcf0278fa85e33bb9924fed7e", 307 - "type": "path" 308 - }, 309 - "original": { 310 - "id": "nixpkgs", 311 - "type": "indirect" 312 - } 313 - }, 314 - "nixpkgs_3": { 315 - "locked": { 316 - "lastModified": 1712192574, 317 - "narHash": "sha256-LbbVOliJKTF4Zl2b9salumvdMXuQBr2kuKP5+ZwbYq4=", 279 + "lastModified": 1715037484, 280 + "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=", 318 281 "owner": "NixOS", 319 282 "repo": "nixpkgs", 320 - "rev": "f480f9d09e4b4cf87ee6151eba068197125714de", 283 + "rev": "ad7efee13e0d216bf29992311536fce1d3eefbef", 321 284 "type": "github" 322 285 }, 323 286 "original": { ··· 334 297 "charm-freeze": "charm-freeze", 335 298 "darwin": "darwin", 336 299 "flake-parts": "flake-parts_2", 337 - "git-branchless": "git-branchless", 338 300 "home-manager": "home-manager", 339 301 "lexical": "lexical", 340 - "nixpkgs": "nixpkgs_3" 302 + "nixpkgs": "nixpkgs_2" 341 303 } 342 304 }, 343 305 "systems": {
+2 -4
flake.nix
··· 18 18 inputs.nixpkgs.follows = "nixpkgs"; 19 19 }; 20 20 21 - git-branchless = { 22 - url = "github:arxanas/git-branchless"; 21 + lexical = { 22 + url = "github:lexical-lsp/lexical"; 23 23 inputs.nixpkgs.follows = "nixpkgs"; 24 24 }; 25 - 26 - lexical.url = "github:lexical-lsp/lexical"; 27 25 28 26 beam = { 29 27 url = "github:shanesveller/nix-beam-flakes";
+61 -7
modules/email.nix
··· 1 - {pkgs, ...}: { 1 + {pkgs, config, lib, ...}: { 2 2 targets.darwin.defaults = { 3 3 # Remember the fallen 4 4 "com.apple.mail" = { ··· 6 6 }; 7 7 }; 8 8 9 - # programs.himalaya.enable = true; 10 - # programs.mbsync.enable = true; 9 + programs.himalaya = { 10 + enable = true; 11 + package = pkgs.himalaya.overrideAttrs (old: let 12 + version = "1.0.0-beta.4"; 13 + src = pkgs.fetchFromGitHub { 14 + inherit (old.src) owner repo; 15 + rev = "v${version}"; 16 + hash = "sha256-NrWBg0sjaz/uLsNs8/T4MkUgHOUvAWRix1O5usKsw6o="; 17 + }; 18 + in { 19 + inherit version src; 20 + 21 + cargoDeps = old.cargoDeps.overrideAttrs (lib.const { 22 + name = "himalaya-${version}-vendor.tar.gz"; 23 + inherit src; 24 + outputHash = "YS8IamapvmdrOPptQh2Ef9Yold0IK1XIeGs0kDIQ5b8="; 25 + }); 26 + 27 + NIX_LDFLAGS = lib.optionals pkgs.stdenv.isDarwin [ 28 + "-F${pkgs.darwin.apple_sdk.frameworks.AppKit}/Library/Frameworks" 29 + "-framework" 30 + "AppKit" 31 + ]; 32 + }); 33 + }; 34 + programs.mbsync.enable = true; 35 + programs.msmtp.enable = true; 11 36 # programs.notmuch.enable = true; 12 37 13 38 programs.aerc = { ··· 18 43 filters = { 19 44 "text/plain" = "colorize"; 20 45 }; 46 + 47 + ui = { 48 + threading-enabled = true; 49 + }; 21 50 }; 22 51 }; 23 52 ··· 25 54 realName = "Łukasz Niemier"; 26 55 userName = "hauleth"; 27 56 address = "~@hauleth.dev"; 57 + # aliases = [ 58 + # "#@hauleth.dev" 59 + # ]; 28 60 primary = true; 29 61 30 62 passwordCommand = "op item get i6gyiq3aro4lp2ys5xygfb7uwu --field password"; 31 63 32 - mbsync.enable = true; 33 - notmuch.enable = true; 34 - aerc.enable = true; 35 - # himalaya.enable = true; 64 + # mbsync.enable = true; 65 + # notmuch.enable = true; 66 + aerc = { 67 + enable = true; 68 + extraAccounts = { 69 + default = "INBOX"; 70 + copy-to = "INBOX"; 71 + folders-sort = "INBOX,Draft"; 72 + signature-file = 73 + toString (pkgs.writeTextFile { 74 + name = "hauleth-signature"; 75 + text = config.accounts.email.accounts.hauleth.signature.text; 76 + }); 77 + }; 78 + }; 79 + himalaya.enable = true; 80 + msmtp.enable = true; 81 + 82 + signature = { 83 + showSignature = "append"; 84 + 85 + text = '' 86 + Hauleth 87 + ~@hauleth.dev 88 + ''; 89 + }; 36 90 37 91 # TODO: Migrate to JMAP 38 92 imap = {
+9 -1
modules/git.nix
··· 1 1 { 2 2 pkgs, 3 - lib, 4 3 inputs, 4 + config, 5 5 ... 6 6 }: { 7 7 programs.gh = { ··· 159 159 160 160 url."git@github.com:".pushInsteadOf = "https://github.com/"; 161 161 162 + sendemail = { 163 + smtpserver = "${config.programs.msmtp.package}/bin/msmtp"; 164 + bcc = config.accounts.email.accounts.hauleth.address; 165 + annotate = true; 166 + }; 167 + 162 168 maintenance = { 163 169 # It will ask 1password for access to SSH key/GH token. That is 164 170 # irritating ··· 169 175 simple-oneline = "%C(yellow)%h%C(auto)%d %s [%C(green)%aN <%aE>%C(reset)] (%C(blue)%ar%C(reset))"; 170 176 simple-oneline-sign = "%C(yellow)%h%C(auto)%d %s [%C(green)%aN <%aE>%C(reset)] (%C(blue)%ar%C(reset)) %G?"; 171 177 }; 178 + 179 + branchless."revsets.alias".work = "heads(draft())"; 172 180 }; 173 181 }; 174 182 }
+11 -2
modules/nvim.nix
··· 17 17 start = [ 18 18 packer-nvim 19 19 nvim-treesitter.withAllGrammars 20 - neorg 21 - neorg-telescope 20 + vim-nickel 21 + # XXX: Currently broken 22 + # (neorg.overrideAttrs { 23 + # dependencies = [ 24 + # pkgs.luaPackages.lua-utils-nvim 25 + # plenary-nvim 26 + # nui-nvim 27 + # nvim-nio 28 + # ]; 29 + # }) 30 + # neorg-telescope 22 31 ]; 23 32 24 33 opt = [];
+2
modules/tools.nix
··· 2 2 pkgs, 3 3 inputs, 4 4 config, 5 + lib, 5 6 ... 6 7 }: let 7 8 pkgs-self = inputs.self.packages.${pkgs.stdenv.hostPlatform.system}; ··· 17 18 pkgs-self.ubin-client 18 19 reuse 19 20 pkgs-freeze.default 21 + timg 20 22 ]; 21 23 }
+1 -4
vim/.config/nvim/fnl/langclient.fnl
··· 50 50 :default_config { 51 51 :autostart false 52 52 :filetypes ["elixir" "eelixir" "heex"] 53 - :root_dir (lspconfig.util.root_pattern "mix.lock") 53 + :root_dir (lspconfig.util.root_pattern "mix.exs") 54 54 }}) 55 55 56 56 (set lspconfig.util.default_config ··· 68 68 69 69 (setup :lexical 70 70 {:cmd [:lexical :start]}) 71 - 72 - (setup :erlangls 73 - {:cmd [:erlang_ls]}) 74 71 75 72 (setup :zls {}) 76 73
+13 -4
vim/.config/nvim/init.fnl
··· 77 77 (do ; XXI century - we have cursors now 78 78 (set opt.mouse :a)) 79 79 80 + (do 81 + (set opt.title true) 82 + (augroup window-title 83 + (on BufEnter "*" 84 + (let [cwd (fun.getcwd) 85 + project (fun.fnamemodify cwd ":p:~:h")] 86 + (set opt.titlestring (.. "nvim " project))) 87 + ))) 88 + 80 89 (do ; Split in CORRECT places 81 90 (opt {:splitright true :splitbelow true})) 82 91 ··· 265 274 :disable [:erlang :make :diff]} 266 275 :matchup {:enable true} 267 276 :indent {:enable true} 268 - :incremental_selection {:enable true}}) 269 - (setup :neorg 270 - {:load {:core.defaults {} 271 - :core.concealer {}}}))) 277 + :incremental_selection {:enable true}}))) 278 + ; (setup :neorg 279 + ; {:load {:core.defaults {} 280 + ; :core.concealer {}}}))) 272 281 273 282 (defcommand Clean "keeppatterns %s/\\s\\+$//e | set nohlsearch") 274 283