commit 9c2c7d9e9cfadc812ef4a4d13d1269602971c56b · dunkirk.sh/dots

+87 -1

flake.lock

···

       437
       437
        
               "type": "github"

     

       438
       438
        
             }

     

       439
       439
        
           },

     

       440
       440
       +
           "flake-utils_7": {

     

       441
       441
       +
             "inputs": {

     

       442
       442
       +
               "systems": "systems_10"

     

       443
       443
       +
             },

     

       444
       444
       +
             "locked": {

     

       445
       445
       +
               "lastModified": 1731533236,

     

       446
       446
       +
               "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",

     

       447
       447
       +
               "owner": "numtide",

     

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

     

       449
       449
       +
               "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",

     

       450
       450
       +
               "type": "github"

     

       451
       451
       +
             },

     

       452
       452
       +
             "original": {

     

       453
       453
       +
               "owner": "numtide",

     

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

     

       455
       455
       +
               "type": "github"

     

       456
       456
       +
             }

     

       457
       457
       +
           },

     

       440
       458
        
           "flare": {

     

       441
       459
        
             "inputs": {

     

       442
       460
        
               "flake-utils": "flake-utils_3",

     
···

       966
       984
        
               "type": "github"

     

       967
       985
        
             }

     

       968
       986
        
           },

     

       987
       987
       +
           "nixpkgs_8": {

     

       988
       988
       +
             "locked": {

     

       989
       989
       +
               "lastModified": 1764635402,

     

       990
       990
       +
               "narHash": "sha256-6rYcajRLe2C5ZYnV1HYskJl+QAkhvseWTzbdQiTN9OI=",

     

       991
       991
       +
               "owner": "nixos",

     

       992
       992
       +
               "repo": "nixpkgs",

     

       993
       993
       +
               "rev": "5f53b0d46d320352684242d000b36dcfbbf7b0bc",

     

       994
       994
       +
               "type": "github"

     

       995
       995
       +
             },

     

       996
       996
       +
             "original": {

     

       997
       997
       +
               "owner": "nixos",

     

       998
       998
       +
               "repo": "nixpkgs",

     

       999
       999
       +
               "type": "github"

     

       1000
       1000
       +
             }

     

       1001
       1001
       +
           },

     

       969
       1002
        
           "nixvim": {

     

       970
       1003
        
             "inputs": {

     

       971
       1004
        
               "flake-parts": "flake-parts",

     
···

       1100
       1133
        
               "spicetify-nix": "spicetify-nix",

     

       1101
       1134
        
               "tangled": "tangled",

     

       1102
       1135
        
               "terminal-wakatime": "terminal-wakatime",

     

       1103
       1103
       -
               "wakatime-ls": "wakatime-ls"

     

       1136
       1136
       +
               "wakatime-ls": "wakatime-ls",

     

       1137
       1137
       +
               "zmx": "zmx"

     

       1104
       1138
        
             }

     

       1105
       1139
        
           },

     

       1106
       1140
        
           "rust-overlay": {

     
···

       1193
       1227
        
               "type": "github"

     

       1194
       1228
        
             }

     

       1195
       1229
        
           },

     

       1230
       1230
       +
           "systems_10": {

     

       1231
       1231
       +
             "locked": {

     

       1232
       1232
       +
               "lastModified": 1681028828,

     

       1233
       1233
       +
               "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

     

       1234
       1234
       +
               "owner": "nix-systems",

     

       1235
       1235
       +
               "repo": "default",

     

       1236
       1236
       +
               "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",

     

       1237
       1237
       +
               "type": "github"

     

       1238
       1238
       +
             },

     

       1239
       1239
       +
             "original": {

     

       1240
       1240
       +
               "owner": "nix-systems",

     

       1241
       1241
       +
               "repo": "default",

     

       1242
       1242
       +
               "type": "github"

     

       1243
       1243
       +
             }

     

       1244
       1244
       +
           },

     

       1196
       1245
        
           "systems_2": {

     

       1197
       1246
        
             "locked": {

     

       1198
       1247
        
               "lastModified": 1681028828,

     
···

       1400
       1449
        
             "original": {

     

       1401
       1450
        
               "owner": "mrnossiom",

     

       1402
       1451
        
               "repo": "wakatime-ls",

     

       1452
       1452
       +
               "type": "github"

     

       1453
       1453
       +
             }

     

       1454
       1454
       +
           },

     

       1455
       1455
       +
           "zig2nix": {

     

       1456
       1456
       +
             "inputs": {

     

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

     

       1458
       1458
       +
               "nixpkgs": "nixpkgs_8"

     

       1459
       1459
       +
             },

     

       1460
       1460
       +
             "locked": {

     

       1461
       1461
       +
               "lastModified": 1764678235,

     

       1462
       1462
       +
               "narHash": "sha256-NNQWR3DAufaH7fs6ZplfAv1xPHEc0Ne3Z0v4MNHCqSw=",

     

       1463
       1463
       +
               "owner": "Cloudef",

     

       1464
       1464
       +
               "repo": "zig2nix",

     

       1465
       1465
       +
               "rev": "8b6ec85bccdf6b91ded19e9ef671205937e271e6",

     

       1466
       1466
       +
               "type": "github"

     

       1467
       1467
       +
             },

     

       1468
       1468
       +
             "original": {

     

       1469
       1469
       +
               "owner": "Cloudef",

     

       1470
       1470
       +
               "repo": "zig2nix",

     

       1471
       1471
       +
               "type": "github"

     

       1472
       1472
       +
             }

     

       1473
       1473
       +
           },

     

       1474
       1474
       +
           "zmx": {

     

       1475
       1475
       +
             "inputs": {

     

       1476
       1476
       +
               "zig2nix": "zig2nix"

     

       1477
       1477
       +
             },

     

       1478
       1478
       +
             "locked": {

     

       1479
       1479
       +
               "lastModified": 1765255474,

     

       1480
       1480
       +
               "narHash": "sha256-Bs/wb2EIDe1QHsmHHQ34L0se4eANdGsQpxAsc+gDCrU=",

     

       1481
       1481
       +
               "owner": "neurosnap",

     

       1482
       1482
       +
               "repo": "zmx",

     

       1483
       1483
       +
               "rev": "b5b525c333f086798e319b1a27f2bc0119ebca5c",

     

       1484
       1484
       +
               "type": "github"

     

       1485
       1485
       +
             },

     

       1486
       1486
       +
             "original": {

     

       1487
       1487
       +
               "owner": "neurosnap",

     

       1488
       1488
       +
               "repo": "zmx",

     

       1403
       1489
        
               "type": "github"

     

       1404
       1490
        
             }

     

       1405
       1491
        
           }

flake.nix

···

       109
       109
        
             url = "github:taciturnaxolotl/battleship-arena";

     

       110
       110
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       111
       111
        
           };

     

       112
       112
       +
       

     

       113
       113
       +
           zmx = {

     

       114
       114
       +
             url = "github:neurosnap/zmx";

     

       115
       115
       +
           };

     

       112
       116
        
         };

     

       113
       117
        
       

     

       114
       118
        
         outputs =

