commit a1eaa7d9bc65678606e1397d6dce117223f0a6dc · hauleth.dev/dotfiles

+1 -1

dev_shells.nix

···

       25
        
             ];

     

       26
        
           };

     

       27
        
       

     

       28
       -
         elixir = with beam.packages.erlang;

     

       29
        
           mkShell {

     

       30
        
             packages =

     

       31
        
               [

···

       25
        
             ];

     

       26
        
           };

     

       27
        
       

     

       28
       +
         elixir = with beam.packages.erlang_27;

     

       29
        
           mkShell {

     

       30
        
             packages =

     

       31
        
               [

+4

flake.nix

···

       63
        
                 (import ./hosts/niuniobook.nix {inherit inputs;})

     

       64
        
                 .system;

     

       65
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       66
        
               homeConfigurations."hauleth" =

     

       67
        
                 (import ./users/hauleth.nix {inherit inputs;})

     

       68
        
                 .home;

···

       63
        
                 (import ./hosts/niuniobook.nix {inherit inputs;})

     

       64
        
                 .system;

     

       65
        
       

     

       66
       +
               darwinConfigurations."Supadupa" =

     

       67
       +
                 (import ./hosts/supadupa.nix {inherit inputs;})

     

       68
       +
                 .system;

     

       69
       +
       

     

       70
        
               homeConfigurations."hauleth" =

     

       71
        
                 (import ./users/hauleth.nix {inherit inputs;})

     

       72
        
                 .home;

+1 -1

hosts/modules/builders.nix

···

       9
        
           config = {

     

       10
        
             virtualisation = {

     

       11
        
               darwin-builder = {

     

       12
       -
                 diskSize = 20 * 1024;

     

       13
        
                 memorySize = 4 * 1024;

     

       14
        
               };

     

       15
        
               cores = 4;

···

       9
        
           config = {

     

       10
        
             virtualisation = {

     

       11
        
               darwin-builder = {

     

       12
       +
           #       diskSize = 20 * 1024;

     

       13
        
                 memorySize = 4 * 1024;

     

       14
        
               };

     

       15
        
               cores = 4;

+1

hosts/niuniobook.nix

···

       23
        
               documentation.enable = true;

     

       24
        
             }

     

       25
        
             inputs.lix-module.nixosModules.default

     

       0
        
       
     

       26
        
           ];

     

       27
        
       

     

       28
        
           inherit inputs;

···

       23
        
               documentation.enable = true;

     

       24
        
             }

     

       25
        
             inputs.lix-module.nixosModules.default

     

       26
       +
             inputs.home-manager.darwinModules.home-manager

     

       27
        
           ];

     

       28
        
       

     

       29
        
           inherit inputs;

+31

hosts/supadupa.nix

···

       1
       +
       {inputs, ...}: {

     

       2
       +
         type = "darwin";

     

       3
       +
       

     

       4
       +
         hostname = "Supadupa";

     

       5
       +
       

     

       6
       +
         system = inputs.darwin.lib.darwinSystem {

     

       7
       +
           system = "aarch64-darwin";

     

       8
       +
           modules = [

     

       9
       +
             {

     

       10
       +
               # You should generally set this to the total number of logical cores in your system.

     

       11
       +
               # $ sysctl -n hw.ncpu

     

       12
       +
               nix.settings.max-jobs = 8;

     

       13
       +
               nix.settings.cores = 8;

     

       14
       +
             }

     

       15
       +
             ../modules/common.nix

     

       16
       +
             ../modules/darwin.nix

     

       17
       +
             ../modules/fonts.nix

     

       18
       +
             ./modules/environment.nix

     

       19
       +
             # ./modules/builders.nix

     

       20
       +
             ../modules/nvim.nix

     

       21
       +
             {

     

       22
       +
               system.stateVersion = 4;

     

       23
       +
               documentation.enable = true;

     

       24
       +
             }

     

       25
       +
             inputs.lix-module.nixosModules.default

     

       26
       +
             inputs.home-manager.darwinModules.home-manager

     

       27
       +
           ];

     

       28
       +
       

     

       29
       +
           inherit inputs;

     

       30
       +
         };

     

       31
       +
       }

-1

modules/common.nix

···

       13
        
         ];

     

       14
        
       

     

       15
        
         nix.registry = {

     

       16
       -
           darwin.flake = inputs.darwin;

     

       17
        
           dotfiles.flake = inputs.self;

     

       18
        
           flake-parts.flake = inputs.flake-parts;

     

       19
        
         };

···

       13
        
         ];

     

       14
        
       

     

       15
        
         nix.registry = {

     

       0
        
       
     

       16
        
           dotfiles.flake = inputs.self;

     

       17
        
           flake-parts.flake = inputs.flake-parts;

     

       18
        
         };

