commit cc25f033fbe47351a5aa4d525f775ef3d0a420f1 · hauleth.dev/dotfiles

-4

dev_shells.nix

···

       31
       31
        
               [

     

       32
       32
        
                 elixir

     

       33
       33
        
                 lexical

     

       34
       34
       -
               ]

     

       35
       35
       -
               ++ lib.optionals stdenv.isDarwin [

     

       36
       36
       -
                 darwin.apple_sdk.frameworks.CoreFoundation

     

       37
       37
       -
                 darwin.apple_sdk.frameworks.CoreServices

     

       38
       34
        
               ];

     

       39
       35
        
           };

     

       40
       36

+31 -49

flake.lock

···

       28
       28
        
               ]

     

       29
       29
        
             },

     

       30
       30
        
             "locked": {

     

       31
       31
       -
               "lastModified": 1751313918,

     

       32
       32
       -
               "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=",

     

       31
       31
       +
               "lastModified": 1755825449,

     

       32
       32
       +
               "narHash": "sha256-XkiN4NM9Xdy59h69Pc+Vg4PxkSm9EWl6u7k6D5FZ5cM=",

     

       33
       33
        
               "owner": "lnl7",

     

       34
       34
        
               "repo": "nix-darwin",

     

       35
       35
       -
               "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",

     

       35
       35
       +
               "rev": "8df64f819698c1fee0c2969696f54a843b2231e8",

     

       36
       36
        
               "type": "github"

     

       37
       37
        
             },

     

       38
       38
        
             "original": {

     
···

       94
       94
        
               "nixpkgs-lib": "nixpkgs-lib"

     

       95
       95
        
             },

     

       96
       96
        
             "locked": {

     

       97
       97
       -
               "lastModified": 1753121425,

     

       98
       98
       -
               "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=",

     

       97
       97
       +
               "lastModified": 1754487366,

     

       98
       98
       +
               "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",

     

       99
       99
        
               "owner": "hercules-ci",

     

       100
       100
        
               "repo": "flake-parts",

     

       101
       101
       -
               "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e",

     

       101
       101
       +
               "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",

     

       102
       102
        
               "type": "github"

     

       103
       103
        
             },

     

       104
       104
        
             "original": {

     
···

       221
       221
        
               "type": "github"

     

       222
       222
        
             }

     

       223
       223
        
           },

     

       224
       224
       -
           "git-branchless": {

     

       225
       225
       -
             "inputs": {

     

       226
       226
       -
               "nixpkgs": [

     

       227
       227
       -
                 "nixpkgs"

     

       228
       228
       -
               ]

     

       229
       229
       -
             },

     

       230
       230
       -
             "locked": {

     

       231
       231
       -
               "lastModified": 1753565501,

     

       232
       232
       -
               "narHash": "sha256-G5MlE638vrgUo/aQUy1udjNVTOhY4KeywGaT3bD6V/g=",

     

       233
       233
       -
               "owner": "arxanas",

     

       234
       234
       -
               "repo": "git-branchless",

     

       235
       235
       -
               "rev": "5f4d1ea6801d94f2cdf44b456c108154691cd93f",

     

       236
       236
       -
               "type": "github"

     

       237
       237
       -
             },

     

       238
       238
       -
             "original": {

     

       239
       239
       -
               "owner": "arxanas",

     

       240
       240
       -
               "repo": "git-branchless",

     

       241
       241
       -
               "type": "github"

     

       242
       242
       -
             }

     

       243
       243
       -
           },

     

       244
       224
        
           "home-manager": {

     

       245
       225
        
             "inputs": {

     

       246
       226
        
               "nixpkgs": [

     
···

       248
       228
        
               ]

     

       249
       229
        
             },

     

       250
       230
        
             "locked": {

     

       251
       251
       -
               "lastModified": 1753709185,

     

       252
       252
       -
               "narHash": "sha256-fU0XPSNudRJHvbeMK2qWBXEbfd77t7r+e9V2L9ON5kI=",

     

       231
       231
       +
               "lastModified": 1756579987,

     

       232
       232
       +
               "narHash": "sha256-duCce8zGsaMsrqqOmLOsuaV1PVIw/vXWnKuLKZClsGg=",

     

       253
       233
        
               "owner": "nix-community",

     

       254
       234
        
               "repo": "home-manager",

     

       255
       255
       -
               "rev": "20cf285e9f8e5e3968abca80081c03ea96e7ea73",

     

       235
       235
       +
               "rev": "99a69bdf8a3c6bf038c4121e9c4b6e99706a187a",

     

       256
       236
        
               "type": "github"

     

       257
       237
        
             },

     

       258
       238
        
             "original": {

     
···

       284
       264
        
           "lix": {

     

       285
       265
        
             "flake": false,

     

       286
       266
        
             "locked": {

     

       287
       287
       -
               "lastModified": 1751235704,

     

       288
       288
       -
               "narHash": "sha256-J4ycLoXHPsoBoQtEXFCelL4xlq5pT8U9tNWNKm43+YI=",

     

       289
       289
       -
               "rev": "1d7368585eebaa2c4bdbcb88fe600cfb2239b2c6",

     

       267
       267
       +
               "lastModified": 1753306924,

     

       268
       268
       +
               "narHash": "sha256-jLCEW0FvjFhC+c4RHzH+xbkSOxrnpFHnhjOw6sudhx0=",

     

       269
       269
       +
               "rev": "1a4393d0aac31aba21f5737ede1b171e11336d77",

     

       290
       270
        
               "type": "tarball",

     

       291
       291
       -
               "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1d7368585eebaa2c4bdbcb88fe600cfb2239b2c6.tar.gz?rev=1d7368585eebaa2c4bdbcb88fe600cfb2239b2c6"

     

       271
       271
       +
               "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1a4393d0aac31aba21f5737ede1b171e11336d77.tar.gz?rev=1a4393d0aac31aba21f5737ede1b171e11336d77"

     

       292
       272
        
             },

     

       293
       273
        
             "original": {

     

       294
       274
        
               "type": "tarball",

     
···

       299
       279
        
             "inputs": {

     

       300
       280
        
               "flake-utils": "flake-utils_2",

     

       301
       281
        
               "flakey-profile": "flakey-profile",

     

       302
       302
       -
               "lix": "lix",

     

       282
       282
       +
               "lix": [

     

       283
       283
       +
                 "lix"

     

       284
       284
       +
               ],

     

       303
       285
        
               "nixpkgs": [

     

       304
       286
        
                 "nixpkgs"

     

       305
       287
        
               ]

     

       306
       288
        
             },

     

       307
       289
        
             "locked": {

     

       308
       308
       -
               "lastModified": 1751240025,

     

       309
       309
       -
               "narHash": "sha256-SXUAlxpjPRkArRMHy5+Hdi+PiC+ND9yzzIjiaHmTvQU=",

     

       310
       310
       -
               "rev": "8b1094356f4723d6e89d3f8a95b333ee16d9ab02",

     

       290
       290
       +
               "lastModified": 1756125859,

     

       291
       291
       +
               "narHash": "sha256-6a+PWILmqHCs9B5eIBLg6HSZ8jYweZpgOWO8FlyVwYI=",

     

       292
       292
       +
               "rev": "d3292125035b04df00d01549a26e948631fabe1e",

     

       311
       293
        
               "type": "tarball",

     

       312
       312
       -
               "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/8b1094356f4723d6e89d3f8a95b333ee16d9ab02.tar.gz?rev=8b1094356f4723d6e89d3f8a95b333ee16d9ab02"

     

       294
       294
       +
               "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/d3292125035b04df00d01549a26e948631fabe1e.tar.gz?rev=d3292125035b04df00d01549a26e948631fabe1e"

     

       313
       295
        
             },

     

       314
       296
        
             "original": {

     

       315
       297
        
               "type": "tarball",

     

       316
       316
       -
               "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz"

     

       298
       298
       +
               "url": "https://git.lix.systems/lix-project/nixos-module/archive/release-2.93.tar.gz"

     

       317
       299
        
             }

     

       318
       300
        
           },

     

       319
       301
        
           "neorg": {

     
···

       344
       326
        
               "norg-meta": "norg-meta"

     

       345
       327
        
             },

     

       346
       328
        
             "locked": {

     

       347
       347
       -
               "lastModified": 1753554376,

     

       348
       348
       -
               "narHash": "sha256-72G3UloqOH8asQW58J0EtBLyp2f3DcYHY2Q9InmuHcQ=",

     

       329
       329
       +
               "lastModified": 1756585044,

     

       330
       330
       +
               "narHash": "sha256-Pd71Z4muaqfFdbbW7gajF7mJurgPGK5V+dp1gDhB7io=",

     

       349
       331
        
               "owner": "nvim-neorg",

     

       350
       332
        
               "repo": "nixpkgs-neorg-overlay",

     

       351
       351
       -
               "rev": "ed92eec2ab79f10c021451a5ec3fd3b8c77cf29e",

     

       333
       333
       +
               "rev": "9050eda53388acfa780b8e6e316c2ec5758cd492",

     

       352
       334
        
               "type": "github"

     

       353
       335
        
             },

     

       354
       336
        
             "original": {

     
···

       389
       371
        
           },

     

       390
       372
        
           "nixpkgs-lib": {

     

       391
       373
        
             "locked": {

     

       392
       392
       -
               "lastModified": 1751159883,

     

       393
       393
       -
               "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",

     

       374
       374
       +
               "lastModified": 1753579242,

     

       375
       375
       +
               "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=",

     

       394
       376
        
               "owner": "nix-community",

     

       395
       377
        
               "repo": "nixpkgs.lib",

     

       396
       396
       -
               "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab",

     

       378
       378
       +
               "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e",

     

       397
       379
        
               "type": "github"

     

       398
       380
        
             },

     

       399
       381
        
             "original": {

     
···

       448
       430
        
           },

     

       449
       431
        
           "nixpkgs_4": {

     

       450
       432
        
             "locked": {

     

       451
       451
       -
               "lastModified": 1753432016,

     

       452
       452
       -
               "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=",

     

       433
       433
       +
               "lastModified": 1756536218,

     

       434
       434
       +
               "narHash": "sha256-ynQxPVN2FIPheUgTFhv01gYLbaiSOS7NgWJPm9LF9D0=",

     

       453
       435
        
               "owner": "NixOS",

     

       454
       436
        
               "repo": "nixpkgs",

     

       455
       455
       -
               "rev": "6027c30c8e9810896b92429f0092f624f7b1aace",

     

       437
       437
       +
               "rev": "a918bb3594dd243c2f8534b3be01b3cb4ed35fd1",

     

       456
       438
        
               "type": "github"

     

       457
       439
        
             },

     

       458
       440
        
             "original": {

     
···

       509
       491
        
               "darwin": "darwin",

     

       510
       492
        
               "darwin-stable": "darwin-stable",

     

       511
       493
        
               "flake-parts": "flake-parts",

     

       512
       512
       -
               "git-branchless": "git-branchless",

     

       513
       494
        
               "home-manager": "home-manager",

     

       514
       495
        
               "lexical": "lexical",

     

       496
       496
       +
               "lix": "lix",

     

       515
       497
        
               "lix-module": "lix-module",

     

       516
       498
        
               "neorg-overlay": "neorg-overlay",

     

       517
       499
        
               "nixpkgs": "nixpkgs_4"

+6 -6

flake.nix

···

       19
       19
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       20
       20
        
           };

     

       21
       21
        
       

     

       22
       22
       +
           lix = {

     

       23
       23
       +
             url = "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz";

     

       24
       24
       +
             flake = false;

     

       25
       25
       +
           };

     

       22
       26
        
           lix-module = {

     

       23
       23
       -
             url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz";

     

       27
       27
       +
             url = "https://git.lix.systems/lix-project/nixos-module/archive/release-2.93.tar.gz";

     

       24
       28
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       29
       29
       +
             inputs.lix.follows = "lix";

     

       25
       30
        
           };

     

       26
       31
        
       

     

       27
       32
        
           neorg-overlay = {

     

       28
       33
        
             url = "github:nvim-neorg/nixpkgs-neorg-overlay";

     

       29
       29
       -
             inputs.nixpkgs.follows = "nixpkgs";

     

       30
       30
       -
           };

     

       31
       31
       -
       

     

       32
       32
       -
           git-branchless = {

     

       33
       33
       -
             url = "github:arxanas/git-branchless";

     

       34
       34
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       35
       35
        
           };

     

       36
       36

+1 -1

modules/git.nix

···

       21
       21
        
         # manual.manpages.enable = true;

     

       22
       22
        
       

     

       23
       23
        
         home.packages = [

     

       24
       24
       -
           pkgs.git-branchless

     

       24
       24
       +
           # pkgs.git-branchless

     

       25
       25
        
           pkgs.git-gone

     

       26
       26
        
           pkgs.git-cliff

     

       27
       27
        
           # pkgs.git-revise

+6 -3

modules/jj.nix

···

       9
       9
        
             ui = {

     

       10
       10
        
               default-command = ["log" "--template=log_compact"];

     

       11
       11
        
       

     

       12
       12
       -
               conflict-marker-style = "diff3";

     

       12
       12
       +
               conflict-marker-style = "git";

     

       13
       13
        
             };

     

       14
       14
        
       

     

       15
       15
        
             aliases = {

     
···

       19
       19
        
               lg = ["log"];

     

       20
       20
        
               tug = ["bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-"];

     

       21
       21
        
               pull = ["git" "fetch"];

     

       22
       22
       -
               push = ["git" "push" "--allow-new"];

     

       22
       22
       +
               push = ["git" "push"];

     

       23
       23
        
               sync = [

     

       24
       24
        
                 "rebase"

     

       25
       25
        
                 "--source" "all:roots(trunk()..mutable())"

     
···

       31
       31
        
               "closest_bookmark(to)" = "heads(::to & bookmarks())";

     

       32
       32
        
             };

     

       33
       33
        
       

     

       34
       34
       -
             git.write-change-id-header = true;

     

       34
       34
       +
             git = {

     

       35
       35
       +
               write-change-id-header = true;

     

       36
       36
       +
               push-new-bookmarks = true;

     

       37
       37
       +
             };

     

       35
       38
        
       

     

       36
       39
        
             colors = {

     

       37
       40
        
               # change_id = "green";

+5 -9

modules/nvim/fnl/langclient.fnl

···

       2
       2
        
       

     

       3
       3
        
       (use nvim {: fun : cmd : opt : map :buf-map bmap})

     

       4
       4
        
       (use picker)

     

       5
       5
       -
       (use lspconfig)

     

       6
       6
       -
       (use lspconfig.configs)

     

       7
       5
        
       (import-macros logger :nvim.logger)

     

       8
       6
        
       (import-macros {: augroup} :nvim)

     

       9
       7
        
       

     

       10
       8
        
       (let [lsp vim.lsp

     

       11
       9
        
             border :rounded]

     

       12
       12
       -
         (tset (require :lspconfig.ui.windows) :default_options {:border border})

     

       13
       10
        
         (set lsp.handlers.textDocument/hover (lsp.with lsp.handlers.hover {:border border}))

     

       14
       11
        
         (set lsp.handlers.textDocument/signatureHelp (lsp.with lsp.handlers.signature_help {:border border}))

     

       15
       12
        
         (vim.diagnostic.config {:float {:border border}}))

     
···

       33
       30
        
                (on CursorHold "*" (vim.diagnostic.open_float {:focus false})))

     

       34
       31
        
       

     

       35
       32
        
       

     

       36
       36
       -
       (set lspconfig.util.default_config

     

       37
       37
       -
            (vim.tbl_extend :force lspconfig.util.default_config

     

       38
       38
       -
                            {:autostart false}))

     

       39
       39
       -
       

     

       40
       40
       -
       

     

       41
       33
        
       (fn setup [name opts]

     

       42
       34
        
         (vim.lsp.enable name)

     

       43
       35
        
         (vim.lsp.config name opts))

     

       44
       36
        
       

     

       45
       37
        
       (setup :rust_analyzer {

     

       38
       38
       +
              :root_markers [ "Cargo.lock" ".git" ".jj" ]

     

       39
       39
       +
              :filetypes [ "rust" ]

     

       46
       40
        
              :cmd [vim.g.lsp_paths.rust_analyzer]

     

       47
       41
        
              :settings {:rust-analyzer {:files {:excludeDirs [".direnv"]}}}})

     

       48
       42
        
       

     

       49
       43
        
       (setup :lexical {

     

       44
       44
       +
              :root_markers [ "mix.exs" ".git" ".jj" ]

     

       45
       45
       +
              :filetypes [ "elixir" "eelixir" "heex" ]

     

       50
       46
        
              :cmd [vim.g.lsp_paths.lexical]})

     

       51
       47
        
       

     

       52
       48
        
       ; (setup :zls {})

     
···

       60
       56
        
              :autostart true

     

       61
       57
        
              :cmd [vim.g.lsp_paths.typos_lsp]})

     

       62
       58
        
       

     

       63
       63
       -
       (augroup lsp-direnv (on User :DirenvLoaded (cmd.LspStart)))

     

       59
       59
       +
       ; (augroup lsp-direnv (on User :DirenvLoaded (cmd.LspStart)))

-1

modules/nvim/fnl/plugins.fnl

···

       45
       45
        
                      {:ft [:elixir :eex :heex]})

     

       46
       46
        
       

     

       47
       47
        
                 ; Language Protocol

     

       48
       48
       -
                 (pkg :neovim/nvim-lspconfig)

     

       49
       48
        
                 (pkg :nvim-treesitter/playground

     

       50
       49
        
                      {:cmd [:TSPlaygroundToggle

     

       51
       50
        
                             :TSHighlightCapturesUnderCursor]})