+56

machines/atalanta/home/default.nix

···

       42
       42
        
             enable = true;

     

       43
       43
        
             authTokenFile = osConfig.age.secrets.frp-auth-token.path;

     

       44
       44
        
           };

     

       45
       45
       +
           ssh = {

     

       46
       46
       +
             enable = true;

     

       47
       47
       +
             

     

       48
       48
       +
             zmx = {

     

       49
       49
       +
               enable = true;

     

       50
       50
       +
               hosts = [ "t.*" "p.*" "e.*" ];

     

       51
       51
       +
             };

     

       52
       52
       +
       

     

       53
       53
       +
             hosts = {

     

       54
       54
       +
               # Dynamic zmx sessions per server

     

       55
       55
       +
               "t.*" = {

     

       56
       56
       +
                 hostname = "150.136.15.177";  # terebithia

     

       57
       57
       +
               };

     

       58
       58
       +
       

     

       59
       59
       +
               "p.*" = {

     

       60
       60
       +
                 hostname = "150.136.63.103";  # prattle

     

       61
       61
       +
               };

     

       62
       62
       +
       

     

       63
       63
       +
               "e.*" = {

     

       64
       64
       +
                 hostname = "192.168.0.94";  # ember

     

       65
       65
       +
               };

     

       66
       66
       +
       

     

       67
       67
       +
               # Regular hosts

     

       68
       68
       +
               john = {

     

       69
       69
       +
                 user = "klukas";

     

       70
       70
       +
               };

     

       71
       71
       +
       

     

       72
       72
       +
               bandit = {

     

       73
       73
       +
                 hostname = "bandit.labs.overthewire.org";

     

       74
       74
       +
                 port = 2220;

     

       75
       75
       +
               };

     

       76
       76
       +
       

     

       77
       77
       +
               kali = {

     

       78
       78
       +
                 user = "kali";

     

       79
       79
       +
               };

     

       80
       80
       +
       

     

       81
       81
       +
               terebithia = {

     

       82
       82
       +
                 hostname = "150.136.15.177";

     

       83
       83
       +
                 zmx = true;

     

       84
       84
       +
               };

     

       85
       85
       +
       

     

       86
       86
       +
               prattle = {

     

       87
       87
       +
                 hostname = "150.136.63.103";

     

       88
       88
       +
                 zmx = true;

     

       89
       89
       +
               };

     

       90
       90
       +
       

     

       91
       91
       +
               ember = {

     

       92
       92
       +
                 hostname = "192.168.0.94";

     

       93
       93
       +
                 zmx = true;

     

       94
       94
       +
               };

     

       95
       95
       +
             };

     

       96
       96
       +
       

     

       97
       97
       +
             extraConfig = ''

     

       98
       98
       +
               IdentityFile ~/.ssh/id_rsa

     

       99
       99
       +
             '';

     

       100
       100
       +
           };

     

       45
       101
        
         };

     

       46
       102
        
       

     

       47
       103
        
         programs.zsh.initContent = ''