+3 -1

modules/darwin.nix

···

       1
       -
       {pkgs, ...}: {

     

       2
        
         nix.settings.extra-sandbox-paths = [

     

       3
        
           "/System/Library/Frameworks"

     

       4
        
           "/System/Library/PrivateFrameworks"

     
···

       18
        
             localhost = "127.0.0.1";

     

       19
        
           };

     

       20
        
         };

     

       0
        
       
     

       0
        
       
     

       21
        
       

     

       22
        
         # Enable TouchID PAM on macOS

     

       23
        
         security.pam.enableSudoTouchIdAuth = true;

···

       1
       +
       {pkgs, inputs, ...}: {

     

       2
        
         nix.settings.extra-sandbox-paths = [

     

       3
        
           "/System/Library/Frameworks"

     

       4
        
           "/System/Library/PrivateFrameworks"

     
···

       18
        
             localhost = "127.0.0.1";

     

       19
        
           };

     

       20
        
         };

     

       21
       +
       

     

       22
       +
         nix.registry.darwin.flake = inputs.darwin;

     

       23
        
       

     

       24
        
         # Enable TouchID PAM on macOS

     

       25
        
         security.pam.enableSudoTouchIdAuth = true;

+3 -1

modules/fish.nix

···

       27
        
           ERL_FLAGS = "-kernel shell_history enabled";

     

       28
        
         };

     

       29
        
       

     

       0
        
       
     

       0
        
       
     

       30
        
         programs.fish = {

     

       31
        
           enable = true;

     

       32
        
       

     
···

       68
        
       

     

       69
        
           interactiveShellInit = ''

     

       70
        
             # use fish in nix run and nix-shell

     

       71
       -
             ${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source

     

       72
        
       

     

       73
        
             set -g DEFAULT_USER ${config.home.username}

     

       74

···

       27
        
           ERL_FLAGS = "-kernel shell_history enabled";

     

       28
        
         };

     

       29
        
       

     

       30
       +
         programs.zsh.enable = true;

     

       31
       +
       

     

       32
        
         programs.fish = {

     

       33
        
           enable = true;

     

       34
        
       

     
···

       70
        
       

     

       71
        
           interactiveShellInit = ''

     

       72
        
             # use fish in nix run and nix-shell

     

       73
       +
             ${pkgs.any-nix-shell}/bin/any-nix-shell fish | source

     

       74
        
       

     

       75
        
             set -g DEFAULT_USER ${config.home.username}

     

       76

+1 -1

modules/git.nix

···

       22
        
       

     

       23
        
         home.packages = [

     

       24
        
           pkgs.git-absorb

     

       25
       -
           (inputs.self.lib.dontCheck pkgs.git-branchless)

     

       26
        
           pkgs.git-gone

     

       27
        
           pkgs.git-cliff

     

       28
        
           pkgs.git-revise

···

       22
        
       

     

       23
        
         home.packages = [

     

       24
        
           pkgs.git-absorb

     

       25
       +
           (inputs.self.lib.dontCheck inputs.git-branchless.packages.${pkgs.stdenv.hostPlatform.system}.git-branchless)

     

       26
        
           pkgs.git-gone

     

       27
        
           pkgs.git-cliff

     

       28
        
           pkgs.git-revise

+1

modules/tools.nix

···

       24
        
           pkgs.senpai

     

       25
        
           pkgs.timg

     

       26
        
           pkgs.typos

     

       0
        
       
     

       27
        
         ];

     

       28
        
       }

···

       24
        
           pkgs.senpai

     

       25
        
           pkgs.timg

     

       26
        
           pkgs.typos

     

       27
       +
           pkgs.pngpaste

     

       28
        
         ];

     

       29
        
       }

+2 -2

vim/.config/nvim/after/queries/haskell/highlights.scm

