commit 29682f748ab5a325f7830b3c293f554f2f84dd9e · ryan.freumh.org/nixos

+29 -66

flake.lock

···

       103
       103
        
               "type": "github"

     

       104
       104
        
             }

     

       105
       105
        
           },

     

       106
       106
       -
           "eeww": {

     

       107
       107
       -
             "inputs": {

     

       108
       108
       -
               "flake-utils": "flake-utils_3",

     

       109
       109
       -
               "nixpkgs": [

     

       110
       110
       -
                 "nixpkgs"

     

       111
       111
       -
               ]

     

       112
       112
       -
             },

     

       113
       113
       -
             "locked": {

     

       114
       114
       -
               "lastModified": 1670945505,

     

       115
       115
       -
               "narHash": "sha256-gN6ATdvUuNDBKYTQeax5oNtUeQIiCGQyYgfueLsC8Es=",

     

       116
       116
       -
               "owner": "RyanGibb",

     

       117
       117
       -
               "repo": "eeww",

     

       118
       118
       -
               "rev": "12f3908ffa24fcbdf8df6e422d27022965b8058c",

     

       119
       119
       -
               "type": "github"

     

       120
       120
       -
             },

     

       121
       121
       -
             "original": {

     

       122
       122
       -
               "owner": "RyanGibb",

     

       123
       123
       -
               "ref": "nixos",

     

       124
       124
       -
               "repo": "eeww",

     

       125
       125
       -
               "type": "github"

     

       126
       126
       -
             }

     

       127
       127
       -
           },

     

       128
       106
        
           "eilean": {

     

       129
       107
        
             "inputs": {

     

       130
       108
        
               "nixos-mailserver": "nixos-mailserver",

     
···

       149
       127
        
           },

     

       150
       128
        
           "eon": {

     

       151
       129
        
             "inputs": {

     

       152
       152
       -
               "flake-utils": "flake-utils_4",

     

       130
       130
       +
               "flake-utils": "flake-utils_3",

     

       153
       131
        
               "nixpkgs": [

     

       154
       132
        
                 "nixpkgs"

     

       155
       133
        
               ],

     
···

       246
       224
        
               "type": "indirect"

     

       247
       225
        
             }

     

       248
       226
        
           },

     

       249
       249
       -
           "flake-utils_10": {

     

       250
       250
       -
             "locked": {

     

       251
       251
       -
               "lastModified": 1676283394,

     

       252
       252
       -
               "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",

     

       253
       253
       -
               "owner": "numtide",

     

       254
       254
       -
               "repo": "flake-utils",

     

       255
       255
       -
               "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",

     

       256
       256
       -
               "type": "github"

     

       257
       257
       -
             },

     

       258
       258
       -
             "original": {

     

       259
       259
       -
               "id": "flake-utils",

     

       260
       260
       -
               "type": "indirect"

     

       261
       261
       -
             }

     

       262
       262
       -
           },

     

       263
       227
        
           "flake-utils_2": {

     

       264
       228
        
             "inputs": {

     

       265
       229
        
               "systems": "systems_2"

     
···

       278
       242
        
             }

     

       279
       243
        
           },

     

       280
       244
        
           "flake-utils_3": {

     

       281
       281
       -
             "locked": {

     

       282
       282
       -
               "lastModified": 1667395993,

     

       283
       283
       -
               "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",

     

       284
       284
       -
               "owner": "numtide",

     

       285
       285
       -
               "repo": "flake-utils",

     

       286
       286
       -
               "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",

     

       287
       287
       -
               "type": "github"

     

       288
       288
       -
             },

     

       289
       289
       -
             "original": {

     

       290
       290
       -
               "id": "flake-utils",

     

       291
       291
       -
               "type": "indirect"

     

       292
       292
       -
             }

     

       293
       293
       -
           },

     

       294
       294
       -
           "flake-utils_4": {

     

       295
       245
        
             "inputs": {

     

       296
       246
        
               "systems": "systems_4"

     

       297
       247
        
             },

     
···

       309
       259
        
               "type": "github"

     

       310
       260
        
             }

     

       311
       261
        
           },

     

       312
       312
       -
           "flake-utils_5": {

     

       262
       262
       +
           "flake-utils_4": {

     

       313
       263
        
             "locked": {

     

       314
       264
        
               "lastModified": 1676283394,

     

       315
       265
        
               "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",

     
···

       323
       273
        
               "type": "indirect"

     

       324
       274
        
             }

     

       325
       275
        
           },

     

       326
       326
       -
           "flake-utils_6": {

     

       276
       276
       +
           "flake-utils_5": {

     

       327
       277
        
             "inputs": {

     

       328
       278
        
               "systems": "systems_5"

     

       329
       279
        
             },

     
···

       341
       291
        
               "type": "github"

     

       342
       292
        
             }

     

       343
       293
        
           },

     

       344
       344
       -
           "flake-utils_7": {

     

       294
       294
       +
           "flake-utils_6": {

     

       345
       295
        
             "locked": {

     

       346
       296
        
               "lastModified": 1638122382,

     

       347
       297
        
               "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",

     
···

       356
       306
        
               "type": "github"

     

       357
       307
        
             }

     

       358
       308
        
           },

     

       359
       359
       -
           "flake-utils_8": {

     

       309
       309
       +
           "flake-utils_7": {

     

       360
       310
        
             "inputs": {

     

       361
       311
        
               "systems": "systems_6"

     

       362
       312
        
             },

     
···

       374
       324
        
               "type": "github"

     

       375
       325
        
             }

     

       376
       326
        
           },

     

       377
       377
       -
           "flake-utils_9": {

     

       327
       327
       +
           "flake-utils_8": {

     

       378
       328
        
             "inputs": {

     

       379
       329
        
               "systems": "systems_7"

     

       380
       330
        
             },

     
···

       392
       342
        
               "type": "github"

     

       393
       343
        
             }

     

       394
       344
        
           },

     

       345
       345
       +
           "flake-utils_9": {

     

       346
       346
       +
             "locked": {

     

       347
       347
       +
               "lastModified": 1676283394,

     

       348
       348
       +
               "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",

     

       349
       349
       +
               "owner": "numtide",

     

       350
       350
       +
               "repo": "flake-utils",

     

       351
       351
       +
               "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",

     

       352
       352
       +
               "type": "github"

     

       353
       353
       +
             },

     

       354
       354
       +
             "original": {

     

       355
       355
       +
               "id": "flake-utils",

     

       356
       356
       +
               "type": "indirect"

     

       357
       357
       +
             }

     

       358
       358
       +
           },

     

       395
       359
        
           "fn06-website": {

     

       396
       360
        
             "inputs": {

     

       397
       397
       -
               "flake-utils": "flake-utils_5",

     

       361
       361
       +
               "flake-utils": "flake-utils_4",

     

       398
       362
        
               "nixpkgs": [

     

       399
       363
        
                 "nixpkgs"

     

       400
       364
        
               ]

     
···

       476
       440
        
           },

     

       477
       441
        
           "hyperbib-eeg": {

     

       478
       442
        
             "inputs": {

     

       479
       479
       -
               "flake-utils": "flake-utils_6",

     

       443
       443
       +
               "flake-utils": "flake-utils_5",

     

       480
       444
        
               "nixpkgs": [

     

       481
       445
        
                 "nixpkgs"

     

       482
       446
        
               ],

     
···

       500
       464
        
           },

     

       501
       465
        
           "i3-workspace-history": {

     

       502
       466
        
             "inputs": {

     

       503
       503
       -
               "flake-utils": "flake-utils_8",

     

       467
       467
       +
               "flake-utils": "flake-utils_7",

     

       504
       468
        
               "gomod2nix": "gomod2nix",

     

       505
       469
        
               "nixpkgs": [

     

       506
       470
        
                 "nixpkgs"

     
···

       554
       518
        
           },

     

       555
       519
        
           "neovim": {

     

       556
       520
        
             "inputs": {

     

       557
       557
       -
               "flake-utils": "flake-utils_9",

     

       521
       521
       +
               "flake-utils": "flake-utils_8",

     

       558
       522
        
               "nixpkgs": "nixpkgs_4"

     

       559
       523
        
             },

     

       560
       524
        
             "locked": {

     
···

       840
       804
        
           },

     

       841
       805
        
           "nixpkgs_6": {

     

       842
       806
        
             "locked": {

     

       843
       843
       -
               "lastModified": 1711124224,

     

       844
       844
       -
               "narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=",

     

       807
       807
       +
               "lastModified": 1712168706,

     

       808
       808
       +
               "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=",

     

       845
       809
        
               "owner": "nixos",

     

       846
       810
        
               "repo": "nixpkgs",

     

       847
       847
       -
               "rev": "56528ee42526794d413d6f244648aaee4a7b56c0",

     

       811
       811
       +
               "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb",

     

       848
       812
        
               "type": "github"

     

       849
       813
        
             },

     

       850
       814
        
             "original": {

     
···

       939
       903
        
           "opam-nix_2": {

     

       940
       904
        
             "inputs": {

     

       941
       905
        
               "flake-compat": "flake-compat_3",

     

       942
       942
       -
               "flake-utils": "flake-utils_7",

     

       906
       906
       +
               "flake-utils": "flake-utils_6",

     

       943
       907
        
               "mirage-opam-overlays": "mirage-opam-overlays_2",

     

       944
       908
        
               "nixpkgs": [

     

       945
       909
        
                 "hyperbib-eeg",

     
···

       1079
       1043
        
               "agenix": "agenix",

     

       1080
       1044
        
               "alec-website": "alec-website",

     

       1081
       1045
        
               "colour-guesser": "colour-guesser",

     

       1082
       1082
       -
               "eeww": "eeww",

     

       1083
       1046
        
               "eilean": "eilean",

     

       1084
       1047
        
               "eon": "eon",

     

       1085
       1048
        
               "fn06-website": "fn06-website",

     
···

       1097
       1060
        
           },

     

       1098
       1061
        
           "ryan-website": {

     

       1099
       1062
        
             "inputs": {

     

       1100
       1100
       -
               "flake-utils": "flake-utils_10",

     

       1063
       1063
       +
               "flake-utils": "flake-utils_9",

     

       1101
       1064
        
               "nixpkgs": [

     

       1102
       1065
        
                 "nixpkgs"

     

       1103
       1066
        
               ]

+10 -5

flake.nix

···

       7
       7
        
           home-manager.url = "github:RyanGibb/home-manager/fork";

     

       8
       8
        
           agenix.url = "github:ryantm/agenix";

     

       9
       9
        
           nix-on-droid.url = "github:nix-community/nix-on-droid/release-23.05";

     

       10
       10
       -
           eeww.url = "github:RyanGibb/eeww/nixos";

     

       11
       10
        
           eon.url = "github:RyanGibb/eon";

     

       12
       11
        
           eilean.url = "github:RyanGibb/eilean-nix/main";

     

       13
       12
        
           ryan-website.url = "git+ssh://git@github.com/RyanGibb/website.git";

     
···

       29
       28
        
           ryan-website.inputs.nixpkgs.follows = "nixpkgs";

     

       30
       29
        
           alec-website.inputs.nixpkgs.follows = "nixpkgs";

     

       31
       30
        
           fn06-website.inputs.nixpkgs.follows = "nixpkgs";

     

       32
       32
       -
           eeww.inputs.nixpkgs.follows = "nixpkgs";

     

       33
       31
        
           eon.inputs.nixpkgs.follows = "nixpkgs";

     

       34
       32
        
           colour-guesser.inputs.nixpkgs.follows = "nixpkgs";

     

       35
       33
        
           i3-workspace-history.inputs.nixpkgs.follows = "nixpkgs";

     
···

       37
       35
        
         };

     

       38
       36
        
       

     

       39
       37
        
         outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager

     

       40
       40
       -
           , agenix, nix-on-droid, eeww, eon, eilean, fn06-website

     

       41
       41
       -
           , i3-workspace-history, hyperbib-eeg, neovim, ... }@inputs:

     

       38
       38
       +
           , agenix, nix-on-droid, eon, eilean, fn06-website, i3-workspace-history

     

       39
       39
       +
           , hyperbib-eeg, neovim, ... }@inputs:

     

       42
       40
        
           let

     

       43
       41
        
             getSystemOverlays = system: nixpkgsConfig:

     

       44
       42
        
               [

     
···

       49
       47
        
                     config = nixpkgsConfig;

     

       50
       48
        
                   };

     

       51
       49
        
                   agenix = agenix.packages.${system}.default;

     

       52
       52
       -
                   eeww = eeww.defaultPackage.${system};

     

       53
       50
        
                   eon = eon.defaultPackage.${system};

     

       54
       51
        
                   mautrix-signal = final.overlay-unstable.mautrix-signal;

     

       55
       52
        
                   i3-workspace-history =

     
···

       196
       193
        
                   ];

     

       197
       194
        
                 };

     

       198
       195
        
               };

     

       196
       196
       +
       

     

       197
       197
       +
             homeConfigurations.ryan = let

     

       198
       198
       +
               system = "x86_64-linux";

     

       199
       199
       +
               pkgs = nixpkgs.legacyPackages.${system};

     

       200
       200
       +
             in home-manager.lib.homeManagerConfiguration {

     

       201
       201
       +
               inherit pkgs;

     

       202
       202
       +
               modules = [ ./home/default.nix ];

     

       203
       203
       +
             };

     

       199
       204
        
       

     

       200
       205
        
             legacyPackages = {

     

       201
       206
        
               nixpkgs = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed

+193

home/default.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       let cfg = config.custom;

     

       4
       4
       +
       in {

     

       5
       5
       +
         imports = [ ./mail.nix ./gui.nix ./i3.nix ./sway.nix ./nvim/default.nix ];

     

       6
       6
       +
       

     

       7
       7
       +
         options.custom.machineColour = lib.mkOption {

     

       8
       8
       +
           type = lib.types.str;

     

       9
       9
       +
           default = "cyan";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         config = {

     

       13
       13
       +
           home.sessionVariables = {

     

       14
       14
       +
             EDITOR = "nvim";

     

       15
       15
       +
             NIX_AUTO_RUN = "y";

     

       16
       16
       +
             NIX_AUTO_RUN_INTERACTIVE = "y";

     

       17
       17
       +
             BROWSER = "firefox"; # urlview

     

       18
       18
       +
             GOPATH = "$HOME/.go";

     

       19
       19
       +
           };

     

       20
       20
       +
           home.packages = with pkgs; [

     

       21
       21
       +
             tree

     

       22
       22
       +
             htop

     

       23
       23
       +
             bind

     

       24
       24
       +
             inetutils

     

       25
       25
       +
             dua

     

       26
       26
       +
             fd

     

       27
       27
       +
             nix-prefetch-git

     

       28
       28
       +
             gnumake

     

       29
       29
       +
             vlock

     

       30
       30
       +
             bat

     

       31
       31
       +
             killall

     

       32
       32
       +
             nmap

     

       33
       33
       +
             gcc

     

       34
       34
       +
             fzf

     

       35
       35
       +
             tcpdump

     

       36
       36
       +
             sshfs

     

       37
       37
       +
             nix-tree

     

       38
       38
       +
             #atuin

     

       39
       39
       +
             git-crypt

     

       40
       40
       +
             jq

     

       41
       41
       +
             bc

     

       42
       42
       +
             pandoc

     

       43
       43
       +
             w3m

     

       44
       44
       +
             ranger

     

       45
       45
       +
             bluetuith

     

       46
       46
       +
             powertop

     

       47
       47
       +
             ripgrep

     

       48
       48
       +
             toot

     

       49
       49
       +
             iamb

     

       50
       50
       +
           ];

     

       51
       51
       +
       

     

       52
       52
       +
           home.shellAliases = {

     

       53
       53
       +
             ls = "ls -p --color=auto";

     

       54
       54
       +
             pls = "sudo $(fc -ln -1)";

     

       55
       55
       +
             o = "xdg-open";

     

       56
       56
       +
             se = "sudoedit";

     

       57
       57
       +
             su = "su -p";

     

       58
       58
       +
             ssh = "TERM=xterm ssh";

     

       59
       59
       +
             nix-shell = "nix-shell --command zsh";

     

       60
       60
       +
             inhibit-lid = "systemd-inhibit --what=handle-lid-switch sleep 1d";

     

       61
       61
       +
             tmux = "tmux -2";

     

       62
       62
       +
             feh = "feh --scale-down --auto-zoom";

     

       63
       63
       +
             nix-stray-roots =

     

       64
       64
       +
               "nix-store --gc --print-roots | egrep -v '^(/nix/var|/run|/proc|{censored})'";

     

       65
       65
       +
           };

     

       66
       66
       +
       

     

       67
       67
       +
           # https://github.com/nix-community/home-manager/issues/1439#issuecomment-1106208294

     

       68
       68
       +
           home.activation = {

     

       69
       69
       +
             linkDesktopApplications = {

     

       70
       70
       +
               after = [ "writeBoundary" "createXdgUserDirectories" ];

     

       71
       71
       +
               before = [ ];

     

       72
       72
       +
               data = ''

     

       73
       73
       +
                 rm -rf ${config.xdg.dataHome}/"applications/home-manager"

     

       74
       74
       +
                 mkdir -p ${config.xdg.dataHome}/"applications/home-manager"

     

       75
       75
       +
                 cp -Lr ${config.home.homeDirectory}/.nix-profile/share/applications/* ${config.xdg.dataHome}/"applications/home-manager/"

     

       76
       76
       +
               '';

     

       77
       77
       +
             };

     

       78
       78
       +
           };

     

       79
       79
       +
       

     

       80
       80
       +
           programs.zsh = {

     

       81
       81
       +
             enable = true;

     

       82
       82
       +
             history = {

     

       83
       83
       +
               size = 1000000;

     

       84
       84
       +
               path = "$HOME/.histfile";

     

       85
       85
       +
               share = false;

     

       86
       86
       +
             };

     

       87
       87
       +
             enableAutosuggestions = true;

     

       88
       88
       +
             syntaxHighlighting.enable = true;

     

       89
       89
       +
             enableCompletion = true;

     

       90
       90
       +
             initExtraFirst = ''

     

       91
       91
       +
               export ZSH_AUTOSUGGEST_STRATEGY=(match_prev_cmd completion history)

     

       92
       92
       +
               export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=5"

     

       93
       93
       +
               PROMPT='%(?..%F{red}%3?%f )%F{${config.custom.machineColour}}%n@%m%f:%~ %#'$'\n'

     

       94
       94
       +
             '';

     

       95
       95
       +
             initExtra = builtins.readFile ./zsh.cfg;

     

       96
       96
       +
           };

     

       97
       97
       +
       

     

       98
       98
       +
           programs.bash.initExtra = ''

     

       99
       99
       +
             PS1='\[\e[36m\]\u@\h:\W\[\e[0m\] $ '

     

       100
       100
       +
           '';

     

       101
       101
       +
       

     

       102
       102
       +
           programs.git = {

     

       103
       103
       +
             enable = true;

     

       104
       104
       +
             extraConfig = {

     

       105
       105
       +
               init = { defaultBranch = "main"; };

     

       106
       106
       +
               user = {

     

       107
       107
       +
                 email = "ryan@freumh.org";

     

       108
       108
       +
                 name = "Ryan Gibb";

     

       109
       109
       +
               };

     

       110
       110
       +
               alias = {

     

       111
       111
       +
                 s = "status";

     

       112
       112
       +
                 c = "commit";

     

       113
       113
       +
                 cm = "commit --message";

     

       114
       114
       +
                 ca = "commit --amend";

     

       115
       115
       +
                 cu = "commit --message update";

     

       116
       116
       +
                 ci = "commit --message initial";

     

       117
       117
       +
                 br = "branch";

     

       118
       118
       +
                 co = "checkout";

     

       119
       119
       +
                 df = "diff";

     

       120
       120
       +
                 l = "log";

     

       121
       121
       +
                 lg = "log -p";

     

       122
       122
       +
                 lol = "log --graph --decorate --pretty=oneline --abbrev-commit";

     

       123
       123
       +
                 lola =

     

       124
       124
       +
                   "log --graph --decorate --pretty=oneline --abbrev-commit --all";

     

       125
       125
       +
                 ls = "ls-files";

     

       126
       126
       +
                 a = "add";

     

       127
       127
       +
                 aa = "add --all";

     

       128
       128
       +
                 au = "add -u";

     

       129
       129
       +
                 ap = "add --patch";

     

       130
       130
       +
                 ai = "add -i";

     

       131
       131
       +
                 ps = "push";

     

       132
       132
       +
                 pf = "push --force";

     

       133
       133
       +
                 pu = "push --set-upstream";

     

       134
       134
       +
                 pl = "pull";

     

       135
       135
       +
                 pr = "pull --rebase";

     

       136
       136
       +
                 acp = "!git add --all && git commit --message update && git push";

     

       137
       137
       +
                 d = "diff";

     

       138
       138
       +
                 dc = "diff --cached";

     

       139
       139
       +
               };

     

       140
       140
       +
             };

     

       141
       141
       +
           };

     

       142
       142
       +
       

     

       143
       143
       +
           programs.tmux = {

     

       144
       144
       +
             enable = true;

     

       145
       145
       +
             extraConfig = let

     

       146
       146
       +
               toggle-status-bar = pkgs.writeScript "toggle-status-bar.sh" ''

     

       147
       147
       +
                 #!/usr/bin/env bash

     

       148
       148
       +
                 window_count=$(tmux list-windows | wc -l)

     

       149
       149
       +
                 if [ "$window_count" -ge "2" ]; then

     

       150
       150
       +
                     tmux set-option status on

     

       151
       151
       +
                 else

     

       152
       152
       +
                     tmux set-option status off

     

       153
       153
       +
                 fi

     

       154
       154
       +
               '';

     

       155
       155
       +
             in ''

     

       156
       156
       +
               set-window-option -g mode-keys vi

     

       157
       157
       +
               set-option -g mouse on

     

       158
       158
       +
               set-option -g set-titles on

     

       159
       159
       +
               set-option -g set-titles-string "#T"

     

       160
       160
       +
               bind-key t capture-pane -S -\; new-window '(tmux show-buffer; tmux delete-buffer) | nvim -c $'

     

       161
       161
       +
               bind-key u capture-pane\; new-window '(tmux show-buffer; tmux delete-buffer) | ${pkgs.urlview}/bin/urlview'

     

       162
       162
       +
               set-hook -g session-window-changed 'run-shell ${toggle-status-bar}'

     

       163
       163
       +
               set-hook -g session-created 'run-shell ${toggle-status-bar}'

     

       164
       164
       +
               # Fixes C-Up/Down in TUIs

     

       165
       165
       +
               set-option default-terminal tmux

     

       166
       166
       +
               # https://stackoverflow.com/questions/62182401/neovim-screen-lagging-when-switching-mode-from-insert-to-normal

     

       167
       167
       +
               # locking

     

       168
       168
       +
               set -s escape-time 0

     

       169
       169
       +
               set -g lock-command vlock

     

       170
       170
       +
               set -g lock-after-time 0 # Seconds; 0 = never

     

       171
       171
       +
               bind L lock-session

     

       172
       172
       +
               # for .zprofile display environment starting https://github.com/tmux/tmux/issues/3483

     

       173
       173
       +
               set-option -g update-environment XDG_VTNR

     

       174
       174
       +
               # Allow clipboard with OSC-52 work

     

       175
       175
       +
               set -s set-clipboard on

     

       176
       176
       +
             '';

     

       177
       177
       +
           };

     

       178
       178
       +
       

     

       179
       179
       +
           programs.less = {

     

       180
       180
       +
             enable = true;

     

       181
       181
       +
             keys = ''

     

       182
       182
       +
               #line-edit

     

       183
       183
       +
               \e[1;5D  word-left

     

       184
       184
       +
               \e[1;5C  word-right

     

       185
       185
       +
             '';

     

       186
       186
       +
           };

     

       187
       187
       +
       

     

       188
       188
       +
           programs.go.goPath = "~/.go";

     

       189
       189
       +
       

     

       190
       190
       +
           home.stateVersion = "22.05";

     

       191
       191
       +
         };

     

       192
       192
       +
       }

     

       193
       193
       +

+173

home/gui.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       let cfg = config.custom.gui;

     

       4
       4
       +
       in {

     

       5
       5
       +
         options.custom.gui.enable = lib.mkEnableOption "gui";

     

       6
       6
       +
       

     

       7
       7
       +
         config = lib.mkIf cfg.enable {

     

       8
       8
       +
           gtk = {

     

       9
       9
       +
             enable = true;

     

       10
       10
       +
             font = {

     

       11
       11
       +
               name = "Noto Sans 11";

     

       12
       12
       +
               package = pkgs.noto-fonts;

     

       13
       13
       +
             };

     

       14
       14
       +
             iconTheme = {

     

       15
       15
       +
               package = pkgs.gruvbox-dark-icons-gtk;

     

       16
       16
       +
               name = "gruvbox-dark";

     

       17
       17
       +
             };

     

       18
       18
       +
             theme = {

     

       19
       19
       +
               package = pkgs.gruvbox-dark-gtk;

     

       20
       20
       +
               name = "gruvbox-dark";

     

       21
       21
       +
             };

     

       22
       22
       +
           };

     

       23
       23
       +
       

     

       24
       24
       +
           home = {

     

       25
       25
       +
             sessionVariables = {

     

       26
       26
       +
               # evince workaround

     

       27
       27
       +
               GTK_THEME = "gruvbox-dark";

     

       28
       28
       +
               WALLPAPER = let wallpaper = ./wallpaper.jpg;

     

       29
       29
       +
               in pkgs.runCommand (builtins.baseNameOf wallpaper) { }

     

       30
       30
       +
               "cp ${wallpaper} $out";

     

       31
       31
       +
       

     

       32
       32
       +
             };

     

       33
       33
       +
             pointerCursor = {

     

       34
       34
       +
               name = "Adwaita";

     

       35
       35
       +
               package = pkgs.gnome.adwaita-icon-theme;

     

       36
       36
       +
               size = 32;

     

       37
       37
       +
             };

     

       38
       38
       +
             file = {

     

       39
       39
       +
               ".profile".text = ''

     

       40
       40
       +
                 source "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"

     

       41
       41
       +
               '';

     

       42
       42
       +
               ".config/gtk-3.0/bookmarks" = {

     

       43
       43
       +
                 force = true;

     

       44
       44
       +
                 text = ''

     

       45
       45
       +
                   file:///${config.home.homeDirectory}/archive

     

       46
       46
       +
                   file:///${config.home.homeDirectory}/documents

     

       47
       47
       +
                   file:///${config.home.homeDirectory}/downloads

     

       48
       48
       +
                   file:///${config.home.homeDirectory}/pictures

     

       49
       49
       +
                   file:///${config.home.homeDirectory}/videos

     

       50
       50
       +
                   file:///${config.home.homeDirectory}/projects

     

       51
       51
       +
                 '';

     

       52
       52
       +
               };

     

       53
       53
       +
               ".config/mimeapps.list" = {

     

       54
       54
       +
                 force = true;

     

       55
       55
       +
                 source = ./mimeapps.list;

     

       56
       56
       +
               };

     

       57
       57
       +
             };

     

       58
       58
       +
           };

     

       59
       59
       +
       

     

       60
       60
       +
           programs.firefox = let

     

       61
       61
       +
             settings = {

     

       62
       62
       +
               "browser.ctrlTab.recentlyUsedOrder" = false;

     

       63
       63
       +
               "browser.tabs.warnOnClose" = false;

     

       64
       64
       +
               "browser.toolbars.bookmarks.visibility" = "never";

     

       65
       65
       +
       

     

       66
       66
       +
               # Only hide UI elements on F11 (i.e. don't go fullscreen, leave that to WM)

     

       67
       67
       +
               "full-screen-api.ignore-widgets" = true;

     

       68
       68
       +
               # Right click issue fix

     

       69
       69
       +
               "ui.context_menus.after_mouseup" = true;

     

       70
       70
       +
       

     

       71
       71
       +
               # Use userChrome.css

     

       72
       72
       +
               "toolkit.legacyUserProfileCustomizations.stylesheets" = true;

     

       73
       73
       +
       

     

       74
       74
       +
               "browser.shell.checkDefaultBrowser" = false;

     

       75
       75
       +
       

     

       76
       76
       +
               # sync toolbar

     

       77
       77
       +
               "services.sync.prefs.sync.browser.uiCustomization.state" = true;

     

       78
       78
       +
       

     

       79
       79
       +
               "extensions.pocket.enabled" = false;

     

       80
       80
       +
             };

     

       81
       81
       +
             userChrome = ''

     

       82
       82
       +
               #webrtcIndicator {

     

       83
       83
       +
                 display: none;

     

       84
       84
       +
               }

     

       85
       85
       +
       

     

       86
       86
       +
               /* Move find bar to top */

     

       87
       87
       +
               .browserContainer > findbar {

     

       88
       88
       +
                 -moz-box-ordinal-group: 0;

     

       89
       89
       +
               }

     

       90
       90
       +
       

     

       91
       91
       +
               #TabsToolbar

     

       92
       92
       +
               {

     

       93
       93
       +
                   visibility: collapse;

     

       94
       94
       +
               }

     

       95
       95
       +
             '';

     

       96
       96
       +
           in {

     

       97
       97
       +
             enable = true;

     

       98
       98
       +
             profiles.default = {

     

       99
       99
       +
               settings = settings;

     

       100
       100
       +
               userChrome = userChrome;

     

       101
       101
       +
             };

     

       102
       102
       +
             profiles.secondary = {

     

       103
       103
       +
               id = 1;

     

       104
       104
       +
               isDefault = false;

     

       105
       105
       +
               settings = settings;

     

       106
       106
       +
               userChrome = userChrome;

     

       107
       107
       +
             };

     

       108
       108
       +
             package = (pkgs.firefox.override {

     

       109
       109
       +
               nativeMessagingHosts = with pkgs; [ tridactyl-native ];

     

       110
       110
       +
             });

     

       111
       111
       +
           };

     

       112
       112
       +
       

     

       113
       113
       +
           xdg = {

     

       114
       114
       +
             desktopEntries = {

     

       115
       115
       +
               # https://gitlab.freedesktop.org/xdg/xdg-utils/-/issues/84

     

       116
       116
       +
               # `echo $XDG_DATA_DIRS`

     

       117
       117
       +
               nvim = {

     

       118
       118
       +
                 name = "Neovim";

     

       119
       119
       +
                 genericName = "Text Editor";

     

       120
       120
       +
                 exec = "alacritty -e nvim %F";

     

       121
       121
       +
                 terminal = false;

     

       122
       122
       +
                 categories = [ "Application" "Utility" "TextEditor" ];

     

       123
       123
       +
                 icon = "nvim";

     

       124
       124
       +
                 mimeType = [ "text/english" "text/plain" ];

     

       125
       125
       +
               };

     

       126
       126
       +
               aerc = {

     

       127
       127
       +
                 name = "aerc";

     

       128
       128
       +
                 genericName = "Mail Client";

     

       129
       129
       +
                 exec = "alacritty -e aerc";

     

       130
       130
       +
                 terminal = false;

     

       131
       131
       +
                 categories = [ "Office" "Network" "Email" "ConsoleOnly" ];

     

       132
       132
       +
                 icon = "utilities-terminal";

     

       133
       133
       +
                 mimeType = [ "x-scheme-handler/mailto" ];

     

       134
       134
       +
               };

     

       135
       135
       +
             };

     

       136
       136
       +
             configFile = {

     

       137
       137
       +
               "Thunar/uca.xml".source = ./thunar.xml;

     

       138
       138
       +
               "fontconfig/fonts.conf".source = ./fonts.conf;

     

       139
       139
       +
               "alacritty.yml".source = ./alacritty.yml;

     

       140
       140
       +
               "Element/config.json".source = ./element.json;

     

       141
       141
       +
               "swappy/config".text = ''

     

       142
       142
       +
                 [Default]

     

       143
       143
       +
                 save_dir=~/capture/capture/

     

       144
       144
       +
                 save_filename_format=screenshot_%Y-%m-%dT%H:%M:%S%z.png

     

       145
       145
       +
               '';

     

       146
       146
       +
               "tridactyl/tridactylrc".source = ./tridactylrc;

     

       147
       147
       +
             };

     

       148
       148
       +
             userDirs = {

     

       149
       149
       +
               enable = true;

     

       150
       150
       +
               createDirectories = true;

     

       151
       151
       +
               download = "$HOME/downloads";

     

       152
       152
       +
               pictures = "$HOME/pictures";

     

       153
       153
       +
               videos = "$HOME/videos";

     

       154
       154
       +
               documents = "$HOME/documents/";

     

       155
       155
       +
               music = "$HOME/";

     

       156
       156
       +
               # https://bugzilla.mozilla.org/show_bug.cgi?id=1082717

     

       157
       157
       +
               desktop = "$HOME/";

     

       158
       158
       +
               templates = "$HOME/";

     

       159
       159
       +
               publicShare = "$HOME/";

     

       160
       160
       +
             };

     

       161
       161
       +
           };

     

       162
       162
       +
       

     

       163
       163
       +
           services.kdeconnect.enable = true;

     

       164
       164
       +
       

     

       165
       165
       +
           services.spotifyd = {

     

       166
       166
       +
             enable = true;

     

       167
       167
       +
             settings.global = {

     

       168
       168
       +
               username = "ryangibb321@gmail.com";

     

       169
       169
       +
               password_cmd = "pass show spotify/ryangibb321@gmail.com";

     

       170
       170
       +
             };

     

       171
       171
       +
           };

     

       172
       172
       +
         };

     

       173
       173
       +
       }

+68

home/i3.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         replacements = {

     

       5
       5
       +
           wm = "i3";

     

       6
       6
       +
           wmmsg = "i3-msg";

     

       7
       7
       +
           rofi = "rofi";

     

       8
       8
       +
           app_id = "class";

     

       9
       9
       +
           bar_extra = "";

     

       10
       10
       +
           locked = "";

     

       11
       11
       +
           polkit_gnome = "${pkgs.polkit_gnome}";

     

       12
       12
       +
           locker = "xsecurelock";

     

       13
       13
       +
           enable_output = "xrandr --output $laptop_output --auto";

     

       14
       14
       +
           disable_output = "xrandr --output $laptop_output --off";

     

       15
       15
       +
           drun = "rofi -i -modi drun -show drun";

     

       16
       16
       +
           run = "rofi -i -modi run -show run";

     

       17
       17
       +
           dmenu = "rofi -i -dmenu -p";

     

       18
       18
       +
           displays = "arandr";

     

       19
       19
       +
           bar = "i3bar";

     

       20
       20
       +
           notification_deamon = "dunst";

     

       21
       21
       +
           i3-workspace-history = "${pkgs.i3-workspace-history}";

     

       22
       22
       +
           i3-workspace-history-args = "";

     

       23
       23
       +
         };

     

       24
       24
       +
         util = import ./util.nix { inherit pkgs lib; };

     

       25
       25
       +
         cfg = config.custom.gui.i3;

     

       26
       26
       +
       in {

     

       27
       27
       +
         options.custom.gui.i3.enable = lib.mkEnableOption "i3";

     

       28
       28
       +
       

     

       29
       29
       +
         config = lib.mkIf cfg.enable {

     

       30
       30
       +
           # TODO

     

       31
       31
       +
           # idling

     

       32
       32
       +
       

     

       33
       33
       +
           home.pointerCursor.x11.enable = true;

     

       34
       34
       +
       

     

       35
       35
       +
           home.file = {

     

       36
       36
       +
             ".xinitrc".text = ''

     

       37
       37
       +
               export XDG_SESSION_TYPE=x11

     

       38
       38
       +
               export GDK_BACKEND=x11

     

       39
       39
       +
               export DESKTOP_SESSION=plasma

     

       40
       40
       +
               exec i3 &> ~/.i3_log

     

       41
       41
       +
             '';

     

       42
       42
       +
             ".zprofile".text = ''

     

       43
       43
       +
               # Autostart at login on TTY 2

     

       44
       44
       +
               if [ -z "''${DISPLAY}" ] && [ "''${XDG_VTNR}" -eq 2 ]; then

     

       45
       45
       +
                 source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh

     

       46
       46
       +
               	exec startx

     

       47
       47
       +
               fi

     

       48
       48
       +
             '';

     

       49
       49
       +
           };

     

       50
       50
       +
       

     

       51
       51
       +
           xdg.configFile = let

     

       52
       52
       +
             entries = {

     

       53
       53
       +
               "dunst/dunstrc".source = ./dunst;

     

       54
       54
       +
               "i3/config".text = let wmFilenames = util.listFilesInDir ./wm/config.d;

     

       55
       55
       +
               in let i3Filenames = util.listFilesInDir ./wm/i3;

     

       56
       56
       +
               in (util.concatFilesReplace

     

       57
       57
       +
                 ([ ./wm/config ] ++ wmFilenames ++ i3Filenames) replacements);

     

       58
       58
       +
               "i3blocks".source = ./i3blocks;

     

       59
       59
       +
               "rofi/config.rasi".source = ./rofi.rasi;

     

       60
       60
       +
             };

     

       61
       61
       +
           in (util.inDirReplace ./wm/scripts "i3/scripts" replacements) // entries;

     

       62
       62
       +
       

     

       63
       63
       +
           services.redshift = {

     

       64
       64
       +
             enable = true;

     

       65
       65
       +
             provider = "geoclue2";

     

       66
       66
       +
           };

     

       67
       67
       +
         };

     

       68
       68
       +
       }

+312

home/mail.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         address-book = pkgs.writeScriptBin "address-book" ''

     

       5
       5
       +
           #!/usr/bin/env bash

     

       6
       6
       +
           ${pkgs.ugrep}/bin/ugrep -jPh -m 100 --color=never "$1"\

     

       7
       7
       +
             ${config.accounts.email.maildirBasePath}/addressbook/maildir\

     

       8
       8
       +
             ${config.accounts.email.maildirBasePath}/addressbook/cam-ldap

     

       9
       9
       +
         '';

     

       10
       10
       +
         sync-mail = pkgs.writeScriptBin "sync-mail" ''

     

       11
       11
       +
           #!/usr/bin/env bash

     

       12
       12
       +
           ${pkgs.isync}/bin/mbsync "$1"

     

       13
       13
       +
           ${pkgs.mu}/bin/mu index

     

       14
       14
       +
           ${pkgs.procps}/bin/pkill -RTMIN+13 i3block

     

       15
       15
       +
         '';

     

       16
       16
       +
         cfg = config.custom.mail;

     

       17
       17
       +
       in {

     

       18
       18
       +
         options.custom.mail.enable = lib.mkEnableOption "mail";

     

       19
       19
       +
       

     

       20
       20
       +
         config = lib.mkIf cfg.enable {

     

       21
       21
       +
           home.packages = with pkgs; [

     

       22
       22
       +
             maildir-rank-addr

     

       23
       23
       +
             (pkgs.writeScriptBin "cam-ldap-addr" ''

     

       24
       24
       +
               ${pkgs.openldap}/bin/ldapsearch -xZ -H ldaps://ldap.lookup.cam.ac.uk -b "ou=people,o=University of Cambridge,dc=cam,dc=ac,dc=uk" displayName mail\

     

       25
       25
       +
               | ${pkgs.gawk}/bin/awk '/^dn:/{displayName=""; mail=""; next} /^displayName:/{displayName=$2; for(i=3;i<=NF;i++) displayName=displayName " " $i; next} /^mail:/{mail=$2; next} /^$/{if(displayName!="" && mail!="") print mail "\t" displayName}'\

     

       26
       26
       +
               > ${config.accounts.email.maildirBasePath}/addressbook/cam-ldap

     

       27
       27
       +
             '')

     

       28
       28
       +
             address-book

     

       29
       29
       +
           ];

     

       30
       30
       +
       

     

       31
       31
       +
           xdg.configFile = {

     

       32
       32
       +
             "maildir-rank-addr/config".text = with config.accounts.email; ''

     

       33
       33
       +
               maildir = "${config.accounts.email.maildirBasePath}"

     

       34
       34
       +
               outputpath = "${config.accounts.email.maildirBasePath}/addressbook/maildir"

     

       35
       35
       +
               addresses = [

     

       36
       36
       +
                   "ryan@freumh.org",

     

       37
       37
       +
                   "misc@freumh.org",

     

       38
       38
       +
                   "ryan@gibbr.org",

     

       39
       39
       +
                   "misc@gibbr.org",

     

       40
       40
       +
                   "ryan.gibb@cl.cam.ac.uk",

     

       41
       41
       +
                   "rtg24@cam.ac.uk",

     

       42
       42
       +
                   "rtg2@st-andrews.ac.uk",

     

       43
       43
       +
                   "ryangibb321@gmail.com",

     

       44
       44
       +
                   "ryangibb@btconnect.com",

     

       45
       45
       +
               ]

     

       46
       46
       +
             '';

     

       47
       47
       +
           };

     

       48
       48
       +
       

     

       49
       49
       +
           programs = {

     

       50
       50
       +
             password-store.enable = true;

     

       51
       51
       +
             gpg.enable = true;

     

       52
       52
       +
             mbsync.enable = true;

     

       53
       53
       +
             mu.enable = true;

     

       54
       54
       +
             msmtp.enable = true;

     

       55
       55
       +
             aerc = {

     

       56
       56
       +
               enable = true;

     

       57
       57
       +
               extraConfig = {

     

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

     

       59
       59
       +
                 general.default-save-path = "~/downloads";

     

       60
       60
       +
                 ui.mouse-enabled = true;

     

       61
       61
       +
                 compose.address-book-cmd = "${address-book}/bin/address-book '%s'";

     

       62
       62
       +
                 compose.file-picker-cmd =

     

       63
       63
       +
                   "${pkgs.ranger}/bin/ranger --choosefiles=%f";

     

       64
       64
       +
                 compose.format-flowed = true;

     

       65
       65
       +
                 ui.index-columns = "date<=,name<50,flags>=,subject<*";

     

       66
       66
       +
                 ui.column-name = "{{index (.From | persons) 0}}";

     

       67
       67
       +
                 "ui:folder=Sent".index-columns = "date<=,to<50,flags>=,subject<*";

     

       68
       68
       +
                 "ui:folder=Sent".column-to = "{{index (.To | persons) 0}}";

     

       69
       69
       +
                 openers."text/html" = "firefox --new-window";

     

       70
       70
       +
                 hooks.mail-recieved = ''

     

       71
       71
       +
                   notify-send "[$AERC_ACCOUNT/$AERC_FOLDER] mail from $AERC_FROM_NAME" "$AERC_SUBJECT"'';

     

       72
       72
       +
                 filters = {

     

       73
       73
       +
                   "text/plain" = "wrap -w 90 | colorize";

     

       74
       74
       +
                   "text/calendar" = "calendar";

     

       75
       75
       +
                   "message/delivery-status" = "colorize";

     

       76
       76
       +
                   "message/rfc822" = "colorize";

     

       77
       77
       +
                   "text/html" = "html | colorize";

     

       78
       78
       +
                 };

     

       79
       79
       +
               };

     

       80
       80
       +
               extraBinds = import ./aerc-binds.nix;

     

       81
       81
       +
             };

     

       82
       82
       +
             neomutt = {

     

       83
       83
       +
               enable = true;

     

       84
       84
       +
               extraConfig = ''

     

       85
       85
       +
                 # Macro to switch accounts

     

       86
       86
       +
                 macro index,pager <F1> '"<change-folder> ${config.accounts.email.maildirBasePath}/ryan@freumh.org/Inbox<enter>"'

     

       87
       87
       +
                 macro index,pager <F2> '"<change-folder> ${config.accounts.email.maildirBasePath}/ryangibb321@gmail.com/Inbox<enter>"'

     

       88
       88
       +
                 macro index,pager <F3> '"<change-folder> ${config.accounts.email.maildirBasePath}/ryan.gibb@cl.cam.ac.uk/Inbox<enter>"'

     

       89
       89
       +
       

     

       90
       90
       +
                 # mutt macros for mu

     

       91
       91
       +
                 macro index <F8> "<shell-escape>mu find --clearlinks --format=links --linksdir=${config.accounts.email.maildirBasePath}/search " \

     

       92
       92
       +
                                          "mu find"

     

       93
       93
       +
                 macro index <F9> "<change-folder-readonly>˜/Maildir/search" \

     

       94
       94
       +
                                                "mu find results"

     

       95
       95
       +
               '';

     

       96
       96
       +
             };

     

       97
       97
       +
           };

     

       98
       98
       +
       

     

       99
       99
       +
           services = {

     

       100
       100
       +
             imapnotify.enable = true;

     

       101
       101
       +
             gpg-agent.enable = true;

     

       102
       102
       +
           };

     

       103
       103
       +
       

     

       104
       104
       +
           accounts.email = {

     

       105
       105
       +
             maildirBasePath = "mail";

     

       106
       106
       +
             order = [ "ryangibb321@gmail.com" "ryan.gibb@cl.cam.ac.uk" ];

     

       107
       107
       +
             accounts = {

     

       108
       108
       +
               "ryan@freumh.org" = rec {

     

       109
       109
       +
                 primary = true;

     

       110
       110
       +
                 realName = "Ryan Gibb";

     

       111
       111
       +
                 userName = "ryan@freumh.org";

     

       112
       112
       +
                 address = "ryan@freumh.org";

     

       113
       113
       +
                 passwordCommand = "${pkgs.pass}/bin/pass show email/ryan@freumh.org";

     

       114
       114
       +
                 imap.host = "mail.freumh.org";

     

       115
       115
       +
                 smtp = {

     

       116
       116
       +
                   host = "mail.freumh.org";

     

       117
       117
       +
                   port = 465;

     

       118
       118
       +
                 };

     

       119
       119
       +
                 folders = {

     

       120
       120
       +
                   drafts = "Drafts";

     

       121
       121
       +
                   inbox = "Inbox";

     

       122
       122
       +
                   sent = "Sent";

     

       123
       123
       +
                   trash = "Trash";

     

       124
       124
       +
                 };

     

       125
       125
       +
                 imapnotify = {

     

       126
       126
       +
                   enable = true;

     

       127
       127
       +
                   boxes = [ "Inbox" ];

     

       128
       128
       +
                   onNotify =

     

       129
       129
       +
                     "${pkgs.isync}/bin/mbsync ryan@freumh.org && ${pkgs.mu}/bin/mu index && ${pkgs.procps}/bin/pkill -RTMIN+13 i3blocks";

     

       130
       130
       +
                 };

     

       131
       131
       +
                 mbsync = {

     

       132
       132
       +
                   enable = true;

     

       133
       133
       +
                   create = "both";

     

       134
       134
       +
                   expunge = "both";

     

       135
       135
       +
                   remove = "both";

     

       136
       136
       +
                 };

     

       137
       137
       +
                 msmtp = { enable = true; };

     

       138
       138
       +
                 aerc = {

     

       139
       139
       +
                   enable = true;

     

       140
       140
       +
                   extraAccounts = {

     

       141
       141
       +
                     check-mail-cmd =

     

       142
       142
       +
                       "${pkgs.isync}/bin/mbsync ryan@freumh.org && ${pkgs.mu}/bin/mu index && ${pkgs.procps}/bin/pkill -RTMIN+13 i3blocks";

     

       143
       143
       +
                     check-mail-timeout = "1m";

     

       144
       144
       +
                     check-mail = "1h";

     

       145
       145
       +
                     folders-sort =

     

       146
       146
       +
                       [ "Inbox" "Sent" "Drafts" "Archive" "Spam" "Trash" ];

     

       147
       147
       +
                     folder-map = "${pkgs.writeText "folder-map" ''

     

       148
       148
       +
                       Spam = Junk

     

       149
       149
       +
                       Bin = Trash

     

       150
       150
       +
                     ''}";

     

       151
       151
       +
                   };

     

       152
       152
       +
                 };

     

       153
       153
       +
                 neomutt = {

     

       154
       154
       +
                   enable = true;

     

       155
       155
       +
                   extraConfig = ''

     

       156
       156
       +
                     bind index g noop

     

       157
       157
       +
                     macro index gi "<change-folder>=${folders.inbox}<enter>"

     

       158
       158
       +
                     macro index gs "<change-folder>=${folders.sent}<enter>"

     

       159
       159
       +
                     macro index gd "<change-folder>=${folders.drafts}<enter>"

     

       160
       160
       +
                     macro index gt "<change-folder>=${folders.trash}<enter>"

     

       161
       161
       +
                   '';

     

       162
       162
       +
                 };

     

       163
       163
       +
               };

     

       164
       164
       +
               "misc@freumh.org" = rec {

     

       165
       165
       +
                 userName = "misc@freumh.org";

     

       166
       166
       +
                 address = "misc@freumh.org";

     

       167
       167
       +
                 realName = "Misc";

     

       168
       168
       +
                 passwordCommand = "${pkgs.pass}/bin/pass show email/misc@freumh.org";

     

       169
       169
       +
                 imap.host = "mail.freumh.org";

     

       170
       170
       +
                 smtp = {

     

       171
       171
       +
                   host = "mail.freumh.org";

     

       172
       172
       +
                   port = 465;

     

       173
       173
       +
                 };

     

       174
       174
       +
                 folders = {

     

       175
       175
       +
                   drafts = "Drafts";

     

       176
       176
       +
                   inbox = "Inbox";

     

       177
       177
       +
                   sent = "Sent";

     

       178
       178
       +
                   trash = "Bin";

     

       179
       179
       +
                 };

     

       180
       180
       +
                 imapnotify = {

     

       181
       181
       +
                   enable = true;

     

       182
       182
       +
                   boxes = [ "Inbox" ];

     

       183
       183
       +
                   onNotify =

     

       184
       184
       +
                     "${pkgs.isync}/bin/mbsync misc@freumh.org && ${pkgs.mu}/bin/mu index && ${pkgs.procps}/bin/pkill -RTMIN+13 i3blocks";

     

       185
       185
       +
                 };

     

       186
       186
       +
                 mbsync = {

     

       187
       187
       +
                   enable = true;

     

       188
       188
       +
                   create = "both";

     

       189
       189
       +
                   expunge = "both";

     

       190
       190
       +
                   remove = "both";

     

       191
       191
       +
                 };

     

       192
       192
       +
                 msmtp = { enable = true; };

     

       193
       193
       +
                 neomutt = {

     

       194
       194
       +
                   enable = true;

     

       195
       195
       +
                   extraConfig = ''

     

       196
       196
       +
                     bind index g noop

     

       197
       197
       +
                     macro index gi "<change-folder>=${folders.inbox}<enter>"

     

       198
       198
       +
                     macro index gs "<change-folder>=${folders.sent}<enter>"

     

       199
       199
       +
                     macro index gd "<change-folder>=${folders.drafts}<enter>"

     

       200
       200
       +
                     macro index gt "<change-folder>=${folders.trash}<enter>"

     

       201
       201
       +
                   '';

     

       202
       202
       +
                 };

     

       203
       203
       +
               };

     

       204
       204
       +
               "ryan.gibb@cl.cam.ac.uk" = rec {

     

       205
       205
       +
                 userName = "rtg24@fm.cl.cam.ac.uk";

     

       206
       206
       +
                 address = "ryan.gibb@cl.cam.ac.uk";

     

       207
       207
       +
                 realName = "Ryan Gibb";

     

       208
       208
       +
                 passwordCommand =

     

       209
       209
       +
                   "${pkgs.pass}/bin/pass show email/ryan.gibb@cl.cam.ac.uk";

     

       210
       210
       +
                 flavor = "fastmail.com";

     

       211
       211
       +
                 folders = {

     

       212
       212
       +
                   drafts = "Drafts";

     

       213
       213
       +
                   inbox = "Inbox";

     

       214
       214
       +
                   sent = "Sent";

     

       215
       215
       +
                   trash = "Trash";

     

       216
       216
       +
                 };

     

       217
       217
       +
                 imapnotify = {

     

       218
       218
       +
                   enable = true;

     

       219
       219
       +
                   boxes = [ "Inbox" ];

     

       220
       220
       +
                   onNotify =

     

       221
       221
       +
                     "${pkgs.isync}/bin/mbsync ryan.gibb@cl.cam.ac.uk && ${pkgs.mu}/bin/mu index && ${pkgs.procps}/bin/pkill -RTMIN+13 i3blocks";

     

       222
       222
       +
                 };

     

       223
       223
       +
                 mbsync = {

     

       224
       224
       +
                   enable = true;

     

       225
       225
       +
                   create = "both";

     

       226
       226
       +
                   expunge = "both";

     

       227
       227
       +
                   remove = "both";

     

       228
       228
       +
                 };

     

       229
       229
       +
                 msmtp = { enable = true; };

     

       230
       230
       +
                 aerc = {

     

       231
       231
       +
                   enable = true;

     

       232
       232
       +
                   extraAccounts = {

     

       233
       233
       +
                     check-mail-cmd =

     

       234
       234
       +
                       "${pkgs.isync}/bin/mbsync ryan.gibb@cl.cam.ac.uk && ${pkgs.mu}/bin/mu index && ${pkgs.procps}/bin/pkill -RTMIN+13 i3blocks";

     

       235
       235
       +
                     check-mail-timeout = "1m";

     

       236
       236
       +
                     check-mail = "1h";

     

       237
       237
       +
                     aliases = "rtg24@cam.ac.uk";

     

       238
       238
       +
                     folders-sort =

     

       239
       239
       +
                       [ "Inbox" "Sidebox" "Sent" "Drafts" "Archive" "Spam" "Trash" ];

     

       240
       240
       +
                     folder-map = "${pkgs.writeText "folder-map" ''

     

       241
       241
       +
                       Bin = Trash

     

       242
       242
       +
                     ''}";

     

       243
       243
       +
                   };

     

       244
       244
       +
                 };

     

       245
       245
       +
                 neomutt = {

     

       246
       246
       +
                   enable = true;

     

       247
       247
       +
                   extraConfig = ''

     

       248
       248
       +
                     bind index g noop

     

       249
       249
       +
                     macro index gi "<change-folder>=${folders.inbox}<enter>"

     

       250
       250
       +
                     macro index gs "<change-folder>=${folders.sent}<enter>"

     

       251
       251
       +
                     macro index gd "<change-folder>=${folders.drafts}<enter>"

     

       252
       252
       +
                     macro index gt "<change-folder>=${folders.trash}<enter>"

     

       253
       253
       +
                   '';

     

       254
       254
       +
                 };

     

       255
       255
       +
               };

     

       256
       256
       +
               "ryangibb321@gmail.com" = rec {

     

       257
       257
       +
                 userName = "ryangibb321@gmail.com";

     

       258
       258
       +
                 address = "ryangibb321@gmail.com";

     

       259
       259
       +
                 realName = "Ryan Gibb";

     

       260
       260
       +
                 passwordCommand =

     

       261
       261
       +
                   "${pkgs.pass}/bin/pass show email/ryangibb321@gmail.com";

     

       262
       262
       +
                 flavor = "gmail.com";

     

       263
       263
       +
                 folders = {

     

       264
       264
       +
                   drafts = "Drafts";

     

       265
       265
       +
                   inbox = "Inbox";

     

       266
       266
       +
                   sent = "Sent Mail";

     

       267
       267
       +
                   trash = "Bin";

     

       268
       268
       +
                 };

     

       269
       269
       +
                 imapnotify = {

     

       270
       270
       +
                   enable = true;

     

       271
       271
       +
                   boxes = [ "Inbox" ];

     

       272
       272
       +
                   onNotify =

     

       273
       273
       +
                     "${pkgs.isync}/bin/mbsync ryangibb321@gmail.com && ${pkgs.mu}/bin/mu index && ${pkgs.procps}/bin/pkill -RTMIN+13 i3blocks";

     

       274
       274
       +
                 };

     

       275
       275
       +
                 mbsync = {

     

       276
       276
       +
                   enable = true;

     

       277
       277
       +
                   create = "both";

     

       278
       278
       +
                   expunge = "both";

     

       279
       279
       +
                   remove = "both";

     

       280
       280
       +
                 };

     

       281
       281
       +
                 msmtp = { enable = true; };

     

       282
       282
       +
                 aerc = {

     

       283
       283
       +
                   enable = true;

     

       284
       284
       +
                   extraAccounts = {

     

       285
       285
       +
                     check-mail-cmd =

     

       286
       286
       +
                       "${pkgs.isync}/bin/mbsync ryangibb321@gmail.com && ${pkgs.mu}/bin/mu index && ${pkgs.procps}/bin/pkill -RTMIN+13 i3blocks";

     

       287
       287
       +
                     check-mail-timeout = "1m";

     

       288
       288
       +
                     check-mail = "1h";

     

       289
       289
       +
                     folders-sort =

     

       290
       290
       +
                       [ "Inbox" "Sidebox" "Sent" "Drafts" "Archive" "Spam" "Trash" ];

     

       291
       291
       +
                     folder-map = "${pkgs.writeText "folder-map" ''

     

       292
       292
       +
                       * = [Gmail]/*

     

       293
       293
       +
                       Sent = 'Sent Mail'

     

       294
       294
       +
                       Archive = 'All Mail'

     

       295
       295
       +
                     ''}";

     

       296
       296
       +
                   };

     

       297
       297
       +
                 };

     

       298
       298
       +
                 neomutt = {

     

       299
       299
       +
                   enable = true;

     

       300
       300
       +
                   extraConfig = ''

     

       301
       301
       +
                     bind index g noop

     

       302
       302
       +
                     macro index gi "<change-folder>=${folders.inbox}<enter>"

     

       303
       303
       +
                     macro index gs "<change-folder>=${folders.sent}<enter>"

     

       304
       304
       +
                     macro index gd "<change-folder>=${folders.drafts}<enter>"

     

       305
       305
       +
                     macro index gt "<change-folder>=${folders.trash}<enter>"

     

       306
       306
       +
                   '';

     

       307
       307
       +
                 };

     

       308
       308
       +
               };

     

       309
       309
       +
             };

     

       310
       310
       +
           };

     

       311
       311
       +
         };

     

       312
       312
       +
       }

+117

home/nvim/default.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         obsidian-nvim = (pkgs.vimUtils.buildVimPlugin {

     

       5
       5
       +
           pname = "obsidian.nvim";

     

       6
       6
       +
           version = "2.6.0";

     

       7
       7
       +
           src = pkgs.fetchFromGitHub {

     

       8
       8
       +
             owner = "epwalsh";

     

       9
       9
       +
             repo = "obsidian.nvim";

     

       10
       10
       +
             rev = "v2.6.0";

     

       11
       11
       +
             sha256 = "sha256-+w3XYoobuH17oinPfQxhrizbmQB5IbbulUK69674/Wg=";

     

       12
       12
       +
           };

     

       13
       13
       +
         });

     

       14
       14
       +
         ltex-ls-nvim = (pkgs.vimUtils.buildVimPlugin {

     

       15
       15
       +
           pname = "ltex-ls.nvim";

     

       16
       16
       +
           version = "2.6.0";

     

       17
       17
       +
           src = pkgs.fetchFromGitHub {

     

       18
       18
       +
             owner = "vigoux";

     

       19
       19
       +
             repo = "ltex-ls.nvim";

     

       20
       20
       +
             rev = "c8139ea6b7f3d71adcff121e16ee8726037ffebd";

     

       21
       21
       +
             sha256 = "sha256-jY3ALr6h88xnWN2QdKe3R0vvRcSNhFWDW56b2NvnTCs=";

     

       22
       22
       +
           };

     

       23
       23
       +
         });

     

       24
       24
       +
         cfg = config.custom;

     

       25
       25
       +
       in {

     

       26
       26
       +
         options.custom.nvim-lsps = lib.mkEnableOption "nvim-lsps";

     

       27
       27
       +
       

     

       28
       28
       +
         config = {

     

       29
       29
       +
           programs.neovim = {

     

       30
       30
       +
             enable = true;

     

       31
       31
       +
             viAlias = true;

     

       32
       32
       +
             vimAlias = true;

     

       33
       33
       +
             extraPackages = with pkgs;

     

       34
       34
       +
               [ ripgrep nixd ] ++ lib.lists.optionals cfg.nvim-lsps [

     

       35
       35
       +
                 nixfmt

     

       36
       36
       +
                 # stop complaining when launching but a devshell is better

     

       37
       37
       +
                 ocamlPackages.ocaml-lsp

     

       38
       38
       +
                 ocamlPackages.ocamlformat

     

       39
       39
       +
                 lua-language-server

     

       40
       40
       +
                 pyright

     

       41
       41
       +
                 black

     

       42
       42
       +
                 ltex-ls

     

       43
       43
       +
                 jdt-language-server

     

       44
       44
       +
                 nodejs_18

     

       45
       45
       +
                 clang-tools

     

       46
       46
       +
                 typst-lsp

     

       47
       47
       +
               ];

     

       48
       48
       +
             extraLuaConfig = builtins.readFile ./nvim.lua;

     

       49
       49
       +
             # undo transparent background

     

       50
       50
       +
             # + "colorscheme gruvbox";

     

       51
       51
       +
             plugins = with pkgs.vimPlugins; [

     

       52
       52
       +
               {

     

       53
       53
       +
                 plugin = nvim-lspconfig;

     

       54
       54
       +
                 runtime = let

     

       55
       55
       +
                   ml-style = ''

     

       56
       56
       +
                     setlocal expandtab

     

       57
       57
       +
                     setlocal shiftwidth=2

     

       58
       58
       +
                     setlocal tabstop=2

     

       59
       59
       +
                     setlocal softtabstop=2

     

       60
       60
       +
                   '';

     

       61
       61
       +
                 in {

     

       62
       62
       +
                   # format-flowed

     

       63
       63
       +
                   "ftplugin/mail.vim".text = ''

     

       64
       64
       +
                     setlocal tw=72

     

       65
       65
       +
                     set formatoptions+=w

     

       66
       66
       +
                   '';

     

       67
       67
       +
                   "ftplugin/nix.vim".text = ml-style;

     

       68
       68
       +
                   "ftplugin/ocaml.vim".text = ml-style;

     

       69
       69
       +
                   "after/ftplugin/markdown.vim".text = ''

     

       70
       70
       +
                     set com-=fb:-

     

       71
       71
       +
                     set com+=b:-\ [\ ],b:-\ [x],b:-

     

       72
       72
       +
                     set formatoptions+=ro

     

       73
       73
       +
                   '';

     

       74
       74
       +
                   "ftplugin/java.lua".text = ''

     

       75
       75
       +
                     local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ':p:h:t')

     

       76
       76
       +
                     local workspace_dir = '~/.cache/jdt/' .. project_name

     

       77
       77
       +
                     require('jdtls').start_or_attach {

     

       78
       78
       +
                     	on_attach = On_attach,

     

       79
       79
       +
                     	capabilities = Capabilities,

     

       80
       80
       +
                       cmd = { 'jdt-language-server', '-data', workspace_dir, },

     

       81
       81
       +
                       root_dir = vim.fs.dirname(vim.fs.find({'gradlew', '.git', 'mvnw'}, { upward = true })[1]),

     

       82
       82
       +
                     }

     

       83
       83
       +
                   '';

     

       84
       84
       +
                 };

     

       85
       85
       +
               }

     

       86
       86
       +
               gruvbox-nvim

     

       87
       87
       +
       

     

       88
       88
       +
               telescope-nvim

     

       89
       89
       +
               telescope-fzf-native-nvim

     

       90
       90
       +
               trouble-nvim

     

       91
       91
       +
       

     

       92
       92
       +
               obsidian-nvim

     

       93
       93
       +
               plenary-nvim

     

       94
       94
       +
               pkgs.ripgrep

     

       95
       95
       +
       

     

       96
       96
       +
               cmp-nvim-lsp

     

       97
       97
       +
               cmp-nvim-lsp-signature-help

     

       98
       98
       +
               cmp-path

     

       99
       99
       +
               cmp-buffer

     

       100
       100
       +
               cmp-cmdline

     

       101
       101
       +
               cmp-spell

     

       102
       102
       +
               luasnip

     

       103
       103
       +
               nvim-cmp

     

       104
       104
       +
       

     

       105
       105
       +
               vimtex

     

       106
       106
       +
               nvim-surround

     

       107
       107
       +
               comment-nvim

     

       108
       108
       +
       

     

       109
       109
       +
               ltex-ls-nvim

     

       110
       110
       +
               nvim-jdtls

     

       111
       111
       +
               # TODO nvim-dap

     

       112
       112
       +
       

     

       113
       113
       +
               copilot-vim

     

       114
       114
       +
             ];

     

       115
       115
       +
           };

     

       116
       116
       +
         };

     

       117
       117
       +
       }

+84

home/sway.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         replacements = {

     

       5
       5
       +
           wm = "sway";

     

       6
       6
       +
           wmmsg = "swaymsg";

     

       7
       7
       +
           rofi = "wofi";

     

       8
       8
       +
           app_id = "app_id";

     

       9
       9
       +
           bar_extra = ''

     

       10
       10
       +
             icon_theme Papirus

     

       11
       11
       +
           '';

     

       12
       12
       +
           locked = "--locked";

     

       13
       13
       +
           polkit_gnome = "${pkgs.polkit_gnome}";

     

       14
       14
       +
           locker = "swaylock -f -i $WALLPAPER";

     

       15
       15
       +
           enable_output = "swaymsg output $laptop_output enable";

     

       16
       16
       +
           disable_output = "swaymsg output $laptop_output disable";

     

       17
       17
       +
           drun = "wofi -i --show drun --allow-images -a";

     

       18
       18
       +
           run = "wofi -i --show run";

     

       19
       19
       +
           dmenu = "wofi -d -i -p";

     

       20
       20
       +
           displays = "wdisplays";

     

       21
       21
       +
           bar = "swaybar";

     

       22
       22
       +
           notification_deamon = "mako";

     

       23
       23
       +
           i3-workspace-history = "${pkgs.i3-workspace-history}";

     

       24
       24
       +
           i3-workspace-history-args = "-sway";

     

       25
       25
       +
         };

     

       26
       26
       +
         util = import ./util.nix { inherit pkgs lib; };

     

       27
       27
       +
         cfg = config.custom.gui.sway;

     

       28
       28
       +
       in {

     

       29
       29
       +
         options.custom.gui.sway.enable = lib.mkEnableOption "sway";

     

       30
       30
       +
       

     

       31
       31
       +
         config = lib.mkIf cfg.enable {

     

       32
       32
       +
           home.sessionVariables = {

     

       33
       33
       +
             QT_QPA_PLATFORM = "wayland";

     

       34
       34
       +
             SDL_VIDEODRIVER = "wayland";

     

       35
       35
       +
             MOZ_ENABLE_WAYLAND = 1;

     

       36
       36
       +
             MOZ_DBUS_REMOTE = 1;

     

       37
       37
       +
             QT_STYLE_OVERRIDE = "Fusion";

     

       38
       38
       +
             TERMINAL = "alacritty";

     

       39
       39
       +
             WLR_NO_HARDWARE_CURSORS = 1;

     

       40
       40
       +
             NIXOS_OZONE_WL = 1;

     

       41
       41
       +
       

     

       42
       42
       +
             # for intellij

     

       43
       43
       +
             _JAVA_AWT_WM_NONREPARENTING = 1;

     

       44
       44
       +
       

     

       45
       45
       +
             # for screensharing

     

       46
       46
       +
             XDG_SESSION_TYPE = "wayland";

     

       47
       47
       +
             XDG_CURRENT_DESKTOP = "sway";

     

       48
       48
       +
           };

     

       49
       49
       +
       

     

       50
       50
       +
           home.file.".zprofile".text = ''

     

       51
       51
       +
             # Autostart sway at login on TTY 1

     

       52
       52
       +
             if [ -z "''${DISPLAY}" ] && [ "''${XDG_VTNR}" -eq 1 ]; then

     

       53
       53
       +
               source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh

     

       54
       54
       +
             	exec sway -d 2> $HOME/.sway_log

     

       55
       55
       +
             fi

     

       56
       56
       +
           '';

     

       57
       57
       +
       

     

       58
       58
       +
           xdg.configFile = let

     

       59
       59
       +
             entries = {

     

       60
       60
       +
               "fusuma/config.yml".source = ./fusuma.yml;

     

       61
       61
       +
               "kanshi/config".source = ./kanshi;

     

       62
       62
       +
               "mako/config".source = ./mako;

     

       63
       63
       +
               "swaylock/config".source = ./swaylock;

     

       64
       64
       +
               "wofi/style.css".source = ./wofi.css;

     

       65
       65
       +
               "swappy/config".text = ''

     

       66
       66
       +
                 [Default]

     

       67
       67
       +
                 save_dir=$XDG_PICTURES_DIR/capture/

     

       68
       68
       +
                 save_filename_format=screenshot_%Y-%m-%dT%H:%M:%S%z.png

     

       69
       69
       +
               '';

     

       70
       70
       +
               "sway/config".text =

     

       71
       71
       +
                 let wmFilenames = util.listFilesInDir ./wm/config.d;

     

       72
       72
       +
                 in let swayFilenames = util.listFilesInDir ./wm/sway;

     

       73
       73
       +
                 in (util.concatFilesReplace

     

       74
       74
       +
                   ([ ./wm/config ] ++ wmFilenames ++ swayFilenames) replacements);

     

       75
       75
       +
               "i3blocks".source = ./i3blocks;

     

       76
       76
       +
             };

     

       77
       77
       +
           in (util.inDirReplace ./wm/scripts "sway/scripts" replacements) // entries;

     

       78
       78
       +
       

     

       79
       79
       +
           services.gammastep = {

     

       80
       80
       +
             enable = true;

     

       81
       81
       +
             provider = "geoclue2";

     

       82
       82
       +
           };

     

       83
       83
       +
         };

     

       84
       84
       +
       }

+1 -1

hosts/barnacle/default.nix

···

       9
       9
        
       

     

       10
       10
        
         nixpkgs.hostPlatform = "x86_64-linux";

     

       11
       11
        
       

     

       12
       12
       -
         personal = {

     

       12
       12
       +
         custom = {

     

       13
       13
        
           enable = true;

     

       14
       14
        
           laptop = true;

     

       15
       15
        
           gui.i3 = true;

+4 -2

hosts/capybara/default.nix

···

       3
       3
        
       {

     

       4
       4
        
         imports = [ ./hardware-configuration.nix ];

     

       5
       5
        
       

     

       6
       6
       -
         personal = {

     

       6
       6
       +
         custom = {

     

       7
       7
        
           enable = true;

     

       8
       8
        
           tailscale = true;

     

       9
       9
       -
           machineColour = "red";

     

       10
       9
        
         };

     

       10
       10
       +
       

     

       11
       11
       +
         home-manager.users.${config.custom.username}.config.custom.machineColour =

     

       12
       12
       +
           "red";

     

       11
       13
        
       

     

       12
       14
        
         networking.networkmanager.enable = true;

     

       13
       15

+5 -29

hosts/duck/default.nix

···

       3
       3
        
       {

     

       4
       4
        
         imports = [ ./hardware-configuration.nix ];

     

       5
       5
        
       

     

       6
       6
       -
         personal = {

     

       6
       6
       +
         custom = {

     

       7
       7
        
           enable = true;

     

       8
       8
        
           tailscale = true;

     

       9
       9
       -
           machineColour = "green";

     

       10
       9
        
         };

     

       10
       10
       +
       

     

       11
       11
       +
         home-manager.users.${config.custom.username}.config.custom.machineColour =

     

       12
       12
       +
           "green";

     

       11
       13
        
       

     

       12
       14
        
         swapDevices = [{

     

       13
       15
        
           device = "/var/swap";

     
···

       65
       67
        
         };

     

       66
       68
        
       

     

       67
       69
        
         security.acme = {

     

       68
       68
       -
           defaults.email = "${config.eilean.username}@${config.networking.domain}";

     

       70
       70
       +
           defaults.email = "${config.custom.username}@${config.networking.domain}";

     

       69
       71
        
           acceptTerms = true;

     

       70
       72
        
         };

     

       71
       71
       -
       

     

       72
       72
       -
         systemd.services.eeww = {

     

       73
       73
       -
           enable = true;

     

       74
       74
       -
           description = "eeww";

     

       75
       75
       -
           after = [ "network.target" ];

     

       76
       76
       -
           wantedBy = [ "multi-user.target" ];

     

       77
       77
       -
           serviceConfig = {

     

       78
       78
       -
             ExecStart = "${pkgs.eeww}/main.exe -p 80";

     

       79
       79
       -
             WorkingDirectory =

     

       80
       80
       -
               "${ryan-website.packages.${config.nixpkgs.hostPlatform.system}.default}";

     

       81
       81
       -
             Restart = "always";

     

       82
       82
       -
             RestartSec = "10s";

     

       83
       83
       -
             AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];

     

       84
       84
       -
             User = "eeww";

     

       85
       85
       -
             Group = "eeww";

     

       86
       86
       -
           };

     

       87
       87
       -
         };

     

       88
       88
       -
       

     

       89
       89
       -
         users.users."eeww" = {

     

       90
       90
       -
           description = "eeww";

     

       91
       91
       -
           useDefaultShell = true;

     

       92
       92
       -
           group = "eeww";

     

       93
       93
       -
           isSystemUser = true;

     

       94
       94
       -
         };

     

       95
       95
       -
       

     

       96
       96
       -
         users.groups."eeww" = { };

     

       97
       73
        
       

     

       98
       74
        
         networking.firewall = {

     

       99
       75
        
           allowedTCPPorts = [

+4 -2

hosts/elephant/default.nix

···

       3
       3
        
       {

     

       4
       4
        
         imports = [ ./hardware-configuration.nix ./zfs.nix ./services.nix ];

     

       5
       5
        
       

     

       6
       6
       -
         personal = {

     

       6
       6
       +
         custom = {

     

       7
       7
        
           enable = true;

     

       8
       8
        
           tailscale = true;

     

       9
       9
       -
           machineColour = "blue";

     

       10
       9
        
         };

     

       10
       10
       +
       

     

       11
       11
       +
         home-manager.users.${config.custom.username}.config.custom.machineColour =

     

       12
       12
       +
           "blue";

     

       11
       13
        
       

     

       12
       14
        
         environment.systemPackages = with pkgs; [

     

       13
       15
        
           smartmontools

+1 -1

hosts/elephant/services.nix

···

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
        
         security.acme = {

     

       5
       5
       -
           defaults.email = "${config.eilean.username}@${config.networking.domain}";

     

       5
       5
       +
           defaults.email = "${config.custom.username}@${config.networking.domain}";

     

       6
       6
        
           acceptTerms = true;

     

       7
       7
        
         };

     

       8
       8

+11 -10

hosts/gecko/default.nix

···

       3
       3
        
       {

     

       4
       4
        
         imports = [ ./hardware-configuration.nix ];

     

       5
       5
        
       

     

       6
       6
       -
         personal = {

     

       6
       6
       +
         custom = {

     

       7
       7
        
           enable = true;

     

       8
       8
        
           tailscale = true;

     

       9
       9
       -
           machineColour = "blue";

     

       10
       9
        
           laptop = true;

     

       11
       10
        
           printing = true;

     

       12
       11
        
           gui.i3 = true;

     

       13
       12
        
           gui.sway = true;

     

       14
       13
        
           gui.extra = true;

     

       15
       14
        
           ocaml = true;

     

       15
       15
       +
           workstation = true;

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         home-manager.users.${config.custom.username}.config.custom = {

     

       19
       19
       +
           machineColour = "blue";

     

       16
       20
        
           nvim-lsps = true;

     

       17
       21
        
         };

     

       18
       22
        
       

     
···

       93
       97
        
           repository = "rest:http://100.64.0.9:8000/${config.networking.hostName}/";

     

       94
       98
        
           passwordFile = config.age.secrets.restic-gecko.path;

     

       95
       99
        
           initialize = true;

     

       96
       96
       -
           paths = [

     

       97
       97
       -
             "/home/${config.custom.username}"

     

       98
       98
       -
             "/etc/NetworkManager/system-connections"

     

       99
       99
       -
           ];

     

       100
       100
       +
           paths = [ "/home/ryan}" "/etc/NetworkManager/system-connections" ];

     

       100
       101
        
           exclude = [

     

       101
       101
       -
             "/home/${config.custom.username}/videos"

     

       102
       102
       -
             "/home/${config.custom.username}/.thunderbird"

     

       103
       103
       -
             "/home/${config.custom.username}/.cache"

     

       104
       104
       -
             "/home/${config.custom.username}/.local/share/Steam"

     

       102
       102
       +
             "/home/ryan/videos"

     

       103
       103
       +
             "/home/ryan/.thunderbird"

     

       104
       104
       +
             "/home/ryan/.cache"

     

       105
       105
       +
             "/home/ryan/.local/share/Steam"

     

       105
       106
        
           ];

     

       106
       107
        
           timerConfig = { OnUnitActiveSec = "1d"; };

     

       107
       108
        
           extraBackupArgs = [ "-vv" ];

+2 -4

hosts/mouse/installer.nix

···

       43
       43
        
               "wheel" # enable sudo

     

       44
       44
        
             ];

     

       45
       45
        
             hashedPassword = hashedPassword;

     

       46
       46
       -
             openssh.authorizedKeys.keyFiles =

     

       47
       47
       -
               [ ../../modules/personal/authorized_keys ];

     

       46
       46
       +
             openssh.authorizedKeys.keyFiles = [ ../../modules/authorized_keys ];

     

       48
       47
        
           };

     

       49
       48
        
           users.root = {

     

       50
       49
        
             hashedPassword = hashedPassword;

     

       51
       51
       -
             openssh.authorizedKeys.keyFiles =

     

       52
       52
       -
               [ ../../modules/personal/authorized_keys ];

     

       50
       50
       +
             openssh.authorizedKeys.keyFiles = [ ../../modules/authorized_keys ];

     

       53
       51
        
           };

     

       54
       52
        
         };

     

       55
       53

+2 -4

hosts/mouse/sd-image.nix

···

       45
       45
        
               "wheel" # enable sudo

     

       46
       46
        
             ];

     

       47
       47
        
             hashedPassword = hashedPassword;

     

       48
       48
       -
             openssh.authorizedKeys.keyFiles =

     

       49
       49
       -
               [ ../../modules/personal/authorized_keys ];

     

       48
       48
       +
             openssh.authorizedKeys.keyFiles = [ ../../modules/authorized_keys ];

     

       50
       49
        
           };

     

       51
       50
        
           users.root = {

     

       52
       51
        
             hashedPassword = hashedPassword;

     

       53
       53
       -
             openssh.authorizedKeys.keyFiles =

     

       54
       54
       -
               [ ../../modules/personal/authorized_keys ];

     

       52
       52
       +
             openssh.authorizedKeys.keyFiles = [ ../../modules/authorized_keys ];

     

       55
       53
        
           };

     

       56
       54
        
         };

     

       57
       55

+8 -2

hosts/owl/default.nix

···

       10
       10
        
           inputs.fn06-website.nixosModules.default

     

       11
       11
        
         ];

     

       12
       12
        
       

     

       13
       13
       +
         eilean = {

     

       14
       14
       +
           username = config.custom.username;

     

       15
       15
       +
           serverIpv4 = "135.181.100.27";

     

       16
       16
       +
           serverIpv6 = "2a01:4f9:c011:87ad:0:0:0:0";

     

       17
       17
       +
         };

     

       18
       18
       +
         networking.domain = lib.mkDefault "freumh.org";

     

       13
       19
        
         eilean.publicInterface = "enp1s0";

     

       14
       20
        
         eilean.mailserver.enable = true;

     

       15
       21
        
         age.secrets.matrix-shared-secret = {

     
···

       36
       42
        
           path = [ pkgs.ffmpeg ];

     

       37
       43
        
         };

     

       38
       44
        
       

     

       39
       39
       -
         hosting = {

     

       45
       45
       +
         custom = {

     

       40
       46
        
           freumh.enable = true;

     

       41
       47
        
           nix-cache.enable = true;

     

       42
       48
        
           rmfakecloud.enable = true;

     
···

       264
       270
        
             cname = "vps";

     

       265
       271
        
             keys = pkgs.stdenv.mkDerivation {

     

       266
       272
        
               name = "ryan-keys";

     

       267
       267
       -
               src = ../../modules/personal/authorized_keys;

     

       273
       273
       +
               src = ../../modules/authorized_keys;

     

       268
       274
        
               phases = [ "buildPhase" ];

     

       269
       275
        
               buildPhase = ''

     

       270
       276
        
                 touch $out

+4 -2

hosts/owl/minimal.nix

···

       3
       3
        
       {

     

       4
       4
        
         imports = [ ./hardware-configuration.nix ];

     

       5
       5
        
       

     

       6
       6
       -
         personal = {

     

       6
       6
       +
         custom = {

     

       7
       7
        
           enable = true;

     

       8
       8
        
           tailscale = true;

     

       9
       9
       -
           machineColour = "yellow";

     

       10
       9
        
         };

     

       10
       10
       +
       

     

       11
       11
       +
         home-manager.users.${config.custom.username}.config.custom.machineColour =

     

       12
       12
       +
           "yellow";

     

       11
       13
        
       

     

       12
       14
        
         boot.tmp.cleanOnBoot = true;

     

       13
       15
        
         zramSwap.enable = true;

+4 -2

hosts/shrew/default.nix

···

       3
       3
        
       {

     

       4
       4
        
         imports = [ ./hardware-configuration.nix "${nixos-hardware}/raspberry-pi/4" ];

     

       5
       5
        
       

     

       6
       6
       -
         personal = {

     

       6
       6
       +
         custom = {

     

       7
       7
        
           enable = true;

     

       8
       8
        
           tailscale = true;

     

       9
       9
       -
           machineColour = "red";

     

       10
       9
        
           gui.sway = true;

     

       11
       10
        
         };

     

       11
       11
       +
       

     

       12
       12
       +
         home-manager.users.${config.custom.username}.config.custom.machineColour =

     

       13
       13
       +
           "red";

     

       12
       14
        
       

     

       13
       15
        
         networking.networkmanager.enable = true;

     

       14
       16

+5 -5

hosts/shrew/sd-image.nix

···

       1
       1
       -
       { lib, nixpkgs, ... }:

     

       1
       1
       +
       { config, lib, nixpkgs, ... }:

     

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
        
         imports =

     
···

       6
       6
        
       

     

       7
       7
        
         nixpkgs.hostPlatform = "aarch64-linux";

     

       8
       8
        
       

     

       9
       9
       -
         personal = {

     

       10
       10
       -
           enable = true;

     

       11
       11
       -
           machineColour = "red";

     

       12
       12
       -
         };

     

       9
       9
       +
         custom = { enable = true; };

     

       10
       10
       +
       

     

       11
       11
       +
         home-manager.users.${config.custom.username}.config.custom.machineColour =

     

       12
       12
       +
           "red";

     

       13
       13
        
       

     

       14
       14
        
         networking.wireless = {

     

       15
       15
        
           enable = true;

+2 -2

hosts/swan/default.nix

···

       1
       1
       -
       { pkgs, config, lib, eilean, ... }:

     

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

     

       2
       2
        
       

     

       3
       3
        
       let domain = "eeg.cl.cam.ac.uk";

     

       4
       4
        
       in {

     

       5
       5
        
         imports = [ ./hardware-configuration.nix ./minimal.nix ];

     

       6
       6
        
       

     

       7
       7
        
         security.acme = {

     

       8
       8
       -
           defaults.email = "${config.eilean.username}@${config.networking.domain}";

     

       8
       8
       +
           defaults.email = "${config.custom.username}@${config.networking.domain}";

     

       9
       9
        
           acceptTerms = true;

     

       10
       10
        
         };

     

       11
       11

+4 -4

hosts/swan/minimal.nix

···

       3
       3
        
       {

     

       4
       4
        
         imports = [ ./hardware-configuration.nix ];

     

       5
       5
        
       

     

       6
       6
       -
         personal = {

     

       7
       7
       -
           enable = true;

     

       8
       8
       -
           machineColour = "green";

     

       9
       9
       -
         };

     

       6
       6
       +
         custom = { enable = true; };

     

       7
       7
       +
       

     

       8
       8
       +
         home-manager.users.${config.custom.username}.config.custom.machineColour =

     

       9
       9
       +
           "green";

     

       10
       10
        
       

     

       11
       11
        
         services.openssh.openFirewall = true;

     

       12
       12

+6 -3

hosts/vulpine/default.nix

···

       1
       1
       -
       { pkgs, ... }:

     

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

     

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
        
         imports = [ ./hardware-configuration.nix ];

     

       5
       5
        
       

     

       6
       6
       -
         personal = {

     

       6
       6
       +
         custom = {

     

       7
       7
        
           enable = true;

     

       8
       8
        
           tailscale = true;

     

       9
       9
       -
           machineColour = "magenta";

     

       10
       9
        
           laptop = true;

     

       11
       10
        
           gui.i3 = true;

     

       12
       11
        
           gui.sway = true;

     

       13
       12
        
           gui.extra = true;

     

       13
       13
       +
           workstation = true;

     

       14
       14
        
         };

     

       15
       15
       +
       

     

       16
       16
       +
         home-manager.users.${config.custom.username}.config.custom.machineColour =

     

       17
       17
       +
           "magenta";

     

       15
       18
        
       

     

       16
       19
        
         boot.loader.grub = {

     

       17
       20
        
           enable = true;

+18

modules/auto-upgrade.nix

···

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

     

       2
       2
       +
         system.autoUpgrade = {

     

       3
       3
       +
           enable = true;

     

       4
       4
       +
           allowReboot = true;

     

       5
       5
       +
           flake = inputs.self.outPath;

     

       6
       6
       +
           flags = [ "--update-input" "nixpkgs" "-L" ];

     

       7
       7
       +
           dates = "03:00";

     

       8
       8
       +
           randomizedDelaySec = "1hr";

     

       9
       9
       +
           rebootWindow = {

     

       10
       10
       +
             lower = "03:00";

     

       11
       11
       +
             upper = "05:00";

     

       12
       12
       +
           };

     

       13
       13
       +
         };

     

       14
       14
       +
         systemd.services.nixos-upgrade.preStart = with pkgs; ''

     

       15
       15
       +
           DIR=/etc/nixos

     

       16
       16
       +
           ${sudo}/bin/sudo -u `stat -c "%U" $DIR` ${git}/bin/git -C $DIR pull || exit 0

     

       17
       17
       +
         '';

     

       18
       18
       +
       }

+71 -51

modules/default.nix

···

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

     

       1
       1
       +
       { pkgs, config, lib, ... }@inputs:

     

       2
       2
        
       

     

       3
       3
       -
       {

     

       3
       3
       +
       let cfg = config.custom;

     

       4
       4
       +
       in {

     

       4
       5
        
         imports = [

     

       5
       5
       -
           ./personal/default.nix

     

       6
       6
       -
           ./personal/nvim/default.nix

     

       7
       7
       -
           ./personal/wireguard-hosts.nix

     

       8
       8
       -
           ./personal/printing.nix

     

       9
       9
       -
           ./personal/laptop.nix

     

       10
       10
       -
           ./personal/nix-index.nix

     

       11
       11
       -
           ./personal/ssh.nix

     

       12
       12
       -
           ./personal/ocaml.nix

     

       13
       13
       -
           ./personal/scripts.nix

     

       14
       14
       -
           ./personal/gui/extra.nix

     

       15
       15
       -
           ./personal/gui/kde.nix

     

       16
       16
       -
           ./personal/gui/i3.nix

     

       17
       17
       -
           ./personal/gui/default.nix

     

       18
       18
       -
           ./personal/gui/sway.nix

     

       19
       19
       -
           ./personal/tailscale.nix

     

       20
       20
       -
           ./personal/shell.nix

     

       21
       21
       -
           ./personal/external-hdd-backup.nix

     

       22
       22
       -
           ./hosting/freumh.nix

     

       23
       23
       -
           ./hosting/nix-cache.nix

     

       24
       24
       -
           ./hosting/eeww.nix

     

       25
       25
       -
           ./hosting/rmfakecloud.nix

     

       6
       6
       +
           ./auto-upgrade.nix

     

       7
       7
       +
           ./workstation.nix

     

       8
       8
       +
           ./printing.nix

     

       9
       9
       +
           ./freumh.nix

     

       10
       10
       +
           ./scripts.nix

     

       11
       11
       +
           ./ocaml.nix

     

       12
       12
       +
           ./nix-cache.nix

     

       13
       13
       +
           ./external-hdd-backup.nix

     

       14
       14
       +
           ./laptop.nix

     

       15
       15
       +
           ./nix-index.nix

     

       16
       16
       +
           ./ssh.nix

     

       17
       17
       +
           ./gui/extra.nix

     

       18
       18
       +
           ./gui/kde.nix

     

       19
       19
       +
           ./gui/i3.nix

     

       20
       20
       +
           ./gui/default.nix

     

       21
       21
       +
           ./gui/sway.nix

     

       22
       22
       +
           ./rmfakecloud.nix

     

       23
       23
       +
           ./tailscale.nix

     

       24
       24
       +
           ./dict.nix

     

       26
       25
        
         ];

     

       27
       26
        
       

     

       28
       28
       -
         options.custom.username = lib.mkOption {

     

       29
       29
       -
           type = lib.types.str;

     

       30
       30
       -
           default = "ryan";

     

       27
       27
       +
         options.custom = {

     

       28
       28
       +
           enable = lib.mkEnableOption "custom";

     

       29
       29
       +
           username = lib.mkOption {

     

       30
       30
       +
             type = lib.types.str;

     

       31
       31
       +
             default = "ryan";

     

       32
       32
       +
           };

     

       31
       33
        
         };

     

       32
       34
        
       

     

       33
       35
        
         config = let nixPath = "/etc/nix-path";

     

       34
       34
       -
         in {

     

       35
       35
       -
           eilean = {

     

       36
       36
       -
             username = config.custom.username;

     

       37
       37
       -
             serverIpv4 = "135.181.100.27";

     

       38
       38
       -
             serverIpv6 = "2a01:4f9:c011:87ad:0:0:0:0";

     

       36
       36
       +
         in lib.mkIf cfg.enable {

     

       37
       37
       +
           console = {

     

       38
       38
       +
             font = "Lat2-Terminus16";

     

       39
       39
       +
             keyMap = "uk";

     

       39
       40
        
           };

     

       40
       40
       -
           networking.domain = lib.mkDefault "freumh.org";

     

       41
       41
       +
           i18n.defaultLocale = "en_GB.UTF-8";

     

       41
       42
        
       

     

       42
       42
       -
           services.localtimed.enable = true;

     

       43
       43
       -
           services.geoclue2.enable = true;

     

       43
       43
       +
           networking.domain = "freumh.org";

     

       44
       44
        
       

     

       45
       45
       -
           i18n.defaultLocale = "en_GB.UTF-8";

     

       45
       45
       +
           eilean.username = cfg.username;

     

       46
       46
        
       

     

       47
       47
        
           nix = {

     

       48
       48
        
             settings = lib.mkMerge [

     

       49
       49
        
               {

     

       50
       50
        
                 experimental-features = [ "nix-command" "flakes" ];

     

       51
       51
        
                 auto-optimise-store = true;

     

       52
       52
       -
                 trusted-users = [ config.custom.username ];

     

       52
       52
       +
                 trusted-users = [ cfg.username ];

     

       53
       53
        
               }

     

       54
       54
       -
               (lib.mkIf (config.networking.hostName != "vps") {

     

       54
       54
       +
               (lib.mkIf (config.networking.hostName != "owl") {

     

       55
       55
        
                 substituters = [

     

       56
       56
        
                   "https://cache.nixos.org?priority=100"

     

       57
       57
        
                   "https://binarycache.${config.networking.domain}?priority=10"

     
···

       71
       71
        
           };

     

       72
       72
        
           systemd.tmpfiles.rules = [ "L+ ${nixPath} - - - - ${pkgs.path}" ];

     

       73
       73
        
       

     

       74
       74
       -
           system.autoUpgrade = {

     

       75
       75
       -
             enable = true;

     

       76
       76
       -
             allowReboot = true;

     

       77
       77
       -
             flake = inputs.self.outPath;

     

       78
       78
       -
             flags = [ "--update-input" "nixpkgs" "-L" ];

     

       79
       79
       -
             dates = "03:00";

     

       80
       80
       -
             randomizedDelaySec = "1hr";

     

       81
       81
       -
             rebootWindow = {

     

       82
       82
       -
               lower = "03:00";

     

       83
       83
       -
               upper = "05:00";

     

       74
       74
       +
           users = let

     

       75
       75
       +
             hashedPassword =

     

       76
       76
       +
               "$6$IPvnJnu6/fp1Jxfy$U6EnzYDOC2NqE4iqRrkJJbSTHHNWk0KwK1xyk9jEvlu584UWQLyzDVF5I1Sh47wQhSVrvUI4mrqw6XTTjfPj6.";

     

       77
       77
       +
           in {

     

       78
       78
       +
             mutableUsers = false;

     

       79
       79
       +
             groups.plugdev = { };

     

       80
       80
       +
             users.${cfg.username} = {

     

       81
       81
       +
               isNormalUser = true;

     

       82
       82
       +
               extraGroups = [

     

       83
       83
       +
                 "wheel" # enable sudo

     

       84
       84
       +
                 "networkmanager"

     

       85
       85
       +
                 "video"

     

       86
       86
       +
                 "plugdev"

     

       87
       87
       +
               ];

     

       88
       88
       +
               shell = pkgs.zsh;

     

       89
       89
       +
               # we let home manager manager zsh

     

       90
       90
       +
               ignoreShellProgramCheck = true;

     

       91
       91
       +
               hashedPassword = hashedPassword;

     

       84
       92
        
             };

     

       93
       93
       +
             users.root.hashedPassword = hashedPassword;

     

       85
       94
        
           };

     

       86
       86
       -
           systemd.services.nixos-upgrade.preStart = with pkgs; ''

     

       87
       87
       -
             DIR=/etc/nixos

     

       88
       88
       -
             ${sudo}/bin/sudo -u `stat -c "%U" $DIR` ${git}/bin/git -C $DIR pull || exit 0

     

       89
       89
       -
           '';

     

       95
       95
       +
       

     

       96
       96
       +
           environment.systemPackages = with pkgs; [ nix agenix ];

     

       97
       97
       +
       

     

       98
       98
       +
           networking = rec {

     

       99
       99
       +
             # nameservers = [ "freumh.org" ];

     

       100
       100
       +
             nameservers = [ "1.1.1.1" ];

     

       101
       101
       +
             networkmanager.dns = "none";

     

       102
       102
       +
           };

     

       103
       103
       +
       

     

       104
       104
       +
           home-manager = {

     

       105
       105
       +
             useGlobalPkgs = true;

     

       106
       106
       +
             users.${config.custom.username} = import ../home/default.nix;

     

       107
       107
       +
           };

     

       108
       108
       +
           # zsh completion

     

       109
       109
       +
           environment.pathsToLink = [ "/share/zsh" ];

     

       90
       110
        
         };

     

       91
       111
        
       }

-55

modules/hosting/eeww.nix

···

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

     

       2
       2
       -
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       5
       -
       let cfg = config.services.eeww;

     

       6
       6
       -
       in {

     

       7
       7
       -
         options = {

     

       8
       8
       -
           services.eeww = {

     

       9
       9
       -
             enable = mkEnableOption "eeww";

     

       10
       10
       -
             domain = lib.mkOption { type = lib.types.str; };

     

       11
       11
       -
             port = lib.mkOption {

     

       12
       12
       -
               type = lib.types.port;

     

       13
       13
       -
               default = 8081;

     

       14
       14
       -
             };

     

       15
       15
       -
             user = lib.mkOption {

     

       16
       16
       -
               type = lib.types.str;

     

       17
       17
       -
               default = "eeww";

     

       18
       18
       -
             };

     

       19
       19
       -
             group = lib.mkOption {

     

       20
       20
       -
               type = lib.types.str;

     

       21
       21
       -
               default = cfg.user;

     

       22
       22
       -
             };

     

       23
       23
       -
           };

     

       24
       24
       -
         };

     

       25
       25
       -
       

     

       26
       26
       -
         config = lib.mkIf cfg.enable {

     

       27
       27
       -
           # TODO use unix socket?

     

       28
       28
       -
           services.nginx.virtualHosts."${cfg.domain}".locations."/".proxyPass =

     

       29
       29
       -
             "http://localhost:${builtins.toString cfg.port}";

     

       30
       30
       -
       

     

       31
       31
       -
           systemd.services.eeww = {

     

       32
       32
       -
             enable = true;

     

       33
       33
       -
             description = "eeww";

     

       34
       34
       -
             after = [ "network.target" ];

     

       35
       35
       -
             wantedBy = [ "multi-user.target" ];

     

       36
       36
       -
             serviceConfig = {

     

       37
       37
       -
               ExecStart = "${pkgs.eeww}/main.exe -p 8081";

     

       38
       38
       -
               WorkingDirectory = "${pkgs.ryan-website}";

     

       39
       39
       -
               Restart = "always";

     

       40
       40
       -
               RestartSec = "10s";

     

       41
       41
       -
               User = "eeww";

     

       42
       42
       -
               Group = "eeww";

     

       43
       43
       -
             };

     

       44
       44
       -
           };

     

       45
       45
       -
       

     

       46
       46
       -
           users.users."${cfg.user}" = {

     

       47
       47
       -
             description = "eeww";

     

       48
       48
       -
             useDefaultShell = true;

     

       49
       49
       -
             group = cfg.group;

     

       50
       50
       -
             isSystemUser = true;

     

       51
       51
       -
           };

     

       52
       52
       -
       

     

       53
       53
       -
           users.groups."${cfg.group}" = { };

     

       54
       54
       -
         };

     

       55
       55
       -
       }

+3 -3

modules/hosting/freumh.nix modules/freumh.nix

···

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

     

       2
       2
        
       

     

       3
       3
       -
       let cfg = config.hosting;

     

       3
       3
       +
       let cfg = config.custom;

     

       4
       4
        
       in {

     

       5
       5
       -
         options.hosting.freumh.enable = lib.mkEnableOption "freumh";

     

       5
       5
       +
         options.custom.freumh.enable = lib.mkEnableOption "freumh";

     

       6
       6
        
       

     

       7
       7
        
         config = lib.mkIf cfg.freumh.enable {

     

       8
       8
        
           security.acme = {

     

       9
       9
       -
             defaults.email = "${config.eilean.username}@${config.networking.domain}";

     

       9
       9
       +
             defaults.email = "${config.custom.username}@${config.networking.domain}";

     

       10
       10
        
             acceptTerms = true;

     

       11
       11
        
           };

     

       12
       12

+3 -3

modules/hosting/nix-cache.nix modules/nix-cache.nix

···

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

     

       2
       2
        
       

     

       3
       3
       -
       let cfg = config.hosting;

     

       3
       3
       +
       let cfg = config.custom;

     

       4
       4
        
       in {

     

       5
       5
       -
         options.hosting.nix-cache.enable = lib.mkEnableOption "nix-cache";

     

       5
       5
       +
         options.custom.nix-cache.enable = lib.mkEnableOption "nix-cache";

     

       6
       6
        
       

     

       7
       7
        
         config = lib.mkIf cfg.nix-cache.enable {

     

       8
       8
        
           age.secrets."cache-priv-key.pem" = {

     

       9
       9
       -
             file = ../../secrets/cache-priv-key.pem.age;

     

       9
       9
       +
             file = ../secrets/cache-priv-key.pem.age;

     

       10
       10
        
             mode = "770";

     

       11
       11
        
             owner = "${config.systemd.services.nix-serve.serviceConfig.User}";

     

       12
       12
        
             group = "${config.systemd.services.nix-serve.serviceConfig.Group}";

+3 -3

modules/hosting/rmfakecloud.nix modules/rmfakecloud.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
         cfg = config.hosting.rmfakecloud;

     

       6
       6
       +
         cfg = config.custom.rmfakecloud;

     

       7
       7
        
         domain = config.networking.domain;

     

       8
       8
        
       in {

     

       9
       9
       -
         options.hosting.rmfakecloud = {

     

       9
       9
       +
         options.custom.rmfakecloud = {

     

       10
       10
        
           enable = mkEnableOption "rmfakecloud";

     

       11
       11
        
           port = mkOption {

     

       12
       12
        
             type = types.port;

     
···

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         config = lib.mkIf cfg.enable {

     

       22
       22
       -
           age.secrets.rmfakecloud.file = ../../secrets/rmfakecloud.age;

     

       22
       22
       +
           age.secrets.rmfakecloud.file = ../secrets/rmfakecloud.age;

     

       23
       23
        
           services.rmfakecloud = {

     

       24
       24
        
             enable = true;

     

       25
       25
        
             storageUrl = "https://${cfg.domain}";

modules/personal/authorized_keys modules/authorized_keys

-180

modules/personal/default.nix

···

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

     

       2
       2
       -
       

     

       3
       3
       -
       let cfg = config.personal;

     

       4
       4
       -
       in {

     

       5
       5
       -
         options.personal = { enable = lib.mkEnableOption "personal"; };

     

       6
       6
       -
       

     

       7
       7
       -
         config = lib.mkIf cfg.enable {

     

       8
       8
       -
           console = {

     

       9
       9
       -
             font = "Lat2-Terminus16";

     

       10
       10
       -
             keyMap = "uk";

     

       11
       11
       -
           };

     

       12
       12
       -
       

     

       13
       13
       -
           users = let

     

       14
       14
       -
             hashedPassword =

     

       15
       15
       -
               "$6$IPvnJnu6/fp1Jxfy$U6EnzYDOC2NqE4iqRrkJJbSTHHNWk0KwK1xyk9jEvlu584UWQLyzDVF5I1Sh47wQhSVrvUI4mrqw6XTTjfPj6.";

     

       16
       16
       -
           in {

     

       17
       17
       -
             mutableUsers = false;

     

       18
       18
       -
             groups.plugdev = { };

     

       19
       19
       -
             users.${config.custom.username} = {

     

       20
       20
       -
               isNormalUser = true;

     

       21
       21
       -
               extraGroups = [

     

       22
       22
       -
                 "wheel" # enable sudo

     

       23
       23
       -
                 "networkmanager"

     

       24
       24
       -
                 "video"

     

       25
       25
       -
                 "plugdev"

     

       26
       26
       -
               ];

     

       27
       27
       -
               shell = pkgs.zsh;

     

       28
       28
       -
               hashedPassword = hashedPassword;

     

       29
       29
       -
             };

     

       30
       30
       -
             users.root.hashedPassword = hashedPassword;

     

       31
       31
       -
           };

     

       32
       32
       -
       

     

       33
       33
       -
           environment = {

     

       34
       34
       -
             systemPackages = with pkgs; [

     

       35
       35
       -
               nix

     

       36
       36
       -
               agenix

     

       37
       37
       -
               tree

     

       38
       38
       -
               htop

     

       39
       39
       -
               bind

     

       40
       40
       -
               inetutils

     

       41
       41
       -
               dua

     

       42
       42
       -
               fd

     

       43
       43
       -
               nix-prefetch-git

     

       44
       44
       -
               gnumake

     

       45
       45
       -
               vlock

     

       46
       46
       -
               bat

     

       47
       47
       -
               killall

     

       48
       48
       -
               nmap

     

       49
       49
       -
               gcc

     

       50
       50
       -
               fzf

     

       51
       51
       -
               tcpdump

     

       52
       52
       -
               sshfs

     

       53
       53
       -
               nix-tree

     

       54
       54
       -
               #atuin

     

       55
       55
       -
               git-crypt

     

       56
       56
       -
               jq

     

       57
       57
       -
               bc

     

       58
       58
       -
               pandoc

     

       59
       59
       -
               w3m

     

       60
       60
       -
               ranger

     

       61
       61
       -
               bluetuith

     

       62
       62
       -
               powertop

     

       63
       63
       -
               ripgrep

     

       64
       64
       -
               toot

     

       65
       65
       -
               iamb

     

       66
       66
       -
             ];

     

       67
       67
       -
             variables.EDITOR = "nvim";

     

       68
       68
       -
             shellAliases = {

     

       69
       69
       -
               ls = "ls -p --color=auto";

     

       70
       70
       -
               pls = "sudo $(fc -ln -1)";

     

       71
       71
       -
               o = "xdg-open";

     

       72
       72
       -
               se = "sudoedit";

     

       73
       73
       -
               su = "su -p";

     

       74
       74
       -
               ssh = "TERM=xterm ssh";

     

       75
       75
       -
               nix-shell = "nix-shell --command zsh";

     

       76
       76
       -
               inhibit-lid = "systemd-inhibit --what=handle-lid-switch sleep 1d";

     

       77
       77
       -
               tmux = "tmux -2";

     

       78
       78
       -
               feh = "feh --scale-down --auto-zoom";

     

       79
       79
       -
               nix-stray-roots =

     

       80
       80
       -
                 "nix-store --gc --print-roots | egrep -v '^(/nix/var|/run|/proc|{censored})'";

     

       81
       81
       -
             };

     

       82
       82
       -
             sessionVariables = {

     

       83
       83
       -
               NIX_AUTO_RUN = "y";

     

       84
       84
       -
               NIX_AUTO_RUN_INTERACTIVE = "y";

     

       85
       85
       -
               BROWSER = "firefox"; # urlview

     

       86
       86
       -
             };

     

       87
       87
       -
           };

     

       88
       88
       -
       

     

       89
       89
       -
           networking = rec {

     

       90
       90
       -
             # nameservers = [ ${config.eilean.serverIpv4} ];

     

       91
       91
       -
             nameservers = [ "1.1.1.1" ];

     

       92
       92
       -
             networkmanager.dns = "none";

     

       93
       93
       -
           };

     

       94
       94
       -
       

     

       95
       95
       -
           programs.git = {

     

       96
       96
       -
             enable = true;

     

       97
       97
       -
             config = {

     

       98
       98
       -
               init = { defaultBranch = "main"; };

     

       99
       99
       -
               user = {

     

       100
       100
       -
                 email = "${config.custom.username}@${config.networking.domain}";

     

       101
       101
       -
                 name = "Ryan Gibb";

     

       102
       102
       -
               };

     

       103
       103
       -
               alias = {

     

       104
       104
       -
                 s = "status";

     

       105
       105
       -
                 c = "commit";

     

       106
       106
       -
                 cm = "commit --message";

     

       107
       107
       -
                 ca = "commit --amend";

     

       108
       108
       -
                 cu = "commit --message update";

     

       109
       109
       -
                 ci = "commit --message initial";

     

       110
       110
       -
                 br = "branch";

     

       111
       111
       -
                 co = "checkout";

     

       112
       112
       -
                 df = "diff";

     

       113
       113
       -
                 l = "log";

     

       114
       114
       -
                 lg = "log -p";

     

       115
       115
       -
                 lol = "log --graph --decorate --pretty=oneline --abbrev-commit";

     

       116
       116
       -
                 lola =

     

       117
       117
       -
                   "log --graph --decorate --pretty=oneline --abbrev-commit --all";

     

       118
       118
       -
                 ls = "ls-files";

     

       119
       119
       -
                 a = "add";

     

       120
       120
       -
                 aa = "add --all";

     

       121
       121
       -
                 au = "add -u";

     

       122
       122
       -
                 ap = "add --patch";

     

       123
       123
       -
                 ai = "add -i";

     

       124
       124
       -
                 ps = "push";

     

       125
       125
       -
                 pf = "push --force";

     

       126
       126
       -
                 pu = "push --set-upstream";

     

       127
       127
       -
                 pl = "pull";

     

       128
       128
       -
                 pr = "pull --rebase";

     

       129
       129
       -
                 acp = "!git add --all && git commit --message update && git push";

     

       130
       130
       -
                 d = "diff";

     

       131
       131
       -
                 dc = "diff --cached";

     

       132
       132
       -
               };

     

       133
       133
       -
             };

     

       134
       134
       -
           };

     

       135
       135
       -
       

     

       136
       136
       -
           programs.tmux = {

     

       137
       137
       -
             enable = true;

     

       138
       138
       -
             extraConfig = let

     

       139
       139
       -
               toggle-status-bar = pkgs.writeScript "toggle-status-bar.sh" ''

     

       140
       140
       -
                 #!/usr/bin/env bash

     

       141
       141
       -
                 window_count=$(tmux list-windows | wc -l)

     

       142
       142
       -
                 if [ "$window_count" -ge "2" ]; then

     

       143
       143
       -
                     tmux set-option status on

     

       144
       144
       -
                 else

     

       145
       145
       -
                     tmux set-option status off

     

       146
       146
       -
                 fi

     

       147
       147
       -
               '';

     

       148
       148
       -
             in ''

     

       149
       149
       -
               set-window-option -g mode-keys vi

     

       150
       150
       -
               set-option -g mouse on

     

       151
       151
       -
               set-option -g set-titles on

     

       152
       152
       -
               set-option -g set-titles-string "#T"

     

       153
       153
       -
               bind-key t capture-pane -S -\; new-window '(tmux show-buffer; tmux delete-buffer) | nvim -c $'

     

       154
       154
       -
               bind-key u capture-pane\; new-window '(tmux show-buffer; tmux delete-buffer) | ${pkgs.urlview}/bin/urlview'

     

       155
       155
       -
               set-hook -g session-window-changed 'run-shell ${toggle-status-bar}'

     

       156
       156
       -
               set-hook -g session-created 'run-shell ${toggle-status-bar}'

     

       157
       157
       -
               # Fixes C-Up/Down in TUIs

     

       158
       158
       -
               set-option default-terminal tmux

     

       159
       159
       -
               # https://stackoverflow.com/questions/62182401/neovim-screen-lagging-when-switching-mode-from-insert-to-normal

     

       160
       160
       -
               # locking

     

       161
       161
       -
               set -s escape-time 0

     

       162
       162
       -
               set -g lock-command vlock

     

       163
       163
       -
               set -g lock-after-time 0 # Seconds; 0 = never

     

       164
       164
       -
               bind L lock-session

     

       165
       165
       -
               # for .zprofile display environment starting https://github.com/tmux/tmux/issues/3483

     

       166
       166
       -
               set-option -g update-environment XDG_VTNR

     

       167
       167
       -
               # Allow clipboard with OSC-52 work

     

       168
       168
       -
               set -s set-clipboard on

     

       169
       169
       -
             '';

     

       170
       170
       -
           };

     

       171
       171
       -
       

     

       172
       172
       -
           programs.less = {

     

       173
       173
       -
             enable = true;

     

       174
       174
       -
             lineEditingKeys = {

     

       175
       175
       -
               "\\e[1;5D" = "word-left";

     

       176
       176
       -
               "\\e[1;5C" = "word-right";

     

       177
       177
       -
             };

     

       178
       178
       -
           };

     

       179
       179
       -
         };

     

       180
       180
       -
       }

+3 -3

modules/personal/dict.nix modules/dict.nix

···

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

     

       2
       2
        
       

     

       3
       3
       -
       let cfg = config.personal;

     

       3
       3
       +
       let cfg = config.custom;

     

       4
       4
        
       in {

     

       5
       5
       -
         options.personal.dict = lib.mkOption {

     

       6
       6
       -
           type = types.bool;

     

       5
       5
       +
         options.custom.dict = lib.mkOption {

     

       6
       6
       +
           type = lib.types.bool;

     

       7
       7
        
           default = true;

     

       8
       8
        
         };

     

       9
       9

+3 -3

modules/personal/external-hdd-backup.nix modules/external-hdd-backup.nix

···

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

     

       2
       2
        
       

     

       3
       3
       -
       let cfg = config.personal;

     

       3
       3
       +
       let cfg = config.custom;

     

       4
       4
        
       in {

     

       5
       5
       -
         options.personal.backup = {

     

       5
       5
       +
         options.custom.external-hdd-backup = {

     

       6
       6
        
           enable = lib.mkEnableOption "laptop";

     

       7
       7
        
           disk = lib.mkOption {

     

       8
       8
        
             type = lib.types.str;

     
···

       18
       18
        
           };

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         config = lib.mkIf cfg.backup.enable {

     

       21
       21
       +
         config = lib.mkIf cfg.external-hdd-backup.enable {

     

       22
       22
        
           systemd.services.backup = {

     

       23
       23
        
             description = "Backup service";

     

       24
       24
        
             # NB udisks isn't viable as non-root due to:

+5 -3

modules/personal/gui/default.nix modules/gui/default.nix

···

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

     

       2
       2
        
       

     

       3
       3
       -
       let cfg = config.personal.gui;

     

       3
       3
       +
       let cfg = config.custom.gui;

     

       4
       4
        
       in {

     

       5
       5
       -
         options.personal.gui.enable = lib.mkOption {

     

       5
       5
       +
         options.custom.gui.enable = lib.mkOption {

     

       6
       6
        
           type = lib.types.bool;

     

       7
       7
        
           default = cfg.i3 || cfg.sway || cfg.kde;

     

       8
       8
        
         };

     

       9
       9
        
       

     

       10
       10
        
         config = lib.mkIf cfg.enable {

     

       11
       11
       -
           home-manager.users.${config.custom.username} = import ../home/default.nix;

     

       11
       11
       +
           home-manager.users.${config.custom.username} = { config, ... }: {

     

       12
       12
       +
             config.custom.gui.enable = true;

     

       13
       13
       +
           };

     

       12
       14
        
       

     

       13
       15
        
           networking.networkmanager.enable = true;

     

       14
       16
        
           programs.nm-applet = {

+2 -2

modules/personal/gui/extra.nix modules/gui/extra.nix

···

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

     

       2
       2
        
       

     

       3
       3
       -
       let cfg = config.personal.gui;

     

       3
       3
       +
       let cfg = config.custom.gui;

     

       4
       4
        
       in {

     

       5
       5
       -
         options.personal.gui.extra = lib.mkEnableOption "extra";

     

       5
       5
       +
         options.custom.gui.extra = lib.mkEnableOption "extra";

     

       6
       6
        
       

     

       7
       7
        
         config = lib.mkIf cfg.extra {

     

       8
       8
        
           environment.systemPackages = with pkgs; [

+5 -3

modules/personal/gui/i3.nix modules/gui/i3.nix

···

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

     

       2
       2
        
       

     

       3
       3
       -
       let cfg = config.personal.gui;

     

       3
       3
       +
       let cfg = config.custom.gui;

     

       4
       4
        
       in {

     

       5
       5
       -
         options.personal.gui.i3 = lib.mkEnableOption "i3";

     

       5
       5
       +
         options.custom.gui.i3 = lib.mkEnableOption "i3";

     

       6
       6
        
       

     

       7
       7
        
         config = lib.mkIf cfg.i3 {

     

       8
       8
       -
           home-manager.users.${config.custom.username} = import ../home/i3.nix;

     

       8
       8
       +
           home-manager.users.${config.custom.username} = { config, ... }: {

     

       9
       9
       +
             config.custom.gui.i3.enable = true;

     

       10
       10
       +
           };

     

       9
       11
        
       

     

       10
       12
        
           services.xserver = {

     

       11
       13
        
             enable = true;

+2 -2

modules/personal/gui/kde.nix modules/gui/kde.nix

···

       1
       1
        
       { config, lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       let cfg = config.personal.gui;

     

       3
       3
       +
       let cfg = config.custom.gui;

     

       4
       4
        
       in {

     

       5
       5
       -
         options.personal.gui.kde = lib.mkEnableOption "kde";

     

       5
       5
       +
         options.custom.gui.kde = lib.mkEnableOption "kde";

     

       6
       6
        
       

     

       7
       7
        
         config = lib.mkIf cfg.kde {

     

       8
       8
        
           services.xserver = {

+5 -3

modules/personal/gui/sway.nix modules/gui/sway.nix

···

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

     

       2
       2
        
       

     

       3
       3
       -
       let cfg = config.personal.gui;

     

       3
       3
       +
       let cfg = config.custom.gui;

     

       4
       4
        
       in {

     

       5
       5
       -
         options.personal.gui.sway = lib.mkEnableOption "sway";

     

       5
       5
       +
         options.custom.gui.sway = lib.mkEnableOption "sway";

     

       6
       6
        
       

     

       7
       7
        
         config = lib.mkIf cfg.sway {

     

       8
       8
       -
           home-manager.users.${config.custom.username} = import ../home/sway.nix;

     

       8
       8
       +
           home-manager.users.${config.custom.username} = { config, ... }: {

     

       9
       9
       +
             config.custom.gui.sway.enable = true;

     

       10
       10
       +
           };

     

       9
       11
        
       

     

       10
       12
        
           programs.sway = {

     

       11
       13
        
             enable = true;

modules/personal/home/alacritty.yml home/alacritty.yml

-190

modules/personal/home/default.nix

···

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

     

       2
       2
       -
       

     

       3
       3
       -
       {

     

       4
       4
       -
         imports = [ ./mail/default.nix ];

     

       5
       5
       -
       

     

       6
       6
       -
         gtk = {

     

       7
       7
       -
           enable = true;

     

       8
       8
       -
           font = {

     

       9
       9
       -
             name = "Noto Sans 11";

     

       10
       10
       -
             package = pkgs.noto-fonts;

     

       11
       11
       -
           };

     

       12
       12
       -
           iconTheme = {

     

       13
       13
       -
             package = pkgs.gruvbox-dark-icons-gtk;

     

       14
       14
       -
             name = "gruvbox-dark";

     

       15
       15
       -
           };

     

       16
       16
       -
           theme = {

     

       17
       17
       -
             package = pkgs.gruvbox-dark-gtk;

     

       18
       18
       -
             name = "gruvbox-dark";

     

       19
       19
       -
           };

     

       20
       20
       -
         };

     

       21
       21
       -
       

     

       22
       22
       -
         # evince workaround

     

       23
       23
       -
         home.sessionVariables.GTK_THEME = "gruvbox-dark";

     

       24
       24
       -
       

     

       25
       25
       -
         home.sessionVariables.WALLPAPER = let wallpaper = ./wallpaper.jpg;

     

       26
       26
       -
         in pkgs.runCommand (builtins.baseNameOf wallpaper) { } "cp ${wallpaper} $out";

     

       27
       27
       -
       

     

       28
       28
       -
         home.sessionVariables.GOPATH = "$HOME/.go";

     

       29
       29
       -
       

     

       30
       30
       -
         home.pointerCursor = {

     

       31
       31
       -
           name = "Adwaita";

     

       32
       32
       -
           package = pkgs.gnome.adwaita-icon-theme;

     

       33
       33
       -
           size = 32;

     

       34
       34
       -
         };

     

       35
       35
       -
       

     

       36
       36
       -
         home.file.".profile".text = ''

     

       37
       37
       -
           source "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"

     

       38
       38
       -
         '';

     

       39
       39
       -
       

     

       40
       40
       -
         programs.firefox = let

     

       41
       41
       -
           settings = {

     

       42
       42
       -
             "browser.ctrlTab.recentlyUsedOrder" = false;

     

       43
       43
       -
             "browser.tabs.warnOnClose" = false;

     

       44
       44
       -
             "browser.toolbars.bookmarks.visibility" = "never";

     

       45
       45
       -
       

     

       46
       46
       -
             # Only hide UI elements on F11 (i.e. don't go fullscreen, leave that to WM)

     

       47
       47
       -
             "full-screen-api.ignore-widgets" = true;

     

       48
       48
       -
             # Right click issue fix

     

       49
       49
       -
             "ui.context_menus.after_mouseup" = true;

     

       50
       50
       -
       

     

       51
       51
       -
             # Use userChrome.css

     

       52
       52
       -
             "toolkit.legacyUserProfileCustomizations.stylesheets" = true;

     

       53
       53
       -
       

     

       54
       54
       -
             "browser.shell.checkDefaultBrowser" = false;

     

       55
       55
       -
       

     

       56
       56
       -
             # sync toolbar

     

       57
       57
       -
             "services.sync.prefs.sync.browser.uiCustomization.state" = true;

     

       58
       58
       -
       

     

       59
       59
       -
             "extensions.pocket.enabled" = false;

     

       60
       60
       -
           };

     

       61
       61
       -
           userChrome = ''

     

       62
       62
       -
             #webrtcIndicator {

     

       63
       63
       -
               display: none;

     

       64
       64
       -
             }

     

       65
       65
       -
       

     

       66
       66
       -
             /* Move find bar to top */

     

       67
       67
       -
             .browserContainer > findbar {

     

       68
       68
       -
               -moz-box-ordinal-group: 0;

     

       69
       69
       -
             }

     

       70
       70
       -
       

     

       71
       71
       -
             #TabsToolbar

     

       72
       72
       -
             {

     

       73
       73
       -
                 visibility: collapse;

     

       74
       74
       -
             }

     

       75
       75
       -
           '';

     

       76
       76
       -
         in {

     

       77
       77
       -
           enable = true;

     

       78
       78
       -
           profiles.default = {

     

       79
       79
       -
             settings = settings;

     

       80
       80
       -
             userChrome = userChrome;

     

       81
       81
       -
           };

     

       82
       82
       -
           profiles.secondary = {

     

       83
       83
       -
             id = 1;

     

       84
       84
       -
             isDefault = false;

     

       85
       85
       -
             settings = settings;

     

       86
       86
       -
             userChrome = userChrome;

     

       87
       87
       -
           };

     

       88
       88
       -
           package = (pkgs.firefox.override {

     

       89
       89
       -
             nativeMessagingHosts = with pkgs; [ tridactyl-native ];

     

       90
       90
       -
           });

     

       91
       91
       -
         };

     

       92
       92
       -
       

     

       93
       93
       -
         home.file = {

     

       94
       94
       -
           ".config/gtk-3.0/bookmarks" = {

     

       95
       95
       -
             force = true;

     

       96
       96
       -
             text = ''

     

       97
       97
       -
               file:///${config.home.homeDirectory}/archive

     

       98
       98
       -
               file:///${config.home.homeDirectory}/documents

     

       99
       99
       -
               file:///${config.home.homeDirectory}/downloads

     

       100
       100
       -
               file:///${config.home.homeDirectory}/pictures

     

       101
       101
       -
               file:///${config.home.homeDirectory}/videos

     

       102
       102
       -
               file:///${config.home.homeDirectory}/projects

     

       103
       103
       -
             '';

     

       104
       104
       -
           };

     

       105
       105
       -
           ".config/mimeapps.list" = {

     

       106
       106
       -
             force = true;

     

       107
       107
       -
             source = ./mimeapps.list;

     

       108
       108
       -
           };

     

       109
       109
       -
         };

     

       110
       110
       -
       

     

       111
       111
       -
         xdg = {

     

       112
       112
       -
           desktopEntries = {

     

       113
       113
       -
             # https://gitlab.freedesktop.org/xdg/xdg-utils/-/issues/84

     

       114
       114
       -
             # `echo $XDG_DATA_DIRS`

     

       115
       115
       -
             nvim = {

     

       116
       116
       -
               name = "Neovim";

     

       117
       117
       -
               genericName = "Text Editor";

     

       118
       118
       -
               exec = "alacritty -e nvim %F";

     

       119
       119
       -
               terminal = false;

     

       120
       120
       -
               categories = [ "Application" "Utility" "TextEditor" ];

     

       121
       121
       -
               icon = "nvim";

     

       122
       122
       -
               mimeType = [ "text/english" "text/plain" ];

     

       123
       123
       -
             };

     

       124
       124
       -
             aerc = {

     

       125
       125
       -
               name = "aerc";

     

       126
       126
       -
               genericName = "Mail Client";

     

       127
       127
       -
               exec = "alacritty -e aerc";

     

       128
       128
       -
               terminal = false;

     

       129
       129
       -
               categories = [ "Office" "Network" "Email" "ConsoleOnly" ];

     

       130
       130
       -
               icon = "utilities-terminal";

     

       131
       131
       -
               mimeType = [ "x-scheme-handler/mailto" ];

     

       132
       132
       -
             };

     

       133
       133
       -
           };

     

       134
       134
       -
           configFile = {

     

       135
       135
       -
             "Thunar/uca.xml".source = ./thunar.xml;

     

       136
       136
       -
             "fontconfig/fonts.conf".source = ./fonts.conf;

     

       137
       137
       -
             "alacritty.yml".source = ./alacritty.yml;

     

       138
       138
       -
             "Element/config.json".source = ./element.json;

     

       139
       139
       -
             "swappy/config".text = ''

     

       140
       140
       -
               [Default]

     

       141
       141
       -
               save_dir=~/capture/capture/

     

       142
       142
       -
               save_filename_format=screenshot_%Y-%m-%dT%H:%M:%S%z.png

     

       143
       143
       -
             '';

     

       144
       144
       -
             "tridactyl/tridactylrc".source = ./tridactylrc;

     

       145
       145
       -
           };

     

       146
       146
       -
           userDirs = {

     

       147
       147
       -
             enable = true;

     

       148
       148
       -
             createDirectories = true;

     

       149
       149
       -
             download = "$HOME/downloads";

     

       150
       150
       -
             pictures = "$HOME/pictures";

     

       151
       151
       -
             videos = "$HOME/videos";

     

       152
       152
       -
             documents = "$HOME/documents/";

     

       153
       153
       -
             music = "$HOME/";

     

       154
       154
       -
             # https://bugzilla.mozilla.org/show_bug.cgi?id=1082717

     

       155
       155
       -
             desktop = "$HOME/";

     

       156
       156
       -
             templates = "$HOME/";

     

       157
       157
       -
             publicShare = "$HOME/";

     

       158
       158
       -
           };

     

       159
       159
       -
         };

     

       160
       160
       -
       

     

       161
       161
       -
         # https://github.com/nix-community/home-manager/issues/1439#issuecomment-1106208294

     

       162
       162
       -
         home.activation = {

     

       163
       163
       -
           linkDesktopApplications = {

     

       164
       164
       -
             after = [ "writeBoundary" "createXdgUserDirectories" ];

     

       165
       165
       -
             before = [ ];

     

       166
       166
       -
             data = ''

     

       167
       167
       -
               rm -rf ${config.xdg.dataHome}/"applications/home-manager"

     

       168
       168
       -
               mkdir -p ${config.xdg.dataHome}/"applications/home-manager"

     

       169
       169
       -
               cp -Lr ${config.home.homeDirectory}/.nix-profile/share/applications/* ${config.xdg.dataHome}/"applications/home-manager/"

     

       170
       170
       -
             '';

     

       171
       171
       -
           };

     

       172
       172
       -
         };

     

       173
       173
       -
       

     

       174
       174
       -
         programs.go.goPath = "~/.go";

     

       175
       175
       -
       

     

       176
       176
       -
         home.stateVersion = "22.05";

     

       177
       177
       -
       

     

       178
       178
       -
         services.kdeconnect.enable = true;

     

       179
       179
       -
       

     

       180
       180
       -
         home.packages = with pkgs; [ ];

     

       181
       181
       -
       

     

       182
       182
       -
         services.spotifyd = {

     

       183
       183
       -
           enable = true;

     

       184
       184
       -
           settings.global = {

     

       185
       185
       -
             username = "ryangibb321@gmail.com";

     

       186
       186
       -
             password_cmd = "pass show spotify/ryangibb321@gmail.com";

     

       187
       187
       -
           };

     

       188
       188
       -
         };

     

       189
       189
       -
       }

     

       190
       190
       -

modules/personal/home/dunst home/dunst

modules/personal/home/element.json home/element.json

modules/personal/home/fonts.conf home/fonts.conf

modules/personal/home/fusuma.yml home/fusuma.yml

-63

modules/personal/home/i3.nix

···

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

     

       2
       2
       -
       

     

       3
       3
       -
       let

     

       4
       4
       -
         replacements = {

     

       5
       5
       -
           wm = "i3";

     

       6
       6
       -
           wmmsg = "i3-msg";

     

       7
       7
       -
           rofi = "rofi";

     

       8
       8
       -
           app_id = "class";

     

       9
       9
       -
           bar_extra = "";

     

       10
       10
       -
           locked = "";

     

       11
       11
       -
           polkit_gnome = "${pkgs.polkit_gnome}";

     

       12
       12
       -
           locker = "xsecurelock";

     

       13
       13
       -
           enable_output = "xrandr --output $laptop_output --auto";

     

       14
       14
       -
           disable_output = "xrandr --output $laptop_output --off";

     

       15
       15
       -
           drun = "rofi -i -modi drun -show drun";

     

       16
       16
       -
           run = "rofi -i -modi run -show run";

     

       17
       17
       -
           dmenu = "rofi -i -dmenu -p";

     

       18
       18
       -
           displays = "arandr";

     

       19
       19
       -
           bar = "i3bar";

     

       20
       20
       -
           notification_deamon = "dunst";

     

       21
       21
       -
           i3-workspace-history = "${pkgs.i3-workspace-history}";

     

       22
       22
       -
           i3-workspace-history-args = "";

     

       23
       23
       -
         };

     

       24
       24
       -
       in let util = import ./util.nix { inherit pkgs lib; };

     

       25
       25
       -
       in {

     

       26
       26
       -
         # TODO

     

       27
       27
       -
         # idling

     

       28
       28
       -
       

     

       29
       29
       -
         home.pointerCursor.x11.enable = true;

     

       30
       30
       -
       

     

       31
       31
       -
         home.file = {

     

       32
       32
       -
           ".xinitrc".text = ''

     

       33
       33
       -
             export XDG_SESSION_TYPE=x11

     

       34
       34
       -
             export GDK_BACKEND=x11

     

       35
       35
       -
             export DESKTOP_SESSION=plasma

     

       36
       36
       -
             exec i3 &> ~/.i3_log

     

       37
       37
       -
           '';

     

       38
       38
       -
           ".zprofile".text = ''

     

       39
       39
       -
             # Autostart at login on TTY 2

     

       40
       40
       -
             if [ -z "''${DISPLAY}" ] && [ "''${XDG_VTNR}" -eq 2 ]; then

     

       41
       41
       -
               source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh

     

       42
       42
       -
             	exec startx

     

       43
       43
       -
             fi

     

       44
       44
       -
           '';

     

       45
       45
       -
         };

     

       46
       46
       -
       

     

       47
       47
       -
         xdg.configFile = let

     

       48
       48
       -
           entries = {

     

       49
       49
       -
             "dunst/dunstrc".source = ./dunst;

     

       50
       50
       -
             "i3/config".text = let wmFilenames = util.listFilesInDir ./wm/config.d;

     

       51
       51
       -
             in let i3Filenames = util.listFilesInDir ./wm/i3;

     

       52
       52
       -
             in (util.concatFilesReplace

     

       53
       53
       -
               ([ ./wm/config ] ++ wmFilenames ++ i3Filenames) replacements);

     

       54
       54
       -
             "i3blocks".source = ./i3blocks;

     

       55
       55
       -
             "rofi/config.rasi".source = ./rofi.rasi;

     

       56
       56
       -
           };

     

       57
       57
       -
         in (util.inDirReplace ./wm/scripts "i3/scripts" replacements) // entries;

     

       58
       58
       -
       

     

       59
       59
       -
         services.redshift = {

     

       60
       60
       -
           enable = true;

     

       61
       61
       -
           provider = "geoclue2";

     

       62
       62
       -
         };

     

       63
       63
       -
       }

modules/personal/home/i3blocks/backlight home/i3blocks/backlight

modules/personal/home/i3blocks/battery home/i3blocks/battery

modules/personal/home/i3blocks/config home/i3blocks/config

modules/personal/home/i3blocks/cpu home/i3blocks/cpu

modules/personal/home/i3blocks/disk home/i3blocks/disk

modules/personal/home/i3blocks/idle home/i3blocks/idle

modules/personal/home/i3blocks/load_average home/i3blocks/load_average

modules/personal/home/i3blocks/mail home/i3blocks/mail

modules/personal/home/i3blocks/memory home/i3blocks/memory

modules/personal/home/i3blocks/network home/i3blocks/network

modules/personal/home/i3blocks/pulse home/i3blocks/pulse

modules/personal/home/i3blocks/record home/i3blocks/record

modules/personal/home/i3blocks/temperature home/i3blocks/temperature

modules/personal/home/kanshi home/kanshi

modules/personal/home/mail/aerc-binds.nix home/aerc-binds.nix

-305

modules/personal/home/mail/default.nix

···

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

     

       2
       2
       -
       

     

       3
       3
       -
       let

     

       4
       4
       -
         address-book = pkgs.writeScriptBin "address-book" ''

     

       5
       5
       -
           #!/usr/bin/env bash

     

       6
       6
       -
           ${pkgs.ugrep}/bin/ugrep -jPh -m 100 --color=never "$1"\

     

       7
       7
       -
             ${config.accounts.email.maildirBasePath}/addressbook/maildir\

     

       8
       8
       -
             ${config.accounts.email.maildirBasePath}/addressbook/cam-ldap

     

       9
       9
       -
         '';

     

       10
       10
       -
         sync-mail = pkgs.writeScriptBin "sync-mail" ''

     

       11
       11
       -
           #!/usr/bin/env bash

     

       12
       12
       -
           ${pkgs.isync}/bin/mbsync "$1"

     

       13
       13
       -
           ${pkgs.mu}/bin/mu index

     

       14
       14
       -
           ${pkgs.procps}/bin/pkill -RTMIN+13 i3block

     

       15
       15
       -
         '';

     

       16
       16
       -
       in {

     

       17
       17
       -
         home.packages = with pkgs; [

     

       18
       18
       -
           maildir-rank-addr

     

       19
       19
       -
           (pkgs.writeScriptBin "cam-ldap-addr" ''

     

       20
       20
       -
             ${pkgs.openldap}/bin/ldapsearch -xZ -H ldaps://ldap.lookup.cam.ac.uk -b "ou=people,o=University of Cambridge,dc=cam,dc=ac,dc=uk" displayName mail\

     

       21
       21
       -
             | ${pkgs.gawk}/bin/awk '/^dn:/{displayName=""; mail=""; next} /^displayName:/{displayName=$2; for(i=3;i<=NF;i++) displayName=displayName " " $i; next} /^mail:/{mail=$2; next} /^$/{if(displayName!="" && mail!="") print mail "\t" displayName}'\

     

       22
       22
       -
             > ${config.accounts.email.maildirBasePath}/addressbook/cam-ldap

     

       23
       23
       -
           '')

     

       24
       24
       -
           address-book

     

       25
       25
       -
         ];

     

       26
       26
       -
       

     

       27
       27
       -
         xdg.configFile = {

     

       28
       28
       -
           "maildir-rank-addr/config".text = with config.accounts.email; ''

     

       29
       29
       -
             maildir = "${config.accounts.email.maildirBasePath}"

     

       30
       30
       -
             outputpath = "${config.accounts.email.maildirBasePath}/addressbook/maildir"

     

       31
       31
       -
             addresses = [

     

       32
       32
       -
                 "ryan@freumh.org",

     

       33
       33
       -
                 "misc@freumh.org",

     

       34
       34
       -
                 "ryan@gibbr.org",

     

       35
       35
       -
                 "misc@gibbr.org",

     

       36
       36
       -
                 "ryan.gibb@cl.cam.ac.uk",

     

       37
       37
       -
                 "rtg24@cam.ac.uk",

     

       38
       38
       -
                 "rtg2@st-andrews.ac.uk",

     

       39
       39
       -
                 "ryangibb321@gmail.com",

     

       40
       40
       -
                 "ryangibb@btconnect.com",

     

       41
       41
       -
             ]

     

       42
       42
       -
           '';

     

       43
       43
       -
         };

     

       44
       44
       -
       

     

       45
       45
       -
         programs = {

     

       46
       46
       -
           password-store.enable = true;

     

       47
       47
       -
           gpg.enable = true;

     

       48
       48
       -
           mbsync.enable = true;

     

       49
       49
       -
           mu.enable = true;

     

       50
       50
       -
           msmtp.enable = true;

     

       51
       51
       -
           aerc = {

     

       52
       52
       -
             enable = true;

     

       53
       53
       -
             extraConfig = {

     

       54
       54
       -
               general.unsafe-accounts-conf = true;

     

       55
       55
       -
               general.default-save-path = "~/downloads";

     

       56
       56
       -
               ui.mouse-enabled = true;

     

       57
       57
       -
               compose.address-book-cmd = "${address-book}/bin/address-book '%s'";

     

       58
       58
       -
               compose.file-picker-cmd = "${pkgs.ranger}/bin/ranger --choosefiles=%f";

     

       59
       59
       -
               compose.format-flowed = true;

     

       60
       60
       -
               ui.index-columns = "date<=,name<50,flags>=,subject<*";

     

       61
       61
       -
               ui.column-name = "{{index (.From | persons) 0}}";

     

       62
       62
       -
               "ui:folder=Sent".index-columns = "date<=,to<50,flags>=,subject<*";

     

       63
       63
       -
               "ui:folder=Sent".column-to = "{{index (.To | persons) 0}}";

     

       64
       64
       -
               openers."text/html" = "firefox --new-window";

     

       65
       65
       -
               hooks.mail-recieved = ''

     

       66
       66
       -
                 notify-send "[$AERC_ACCOUNT/$AERC_FOLDER] mail from $AERC_FROM_NAME" "$AERC_SUBJECT"'';

     

       67
       67
       -
               filters = {

     

       68
       68
       -
                 "text/plain" = "wrap -w 90 | colorize";

     

       69
       69
       -
                 "text/calendar" = "calendar";

     

       70
       70
       -
                 "message/delivery-status" = "colorize";

     

       71
       71
       -
                 "message/rfc822" = "colorize";

     

       72
       72
       -
                 "text/html" = "html | colorize";

     

       73
       73
       -
               };

     

       74
       74
       -
             };

     

       75
       75
       -
             extraBinds = import ./aerc-binds.nix;

     

       76
       76
       -
           };

     

       77
       77
       -
           neomutt = {

     

       78
       78
       -
             enable = true;

     

       79
       79
       -
             extraConfig = ''

     

       80
       80
       -
               # Macro to switch accounts

     

       81
       81
       -
               macro index,pager <F1> '"<change-folder> ${config.accounts.email.maildirBasePath}/ryan@freumh.org/Inbox<enter>"'

     

       82
       82
       -
               macro index,pager <F2> '"<change-folder> ${config.accounts.email.maildirBasePath}/ryangibb321@gmail.com/Inbox<enter>"'

     

       83
       83
       -
               macro index,pager <F3> '"<change-folder> ${config.accounts.email.maildirBasePath}/ryan.gibb@cl.cam.ac.uk/Inbox<enter>"'

     

       84
       84
       -
       

     

       85
       85
       -
               # mutt macros for mu

     

       86
       86
       -
               macro index <F8> "<shell-escape>mu find --clearlinks --format=links --linksdir=${config.accounts.email.maildirBasePath}/search " \

     

       87
       87
       -
                                        "mu find"

     

       88
       88
       -
               macro index <F9> "<change-folder-readonly>˜/Maildir/search" \

     

       89
       89
       -
                                              "mu find results"

     

       90
       90
       -
             '';

     

       91
       91
       -
           };

     

       92
       92
       -
         };

     

       93
       93
       -
       

     

       94
       94
       -
         services = {

     

       95
       95
       -
           imapnotify.enable = true;

     

       96
       96
       -
           gpg-agent.enable = true;

     

       97
       97
       -
         };

     

       98
       98
       -
       

     

       99
       99
       -
         accounts.email = {

     

       100
       100
       -
           maildirBasePath = "mail";

     

       101
       101
       -
           order = [ "ryangibb321@gmail.com" "ryan.gibb@cl.cam.ac.uk" ];

     

       102
       102
       -
           accounts = {

     

       103
       103
       -
             "ryan@freumh.org" = rec {

     

       104
       104
       -
               primary = true;

     

       105
       105
       -
               realName = "Ryan Gibb";

     

       106
       106
       -
               userName = "ryan@freumh.org";

     

       107
       107
       -
               address = "ryan@freumh.org";

     

       108
       108
       -
               passwordCommand = "${pkgs.pass}/bin/pass show email/ryan@freumh.org";

     

       109
       109
       -
               imap.host = "mail.freumh.org";

     

       110
       110
       -
               smtp = {

     

       111
       111
       -
                 host = "mail.freumh.org";

     

       112
       112
       -
                 port = 465;

     

       113
       113
       -
               };

     

       114
       114
       -
               folders = {

     

       115
       115
       -
                 drafts = "Drafts";

     

       116
       116
       -
                 inbox = "Inbox";

     

       117
       117
       -
                 sent = "Sent";

     

       118
       118
       -
                 trash = "Trash";

     

       119
       119
       -
               };

     

       120
       120
       -
               imapnotify = {

     

       121
       121
       -
                 enable = true;

     

       122
       122
       -
                 boxes = [ "Inbox" ];

     

       123
       123
       -
                 onNotify =

     

       124
       124
       -
                   "${pkgs.isync}/bin/mbsync ryan@freumh.org && ${pkgs.mu}/bin/mu index && ${pkgs.procps}/bin/pkill -RTMIN+13 i3blocks";

     

       125
       125
       -
               };

     

       126
       126
       -
               mbsync = {

     

       127
       127
       -
                 enable = true;

     

       128
       128
       -
                 create = "both";

     

       129
       129
       -
                 expunge = "both";

     

       130
       130
       -
                 remove = "both";

     

       131
       131
       -
               };

     

       132
       132
       -
               msmtp = { enable = true; };

     

       133
       133
       -
               aerc = {

     

       134
       134
       -
                 enable = true;

     

       135
       135
       -
                 extraAccounts = {

     

       136
       136
       -
                   check-mail-cmd =

     

       137
       137
       -
                     "${pkgs.isync}/bin/mbsync ryan@freumh.org && ${pkgs.mu}/bin/mu index && ${pkgs.procps}/bin/pkill -RTMIN+13 i3blocks";

     

       138
       138
       -
                   check-mail-timeout = "1m";

     

       139
       139
       -
                   check-mail = "1h";

     

       140
       140
       -
                   folders-sort = [ "Inbox" "Sent" "Drafts" "Archive" "Spam" "Trash" ];

     

       141
       141
       -
                   folder-map = "${pkgs.writeText "folder-map" ''

     

       142
       142
       -
                     Spam = Junk

     

       143
       143
       -
                     Bin = Trash

     

       144
       144
       -
                   ''}";

     

       145
       145
       -
                 };

     

       146
       146
       -
               };

     

       147
       147
       -
               neomutt = {

     

       148
       148
       -
                 enable = true;

     

       149
       149
       -
                 extraConfig = ''

     

       150
       150
       -
                   bind index g noop

     

       151
       151
       -
                   macro index gi "<change-folder>=${folders.inbox}<enter>"

     

       152
       152
       -
                   macro index gs "<change-folder>=${folders.sent}<enter>"

     

       153
       153
       -
                   macro index gd "<change-folder>=${folders.drafts}<enter>"

     

       154
       154
       -
                   macro index gt "<change-folder>=${folders.trash}<enter>"

     

       155
       155
       -
                 '';

     

       156
       156
       -
               };

     

       157
       157
       -
             };

     

       158
       158
       -
             "misc@freumh.org" = rec {

     

       159
       159
       -
               userName = "misc@freumh.org";

     

       160
       160
       -
               address = "misc@freumh.org";

     

       161
       161
       -
               realName = "Misc";

     

       162
       162
       -
               passwordCommand = "${pkgs.pass}/bin/pass show email/misc@freumh.org";

     

       163
       163
       -
               imap.host = "mail.freumh.org";

     

       164
       164
       -
               smtp = {

     

       165
       165
       -
                 host = "mail.freumh.org";

     

       166
       166
       -
                 port = 465;

     

       167
       167
       -
               };

     

       168
       168
       -
               folders = {

     

       169
       169
       -
                 drafts = "Drafts";

     

       170
       170
       -
                 inbox = "Inbox";

     

       171
       171
       -
                 sent = "Sent";

     

       172
       172
       -
                 trash = "Bin";

     

       173
       173
       -
               };

     

       174
       174
       -
               imapnotify = {

     

       175
       175
       -
                 enable = true;

     

       176
       176
       -
                 boxes = [ "Inbox" ];

     

       177
       177
       -
                 onNotify =

     

       178
       178
       -
                   "${pkgs.isync}/bin/mbsync misc@freumh.org && ${pkgs.mu}/bin/mu index && ${pkgs.procps}/bin/pkill -RTMIN+13 i3blocks";

     

       179
       179
       -
               };

     

       180
       180
       -
               mbsync = {

     

       181
       181
       -
                 enable = true;

     

       182
       182
       -
                 create = "both";

     

       183
       183
       -
                 expunge = "both";

     

       184
       184
       -
                 remove = "both";

     

       185
       185
       -
               };

     

       186
       186
       -
               msmtp = { enable = true; };

     

       187
       187
       -
               neomutt = {

     

       188
       188
       -
                 enable = true;

     

       189
       189
       -
                 extraConfig = ''

     

       190
       190
       -
                   bind index g noop

     

       191
       191
       -
                   macro index gi "<change-folder>=${folders.inbox}<enter>"

     

       192
       192
       -
                   macro index gs "<change-folder>=${folders.sent}<enter>"

     

       193
       193
       -
                   macro index gd "<change-folder>=${folders.drafts}<enter>"

     

       194
       194
       -
                   macro index gt "<change-folder>=${folders.trash}<enter>"

     

       195
       195
       -
                 '';

     

       196
       196
       -
               };

     

       197
       197
       -
             };

     

       198
       198
       -
             "ryan.gibb@cl.cam.ac.uk" = rec {

     

       199
       199
       -
               userName = "rtg24@fm.cl.cam.ac.uk";

     

       200
       200
       -
               address = "ryan.gibb@cl.cam.ac.uk";

     

       201
       201
       -
               realName = "Ryan Gibb";

     

       202
       202
       -
               passwordCommand =

     

       203
       203
       -
                 "${pkgs.pass}/bin/pass show email/ryan.gibb@cl.cam.ac.uk";

     

       204
       204
       -
               flavor = "fastmail.com";

     

       205
       205
       -
               folders = {

     

       206
       206
       -
                 drafts = "Drafts";

     

       207
       207
       -
                 inbox = "Inbox";

     

       208
       208
       -
                 sent = "Sent";

     

       209
       209
       -
                 trash = "Trash";

     

       210
       210
       -
               };

     

       211
       211
       -
               imapnotify = {

     

       212
       212
       -
                 enable = true;

     

       213
       213
       -
                 boxes = [ "Inbox" ];

     

       214
       214
       -
                 onNotify =

     

       215
       215
       -
                   "${pkgs.isync}/bin/mbsync ryan.gibb@cl.cam.ac.uk && ${pkgs.mu}/bin/mu index && ${pkgs.procps}/bin/pkill -RTMIN+13 i3blocks";

     

       216
       216
       -
               };

     

       217
       217
       -
               mbsync = {

     

       218
       218
       -
                 enable = true;

     

       219
       219
       -
                 create = "both";

     

       220
       220
       -
                 expunge = "both";

     

       221
       221
       -
                 remove = "both";

     

       222
       222
       -
               };

     

       223
       223
       -
               msmtp = { enable = true; };

     

       224
       224
       -
               aerc = {

     

       225
       225
       -
                 enable = true;

     

       226
       226
       -
                 extraAccounts = {

     

       227
       227
       -
                   check-mail-cmd =

     

       228
       228
       -
                     "${pkgs.isync}/bin/mbsync ryan.gibb@cl.cam.ac.uk && ${pkgs.mu}/bin/mu index && ${pkgs.procps}/bin/pkill -RTMIN+13 i3blocks";

     

       229
       229
       -
                   check-mail-timeout = "1m";

     

       230
       230
       -
                   check-mail = "1h";

     

       231
       231
       -
                   aliases = "rtg24@cam.ac.uk";

     

       232
       232
       -
                   folders-sort =

     

       233
       233
       -
                     [ "Inbox" "Sidebox" "Sent" "Drafts" "Archive" "Spam" "Trash" ];

     

       234
       234
       -
                   folder-map = "${pkgs.writeText "folder-map" ''

     

       235
       235
       -
                     Bin = Trash

     

       236
       236
       -
                   ''}";

     

       237
       237
       -
                 };

     

       238
       238
       -
               };

     

       239
       239
       -
               neomutt = {

     

       240
       240
       -
                 enable = true;

     

       241
       241
       -
                 extraConfig = ''

     

       242
       242
       -
                   bind index g noop

     

       243
       243
       -
                   macro index gi "<change-folder>=${folders.inbox}<enter>"

     

       244
       244
       -
                   macro index gs "<change-folder>=${folders.sent}<enter>"

     

       245
       245
       -
                   macro index gd "<change-folder>=${folders.drafts}<enter>"

     

       246
       246
       -
                   macro index gt "<change-folder>=${folders.trash}<enter>"

     

       247
       247
       -
                 '';

     

       248
       248
       -
               };

     

       249
       249
       -
             };

     

       250
       250
       -
             "ryangibb321@gmail.com" = rec {

     

       251
       251
       -
               userName = "ryangibb321@gmail.com";

     

       252
       252
       -
               address = "ryangibb321@gmail.com";

     

       253
       253
       -
               realName = "Ryan Gibb";

     

       254
       254
       -
               passwordCommand =

     

       255
       255
       -
                 "${pkgs.pass}/bin/pass show email/ryangibb321@gmail.com";

     

       256
       256
       -
               flavor = "gmail.com";

     

       257
       257
       -
               folders = {

     

       258
       258
       -
                 drafts = "Drafts";

     

       259
       259
       -
                 inbox = "Inbox";

     

       260
       260
       -
                 sent = "Sent Mail";

     

       261
       261
       -
                 trash = "Bin";

     

       262
       262
       -
               };

     

       263
       263
       -
               imapnotify = {

     

       264
       264
       -
                 enable = true;

     

       265
       265
       -
                 boxes = [ "Inbox" ];

     

       266
       266
       -
                 onNotify =

     

       267
       267
       -
                   "${pkgs.isync}/bin/mbsync ryangibb321@gmail.com && ${pkgs.mu}/bin/mu index && ${pkgs.procps}/bin/pkill -RTMIN+13 i3blocks";

     

       268
       268
       -
               };

     

       269
       269
       -
               mbsync = {

     

       270
       270
       -
                 enable = true;

     

       271
       271
       -
                 create = "both";

     

       272
       272
       -
                 expunge = "both";

     

       273
       273
       -
                 remove = "both";

     

       274
       274
       -
               };

     

       275
       275
       -
               msmtp = { enable = true; };

     

       276
       276
       -
               aerc = {

     

       277
       277
       -
                 enable = true;

     

       278
       278
       -
                 extraAccounts = {

     

       279
       279
       -
                   check-mail-cmd =

     

       280
       280
       -
                     "${pkgs.isync}/bin/mbsync ryangibb321@gmail.com && ${pkgs.mu}/bin/mu index && ${pkgs.procps}/bin/pkill -RTMIN+13 i3blocks";

     

       281
       281
       -
                   check-mail-timeout = "1m";

     

       282
       282
       -
                   check-mail = "1h";

     

       283
       283
       -
                   folders-sort =

     

       284
       284
       -
                     [ "Inbox" "Sidebox" "Sent" "Drafts" "Archive" "Spam" "Trash" ];

     

       285
       285
       -
                   folder-map = "${pkgs.writeText "folder-map" ''

     

       286
       286
       -
                     * = [Gmail]/*

     

       287
       287
       -
                     Sent = 'Sent Mail'

     

       288
       288
       -
                     Archive = 'All Mail'

     

       289
       289
       -
                   ''}";

     

       290
       290
       -
                 };

     

       291
       291
       -
               };

     

       292
       292
       -
               neomutt = {

     

       293
       293
       -
                 enable = true;

     

       294
       294
       -
                 extraConfig = ''

     

       295
       295
       -
                   bind index g noop

     

       296
       296
       -
                   macro index gi "<change-folder>=${folders.inbox}<enter>"

     

       297
       297
       -
                   macro index gs "<change-folder>=${folders.sent}<enter>"

     

       298
       298
       -
                   macro index gd "<change-folder>=${folders.drafts}<enter>"

     

       299
       299
       -
                   macro index gt "<change-folder>=${folders.trash}<enter>"

     

       300
       300
       -
                 '';

     

       301
       301
       -
               };

     

       302
       302
       -
             };

     

       303
       303
       -
           };

     

       304
       304
       -
         };

     

       305
       305
       -
       }

modules/personal/home/mako home/mako

modules/personal/home/mimeapps.list home/mimeapps.list

modules/personal/home/rofi.rasi home/rofi.rasi

-78

modules/personal/home/sway.nix

···

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

     

       2
       2
       -
       

     

       3
       3
       -
       let

     

       4
       4
       -
         replacements = {

     

       5
       5
       -
           wm = "sway";

     

       6
       6
       -
           wmmsg = "swaymsg";

     

       7
       7
       -
           rofi = "wofi";

     

       8
       8
       -
           app_id = "app_id";

     

       9
       9
       -
           bar_extra = ''

     

       10
       10
       -
             icon_theme Papirus

     

       11
       11
       -
           '';

     

       12
       12
       -
           locked = "--locked";

     

       13
       13
       -
           polkit_gnome = "${pkgs.polkit_gnome}";

     

       14
       14
       -
           locker = "swaylock -f -i $WALLPAPER";

     

       15
       15
       -
           enable_output = "swaymsg output $laptop_output enable";

     

       16
       16
       -
           disable_output = "swaymsg output $laptop_output disable";

     

       17
       17
       -
           drun = "wofi -i --show drun --allow-images -a";

     

       18
       18
       -
           run = "wofi -i --show run";

     

       19
       19
       -
           dmenu = "wofi -d -i -p";

     

       20
       20
       -
           displays = "wdisplays";

     

       21
       21
       -
           bar = "swaybar";

     

       22
       22
       -
           notification_deamon = "mako";

     

       23
       23
       -
           i3-workspace-history = "${pkgs.i3-workspace-history}";

     

       24
       24
       -
           i3-workspace-history-args = "-sway";

     

       25
       25
       -
         };

     

       26
       26
       -
       in let util = import ./util.nix { inherit pkgs lib; };

     

       27
       27
       -
       in {

     

       28
       28
       -
         home.sessionVariables = {

     

       29
       29
       -
           QT_QPA_PLATFORM = "wayland";

     

       30
       30
       -
           SDL_VIDEODRIVER = "wayland";

     

       31
       31
       -
           MOZ_ENABLE_WAYLAND = 1;

     

       32
       32
       -
           MOZ_DBUS_REMOTE = 1;

     

       33
       33
       -
           QT_STYLE_OVERRIDE = "Fusion";

     

       34
       34
       -
           TERMINAL = "alacritty";

     

       35
       35
       -
           WLR_NO_HARDWARE_CURSORS = 1;

     

       36
       36
       -
           NIXOS_OZONE_WL = 1;

     

       37
       37
       -
       

     

       38
       38
       -
           # for intellij

     

       39
       39
       -
           _JAVA_AWT_WM_NONREPARENTING = 1;

     

       40
       40
       -
       

     

       41
       41
       -
           # for screensharing

     

       42
       42
       -
           XDG_SESSION_TYPE = "wayland";

     

       43
       43
       -
           XDG_CURRENT_DESKTOP = "sway";

     

       44
       44
       -
         };

     

       45
       45
       -
       

     

       46
       46
       -
         home.file.".zprofile".text = ''

     

       47
       47
       -
           # Autostart sway at login on TTY 1

     

       48
       48
       -
           if [ -z "''${DISPLAY}" ] && [ "''${XDG_VTNR}" -eq 1 ]; then

     

       49
       49
       -
             source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh

     

       50
       50
       -
           	exec sway -d 2> $HOME/.sway_log

     

       51
       51
       -
           fi

     

       52
       52
       -
         '';

     

       53
       53
       -
       

     

       54
       54
       -
         xdg.configFile = let

     

       55
       55
       -
           entries = {

     

       56
       56
       -
             "fusuma/config.yml".source = ./fusuma.yml;

     

       57
       57
       -
             "kanshi/config".source = ./kanshi;

     

       58
       58
       -
             "mako/config".source = ./mako;

     

       59
       59
       -
             "swaylock/config".source = ./swaylock;

     

       60
       60
       -
             "wofi/style.css".source = ./wofi.css;

     

       61
       61
       -
             "swappy/config".text = ''

     

       62
       62
       -
               [Default]

     

       63
       63
       -
               save_dir=$XDG_PICTURES_DIR/capture/

     

       64
       64
       -
               save_filename_format=screenshot_%Y-%m-%dT%H:%M:%S%z.png

     

       65
       65
       -
             '';

     

       66
       66
       -
             "sway/config".text = let wmFilenames = util.listFilesInDir ./wm/config.d;

     

       67
       67
       -
             in let swayFilenames = util.listFilesInDir ./wm/sway;

     

       68
       68
       -
             in (util.concatFilesReplace

     

       69
       69
       -
               ([ ./wm/config ] ++ wmFilenames ++ swayFilenames) replacements);

     

       70
       70
       -
             "i3blocks".source = ./i3blocks;

     

       71
       71
       -
           };

     

       72
       72
       -
         in (util.inDirReplace ./wm/scripts "sway/scripts" replacements) // entries;

     

       73
       73
       -
       

     

       74
       74
       -
         services.gammastep = {

     

       75
       75
       -
           enable = true;

     

       76
       76
       -
           provider = "geoclue2";

     

       77
       77
       -
         };

     

       78
       78
       -
       }

modules/personal/home/swaylock home/swaylock

modules/personal/home/thunar.xml home/thunar.xml

modules/personal/home/tridactylrc home/tridactylrc

modules/personal/home/util.nix home/util.nix

modules/personal/home/vscode/keybindings.json home/vscode/keybindings.json

modules/personal/home/vscode/settings.json home/vscode/settings.json

modules/personal/home/wallpaper.jpg home/wallpaper.jpg

modules/personal/home/wm/config home/wm/config

modules/personal/home/wm/config.d/appearance home/wm/config.d/appearance

modules/personal/home/wm/config.d/bindings home/wm/config.d/bindings

modules/personal/home/wm/config.d/default_workspaces home/wm/config.d/default_workspaces

modules/personal/home/wm/config.d/exec home/wm/config.d/exec

modules/personal/home/wm/config.d/output home/wm/config.d/output

modules/personal/home/wm/i3/bindings home/wm/i3/bindings

modules/personal/home/wm/i3/config home/wm/i3/config

modules/personal/home/wm/i3/exec home/wm/i3/exec

modules/personal/home/wm/i3/input home/wm/i3/input

modules/personal/home/wm/i3/output home/wm/i3/output

modules/personal/home/wm/scripts/bat_monitor.sh home/wm/scripts/bat_monitor.sh

modules/personal/home/wm/scripts/bluetooth_device.sh home/wm/scripts/bluetooth_device.sh

modules/personal/home/wm/scripts/cycle_sink.sh home/wm/scripts/cycle_sink.sh

modules/personal/home/wm/scripts/dpms_off.sh home/wm/scripts/dpms_off.sh

modules/personal/home/wm/scripts/dpms_toggle.sh home/wm/scripts/dpms_toggle.sh

modules/personal/home/wm/scripts/focus_leaf.sh home/wm/scripts/focus_leaf.sh

modules/personal/home/wm/scripts/focus_on_id.sh home/wm/scripts/focus_on_id.sh

modules/personal/home/wm/scripts/focus_root.sh home/wm/scripts/focus_root.sh

modules/personal/home/wm/scripts/get_cur_focus_id.sh home/wm/scripts/get_cur_focus_id.sh

modules/personal/home/wm/scripts/get_cur_ws_name.sh home/wm/scripts/get_cur_ws_name.sh

modules/personal/home/wm/scripts/get_focused_output.sh home/wm/scripts/get_focused_output.sh

modules/personal/home/wm/scripts/get_free_ws_num.sh home/wm/scripts/get_free_ws_num.sh

modules/personal/home/wm/scripts/get_ws_title.sh home/wm/scripts/get_ws_title.sh

modules/personal/home/wm/scripts/laptop_clamshell.sh home/wm/scripts/laptop_clamshell.sh

modules/personal/home/wm/scripts/lock_on_lid_close.sh home/wm/scripts/lock_on_lid_close.sh

modules/personal/home/wm/scripts/network_connect.sh home/wm/scripts/network_connect.sh

modules/personal/home/wm/scripts/notification_log.sh home/wm/scripts/notification_log.sh

modules/personal/home/wm/scripts/open_file.sh home/wm/scripts/open_file.sh

modules/personal/home/wm/scripts/pause_player.sh home/wm/scripts/pause_player.sh

modules/personal/home/wm/scripts/select_ws.sh home/wm/scripts/select_ws.sh

modules/personal/home/wm/scripts/slurp_point.sh home/wm/scripts/slurp_point.sh

modules/personal/home/wm/scripts/slurp_windows.sh home/wm/scripts/slurp_windows.sh

modules/personal/home/wm/scripts/swayidle_dpms.sh home/wm/scripts/swayidle_dpms.sh

modules/personal/home/wm/scripts/swayidle_inhibit.sh home/wm/scripts/swayidle_inhibit.sh

modules/personal/home/wm/scripts/swayidle_lock.sh home/wm/scripts/swayidle_lock.sh

modules/personal/home/wm/scripts/swayidle_lock_no_dpms.sh home/wm/scripts/swayidle_lock_no_dpms.sh

modules/personal/home/wm/scripts/swayidle_suspend.sh home/wm/scripts/swayidle_suspend.sh

modules/personal/home/wm/scripts/tab_windows.sh home/wm/scripts/tab_windows.sh

modules/personal/home/wm/scripts/title_ws.sh home/wm/scripts/title_ws.sh

modules/personal/home/wm/scripts/vault_file.sh home/wm/scripts/vault_file.sh

modules/personal/home/wm/scripts/vault_file_titled.sh home/wm/scripts/vault_file_titled.sh

modules/personal/home/wm/scripts/wifi.sh home/wm/scripts/wifi.sh

modules/personal/home/wm/scripts/window_switcher.sh home/wm/scripts/window_switcher.sh

modules/personal/home/wm/scripts/window_switcher_scratch.sh home/wm/scripts/window_switcher_scratch.sh

modules/personal/home/wm/scripts/ws_mv.sh home/wm/scripts/ws_mv.sh

modules/personal/home/wm/scripts/ws_switch.sh home/wm/scripts/ws_switch.sh

modules/personal/home/wm/scripts/ws_switch_mv.sh home/wm/scripts/ws_switch_mv.sh

modules/personal/home/wm/sway/bindings home/wm/sway/bindings

modules/personal/home/wm/sway/config home/wm/sway/config

modules/personal/home/wm/sway/exec home/wm/sway/exec

modules/personal/home/wm/sway/input home/wm/sway/input

modules/personal/home/wm/sway/output home/wm/sway/output

modules/personal/home/wofi.css home/wofi.css

+2 -2

modules/personal/laptop.nix modules/laptop.nix

···

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

     

       2
       2
        
       

     

       3
       3
       -
       let cfg = config.personal;

     

       3
       3
       +
       let cfg = config.custom;

     

       4
       4
        
       in {

     

       5
       5
       -
         options.personal.laptop = lib.mkEnableOption "laptop";

     

       5
       5
       +
         options.custom.laptop = lib.mkEnableOption "laptop";

     

       6
       6
        
       

     

       7
       7
        
         config = lib.mkIf cfg.laptop {

     

       8
       8
        
           users.users.${config.custom.username}.extraGroups = [ "input" ];

+1 -1

modules/personal/nix-index.nix modules/nix-index.nix

···

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

     

       2
       2
        
       

     

       3
       3
       -
       let cfg = config.personal;

     

       3
       3
       +
       let cfg = config.custom;

     

       4
       4
        
       in {

     

       5
       5
        
         config = lib.mkIf cfg.enable {

     

       6
       6
        
           environment.systemPackages = [ pkgs.nix-index ];

-119

modules/personal/nvim/default.nix

···

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

     

       2
       2
       -
       

     

       3
       3
       -
       let cfg = config.personal;

     

       4
       4
       -
       in let

     

       5
       5
       -
         obsidian-nvim = (pkgs.vimUtils.buildVimPlugin {

     

       6
       6
       -
           pname = "obsidian.nvim";

     

       7
       7
       -
           version = "2.6.0";

     

       8
       8
       -
           src = pkgs.fetchFromGitHub {

     

       9
       9
       -
             owner = "epwalsh";

     

       10
       10
       -
             repo = "obsidian.nvim";

     

       11
       11
       -
             rev = "v2.6.0";

     

       12
       12
       -
             sha256 = "sha256-+w3XYoobuH17oinPfQxhrizbmQB5IbbulUK69674/Wg=";

     

       13
       13
       -
           };

     

       14
       14
       -
         });

     

       15
       15
       -
         ltex-ls-nvim = (pkgs.vimUtils.buildVimPlugin {

     

       16
       16
       -
           pname = "ltex-ls.nvim";

     

       17
       17
       -
           version = "2.6.0";

     

       18
       18
       -
           src = pkgs.fetchFromGitHub {

     

       19
       19
       -
             owner = "vigoux";

     

       20
       20
       -
             repo = "ltex-ls.nvim";

     

       21
       21
       -
             rev = "c8139ea6b7f3d71adcff121e16ee8726037ffebd";

     

       22
       22
       -
             sha256 = "sha256-jY3ALr6h88xnWN2QdKe3R0vvRcSNhFWDW56b2NvnTCs=";

     

       23
       23
       -
           };

     

       24
       24
       -
         });

     

       25
       25
       -
       in {

     

       26
       26
       -
         options.personal.nvim-lsps = lib.mkEnableOption "nvim-lsps";

     

       27
       27
       -
       

     

       28
       28
       -
         config = lib.mkIf cfg.enable {

     

       29
       29
       -
           environment.systemPackages = with pkgs;

     

       30
       30
       -
             [ ripgrep nixd ] ++ lib.lists.optionals cfg.nvim-lsps [

     

       31
       31
       -
               nixfmt

     

       32
       32
       -
               # stop complaining when launching but a devshell is better

     

       33
       33
       -
               ocamlPackages.ocaml-lsp

     

       34
       34
       -
               ocamlPackages.ocamlformat

     

       35
       35
       -
               lua-language-server

     

       36
       36
       -
               pyright

     

       37
       37
       -
               black

     

       38
       38
       -
               ltex-ls

     

       39
       39
       -
               jdt-language-server

     

       40
       40
       -
               nodejs_18

     

       41
       41
       -
               clang-tools

     

       42
       42
       -
               typst-lsp

     

       43
       43
       -
             ];

     

       44
       44
       -
           programs.neovim = {

     

       45
       45
       -
             enable = true;

     

       46
       46
       -
             viAlias = true;

     

       47
       47
       -
             vimAlias = true;

     

       48
       48
       -
             runtime = let

     

       49
       49
       -
               ml-style = ''

     

       50
       50
       -
                 setlocal expandtab

     

       51
       51
       -
                 setlocal shiftwidth=2

     

       52
       52
       -
                 setlocal tabstop=2

     

       53
       53
       -
                 setlocal softtabstop=2

     

       54
       54
       -
               '';

     

       55
       55
       -
             in {

     

       56
       56
       -
               # format-flowed

     

       57
       57
       -
               "ftplugin/mail.vim".text = ''

     

       58
       58
       -
                 setlocal tw=72

     

       59
       59
       -
                 set formatoptions+=w

     

       60
       60
       -
               '';

     

       61
       61
       -
               "ftplugin/nix.vim".text = ml-style;

     

       62
       62
       -
               "ftplugin/ocaml.vim".text = ml-style;

     

       63
       63
       -
               "after/ftplugin/markdown.vim".text = ''

     

       64
       64
       -
                 set com-=fb:-

     

       65
       65
       -
                 set com+=b:-\ [\ ],b:-\ [x],b:-

     

       66
       66
       -
                 set formatoptions+=ro

     

       67
       67
       -
               '';

     

       68
       68
       -
               "ftplugin/java.lua".text = ''

     

       69
       69
       -
                 local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ':p:h:t')

     

       70
       70
       -
                 local workspace_dir = '~/.cache/jdt/' .. project_name

     

       71
       71
       -
                 require('jdtls').start_or_attach {

     

       72
       72
       -
                 	on_attach = On_attach,

     

       73
       73
       -
                 	capabilities = Capabilities,

     

       74
       74
       -
                   cmd = { 'jdt-language-server', '-data', workspace_dir, },

     

       75
       75
       -
                   root_dir = vim.fs.dirname(vim.fs.find({'gradlew', '.git', 'mvnw'}, { upward = true })[1]),

     

       76
       76
       -
                 }

     

       77
       77
       -
               '';

     

       78
       78
       -
             };

     

       79
       79
       -
             configure = {

     

       80
       80
       -
               customRC = "luafile ${./nvim.lua}";

     

       81
       81
       -
               packages.myVimPackage = with pkgs.vimPlugins; {

     

       82
       82
       -
                 start = [

     

       83
       83
       -
                   gruvbox-nvim

     

       84
       84
       -
       

     

       85
       85
       -
                   telescope-nvim

     

       86
       86
       -
                   telescope-fzf-native-nvim

     

       87
       87
       -
                   trouble-nvim

     

       88
       88
       -
       

     

       89
       89
       -
                   obsidian-nvim

     

       90
       90
       -
                   plenary-nvim

     

       91
       91
       -
                   pkgs.ripgrep

     

       92
       92
       -
       

     

       93
       93
       -
                   nvim-lspconfig

     

       94
       94
       -
       

     

       95
       95
       -
                   cmp-nvim-lsp

     

       96
       96
       -
                   cmp-nvim-lsp-signature-help

     

       97
       97
       -
                   cmp-path

     

       98
       98
       -
                   cmp-buffer

     

       99
       99
       -
                   cmp-cmdline

     

       100
       100
       -
                   cmp-spell

     

       101
       101
       -
                   luasnip

     

       102
       102
       -
                   nvim-cmp

     

       103
       103
       -
       

     

       104
       104
       -
                   vimtex

     

       105
       105
       -
                   nvim-surround

     

       106
       106
       -
                   comment-nvim

     

       107
       107
       -
       

     

       108
       108
       -
                   ltex-ls-nvim

     

       109
       109
       -
                   nvim-jdtls

     

       110
       110
       -
                   # TODO nvim-dap

     

       111
       111
       -
       

     

       112
       112
       -
                   copilot-vim

     

       113
       113
       -
                 ];

     

       114
       114
       -
                 opt = [ ];

     

       115
       115
       -
               };

     

       116
       116
       -
             };

     

       117
       117
       -
           };

     

       118
       118
       -
         };

     

       119
       119
       -
       }

modules/personal/nvim/nvim.lua home/nvim/nvim.lua

+2 -2

modules/personal/ocaml.nix modules/ocaml.nix

···

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

     

       2
       2
        
       

     

       3
       3
       -
       let cfg = config.personal;

     

       3
       3
       +
       let cfg = config.custom;

     

       4
       4
        
       in {

     

       5
       5
       -
         options.personal.ocaml = lib.mkEnableOption "ocaml";

     

       5
       5
       +
         options.custom.ocaml = lib.mkEnableOption "ocaml";

     

       6
       6
        
       

     

       7
       7
        
         config = lib.mkIf cfg.ocaml {

     

       8
       8
        
           environment.systemPackages = with pkgs; [

+2 -2

modules/personal/printing.nix modules/printing.nix

···

       1
       1
        
       { config, lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       let cfg = config.personal;

     

       3
       3
       +
       let cfg = config.custom;

     

       4
       4
        
       in {

     

       5
       5
       -
         options.personal.printing = lib.mkEnableOption "printing";

     

       5
       5
       +
         options.custom.printing = lib.mkEnableOption "printing";

     

       6
       6
        
       

     

       7
       7
        
         config = lib.mkIf cfg.printing {

     

       8
       8
        
           networking.firewall = {

+1 -1

modules/personal/scripts.nix modules/scripts.nix

···

       1
       1
        
       { config, lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       let cfg = config.personal;

     

       3
       3
       +
       let cfg = config.custom;

     

       4
       4
        
       in {

     

       5
       5
        
         config = lib.mkIf cfg.enable {

     

       6
       6
        
           environment.interactiveShellInit = "export PATH=$PATH:/etc/nixos/scripts";

-30

modules/personal/shell.nix

···

       1
       1
       -
       { config, lib, ... }:

     

       2
       2
       -
       

     

       3
       3
       -
       let cfg = config.personal;

     

       4
       4
       -
       in {

     

       5
       5
       -
         options.personal.machineColour = lib.mkOption {

     

       6
       6
       -
           type = lib.types.str;

     

       7
       7
       -
           default = "cyan";

     

       8
       8
       -
         };

     

       9
       9
       -
       

     

       10
       10
       -
         config = lib.mkIf cfg.enable {

     

       11
       11
       -
           programs.zsh = {

     

       12
       12
       -
             enable = true;

     

       13
       13
       -
             histSize = 100000;

     

       14
       14
       -
             autosuggestions = {

     

       15
       15
       -
               enable = true;

     

       16
       16
       -
               highlightStyle = "fg=5";

     

       17
       17
       -
             };

     

       18
       18
       -
             syntaxHighlighting = { enable = true; };

     

       19
       19
       -
             autosuggestions.strategy = [ "match_prev_cmd" "completion" "history" ];

     

       20
       20
       -
             promptInit = ''

     

       21
       21
       -
               PROMPT='%(?..%F{red}%3?%f )%F{${config.personal.machineColour}}%n@%m%f:%~ %#'$'\n'

     

       22
       22
       -
             '';

     

       23
       23
       -
             setOptions = [ "HIST_IGNORE_DUPS" "HIST_FCNTL_LOCK" ];

     

       24
       24
       -
             interactiveShellInit = builtins.readFile ./zsh.cfg;

     

       25
       25
       -
           };

     

       26
       26
       -
           programs.bash.promptInit = ''

     

       27
       27
       -
             PS1='\[\e[36m\]\u@\h:\W\[\e[0m\] $ '

     

       28
       28
       -
           '';

     

       29
       29
       -
         };

     

       30
       30
       -
       }

+1 -1

modules/personal/ssh.nix modules/ssh.nix

···

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

     

       2
       2
        
       

     

       3
       3
       -
       let cfg = config.personal;

     

       3
       3
       +
       let cfg = config.custom;

     

       4
       4
        
       in {

     

       5
       5
        
         config = lib.mkIf cfg.enable {

     

       6
       6
        
           users.mutableUsers = false;

+2 -2

modules/personal/tailscale.nix modules/tailscale.nix

···

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
       -
       let cfg = config.personal;

     

       5
       5
       +
       let cfg = config.custom;

     

       6
       6
        
       in {

     

       7
       7
       -
         options.personal.tailscale = mkEnableOption "tailscale";

     

       7
       7
       +
         options.custom.tailscale = mkEnableOption "tailscale";

     

       8
       8
        
       

     

       9
       9
        
         config = lib.mkIf cfg.tailscale {

     

       10
       10
        
           # set up with `tailscale up --login-server https://headscale.freumh.org --hostname`

-30

modules/personal/wireguard-hosts.nix

···

       1
       1
       -
       { config, lib, ... }:

     

       2
       2
       -
       

     

       3
       3
       -
       let cfg = config.personal;

     

       4
       4
       -
       in {

     

       5
       5
       -
         config.wireguard.hosts = lib.mkIf cfg.enable {

     

       6
       6
       -
           "vps" = {

     

       7
       7
       -
             ip = "10.0.0.1";

     

       8
       8
       -
             publicKey = "2nS3QA2XVG4IgRmtTsOQbpjbqKgRhoZ4gL8PeQhJLGE=";

     

       9
       9
       -
             server = true;

     

       10
       10
       -
             endpoint = config.eilean.serverIpv4;

     

       11
       11
       -
           };

     

       12
       12
       -
           "dell-xps" = {

     

       13
       13
       -
             ip = "10.0.0.2";

     

       14
       14
       -
             publicKey = "K9Lq7lQeueo4/fjCRBHOWQjcTHd5vhCHljI6m/ZOcUM=";

     

       15
       15
       -
           };

     

       16
       16
       -
           "pixel-4a" = {

     

       17
       17
       -
             ip = "10.0.0.3";

     

       18
       18
       -
             publicKey = "KPstJ3Dd8YgZ2vsu0RIzjxdZhv1RlAVw2PGqyV1+eX4=";

     

       19
       19
       -
           };

     

       20
       20
       -
           "desktop" = {

     

       21
       21
       -
             ip = "10.0.0.4";

     

       22
       22
       -
             publicKey = "aP0A0Lc7ABFvITmi9DIZiRKen3kBspMa6nsfrMrep2Y=";

     

       23
       23
       -
           };

     

       24
       24
       -
           "rasp-pi" = {

     

       25
       25
       -
             ip = "10.0.0.5";

     

       26
       26
       -
             publicKey = "xG1dOV/C/rvPUbAMp6F+cEAC3t1DxNFJLPF457RTmQ4=";

     

       27
       27
       -
             persistentKeepalive = 25;

     

       28
       28
       -
           };

     

       29
       29
       -
         };

     

       30
       30
       -
       }

+1 -8

modules/personal/zsh.cfg home/zsh.cfg

···

       1
       1
        
       

     

       2
       2
       -
       HISTFILE=~/.histfile

     

       3
       3
       -
       HISTSIZE=100000

     

       4
       4
       -
       SAVEHIST=100000

     

       5
       5
       -
       

     

       6
       6
       -
       setopt autocd nomatch notify interactive_comments inc_append_history histignorespace

     

       2
       2
       +
       setopt autocd nomatch notify interactive_comments inc_append_history 

     

       7
       3
        
       unsetopt beep extendedglob share_history

     

       8
       8
       -
       

     

       9
       9
       -
       autoload -Uz compinit

     

       10
       10
       -
       compinit

     

       11
       4
        
       

     

       12
       5
        
       # https://superuser.com/questions/476532/how-can-i-make-zshs-vi-mode-behave-more-like-bashs-vi-mode

     

       13
       6
        
       vi-search-fix() {

+11

modules/workstation.nix

···

       1
       1
       +
       { pkgs, config, lib, ... }@inputs:

     

       2
       2
       +
       

     

       3
       3
       +
       let cfg = config.custom;

     

       4
       4
       +
       in {

     

       5
       5
       +
         options.custom.workstation = lib.mkEnableOption "custom";

     

       6
       6
       +
       

     

       7
       7
       +
         config = lib.mkIf cfg.workstation {

     

       8
       8
       +
           services.localtimed.enable = true;

     

       9
       9
       +
           services.geoclue2.enable = true;

     

       10
       10
       +
         };

     

       11
       11
       +
       }

+4 -159

nix-on-droid/default.nix

···

       55
       55
        
         home-manager = {

     

       56
       56
        
           useGlobalPkgs = true;

     

       57
       57
        
           config = { pkgs, lib, ... }: {

     

       58
       58
       +
             imports = [ ./home/default.nix ];

     

       59
       59
       +
       

     

       58
       60
        
             # Use the same overlays as the system packages

     

       59
       61
        
             nixpkgs = { inherit (config.nixpkgs) overlays; };

     

       60
       62
        
       

     
···

       75
       77
        
             };

     

       76
       78
        
       

     

       77
       79
        
             programs.zsh = {

     

       78
       78
       -
               enable = true;

     

       79
       79
       -
               history.size = 100000;

     

       80
       80
       -
               enableAutosuggestions = true;

     

       81
       81
       -
               syntaxHighlighting.enable = true;

     

       82
       82
       -
               initExtraFirst = ''

     

       83
       83
       -
                 export ZSH_AUTOSUGGEST_STRATEGY=(match_prev_cmd completion history)

     

       84
       84
       -
                 export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=5"

     

       85
       85
       -
                 PROMPT='%(?..%F{red}%3?%f )%F{blue}%n@%m%f:%~ %#'$'\n'

     

       86
       86
       -
               '';

     

       87
       87
       -
               initExtra = builtins.readFile ../modules/personal/zsh.cfg + ''

     

       80
       80
       +
               initExtra = builtins.readFile ./zsh.cfg + ''

     

       88
       81
        
                 bindkey "^[[A" up-line-or-beginning-search

     

       89
       82
        
                 bindkey "^[[B" down-line-or-beginning-search

     

       90
       83
        
               '';

     

       91
       84
        
             };

     

       92
       85
        
       

     

       93
       93
       -
             programs.git = {

     

       94
       94
       -
               enable = true;

     

       95
       95
       -
               userEmail = "ryan@$freumh.org";

     

       96
       96
       -
               userName = "Ryan Gibb";

     

       97
       97
       -
               aliases = {

     

       98
       98
       -
                 s = "status";

     

       99
       99
       -
                 c = "commit";

     

       100
       100
       -
                 cm = "commit --message";

     

       101
       101
       -
                 ca = "commit --amend";

     

       102
       102
       -
                 cu = "commit --message update";

     

       103
       103
       -
                 ci = "commit --message initial";

     

       104
       104
       -
                 br = "branch";

     

       105
       105
       -
                 co = "checkout";

     

       106
       106
       -
                 df = "diff";

     

       107
       107
       -
                 l = "log";

     

       108
       108
       -
                 lg = "log -p";

     

       109
       109
       -
                 lol = "log --graph --decorate --pretty=oneline --abbrev-commit";

     

       110
       110
       -
                 lola =

     

       111
       111
       -
                   "log --graph --decorate --pretty=oneline --abbrev-commit --all";

     

       112
       112
       -
                 ls = "ls-files";

     

       113
       113
       -
                 a = "add";

     

       114
       114
       -
                 aa = "add --all";

     

       115
       115
       -
                 au = "add -u";

     

       116
       116
       -
                 ap = "add --patch";

     

       117
       117
       -
                 ps = "push";

     

       118
       118
       -
                 pf = "push --force";

     

       119
       119
       -
                 pu = "push --set-upstream";

     

       120
       120
       -
                 pl = "pull";

     

       121
       121
       -
                 pr = "pull --rebase";

     

       122
       122
       -
                 acp = "!git add --all && git commit --message update && git push";

     

       123
       123
       -
               };

     

       124
       124
       -
             };

     

       125
       125
       -
       

     

       126
       126
       -
             programs.neovim = {

     

       127
       127
       -
               enable = true;

     

       128
       128
       -
               viAlias = true;

     

       129
       129
       -
               vimAlias = true;

     

       130
       130
       -
               extraPackages = with pkgs; [

     

       131
       131
       -
                 ripgrep

     

       132
       132
       -
                 nixd

     

       133
       133
       -
                 alejandra

     

       134
       134
       -
                 # stop complaining when launching but a devshell is better

     

       135
       135
       -
                 #ocamlPackages.ocaml-lsp

     

       136
       136
       -
                 #ocamlPackages.ocamlformat

     

       137
       137
       -
                 marksman

     

       138
       138
       -
                 lua-language-server

     

       139
       139
       -
                 #pyright

     

       140
       140
       -
                 #black

     

       141
       141
       -
                 ltex-ls

     

       142
       142
       -
               ];

     

       143
       143
       -
               extraLuaConfig = builtins.readFile ../modules/personal/nvim/nvim.lua;

     

       144
       144
       -
               # undo transparent background

     

       145
       145
       -
               # + "colorscheme gruvbox";

     

       146
       146
       -
               plugins = let

     

       147
       147
       -
                 obsidian-nvim = (pkgs.vimUtils.buildVimPlugin {

     

       148
       148
       -
                   pname = "obsidian.nvim";

     

       149
       149
       -
                   version = "2.6.0";

     

       150
       150
       -
                   src = pkgs.fetchFromGitHub {

     

       151
       151
       -
                     owner = "epwalsh";

     

       152
       152
       -
                     repo = "obsidian.nvim";

     

       153
       153
       -
                     rev = "v2.6.0";

     

       154
       154
       -
                     sha256 = "sha256-+w3XYoobuH17oinPfQxhrizbmQB5IbbulUK69674/Wg=";

     

       155
       155
       -
                   };

     

       156
       156
       -
                 });

     

       157
       157
       -
                 ltex-ls-nvim = (pkgs.vimUtils.buildVimPlugin {

     

       158
       158
       -
                   pname = "ltex-ls.nvim";

     

       159
       159
       -
                   version = "2.6.0";

     

       160
       160
       -
                   src = pkgs.fetchFromGitHub {

     

       161
       161
       -
                     owner = "vigoux";

     

       162
       162
       -
                     repo = "ltex-ls.nvim";

     

       163
       163
       -
                     rev = "c8139ea6b7f3d71adcff121e16ee8726037ffebd";

     

       164
       164
       -
                     sha256 = "sha256-jY3ALr6h88xnWN2QdKe3R0vvRcSNhFWDW56b2NvnTCs=";

     

       165
       165
       -
                   };

     

       166
       166
       -
                 });

     

       167
       167
       -
               in with pkgs.vimPlugins; [

     

       168
       168
       -
                 gruvbox-nvim

     

       169
       169
       -
       

     

       170
       170
       -
                 telescope-nvim

     

       171
       171
       -
                 telescope-fzf-native-nvim

     

       172
       172
       -
                 trouble-nvim

     

       173
       173
       -
       

     

       174
       174
       -
                 obsidian-nvim

     

       175
       175
       -
                 plenary-nvim

     

       176
       176
       -
                 pkgs.ripgrep

     

       177
       177
       -
       

     

       178
       178
       -
                 {

     

       179
       179
       -
                   plugin = nvim-lspconfig;

     

       180
       180
       -
                   runtime = let

     

       181
       181
       -
                     ml-style = ''

     

       182
       182
       -
                       setlocal expandtab

     

       183
       183
       -
                       setlocal shiftwidth=2

     

       184
       184
       -
                       setlocal tabstop=2

     

       185
       185
       -
                       setlocal softtabstop=2

     

       186
       186
       -
                     '';

     

       187
       187
       -
                   in {

     

       188
       188
       -
                     "ftplugin/mail.vim".text = ''

     

       189
       189
       -
                       let b:did_ftplugin = 1

     

       190
       190
       -
                     '';

     

       191
       191
       -
                     "ftplugin/nix.vim".text = ml-style;

     

       192
       192
       -
                     "ftplugin/ocaml.vim".text = ml-style;

     

       193
       193
       -
                     "after/ftplugin/markdown.vim".text = ''

     

       194
       194
       -
                       set com-=fb:-

     

       195
       195
       -
                       set com+=b:-

     

       196
       196
       -
                       set formatoptions+=ro

     

       197
       197
       -
                     '';

     

       198
       198
       -
                   };

     

       199
       199
       -
                 }

     

       200
       200
       -
       

     

       201
       201
       -
                 cmp-nvim-lsp

     

       202
       202
       -
                 cmp-nvim-lsp-signature-help

     

       203
       203
       -
                 cmp-path

     

       204
       204
       -
                 cmp-buffer

     

       205
       205
       -
                 cmp-cmdline

     

       206
       206
       -
                 cmp-spell

     

       207
       207
       -
                 luasnip

     

       208
       208
       -
                 nvim-cmp

     

       209
       209
       -
       

     

       210
       210
       -
                 vimtex

     

       211
       211
       -
                 nvim-surround

     

       212
       212
       -
                 comment-nvim

     

       213
       213
       -
       

     

       214
       214
       -
                 ltex-ls-nvim

     

       215
       215
       -
                 nvim-jdtls

     

       216
       216
       -
                 # TODO nvim-dap

     

       217
       217
       -
       

     

       218
       218
       -
                 copilot-vim

     

       219
       219
       -
               ];

     

       220
       220
       -
             };

     

       221
       221
       -
       

     

       222
       222
       -
             programs.tmux = {

     

       223
       223
       -
               enable = true;

     

       224
       224
       -
               extraConfig = ''

     

       225
       225
       -
                 set-window-option -g mode-keys vi

     

       226
       226
       -
                 set-option -g mouse on

     

       227
       227
       -
                 set-option -g set-titles on

     

       228
       228
       -
                 set-option -g set-titles-string "#T"

     

       229
       229
       -
                 bind-key t capture-pane -S -\; new-window '(tmux show-buffer; tmux delete-buffer) | nvim -c $'

     

       230
       230
       -
                 bind-key u capture-pane\; new-window '(tmux show-buffer; tmux delete-buffer) | ${pkgs.urlview}/bin/urlview'

     

       231
       231
       -
                 # Fixes C-Up/Down in TUIs

     

       232
       232
       -
                 set-option default-terminal tmux

     

       233
       233
       -
                 # https://stackoverflow.com/questions/62182401/neovim-screen-lagging-when-switching-mode-from-insert-to-normal

     

       234
       234
       -
                 set -s escape-time 0

     

       235
       235
       -
                 set -g lock-command vlock

     

       236
       236
       -
                 set -g lock-after-time 0 # Seconds; 0 = never

     

       237
       237
       -
                 bind L lock-session

     

       238
       238
       -
               '';

     

       239
       239
       -
             };

     

       240
       240
       -
       

     

       241
       86
        
             home.file = {

     

       242
       242
       -
               ".ssh/authorized_keys".source = ../modules/personal/authorized_keys;

     

       87
       87
       +
               ".ssh/authorized_keys".source = ../modules/authorized_keys;

     

       243
       88
        
             };

     

       244
       89
        
       

     

       245
       90
        
             programs.ssh = {