machines/ember/default.nix

···

       31
       31
        
           apps = {

     

       32
       32
        
             helix.enable = true;

     

       33
       33
        
           };

     

       34
       34
       +
           ssh = {

     

       35
       35
       +
             enable = true;

     

       36
       36
       +
             zmx.enable = true;

     

       37
       37
       +
           };

     

       34
       38
        
         };

     

       35
       39
        
       

     

       36
       40
        
         # Enable home-manager

machines/nest/default.nix

···

       26
       26
        
           apps = {

     

       27
       27
        
             helix.enable = true;

     

       28
       28
        
           };

     

       29
       29
       +
           ssh = {

     

       30
       30
       +
             enable = true;

     

       31
       31
       +
             zmx.enable = true;

     

       32
       32
       +
           };

     

       29
       33
        
         };

     

       30
       34
        
       

     

       31
       35
        
         # Enable home-manager

machines/prattle/home/default.nix

···

       11
       11
        
           homeDirectory = "/home/kierank";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       +
         atelier = {

     

       15
       15
       +
           ssh = {

     

       16
       16
       +
             enable = true;

     

       17
       17
       +
             zmx.enable = true;

     

       18
       18
       +
           };

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       14
       21
        
         programs.home-manager.enable = true;

     

       15
       22
        
       

     

       16
       23
        
         systemd.user.startServices = "sd-switch";

machines/terebithia/home/default.nix

···

       19
       19
        
             helix.enable = true;

     

       20
       20
        
             irssi.enable = true;

     

       21
       21
        
           };

     

       22
       22
       +
           ssh = {

     

       23
       23
       +
             enable = true;

     

       24
       24
       +
             zmx.enable = true;

     

       25
       25
       +
           };

     

       22
       26
        
         };

     

       23
       27
        
       

     

       24
       28
        
         programs.home-manager.enable = true;

+188