···

       5
        
       

     

       6
        
       ("\\" @operator (#set! conceal "λ"))

     

       7
        
       ("forall" @repeat (#set! conceal "∀"))

     

       8
       -
       ((where) @keyword (#set! conceal "∵"))

     

       9
        
       

     

       10
       -
       ((exp_infix (variable) @operator) (#eq? @operator "in") (#set! conceal "∈"))

     

       11
        
       (((operator) @operator) (#eq? @operator ".") (#set! conceal "∘"))

···

       5
        
       

     

       6
        
       ("\\" @operator (#set! conceal "λ"))

     

       7
        
       ("forall" @repeat (#set! conceal "∀"))

     

       8
       +
       ;((where) @keyword (#set! conceal "∵"))

     

       9
        
       

     

       10
       +
       ;((exp_infix (variable) @operator) (#eq? @operator "in") (#set! conceal "∈"))

     

       11
        
       (((operator) @operator) (#eq? @operator ".") (#set! conceal "∘"))

-1

vim/.config/nvim/fnl/plugins.fnl

···

       54
        
                 (pkg :AndrewRadev/splitjoin.vim

     

       55
        
                      {:keys [:gS :gJ]})

     

       56
        
                 (pkg :hauleth/sad.vim)

     

       57
       -
                 (pkg :tommcdo/vim-exchange)

     

       58
        
       

     

       59
        
                 ; Task running

     

       60
        
                 (pkg :hauleth/asyncdo.vim)

···

       54
        
                 (pkg :AndrewRadev/splitjoin.vim

     

       55
        
                      {:keys [:gS :gJ]})

     

       56
        
                 (pkg :hauleth/sad.vim)

     

       0
        
       
     

       57
        
       

     

       58
        
                 ; Task running

     

       59
        
                 (pkg :hauleth/asyncdo.vim)

+33 -28

vim/.config/nvim/init.fnl

···

       126
        
       (do ; Clap

     

       127
        
         (map :n :<Space><Space> #(picker.find-files)))

     

       128
        
       

     

       129
       -
       (do ; Frequently used unimpaired mappings

     

       130
       -
         (let [unimpaired (fn [char left right]

     

       131
       -
                            (map :n (.. "[" char) left)

     

       132
       -
                            (map :n (.. "]" char) right))]

     

       133
       -
           (unimpaired :w :gT :gt)

     

       134
       -
           (unimpaired :q ":cprev" ":cnext")

     

       135
       -
           (unimpaired :Q ":cpfile" ":cnfile")

     

       136
       -
           (unimpaired :l ":lprev" ":lnext")

     

       137
       -
           (unimpaired :L ":lpfile" ":lnfile")))

     

       138
       -
       

     

       139
        
       (do ; Additional "Close" commands

     

       140
        
         (map :n :ZS ":wa")

     

       141
        
         (map :n :ZA ":qa")

     
···

       178
        
       (do ; Quickly disable highlight

     

       179
        
         (map :n "<Space>," ":nohlsearch"))

     

       180
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       181
        
       (do ; Terminal mappings

     

       182
        
         ; (map :n :<C-q>c ":term")

     

       183
        
         (map :n :<C-q>s ":Start")

     
···

       236
        
                                    :table config)]

     

       237
        
                         (f opts)

     

       238
        
                         lib))]

     

       239
       -
           (setup :mini.starter

     

       240
       -
                  (fn [starter]

     

       241
       -
                    {:items [(starter.sections.sessions 10 true)

     

       242
       -
                             (starter.sections.builtin_actions)]}))

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       243
        
           (setup :mini.sessions

     

       244
        
                  (fn [sessions]

     

       245
        
                    (let [complete (fn [with-current?]

     
···

       254
        
                      (defcommand SRead {:nargs 1 :bang true :complete (complete false)}

     

       255
        
                                  (print (sessions.read (tostring args) {:force bang}))))

     

       256
        
                    {:directory (.. (fun.stdpath :data) "/site/sessions/")}))

     

       257
       -
           (setup :mini.align

     

       258
       -
                  {:mappings {:start :gl

     

       259
       -
                              :start_with_preview :gL}})

     

       260
       -
           (setup :mini.bufremove

     

       261
       -
                  (fn [bufremove]

     

       262
       -
                    (defcommand Bd (bufremove.delete))

     

       263
       -
                    (defcommand BClean

     

       264
       -
                                (->> (fun.getbufinfo {:buflisted true})

     

       265
       -
                                     (vim.tbl_filter #(= (next $1.windows) nil))

     

       266
       -
                                     (#(each [_ v (ipairs $1)]

     

       267
       -
                                         (bufremove.delete v.bufnr)))))

     

       268
       -
                    {:set_vim_settings false}))

     

       269
       -
           (setup :mini.ai)

     

       270
       -
           (setup :mini.jump {:mappings {:repeat_jump ":"}})

     

       271
        
           (setup :mini.surround

     

       272
        
                  {:mappings {:add :gsa

     

       273
        
                              :delete :gsd

···

       126
        
       (do ; Clap

     

       127
        
         (map :n :<Space><Space> #(picker.find-files)))

     

       128
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       129
        
       (do ; Additional "Close" commands

     

       130
        
         (map :n :ZS ":wa")

     

       131
        
         (map :n :ZA ":qa")

     
···

       168
        
       (do ; Quickly disable highlight

     

       169
        
         (map :n "<Space>," ":nohlsearch"))

     

       170
        
       

     

       171
       +
       (do ; Frequently used unimpaired mappings

     

       172
       +
         (let [unimpaired (fn [char left right]

     

       173
       +
                            (map :n (.. "[" char) left)

     

       174
       +
                            (map :n (.. "]" char) right))]

     

       175
       +
           (unimpaired :w :gT :gt)

     

       176
       +
           (unimpaired :q ":cprev" ":cnext")

     

       177
       +
           (unimpaired :Q ":cpfile" ":cnfile")

     

       178
       +
           (unimpaired :l ":lprev" ":lnext")

     

       179
       +
           (unimpaired :L ":lpfile" ":lnfile")))

     

       180
       +
       

     

       181
        
       (do ; Terminal mappings

     

       182
        
         ; (map :n :<C-q>c ":term")

     

       183
        
         (map :n :<C-q>s ":Start")

     
···

       236
        
                                    :table config)]

     

       237
        
                         (f opts)

     

       238
        
                         lib))]

     

       239
       +
           (setup :mini.ai)

     

       240
       +
           (setup :mini.align

     

       241
       +
                  {:mappings {:start :gl

     

       242
       +
                              :start_with_preview :gL}})

     

       243
       +
           ;(setup :mini.bracketed)

     

       244
       +
           (setup :mini.bufremove

     

       245
       +
                  (fn [bufremove]

     

       246
       +
                    (defcommand Bd (bufremove.delete))

     

       247
       +
                    (defcommand BClean

     

       248
       +
                                (->> (fun.getbufinfo {:buflisted true})

     

       249
       +
                                     (vim.tbl_filter #(= (next $1.windows) nil))

     

       250
       +
                                     (#(each [_ v (ipairs $1)]

     

       251
       +
                                         (bufremove.delete v.bufnr)))))

     

       252
       +
                    {:set_vim_settings false}))

     

       253
       +
           (setup :mini.jump {:mappings {:repeat_jump ":"}})

     

       254
       +
           (setup :mini.operators {

     

       255
       +
                  :multiply {:prefix ""}

     

       256
       +
                  :replace {:prefix ""}

     

       257
       +
                  :sort {:prefix ""}})

     

       258
        
           (setup :mini.sessions

     

       259
        
                  (fn [sessions]

     

       260
        
                    (let [complete (fn [with-current?]

     
···

       269
        
                      (defcommand SRead {:nargs 1 :bang true :complete (complete false)}

     

       270
        
                                  (print (sessions.read (tostring args) {:force bang}))))

     

       271
        
                    {:directory (.. (fun.stdpath :data) "/site/sessions/")}))

     

       272
       +
           (setup :mini.starter

     

       273
       +
                  (fn [starter]

     

       274
       +
                    {:items [(starter.sections.sessions 10 true)

     

       275
       +
                             (starter.sections.builtin_actions)]}))

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       276
        
           (setup :mini.surround

     

       277
        
                  {:mappings {:add :gsa

     

       278
        
                              :delete :gsd

+2 -2

vim/.config/nvim/plugin/statusline.vim

···

       5
        
       let &statusline .= ' '

     

       6
        
       let &statusline .= '%#StatusLineNC#%{statusline#path()}%*'

     

       7
        
       let &statusline .= '%='

     

       8
       -
       let &statusline .= '%{FugitiveHead()} %{statusline#quickfix()} %4c:%l'

     

       9
       -
       " let &statusline .= '%{statusline#quickfix()} %4c:%l'

···

       5
        
       let &statusline .= ' '

     

       6
        
       let &statusline .= '%#StatusLineNC#%{statusline#path()}%*'

     

       7
        
       let &statusline .= '%='

     

       8
       +
       "let &statusline .= '%{b:minigit_summary.head_name} %{statusline#quickfix()} %4c:%l'

     

       9
       +
       let &statusline .= '%{statusline#quickfix()} %4c:%l'

+1

vim/.config/nvim/spell/en.utf-8.add

···

       0

···

       1
       +
       Supabase