commit 4af901df0f27d6cafd0d86f6e4c76d9943a05cd5 · hauleth.dev/dotfiles

+21 -4

modules/email.nix

···

       1
        
       {pkgs, ...}: {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2
        
         # programs.himalaya.enable = true;

     

       3
       -
         programs.mbsync.enable = true;

     

       4
       -
         programs.notmuch.enable = true;

     

       5
       -
         programs.aerc.enable = true;

     

       6
       -
         programs.aerc.extraConfig.general.unsafe-accounts-conf = true;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       7
        
       

     

       8
        
         accounts.email.accounts."hauleth" = {

     

       9
        
           realName = "Łukasz Niemier";

     
···

       18
        
           aerc.enable = true;

     

       19
        
           # himalaya.enable = true;

     

       20
        
       

     

       0
        
       
     

       21
        
           imap = {

     

       22
        
             host = "mail.hauleth.dev";

     

       23
        
             port = 993;

···

       1
        
       {pkgs, ...}: {

     

       2
       +
         targets.darwin.defaults = {

     

       3
       +
           # Remember the fallen

     

       4
       +
           "com.apple.mail" = {

     

       5
       +
             UserHeaders = "{ \"X-Clacks-Overhead\" = \"GNU Terry Pratchett\"; }";

     

       6
       +
           };

     

       7
       +
         };

     

       8
       +
       

     

       9
        
         # programs.himalaya.enable = true;

     

       10
       +
         # programs.mbsync.enable = true;

     

       11
       +
         # programs.notmuch.enable = true;

     

       12
       +
       

     

       13
       +
         programs.aerc = {

     

       14
       +
           enable = true;

     

       15
       +
           extraConfig = {

     

       16
       +
             general.unsafe-accounts-conf = true;

     

       17
       +
       

     

       18
       +
             filters = {

     

       19
       +
               "text/plain" = "colorize";

     

       20
       +
             };

     

       21
       +
           };

     

       22
       +
         };

     

       23
        
       

     

       24
        
         accounts.email.accounts."hauleth" = {

     

       25
        
           realName = "Łukasz Niemier";

     
···

       34
        
           aerc.enable = true;

     

       35
        
           # himalaya.enable = true;

     

       36
        
       

     

       37
       +
           # TODO: Migrate to JMAP

     

       38
        
           imap = {

     

       39
        
             host = "mail.hauleth.dev";

     

       40
        
             port = 993;

+10 -2

modules/git.nix

···

       54
        
           pkgs.git-branchless

     

       55
        
           git-branchless-man

     

       56
        
           pkgs.git-gone

     

       57
       -
           pkgs.git-chglog

     

       58
        
           git-cliff

     

       59
        
           pkgs.git-revise

     

       60
        
           pkgs.gitAndTools.git-imerge

     
···

       125
        
       

     

       126
        
             merge = {

     

       127
        
               ff = false;

     

       128
       -
               conflictstyle = "diff3";

     

       129
        
             };

     

       130
        
       

     

       131
        
             branch.autoSetupRebase = "always";

     
···

       140
        
               indentHeuristic = true;

     

       141
        
               algorithm = "histogram";

     

       142
        
               mnemonicPrefix = true;

     

       0
        
       
     

       143
        
       

     

       144
        
               tool = "difftastic";

     

       145
        
       

     
···

       184
        
               autostash = true;

     

       185
        
               autosquash = true;

     

       186
        
               updateRefs = true;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       187
        
             };

     

       188
        
       

     

       189
        
             pretty = {

···

       54
        
           pkgs.git-branchless

     

       55
        
           git-branchless-man

     

       56
        
           pkgs.git-gone

     

       0
        
       
     

       57
        
           git-cliff

     

       58
        
           pkgs.git-revise

     

       59
        
           pkgs.gitAndTools.git-imerge

     
···

       124
        
       

     

       125
        
             merge = {

     

       126
        
               ff = false;

     

       127
       +
               conflictstyle = "zdiff3";

     

       128
        
             };

     

       129
        
       

     

       130
        
             branch.autoSetupRebase = "always";

     
···

       139
        
               indentHeuristic = true;

     

       140
        
               algorithm = "histogram";

     

       141
        
               mnemonicPrefix = true;

     

       142
       +
               renames = "copies";

     

       143
        
       

     

       144
        
               tool = "difftastic";

     

       145
        
       

     
···

       184
        
               autostash = true;

     

       185
        
               autosquash = true;

     

       186
        
               updateRefs = true;

     

       187
       +
             };

     

       188
       +
       

     

       189
       +
             url."git@github.com:".pushInsteadOf = "https://github.com/";

     

       190
       +
       

     

       191
       +
             maintenance = {

     

       192
       +
               # It will ask 1password for access to SSH key/GH token. That is

     

       193
       +
               # irritating

     

       194
       +
               prefetch.enabled = false;

     

       195
        
             };

     

       196
        
       

     

       197
        
             pretty = {

+2

modules/nvim.nix

···

       17
        
               start = [

     

       18
        
                 packer-nvim

     

       19
        
                 nvim-treesitter.withAllGrammars

     

       0
        
       
     

       0
        
       
     

       20
        
               ];

     

       21
        
       

     

       22
        
               opt = [];

···

       17
        
               start = [

     

       18
        
                 packer-nvim

     

       19
        
                 nvim-treesitter.withAllGrammars

     

       20
       +
                 neorg

     

       21
       +
                 neorg-telescope

     

       22
        
               ];

     

       23
        
       

     

       24
        
               opt = [];

+3

modules/pijul.nix

···

       1
       +
       { pkgs, ... }: {

     

       2
       +
         home.packages = [ pkgs.pijul ];

     

       3
       +
       }

+37 -8

modules/swiftbar.nix

···

       1
       -
       {pkgs, ...}: {

     

       2
       -
         home.packages = with pkgs; [

     

       3
       -
           swiftbar

     

       4
       -
         ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       5
        
       

     

       6
       -
         targets.darwin.defaults = {

     

       7
       -
           "com.ameba.SwiftBar" = {

     

       8
       -
             PluginDirectory = "/Users/hauleth/.config/swift-bar/plugins/";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       9
        
           };

     

       10
        
         };

     

       11
       -
       }

···

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

     

       2
       +
         # WIP

     

       3
       +
         options.swiftbar = let

     

       4
       +
           inherit (lib) mkOption types;

     

       5
       +
         in {

     

       6
       +
           enable = lib.mkEnableOption "swiftbar";

     

       7
       +
       

     

       8
       +
           package = lib.mkPackageOption pkgs "swiftbar" {};

     

       9
       +
       

     

       10
       +
           plugins = mkOption {

     

       11
       +
             type = types.attrsOf (types.submodule {

     

       12
       +
               enable = lib.mkEnableOption "current SwiftBar plugin";

     

       13
       +
       

     

       14
       +
               frequency = mkOption {

     

       15
       +
                 type = types.string;

     

       16
       +
                 example = "1m";

     

       17
       +
                 description = ''

     

       18
       +
                 How often should SwiftBar run script in the background.

     

       19
       +
                 '';

     

       20
       +
               };

     

       21
       +
       

     

       22
       +
               script = mkOption {

     

       23
       +
                 type = types.string;

     

       24
       +
               };

     

       25
       +
             });

     

       26
       +
           };

     

       27
       +
         };

     

       28
        
       

     

       29
       +
         config = {

     

       30
       +
           home.packages = [

     

       31
       +
             pkgs.swiftbar

     

       32
       +
           ];

     

       33
       +
       

     

       34
       +
           targets.darwin.defaults = {

     

       35
       +
             "com.ameba.SwiftBar" = {

     

       36
       +
               PluginDirectory = "/Users/hauleth/.config/swift-bar/plugins/";

     

       37
       +
             };

     

       38
        
           };

     

       39
        
         };

     

       40
       +
        }

+5 -2

modules/tools.nix

···

       1
       -
       {pkgs, inputs, config, ...}: {

     

       0
        
       
     

       0
        
       
     

       2
        
         home.packages = with pkgs; [

     

       3
        
           # bfs

     

       4
        
           comby

     

       5
        
           senpai

     

       6
        
           jaq

     

       7
        
           jo

     

       8
       -
           inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.ubin-client

     

       0
        
       
     

       9
        
         ];

     

       10
        
       }

···

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

     

       2
       +
         pkgs-self = inputs.self.packages.${pkgs.stdenv.hostPlatform.system};

     

       3
       +
       in {

     

       4
        
         home.packages = with pkgs; [

     

       5
        
           # bfs

     

       6
        
           comby

     

       7
        
           senpai

     

       8
        
           jaq

     

       9
        
           jo

     

       10
       +
           glow

     

       11
       +
           pkgs-self.ubin-client

     

       12
        
         ];

     

       13
        
       }

+1

users/hauleth.nix

···

       28
        
             ../modules/nixd.nix

     

       29
        
             ../modules/swiftbar.nix

     

       30
        
             ../modules/email.nix

     

       0
        
       
     

       31
        
             ./modules/dircolors.nix

     

       32
        
             {home.stateVersion = "23.05";}

     

       33
        
           ];

···

       28
        
             ../modules/nixd.nix

     

       29
        
             ../modules/swiftbar.nix

     

       30
        
             ../modules/email.nix

     

       31
       +
             ../modules/pijul.nix

     

       32
        
             ./modules/dircolors.nix

     

       33
        
             {home.stateVersion = "23.05";}

     

       34
        
           ];

+2 -4

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

···

       50
        
            :default_config {

     

       51
        
              :autostart false

     

       52
        
              :filetypes ["elixir" "eelixir" "heex"]

     

       53
       -
              :root_dir (fn [fname]

     

       54
       -
                          (let [project ((lspconfig.util.root_pattern ".git") fname)]

     

       55
       -
                                project))}

     

       56
       -
            })

     

       57
        
       

     

       58
        
       (set lspconfig.util.default_config

     

       59
        
            (vim.tbl_extend :force lspconfig.util.default_config

···

       50
        
            :default_config {

     

       51
        
              :autostart false

     

       52
        
              :filetypes ["elixir" "eelixir" "heex"]

     

       53
       +
              :root_dir (lspconfig.util.root_pattern "mix.lock")

     

       54
       +
            }})

     

       0
        
       
     

       0
        
       
     

       55
        
       

     

       56
        
       (set lspconfig.util.default_config

     

       57
        
            (vim.tbl_extend :force lspconfig.util.default_config

+1 -2

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

···

       39
        
                 ; Languages

     

       40
        
                 (pkg :elixir-editors/vim-elixir

     

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

     

       42
       -
                 ;(pkg :nvim-orgmode/orgmode)

     

       43
        
       

     

       44
        
                 ; Language Protocol

     

       45
        
                 (pkg :neovim/nvim-lspconfig)

     

       46
        
                 (pkg :nvim-treesitter/playground

     

       47
        
                      {:cmd [:TSPlaygroundToggle

     

       48
       -
                             :TSHighlightCaputresUnderCursor]})

     

       49
        
                 (pkg :j-hui/fidget.nvim {:tag :legacy})

     

       50
        
       

     

       51
        
                 ; Code manipulation

···

       39
        
                 ; Languages

     

       40
        
                 (pkg :elixir-editors/vim-elixir

     

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

     

       0
        
       
     

       42
        
       

     

       43
        
                 ; Language Protocol

     

       44
        
                 (pkg :neovim/nvim-lspconfig)

     

       45
        
                 (pkg :nvim-treesitter/playground

     

       46
        
                      {:cmd [:TSPlaygroundToggle

     

       47
       +
                             :TSHighlightCapturesUnderCursor]})

     

       48
        
                 (pkg :j-hui/fidget.nvim {:tag :legacy})

     

       49
        
       

     

       50
        
                 ; Code manipulation

+1

vim/.config/nvim/ftdetect/custom.vim

···

       4
        
       au BufRead,BufNewFile PULLREQ_EDITMSG setf gitcommit

     

       5
        
       au BufRead,BufNewFile *.livemd setf markdown

     

       6
        
       au BufRead,BufNewFile *.prr setf prr

     

       0

···

       4
        
       au BufRead,BufNewFile PULLREQ_EDITMSG setf gitcommit

     

       5
        
       au BufRead,BufNewFile *.livemd setf markdown

     

       6
        
       au BufRead,BufNewFile *.prr setf prr

     

       7
       +
       au BufRead,BufNewFile .plan setf plan

+4 -1

vim/.config/nvim/init.fnl

···

       266
        
                               :disable [:erlang :make :diff]}

     

       267
        
                   :matchup {:enable true}

     

       268
        
                   :indent {:enable true}

     

       269
       -
                   :incremental_selection {:enable true}})))

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       270
        
       

     

       271
        
       (defcommand Clean "keeppatterns %s/\\s\\+$//e | set nohlsearch")

     

       272

···

       266
        
                               :disable [:erlang :make :diff]}

     

       267
        
                   :matchup {:enable true}

     

       268
        
                   :indent {:enable true}

     

       269
       +
                   :incremental_selection {:enable true}})

     

       270
       +
           (setup :neorg

     

       271
       +
                  {:load {:core.defaults {}

     

       272
       +
                          :core.concealer {}}})))

     

       273
        
       

     

       274
        
       (defcommand Clean "keeppatterns %s/\\s\\+$//e | set nohlsearch")

     

       275

+11

vim/.config/nvim/syntax/plan.vim

···

       1
       +
       if exists("b:current_syntax")

     

       2
       +
         finish

     

       3
       +
       endif

     

       4
       +
       

     

       5
       +
       syn match PlanDone '^+\ze\s' conceal cchar=✔

     

       6
       +
       syn match PlanWork '^\*\ze\s' conceal cchar=⏲

     

       7
       +
       syn match PlanTodo '^-\ze\s' conceal cchar=⨯

     

       8
       +
       

     

       9
       +
       hi def link PlanDone Include

     

       10
       +
       hi def link PlanWork Keyword

     

       11
       +
       hi def link PlanTodo Comment