modules/home/apps/ssh.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         inputs,

     

       6
       6
       +
         ...

     

       7
       7
       +
       }:

     

       8
       8
       +
       with lib;

     

       9
       9
       +
       let

     

       10
       10
       +
         cfg = config.atelier.ssh;

     

       11
       11
       +
       in

     

       12
       12
       +
       {

     

       13
       13
       +
         options.atelier.ssh = {

     

       14
       14
       +
           enable = mkEnableOption "SSH configuration";

     

       15
       15
       +
       

     

       16
       16
       +
           zmx = {

     

       17
       17
       +
             enable = mkEnableOption "zmx integration for persistent sessions";

     

       18
       18
       +
             hosts = mkOption {

     

       19
       19
       +
               type = types.listOf types.str;

     

       20
       20
       +
               default = [ ];

     

       21
       21
       +
               description = "List of host patterns to enable zmx auto-attach (e.g., 'd.*')";

     

       22
       22
       +
             };

     

       23
       23
       +
           };

     

       24
       24
       +
       

     

       25
       25
       +
           extraConfig = mkOption {

     

       26
       26
       +
             type = types.lines;

     

       27
       27
       +
             default = "";

     

       28
       28
       +
             description = "Extra SSH configuration";

     

       29
       29
       +
           };

     

       30
       30
       +
       

     

       31
       31
       +
           hosts = mkOption {

     

       32
       32
       +
             type = types.attrsOf (

     

       33
       33
       +
               types.submodule {

     

       34
       34
       +
                 options = {

     

       35
       35
       +
                   hostname = mkOption {

     

       36
       36
       +
                     type = types.nullOr types.str;

     

       37
       37
       +
                     default = null;

     

       38
       38
       +
                     description = "Hostname or IP address";

     

       39
       39
       +
                   };

     

       40
       40
       +
       

     

       41
       41
       +
                   port = mkOption {

     

       42
       42
       +
                     type = types.nullOr types.int;

     

       43
       43
       +
                     default = null;

     

       44
       44
       +
                     description = "SSH port";

     

       45
       45
       +
                   };

     

       46
       46
       +
       

     

       47
       47
       +
                   user = mkOption {

     

       48
       48
       +
                     type = types.nullOr types.str;

     

       49
       49
       +
                     default = null;

     

       50
       50
       +
                     description = "Username for SSH connection";

     

       51
       51
       +
                   };

     

       52
       52
       +
       

     

       53
       53
       +
                   identityFile = mkOption {

     

       54
       54
       +
                     type = types.nullOr types.str;

     

       55
       55
       +
                     default = null;

     

       56
       56
       +
                     description = "Path to SSH identity file";

     

       57
       57
       +
                   };

     

       58
       58
       +
       

     

       59
       59
       +
                   forwardAgent = mkOption {

     

       60
       60
       +
                     type = types.nullOr types.bool;

     

       61
       61
       +
                     default = null;

     

       62
       62
       +
                     description = "Enable SSH agent forwarding";

     

       63
       63
       +
                   };

     

       64
       64
       +
       

     

       65
       65
       +
                   extraOptions = mkOption {

     

       66
       66
       +
                     type = types.attrsOf types.str;

     

       67
       67
       +
                     default = { };

     

       68
       68
       +
                     description = "Additional SSH options for this host";

     

       69
       69
       +
                   };

     

       70
       70
       +
       

     

       71
       71
       +
                   zmx = mkOption {

     

       72
       72
       +
                     type = types.bool;

     

       73
       73
       +
                     default = false;

     

       74
       74
       +
                     description = "Enable zmx persistent sessions for this host";

     

       75
       75
       +
                   };

     

       76
       76
       +
                 };

     

       77
       77
       +
               }

     

       78
       78
       +
             );

     

       79
       79
       +
             default = { };

     

       80
       80
       +
             description = "SSH host configurations";

     

       81
       81
       +
           };

     

       82
       82
       +
         };

     

       83
       83
       +
       

     

       84
       84
       +
         config = mkIf cfg.enable {

     

       85
       85
       +
           # On macOS (darwin), zmx must be installed manually due to build issues

     

       86
       86
       +
           # Download from: https://zmx.sh/a/zmx-0.0.2-macos-aarch64.tar.gz

     

       87
       87
       +
           # Extract and place in PATH (e.g., ~/.local/bin/)

     

       88
       88
       +
           

     

       89
       89
       +
           # On Linux, use the zmx flake

     

       90
       90
       +
           home.packages = 

     

       91
       91
       +
             (optionals (cfg.zmx.enable && !pkgs.stdenv.isDarwin) [

     

       92
       92
       +
               inputs.zmx.packages.${pkgs.stdenv.hostPlatform.system}.default

     

       93
       93
       +
             ])

     

       94
       94
       +
             ++ (optionals cfg.zmx.enable [

     

       95
       95
       +
               pkgs.autossh

     

       96
       96
       +
             ]);

     

       97
       97
       +
       

     

       98
       98
       +
           programs.ssh = {

     

       99
       99
       +
             enable = true;

     

       100
       100
       +
             enableDefaultConfig = false;

     

       101
       101
       +
       

     

       102
       102
       +
             matchBlocks =

     

       103
       103
       +
               let

     

       104
       104
       +
                 # Convert atelier.ssh.hosts to SSH matchBlocks

     

       105
       105
       +
                 hostConfigs = mapAttrs (

     

       106
       106
       +
                   name: hostCfg:

     

       107
       107
       +
                   {

     

       108
       108
       +
                     hostname = mkIf (hostCfg.hostname != null) hostCfg.hostname;

     

       109
       109
       +
                     port = mkIf (hostCfg.port != null) hostCfg.port;

     

       110
       110
       +
                     user = mkIf (hostCfg.user != null) hostCfg.user;

     

       111
       111
       +
                     identityFile = mkIf (hostCfg.identityFile != null) hostCfg.identityFile;

     

       112
       112
       +
                     forwardAgent = mkIf (hostCfg.forwardAgent != null) hostCfg.forwardAgent;

     

       113
       113
       +
                     extraOptions = hostCfg.extraOptions // (

     

       114
       114
       +
                       if hostCfg.zmx then

     

       115
       115
       +
                         {

     

       116
       116
       +
                           RemoteCommand = "zmx attach %n";

     

       117
       117
       +
                           RequestTTY = "yes";

     

       118
       118
       +
                           ControlPath = "~/.ssh/cm-%r@%h:%p";

     

       119
       119
       +
                           ControlMaster = "auto";

     

       120
       120
       +
                           ControlPersist = "10m";

     

       121
       121
       +
                         }

     

       122
       122
       +
                       else

     

       123
       123
       +
                         { }

     

       124
       124
       +
                     );

     

       125
       125
       +
                   }

     

       126
       126
       +
                 ) cfg.hosts;

     

       127
       127
       +
       

     

       128
       128
       +
                 # Create zmx pattern hosts if enabled

     

       129
       129
       +
                 zmxPatternHosts = if cfg.zmx.enable then

     

       130
       130
       +
                   listToAttrs (

     

       131
       131
       +
                     map (pattern: 

     

       132
       132
       +
                       let

     

       133
       133
       +
                         patternHost = cfg.hosts.${pattern} or {};

     

       134
       134
       +
                       in {

     

       135
       135
       +
                       name = pattern;

     

       136
       136
       +
                       value = {

     

       137
       137
       +
                         hostname = mkIf (patternHost.hostname or null != null) patternHost.hostname;

     

       138
       138
       +
                         port = mkIf (patternHost.port or null != null) patternHost.port;

     

       139
       139
       +
                         user = mkIf (patternHost.user or null != null) patternHost.user;

     

       140
       140
       +
                         extraOptions = {

     

       141
       141
       +
                           RemoteCommand = "zmx attach %k";

     

       142
       142
       +
                           RequestTTY = "yes";

     

       143
       143
       +
                           ControlPath = "~/.ssh/cm-%r@%h:%p";

     

       144
       144
       +
                           ControlMaster = "auto";

     

       145
       145
       +
                           ControlPersist = "10m";

     

       146
       146
       +
                         };

     

       147
       147
       +
                       };

     

       148
       148
       +
                     }) cfg.zmx.hosts

     

       149
       149
       +
                   )

     

       150
       150
       +
                 else

     

       151
       151
       +
                   { };

     

       152
       152
       +
       

     

       153
       153
       +
                 # Default match block for extraConfig

     

       154
       154
       +
                 defaultBlock = if cfg.extraConfig != "" then

     

       155
       155
       +
                   {

     

       156
       156
       +
                     "*" = { };

     

       157
       157
       +
                   }

     

       158
       158
       +
                 else

     

       159
       159
       +
                   { };

     

       160
       160
       +
               in

     

       161
       161
       +
               defaultBlock // hostConfigs // zmxPatternHosts;

     

       162
       162
       +
       

     

       163
       163
       +
             extraConfig = cfg.extraConfig;

     

       164
       164
       +
           };

     

       165
       165
       +
       

     

       166
       166
       +
           # Add shell aliases for easier zmx usage

     

       167
       167
       +
           programs.zsh.shellAliases = mkIf cfg.zmx.enable {

     

       168
       168
       +
             zmls = "zmx list";

     

       169
       169
       +
             zmk = "zmx kill";

     

       170
       170
       +
             zma = "zmx attach";

     

       171
       171
       +
             ash = "autossh -M 0 -q";

     

       172
       172
       +
           };

     

       173
       173
       +
       

     

       174
       174
       +
           programs.bash.shellAliases = mkIf cfg.zmx.enable {

     

       175
       175
       +
             zmls = "zmx list";

     

       176
       176
       +
             zmk = "zmx kill";

     

       177
       177
       +
             zma = "zmx attach";

     

       178
       178
       +
             ash = "autossh -M 0 -q";

     

       179
       179
       +
           };

     

       180
       180
       +
       

     

       181
       181
       +
           programs.fish.shellAliases = mkIf cfg.zmx.enable {

     

       182
       182
       +
             zmls = "zmx list";

     

       183
       183
       +
             zmk = "zmx kill";

     

       184
       184
       +
             zma = "zmx attach";

     

       185
       185
       +
             ash = "autossh -M 0 -q";

     

       186
       186
       +
           };

     

       187
       187
       +
         };

     

       188
       188
       +
       }

+9 -2

modules/home/system/shell.nix

···

       401
       401
        
                       template = "{{ if .SSHSession }}{{.HostName}} {{ end }}";

     

       402
       402
        
                     }

     

       403
       403
        
                     {

     

       404
       404
       +
                       type = "text";

     

       405
       405
       +
                       style = "plain";

     

       406
       406
       +
                       background = "transparent";

     

       407
       407
       +
                       foreground = "green";

     

       408
       408
       +
                       template = "{{ if .Env.ZMX_SESSION }}[{{ .Env.ZMX_SESSION }}] {{ end }}";

     

       409
       409
       +
                     }

     

       410
       410
       +
                     {

     

       404
       411
        
                       type = "path";

     

       405
       412
        
                       style = "plain";

     

       406
       413
        
                       background = "transparent";

     
···

       461
       468
        
                       style = "plain";

     

       462
       469
        
                       foreground_templates = [

     

       463
       470
        
                         "{{if gt .Code 0}}red{{end}}"

     

       464
       464
       -
                         "{{if eq .Code 0}}magenta{{end}}"

     

       471
       471
       +
                         "{{if eq .Code 0}}{{if .Env.SSH_CONNECTION}}cyan{{else}}magenta{{end}}{{end}}"

     

       465
       472
        
                       ];

     

       466
       473
        
                       background = "transparent";

     

       467
       474
        
                       template = "❯";

     
···

       472
       479
        
               transient_prompt = {

     

       473
       480
        
                 foreground_templates = [

     

       474
       481
        
                   "{{if gt .Code 0}}red{{end}}"

     

       475
       475
       -
                   "{{if eq .Code 0}}magenta{{end}}"

     

       482
       482
       +
                   "{{if eq .Code 0}}{{if .Env.SSH_CONNECTION}}cyan{{else}}magenta{{end}}{{end}}"

     

       476
       483
        
                 ];

     

       477
       484
        
                 background = "transparent";

     

       478
       485
        
                 template = "❯ ";