comparing 9c2c7d9e9cfadc812ef4a4d13d1269602971c56b and main on dunkirk.sh/dots

+8

.github/workflows/deploy.yaml

···

       14
       14
        
             

     

       15
       15
        
             - name: Install Nix

     

       16
       16
        
               uses: DeterminateSystems/determinate-nix-action@main

     

       17
       17
       +
               with:

     

       18
       18
       +
                 extra-conf: |

     

       19
       19
       +
                   extra-platforms = aarch64-linux

     

       20
       20
       +
             

     

       21
       21
       +
             - name: Set up QEMU

     

       22
       22
       +
               uses: docker/setup-qemu-action@v3

     

       23
       23
       +
               with:

     

       24
       24
       +
                 platforms: arm64

     

       17
       25
        
             

     

       18
       26
        
             - name: Setup Tailscale

     

       19
       27
        
               uses: tailscale/github-action@v3

-1

README.md

···

       18
       18
        
       ├── machines

     

       19
       19
        
       │   ├── atalanta # my macOS M4 machine

     

       20
       20
        
       │   ├── ember # my dell r210 server (in my basement)

     

       21
       21
       -
       │   ├── john # shared server for cedarville

     

       22
       21
        
       │   ├── moonlark # my framework 13 <dead>

     

       23
       22
        
       │   ├── nest # shared tilde server through hc

     

       24
       23
        
       │   ├── prattle # oracle cloud x86_64 server

+28 -28

flake.lock

···

       209
       209
        
               ]

     

       210
       210
        
             },

     

       211
       211
        
             "locked": {

     

       212
       212
       -
               "lastModified": 1764627417,

     

       213
       213
       -
               "narHash": "sha256-D6xc3Rl8Ab6wucJWdvjNsGYGSxNjQHzRc2EZ6eeQ6l4=",

     

       212
       212
       +
               "lastModified": 1765326679,

     

       213
       213
       +
               "narHash": "sha256-fTLX9kDwLr9Y0rH/nG+h1XG5UU+jBcy0PFYn5eneRX8=",

     

       214
       214
        
               "owner": "nix-community",

     

       215
       215
        
               "repo": "disko",

     

       216
       216
       -
               "rev": "5a88a6eceb8fd732b983e72b732f6f4b8269bef3",

     

       216
       216
       +
               "rev": "d64e5cdca35b5fad7c504f615357a7afe6d9c49e",

     

       217
       217
        
               "type": "github"

     

       218
       218
        
             },

     

       219
       219
        
             "original": {

     
···

       608
       608
        
               ]

     

       609
       609
        
             },

     

       610
       610
        
             "locked": {

     

       611
       611
       -
               "lastModified": 1765170903,

     

       612
       612
       -
               "narHash": "sha256-O8VTGey1xxiRW+Fpb+Ps9zU7ShmxUA1a7cMTcENCVNg=",

     

       611
       611
       +
               "lastModified": 1765384171,

     

       612
       612
       +
               "narHash": "sha256-FuFtkJrW1Z7u+3lhzPRau69E0CNjADku1mLQQflUORo=",

     

       613
       613
        
               "owner": "nix-community",

     

       614
       614
        
               "repo": "home-manager",

     

       615
       615
       -
               "rev": "20561be440a11ec57a89715480717baf19fe6343",

     

       615
       615
       +
               "rev": "44777152652bc9eacf8876976fa72cc77ca8b9d8",

     

       616
       616
        
               "type": "github"

     

       617
       617
        
             },

     

       618
       618
        
             "original": {

     
···

       813
       813
        
               "nixpkgs": "nixpkgs_3"

     

       814
       814
        
             },

     

       815
       815
        
             "locked": {

     

       816
       816
       -
               "lastModified": 1765159287,

     

       817
       817
       -
               "narHash": "sha256-C+dVEekU31QPaPShMaUbs3LqOVVqzq0b4gKC1jX8Mlk=",

     

       816
       816
       +
               "lastModified": 1765418662,

     

       817
       817
       +
               "narHash": "sha256-8SSYagIUn+m9CKUYddq3DN1xkh04KCO0itB/LMgEgpc=",

     

       818
       818
        
               "owner": "nix-community",

     

       819
       819
        
               "repo": "nix-vscode-extensions",

     

       820
       820
       -
               "rev": "dccd0cc3693bff67e4856b5a22445223aabc4d4b",

     

       820
       820
       +
               "rev": "0f6679daa3f5bc2b09827b67f49caf0ac8e3a4c8",

     

       821
       821
        
               "type": "github"

     

       822
       822
        
             },

     

       823
       823
        
             "original": {

     
···

       828
       828
        
           },

     

       829
       829
        
           "nixos-facter-modules": {

     

       830
       830
        
             "locked": {

     

       831
       831
       -
               "lastModified": 1764252389,

     

       832
       832
       -
               "narHash": "sha256-3bbuneTKZBkYXlm0bE36kUjiDsasoIC1GWBw/UEJ9T4=",

     

       831
       831
       +
               "lastModified": 1765442039,

     

       832
       832
       +
               "narHash": "sha256-k3lYQ+A1F7aTz8HnlU++bd9t/x/NP2A4v9+x6opcVg0=",

     

       833
       833
        
               "owner": "numtide",

     

       834
       834
        
               "repo": "nixos-facter-modules",

     

       835
       835
       -
               "rev": "5ea68886d95218646d11d3551a476d458df00778",

     

       835
       835
       +
               "rev": "9dd775ee92de63f14edd021d59416e18ac2c00f1",

     

       836
       836
        
               "type": "github"

     

       837
       837
        
             },

     

       838
       838
        
             "original": {

     
···

       874
       874
        
           },

     

       875
       875
        
           "nixpkgs-unstable": {

     

       876
       876
        
             "locked": {

     

       877
       877
       -
               "lastModified": 1764950072,

     

       878
       878
       -
               "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=",

     

       877
       877
       +
               "lastModified": 1765186076,

     

       878
       878
       +
               "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",

     

       879
       879
        
               "owner": "nixos",

     

       880
       880
        
               "repo": "nixpkgs",

     

       881
       881
       -
               "rev": "f61125a668a320878494449750330ca58b78c557",

     

       881
       881
       +
               "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",

     

       882
       882
        
               "type": "github"

     

       883
       883
        
             },

     

       884
       884
        
             "original": {

     
···

       922
       922
        
           },

     

       923
       923
        
           "nixpkgs_4": {

     

       924
       924
        
             "locked": {

     

       925
       925
       -
               "lastModified": 1764983851,

     

       926
       926
       -
               "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=",

     

       925
       925
       +
               "lastModified": 1765311797,

     

       926
       926
       +
               "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=",

     

       927
       927
        
               "owner": "nixos",

     

       928
       928
        
               "repo": "nixpkgs",

     

       929
       929
       -
               "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454",

     

       929
       929
       +
               "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b",

     

       930
       930
        
               "type": "github"

     

       931
       931
        
             },

     

       932
       932
        
             "original": {

     
···

       1048
       1048
        
               ]

     

       1049
       1049
        
             },

     

       1050
       1050
        
             "locked": {

     

       1051
       1051
       -
               "lastModified": 1765213466,

     

       1052
       1052
       -
               "narHash": "sha256-JdQa7m3a/oWun8TGJ+jamAdxn820RFjqDLNnl4d8a+0=",

     

       1051
       1051
       +
               "lastModified": 1765470296,

     

       1052
       1052
       +
               "narHash": "sha256-bURojPUn8jloR046JNZf6qrYNmEPfFEoDaLTKoP9pg4=",

     

       1053
       1053
        
               "owner": "nix-community",

     

       1054
       1054
        
               "repo": "NUR",

     

       1055
       1055
       -
               "rev": "0c5cabc4f46e5ce7e45827c22b21173a887acff2",

     

       1055
       1055
       +
               "rev": "441a70568483c0c48b338cca2030e3d9c7aef3ba",

     

       1056
       1056
        
               "type": "github"

     

       1057
       1057
        
             },

     

       1058
       1058
        
             "original": {

     
···

       1379
       1379
        
               "sqlite-lib-src": "sqlite-lib-src"

     

       1380
       1380
        
             },

     

       1381
       1381
        
             "locked": {

     

       1382
       1382
       -
               "lastModified": 1765171220,

     

       1383
       1383
       -
               "narHash": "sha256-K+Cs6k0nQYRwW+RwlKCZabLBOVel84C2wPEZjYOH6JA=",

     

       1382
       1382
       +
               "lastModified": 1765368304,

     

       1383
       1383
       +
               "narHash": "sha256-Q3JC5+FYtsKJU70WIhGhsAYWzu0CvUmmbdYhcFe46Pg=",

     

       1384
       1384
        
               "ref": "refs/heads/master",

     

       1385
       1385
       -
               "rev": "ca8217e99806280fa77316b46b0b243647ed491c",

     

       1386
       1386
       -
               "revCount": 1722,

     

       1385
       1385
       +
               "rev": "a53d124ea4746109c1933f7adc72f0bde1309890",

     

       1386
       1386
       +
               "revCount": 1731,

     

       1387
       1387
        
               "type": "git",

     

       1388
       1388
        
               "url": "https://tangled.org/tangled.org/core"

     

       1389
       1389
        
             },

     
···

       1476
       1476
        
               "zig2nix": "zig2nix"

     

       1477
       1477
        
             },

     

       1478
       1478
        
             "locked": {

     

       1479
       1479
       -
               "lastModified": 1765255474,

     

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

     

       1479
       1479
       +
               "lastModified": 1765397837,

     

       1480
       1480
       +
               "narHash": "sha256-nMlS9SA8MLJHJ0X/zEg3eG18mLw5vvZpZBbTbVcGFTI=",

     

       1481
       1481
        
               "owner": "neurosnap",

     

       1482
       1482
        
               "repo": "zmx",

     

       1483
       1483
       -
               "rev": "b5b525c333f086798e319b1a27f2bc0119ebca5c",

     

       1483
       1483
       +
               "rev": "a22dba538a31480ed450b389f397e15880a1c53a",

     

       1484
       1484
        
               "type": "github"

     

       1485
       1485
        
             },

     

       1486
       1486
        
             "original": {

+3

flake.nix

···

       147
       147
        
                       hash = "sha256-7mkrPl2CQSfc1lRjl1ilwxdYcK5iRU//QGKmdCicK30=";

     

       148
       148
        
                     };

     

       149
       149
        
                   });

     

       150
       150
       +
                   

     

       151
       151
       +
                   zmx-binary = prev.callPackage ./packages/zmx.nix { };

     

       150
       152
        
                 })

     

       151
       153
        
               ];

     

       152
       154
        
             };

     
···

       258
       260
        
                   home-manager.darwinModules.home-manager

     

       259
       261
        
                   agenix.darwinModules.default

     

       260
       262
        
                   unstable-overlays

     

       263
       263
       +
                   nur.modules.darwin.default

     

       261
       264
        
                   ./machines/atalanta

     

       262
       265
        
                 ];

     

       263
       266
        
               };

+13 -3

machines/atalanta/home/default.nix

···

       9
       9
        
           (inputs.import-tree ../../../modules/home)

     

       10
       10
        
         ];

     

       11
       11
        
       

     

       12
       12
       -
         nixpkgs.enable = true;

     

       13
       13
       -
       

     

       14
       12
        
         home = {

     

       15
       13
        
           username = "kierank";

     

       16
       14
        
           homeDirectory = "/Users/kierank";

     
···

       47
       45
        
             

     

       48
       46
        
             zmx = {

     

       49
       47
        
               enable = true;

     

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

     

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

     

       51
       49
        
             };

     

       52
       50
        
       

     

       53
       51
        
             hosts = {

     
···

       64
       62
        
                 hostname = "192.168.0.94";  # ember

     

       65
       63
        
               };

     

       66
       64
        
       

     

       65
       65
       +
               "j.*" = {

     

       66
       66
       +
                 hostname = "john.cedarville.edu";

     

       67
       67
       +
                 user = "klukas";

     

       68
       68
       +
               };

     

       69
       69
       +
       

     

       67
       70
        
               # Regular hosts

     

       68
       71
        
               john = {

     

       72
       72
       +
                 hostname = "john.cedarville.edu";

     

       69
       73
        
                 user = "klukas";

     

       74
       74
       +
                 zmx = true;

     

       70
       75
        
               };

     

       71
       76
        
       

     

       72
       77
        
               bandit = {

     
···

       91
       96
        
               ember = {

     

       92
       97
        
                 hostname = "192.168.0.94";

     

       93
       98
        
                 zmx = true;

     

       99
       99
       +
               };

     

       100
       100
       +
       

     

       101
       101
       +
               remarkable = {

     

       102
       102
       +
                 hostname = "10.11.99.01";

     

       103
       103
       +
                 user = "root";

     

       94
       104
        
               };

     

       95
       105
        
             };

     

       96
       106

+1

machines/atalanta/home-manager.nix

···

       10
       10
        
         ];

     

       11
       11
        
       

     

       12
       12
        
         home-manager = {

     

       13
       13
       +
           useGlobalPkgs = true;

     

       13
       14
        
           extraSpecialArgs = {

     

       14
       15
        
             inherit inputs outputs;

     

       15
       16
        
           };

+1

machines/ember/default.nix

···

       6
       6
        
       {

     

       7
       7
        
         imports = [

     

       8
       8
        
           (inputs.import-tree ../../modules/home)

     

       9
       9
       +
           ../../modules/home/system/nixpkgs.nix.disabled

     

       9
       10
        
         ];

     

       10
       11
        
       

     

       11
       12
        
         nixpkgs.enable = true;

-35

machines/john/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         inputs,

     

       3
       3
       -
         pkgs,

     

       4
       4
       -
         ...

     

       5
       5
       -
       }:

     

       6
       6
       -
       {

     

       7
       7
       -
         imports = [

     

       8
       8
       -
           (inputs.import-tree ../../modules/home)

     

       9
       9
       -
         ];

     

       10
       10
       -
       

     

       11
       11
       -
         nixpkgs.enable = true;

     

       12
       12
       -
       

     

       13
       13
       -
         home = {

     

       14
       14
       -
           username = "klukas";

     

       15
       15
       -
           homeDirectory = "/home/students/2029/klukas";

     

       16
       16
       -
       

     

       17
       17
       -
           packages = with pkgs; [ ];

     

       18
       18
       -
         };

     

       19
       19
       -
       

     

       20
       20
       -
         atelier = {

     

       21
       21
       -
           shell.enable = true;

     

       22
       22
       -
         };

     

       23
       23
       -
       

     

       24
       24
       -
         # Enable home-manager

     

       25
       25
       -
         programs.home-manager.enable = true;

     

       26
       26
       -
       

     

       27
       27
       -
         # keep hm in .local/state since we are using nix-portable

     

       28
       28
       -
         xdg.enable = true;

     

       29
       29
       -
       

     

       30
       30
       -
         # Nicely reload system units when changing configs

     

       31
       31
       -
         systemd.user.startServices = "sd-switch";

     

       32
       32
       -
       

     

       33
       33
       -
         # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion

     

       34
       34
       -
         home.stateVersion = "23.05";

     

       35
       35
       -
       }

-2

machines/moonlark/home/default.nix

···

       4
       4
        
           (inputs.import-tree ../../../modules/home)

     

       5
       5
        
         ];

     

       6
       6
        
       

     

       7
       7
       -
         nixpkgs.enable = true;

     

       8
       8
       -
       

     

       9
       7
        
         home = {

     

       10
       8
        
           username = "kierank";

     

       11
       9
        
           homeDirectory = "/home/kierank";

+1

machines/moonlark/home-manager.nix

···

       6
       6
        
         ];

     

       7
       7
        
       

     

       8
       8
        
         home-manager = {

     

       9
       9
       +
           useGlobalPkgs = true;

     

       9
       10
        
           extraSpecialArgs = {

     

       10
       11
        
             inherit inputs outputs;

     

       11
       12
        
           };

+1

machines/nest/default.nix

···

       7
       7
        
       {

     

       8
       8
        
         imports = [

     

       9
       9
        
           (inputs.import-tree ../../modules/home)

     

       10
       10
       +
           ../../modules/home/system/nixpkgs.nix.disabled

     

       10
       11
        
         ];

     

       11
       12
        
       

     

       12
       13
        
         nixpkgs.enable = true;

-2

machines/prattle/home/default.nix

···

       4
       4
        
           (inputs.import-tree ../../../modules/home)

     

       5
       5
        
         ];

     

       6
       6
        
       

     

       7
       7
       -
         nixpkgs.enable = true;

     

       8
       8
       -
       

     

       9
       7
        
         home = {

     

       10
       8
        
           username = "kierank";

     

       11
       9
        
           homeDirectory = "/home/kierank";

+1

machines/prattle/home-manager.nix

···

       5
       5
        
         ];

     

       6
       6
        
       

     

       7
       7
        
         home-manager = {

     

       8
       8
       +
           useGlobalPkgs = true;

     

       8
       9
        
           extraSpecialArgs = {

     

       9
       10
        
             inherit inputs outputs;

     

       10
       11
        
           };

+1

machines/tacyon/default.nix

···

       6
       6
        
       {

     

       7
       7
        
         imports = [

     

       8
       8
        
           (inputs.import-tree ../../modules/home)

     

       9
       9
       +
           ../../modules/home/system/nixpkgs.nix.disabled

     

       9
       10
        
         ];

     

       10
       11
        
       

     

       11
       12
        
         nixpkgs.enable = true;

-2

machines/terebithia/home/default.nix

···

       4
       4
        
           (inputs.import-tree ../../../modules/home)

     

       5
       5
        
         ];

     

       6
       6
        
       

     

       7
       7
       -
         nixpkgs.enable = true;

     

       8
       8
       -
       

     

       9
       7
        
         home = {

     

       10
       8
        
           username = "kierank";

     

       11
       9
        
           homeDirectory = "/home/kierank";

+1

machines/terebithia/home-manager.nix

···

       5
       5
        
         ];

     

       6
       6
        
       

     

       7
       7
        
         home-manager = {

     

       8
       8
       +
           useGlobalPkgs = true;

     

       8
       9
        
           extraSpecialArgs = {

     

       9
       10
        
             inherit inputs outputs;

     

       10
       11
        
           };

+23 -1

modules/home/apps/bore/default.nix

···

       183
       183
        
                   ;;

     

       184
       184
        
               esac

     

       185
       185
        
             done

     

       186
       186
       +
             

     

       187
       187
       +
             # Prompt for label if not provided via flag and not loaded from saved config

     

       188
       188
       +
             if [ -z "$label" ]; then

     

       189
       189
       +
               echo

     

       190
       190
       +
               # Allow multiple labels selection

     

       191
       191
       +
               labels=$(${pkgs.gum}/bin/gum choose --no-limit --header "Labels (select multiple):" "dev" "prod" "custom")

     

       192
       192
       +
               

     

       193
       193
       +
               if [ -n "$labels" ]; then

     

       194
       194
       +
                 # Check if custom was selected

     

       195
       195
       +
                 if echo "$labels" | ${pkgs.gnugrep}/bin/grep -q "custom"; then

     

       196
       196
       +
                   custom_label=$(${pkgs.gum}/bin/gum input --placeholder "my-label" --prompt "Custom label: ")

     

       197
       197
       +
                   if [ -z "$custom_label" ]; then

     

       198
       198
       +
                     ${pkgs.gum}/bin/gum style --foreground 196 "No custom label provided"

     

       199
       199
       +
                     exit 1

     

       200
       200
       +
                   fi

     

       201
       201
       +
                   # Replace 'custom' with the actual custom label

     

       202
       202
       +
                   labels=$(echo "$labels" | ${pkgs.gnused}/bin/sed "s/custom/$custom_label/")

     

       203
       203
       +
                 fi

     

       204
       204
       +
                 # Join labels with comma

     

       205
       205
       +
                 label=$(echo "$labels" | ${pkgs.coreutils}/bin/tr '\n' ',' | ${pkgs.gnused}/bin/sed 's/,$//')

     

       206
       206
       +
               fi

     

       207
       207
       +
             fi

     

       186
       208
        
           fi

     

       187
       209
        
       

     

       188
       210
        
           # Check if local port is accessible

     
···

       219
       241
        
           config_file=$(${pkgs.coreutils}/bin/mktemp)

     

       220
       242
        
           trap "${pkgs.coreutils}/bin/rm -f $config_file" EXIT

     

       221
       243
        
       

     

       222
       222
       -
           # Encode label into proxy name if provided (format: subdomain[label])

     

       244
       244
       +
           # Encode label into proxy name if provided (format: subdomain[label1,label2])

     

       223
       245
        
           proxy_name="$subdomain"

     

       224
       246
        
           if [ -n "$label" ]; then

     

       225
       247
        
             proxy_name="''${subdomain}[''${label}]"

+6 -11

modules/home/apps/ssh.nix

···

       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

     

       85
       85
       +
           # zmx provides pre-built binaries that we download instead of building from source

     

       86
       86
       +
           # This avoids the zig2nix dependency which causes issues in CI

     

       90
       87
        
           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 [

     

       88
       88
       +
             (optionals cfg.zmx.enable [

     

       89
       89
       +
               pkgs.zmx-binary

     

       95
       90
        
               pkgs.autossh

     

       96
       91
        
             ]);

     

       97
       92
        
       

     
···

       113
       108
        
                     extraOptions = hostCfg.extraOptions // (

     

       114
       109
        
                       if hostCfg.zmx then

     

       115
       110
        
                         {

     

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

     

       111
       111
       +
                           RemoteCommand = "export PATH=$HOME/.nix-profile/bin:$PATH; zmx attach %n";

     

       117
       112
        
                           RequestTTY = "yes";

     

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

     

       119
       114
        
                           ControlMaster = "auto";

     
···

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

     

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

     

       140
       135
        
                         extraOptions = {

     

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

     

       136
       136
       +
                           RemoteCommand = "export PATH=$HOME/.nix-profile/bin:$PATH; zmx attach %k";

     

       142
       137
        
                           RequestTTY = "yes";

     

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

     

       144
       139
        
                           ControlMaster = "auto";

-85

modules/home/apps/vscode.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         pkgs,

     

       4
       4
       -
         config,

     

       5
       5
       -
         inputs,

     

       6
       6
       -
         ...

     

       7
       7
       -
       }:

     

       8
       8
       -
       {

     

       9
       9
       -
         options.atelier.apps.vscode.enable = lib.mkEnableOption "Enable VSCode config";

     

       10
       10
       -
         config = lib.mkIf config.atelier.apps.vscode.enable {

     

       11
       11
       -
           nixpkgs.overlays = [

     

       12
       12
       -
             inputs.nix-vscode-extensions.overlays.default

     

       13
       13
       -
             inputs.catppuccin-vsc.overlays.default

     

       14
       14
       -
           ];

     

       15
       15
       -
           programs.vscode = {

     

       16
       16
       -
             enable = true;

     

       17
       17
       -
             package = pkgs.unstable.vscode;

     

       18
       18
       -
             profiles.default = {

     

       19
       19
       -
               extensions = with pkgs.vscode-marketplace; [

     

       20
       20
       -
                 ms-vscode.live-server

     

       21
       21
       -
                 formulahendry.auto-rename-tag

     

       22
       22
       -
                 edwinkofler.vscode-assorted-languages

     

       23
       23
       -
                 golang.go

     

       24
       24
       -
                 eamodio.gitlens

     

       25
       25
       -
                 yzhang.markdown-all-in-one

     

       26
       26
       -
                 github.vscode-github-actions

     

       27
       27
       -
                 yoavbls.pretty-ts-errors

     

       28
       28
       -
                 esbenp.prettier-vscode

     

       29
       29
       -
                 ms-vscode.vscode-serial-monitor

     

       30
       30
       -
                 prisma.prisma

     

       31
       31
       -
                 ms-azuretools.vscode-docker

     

       32
       32
       -
                 astro-build.astro-vscode

     

       33
       33
       -
                 github.copilot

     

       34
       34
       -
                 github.copilot-chat

     

       35
       35
       -
                 dotjoshjohnson.xml

     

       36
       36
       -
                 mikestead.dotenv

     

       37
       37
       -
                 bradlc.vscode-tailwindcss

     

       38
       38
       -
                 mechatroner.rainbow-csv

     

       39
       39
       -
                 wakatime.vscode-wakatime

     

       40
       40
       -
                 paulober.pico-w-go

     

       41
       41
       -
                 ms-python.python

     

       42
       42
       -
                 karunamurti.tera

     

       43
       43
       -
                 biomejs.biome

     

       44
       44
       -
                 bschulte.love

     

       45
       45
       -
                 yinfei.luahelper

     

       46
       46
       -
                 tamasfe.even-better-toml

     

       47
       47
       -
                 fill-labs.dependi

     

       48
       48
       -
                 rust-lang.rust-analyzer

     

       49
       49
       -
                 dustypomerleau.rust-syntax

     

       50
       50
       -
                 catppuccin.catppuccin-vsc

     

       51
       51
       -
                 inputs.frc-nix.packages.${pkgs.stdenv.hostPlatform.system}.vscode-wpilib

     

       52
       52
       -
               ];

     

       53
       53
       -
               userSettings = {

     

       54
       54
       -
                 "editor.semanticHighlighting.enabled" = true;

     

       55
       55
       -
                 "terminal.integrated.minimumContrastRatio" = 1;

     

       56
       56
       -
                 "window.titleBarStyle" = "custom";

     

       57
       57
       -
                 "gopls" = {

     

       58
       58
       -
                   "ui.semanticTokens" = true;

     

       59
       59
       -
                 };

     

       60
       60
       -
                 "workbench.colorTheme" = "Catppuccin Macchiato";

     

       61
       61
       -
                 "workbench.iconTheme" = "catppuccin-macchiato";

     

       62
       62
       -
                 "catppuccin.accentColor" = lib.mkForce "blue";

     

       63
       63
       -
                 "editor.fontFamily" = "'FiraCode Nerd Font', 'monospace', monospace";

     

       64
       64
       -
                 "git.autofetch" = true;

     

       65
       65
       -
                 "git.confirmSync" = false;

     

       66
       66
       -
                 "github.copilot.editor.enableAutoCompletions" = false;

     

       67
       67
       -
                 "editor.formatOnSave" = true;

     

       68
       68
       -
                 "editor.defaultFormatter" = "biomejs.biome";

     

       69
       69
       -
                 "[go]" = {

     

       70
       70
       -
                   "editor.defaultFormatter" = "golang.go";

     

       71
       71
       -
                 };

     

       72
       72
       -
                 "[yaml]" = {

     

       73
       73
       -
                   "editor.defaultFormatter" = "esbenp.prettier-vscode";

     

       74
       74
       -
                 };

     

       75
       75
       -
                 "[lua]" = {

     

       76
       76
       -
                   "editor.defaultFormatter" = "yinfei.luahelper";

     

       77
       77
       -
                 };

     

       78
       78
       -
                 "[html]" = {

     

       79
       79
       -
                   "editor.defaultFormatter" = "esbenp.prettier-vscode";

     

       80
       80
       -
                 };

     

       81
       81
       -
               };

     

       82
       82
       -
             };

     

       83
       83
       -
           };

     

       84
       84
       -
         };

     

       85
       85
       -
       }

-26

modules/home/system/nixpkgs.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         pkgs,

     

       4
       4
       -
         config,

     

       5
       5
       -
         inputs,

     

       6
       6
       -
         ...

     

       7
       7
       -
       }:

     

       8
       8
       -
       {

     

       9
       9
       -
         options.nixpkgs.enable = lib.mkEnableOption "Enable custom nixpkgs overlays/config";

     

       10
       10
       -
         config = lib.mkIf config.nixpkgs.enable {

     

       11
       11
       -
           nixpkgs = {

     

       12
       12
       -
             overlays = [

     

       13
       13
       -
               (final: prev: {

     

       14
       14
       -
                 unstable = import inputs.nixpkgs-unstable {

     

       15
       15
       -
                   inherit (pkgs.stdenv.hostPlatform) system;

     

       16
       16
       -
                   config.allowUnfree = true;

     

       17
       17
       -
                 };

     

       18
       18
       -
               })

     

       19
       19
       -
             ];

     

       20
       20
       -
             config = {

     

       21
       21
       -
               allowUnfree = true;

     

       22
       22
       -
               allowUnfreePredicate = _: true;

     

       23
       23
       -
             };

     

       24
       24
       -
           };

     

       25
       25
       -
         };

     

       26
       26
       -
       }

+26

modules/home/system/nixpkgs.nix.disabled

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         pkgs,

     

       4
       4
       +
         config,

     

       5
       5
       +
         inputs,

     

       6
       6
       +
         ...

     

       7
       7
       +
       }:

     

       8
       8
       +
       {

     

       9
       9
       +
         options.nixpkgs.enable = lib.mkEnableOption "Enable custom nixpkgs overlays/config";

     

       10
       10
       +
         config = lib.mkIf config.nixpkgs.enable {

     

       11
       11
       +
           nixpkgs = {

     

       12
       12
       +
             overlays = [

     

       13
       13
       +
               (final: prev: {

     

       14
       14
       +
                 unstable = import inputs.nixpkgs-unstable {

     

       15
       15
       +
                   inherit (pkgs.stdenv.hostPlatform) system;

     

       16
       16
       +
                   config.allowUnfree = true;

     

       17
       17
       +
                 };

     

       18
       18
       +
               })

     

       19
       19
       +
             ];

     

       20
       20
       +
             config = {

     

       21
       21
       +
               allowUnfree = true;

     

       22
       22
       +
               allowUnfreePredicate = _: true;

     

       23
       23
       +
             };

     

       24
       24
       +
           };

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+32

modules/nixos/services/bore/README.md

···

       1
       1
       +
       # Bore

     

       2
       2
       +
       

     

       3
       3
       +
       ![screenshot](https://hc-cdn.hel1.your-objectstorage.com/s/v3/7652f29dacb8f76d_screenshot_2025-12-09_at_16.57.47.png)

     

       4
       4
       +
       

     

       5
       5
       +
       Bore is a lightweight wrapper around `frp` which provides a dashboard and a nice `gum` based cli. If you would like to run this in your own nix flake then simplify vendor this folder and `./modules/home/bore` and import the folders into the appropriate home manager and nixos configurations.

     

       6
       6
       +
       

     

       7
       7
       +
       ```nix

     

       8
       8
       +
       atelier = {

     

       9
       9
       +
           bore = {

     

       10
       10
       +
               enable = true;

     

       11
       11
       +
               authTokenFile = osConfig.age.secrets.bore.path

     

       12
       12
       +
           };

     

       13
       13
       +
       }

     

       14
       14
       +
       ```

     

       15
       15
       +
       

     

       16
       16
       +
       and be sure to have a definition for your agenix secret in the osConfig as well:

     

       17
       17
       +
       

     

       18
       18
       +
       ```nix

     

       19
       19
       +
       age = {

     

       20
       20
       +
           identityPaths = [

     

       21
       21
       +
               "path/to/ssh/key"

     

       22
       22
       +
           ];

     

       23
       23
       +
           secrets = {

     

       24
       24
       +
               bore = {

     

       25
       25
       +
                   file = ./path/to/bore.age;

     

       26
       26
       +
                   owner = "username";

     

       27
       27
       +
               };

     

       28
       28
       +
           };

     

       29
       29
       +
       }

     

       30
       30
       +
       ```

     

       31
       31
       +
       

     

       32
       32
       +
       The secret file is just a oneline file with the key in it. If you do end up deploying this feel free to email me and let me know! I would love to hear about your setup!

-5

modules/nixos/services/bore/bore.nix

···

       126
       126
        
                   Strict-Transport-Security "max-age=31536000; includeSubDomains; preload"

     

       127
       127
        
                 }

     

       128
       128
        
                 

     

       129
       129
       -
                 # Proxy /metrics to frps dashboard

     

       130
       130
       -
                 handle /metrics {

     

       131
       131
       -
                   reverse_proxy localhost:7400

     

       132
       132
       -
                 }

     

       133
       133
       -
                 

     

       134
       129
        
                 # Proxy /api/* to frps dashboard

     

       135
       130
        
                 handle /api/* {

     

       136
       131
        
                   reverse_proxy localhost:7400

+67 -12

modules/nixos/services/bore/dashboard.html

···

       185
       185
        
           .tunnel-label {

     

       186
       186
        
             display: inline-block;

     

       187
       187
        
             padding: 0.125rem 0.5rem;

     

       188
       188
       -
             background: rgba(251, 146, 60, 0.2);

     

       189
       189
       -
             color: #fb923c;

     

       190
       190
       -
             border: 1px solid #fb923c;

     

       191
       188
        
             font-size: 0.7rem;

     

       192
       189
        
             font-weight: 500;

     

       193
       190
        
             border-radius: 0;

     

       191
       191
       +
             margin-left: 0.25rem;

     

       192
       192
       +
             border: 1px solid;

     

       194
       193
        
           }

     

       195
       194
        
       

     

       196
       195
        
           .tunnel-url {

     
···

       348
       347
        
           const MAX_FAIL_COUNT = 3;

     

       349
       348
        
           let lastProxiesState = null;

     

       350
       349
        
       

     

       350
       350
       +
           // Predefined color palette for labels

     

       351
       351
       +
           const labelColors = [

     

       352
       352
       +
             { color: '#a78bfa', bg: 'rgba(167, 139, 250, 0.2)' },  // purple

     

       353
       353
       +
             { color: '#f472b6', bg: 'rgba(244, 114, 182, 0.2)' },  // pink

     

       354
       354
       +
             { color: '#facc15', bg: 'rgba(250, 204, 21, 0.2)' },   // yellow

     

       355
       355
       +
             { color: '#60a5fa', bg: 'rgba(96, 165, 250, 0.2)' },   // blue

     

       356
       356
       +
             { color: '#f87171', bg: 'rgba(248, 113, 113, 0.2)' },  // red

     

       357
       357
       +
             { color: '#38bdf8', bg: 'rgba(56, 189, 248, 0.2)' },   // sky

     

       358
       358
       +
             { color: '#c084fc', bg: 'rgba(192, 132, 252, 0.2)' },  // violet

     

       359
       359
       +
             { color: '#fb7185', bg: 'rgba(251, 113, 133, 0.2)' },  // rose

     

       360
       360
       +
           ];

     

       361
       361
       +
       

     

       362
       362
       +
           // Hash string to index

     

       363
       363
       +
           function stringToColorIndex(str) {

     

       364
       364
       +
             let hash = 0;

     

       365
       365
       +
             for (let i = 0; i < str.length; i++) {

     

       366
       366
       +
               hash = str.charCodeAt(i) + ((hash << 5) - hash);

     

       367
       367
       +
             }

     

       368
       368
       +
             return Math.abs(hash) % labelColors.length;

     

       369
       369
       +
           }

     

       370
       370
       +
       

     

       371
       371
       +
           // Get label color and styles

     

       372
       372
       +
           function getLabelStyle(label) {

     

       373
       373
       +
             const trimmedLabel = label.trim();

     

       374
       374
       +
             if (trimmedLabel === 'prod') {

     

       375
       375
       +
               return {

     

       376
       376
       +
                 color: '#22c55e',

     

       377
       377
       +
                 bgColor: 'rgba(34, 197, 94, 0.2)',

     

       378
       378
       +
                 borderColor: '#22c55e'

     

       379
       379
       +
               };

     

       380
       380
       +
             }

     

       381
       381
       +
             

     

       382
       382
       +
             if (trimmedLabel === 'dev') {

     

       383
       383
       +
               return {

     

       384
       384
       +
                 color: '#fb923c',

     

       385
       385
       +
                 bgColor: 'rgba(251, 146, 60, 0.2)',

     

       386
       386
       +
                 borderColor: '#fb923c'

     

       387
       387
       +
               };

     

       388
       388
       +
             }

     

       389
       389
       +
             

     

       390
       390
       +
             const colorIndex = stringToColorIndex(trimmedLabel);

     

       391
       391
       +
             const colorScheme = labelColors[colorIndex];

     

       392
       392
       +
             return {

     

       393
       393
       +
               color: colorScheme.color,

     

       394
       394
       +
               bgColor: colorScheme.bg,

     

       395
       395
       +
               borderColor: colorScheme.color

     

       396
       396
       +
             };

     

       397
       397
       +
           }

     

       398
       398
       +
       

     

       351
       399
        
           async function fetchStats() {

     

       352
       400
        
             try {

     

       353
       401
        
               // Fetch server info

     
···

       427
       475
        
                   const subdomain = proxy.conf?.subdomain || 'unknown';

     

       428
       476
        
                   const url = `https://${subdomain}.bore.dunkirk.sh`;

     

       429
       477
        
                   

     

       430
       430
       -
                   // Parse label from proxy name (format: subdomain[label])

     

       478
       478
       +
                   // Parse labels from proxy name (format: subdomain[label1,label2])

     

       431
       479
        
                   const labelMatch = proxy.name.match(/\[([^\]]+)\]$/);

     

       432
       432
       -
                   const label = labelMatch ? labelMatch[1] : null;

     

       433
       433
       -
                   const displayName = label ? proxy.name.replace(/\[[^\]]+\]$/, '') : proxy.name;

     

       480
       480
       +
                   const labels = labelMatch ? labelMatch[1].split(',') : [];

     

       481
       481
       +
                   const displayName = labels.length > 0 ? proxy.name.replace(/\[[^\]]+\]$/, '') : proxy.name;

     

       482
       482
       +
       

     

       483
       483
       +
                   const labelHtml = labels.map(label => {

     

       484
       484
       +
                     const trimmedLabel = label.trim();

     

       485
       485
       +
                     const style = getLabelStyle(trimmedLabel);

     

       486
       486
       +
                     return `<span class="tunnel-label" style="color: ${style.color}; background: ${style.bgColor}; border-color: ${style.borderColor};">${trimmedLabel}</span>`;

     

       487
       487
       +
                   }).join('');

     

       434
       488
        
       

     

       435
       489
        
                   return `

     

       436
       490
        
                     <div class="tunnel" data-tunnel="${proxy.name}">

     

       437
       491
        
                       <div class="tunnel-info">

     

       438
       492
        
                         <div class="tunnel-name">

     

       439
       493
        
                           ${displayName || 'unnamed'}

     

       440
       440
       -
                           ${label ? `<span class="tunnel-label">${label}</span>` : ''}

     

       494
       494
       +
                           ${labelHtml}

     

       441
       495
        
                         </div>

     

       442
       496
        
                         <div class="tunnel-url">

     

       443
       497
        
                           <a href="${url}" target="_blank">${url}</a>

     
···

       457
       511
        
                 html += '<div class="offline-tunnels">';

     

       458
       512
        
                 html += '<div style="color: #8b949e; font-size: 0.85rem; margin-bottom: 0.75rem;">recently disconnected</div>';

     

       459
       513
        
                 html += offlineTunnels.map(proxy => {

     

       460
       460
       -
                   // Parse label from proxy name (format: subdomain[label])

     

       514
       514
       +
                   // Parse labels from proxy name (format: subdomain[label1,label2])

     

       461
       515
        
                   const labelMatch = proxy.name.match(/\[([^\]]+)\]$/);

     

       462
       462
       -
                   const label = labelMatch ? labelMatch[1] : null;

     

       463
       463
       -
                   const displayName = label ? proxy.name.replace(/\[[^\]]+\]$/, '') : proxy.name;

     

       516
       516
       +
                   const labels = labelMatch ? labelMatch[1].split(',').map(l => l.trim()) : [];

     

       517
       517
       +
                   const displayName = labels.length > 0 ? proxy.name.replace(/\[[^\]]+\]$/, '') : proxy.name;

     

       518
       518
       +
                   const labelStr = labels.length > 0 ? ` [${labels.join(', ')}]` : '';

     

       464
       519
        
                   

     

       465
       520
        
                   if (!proxy.conf) {

     

       466
       521
        
                     return `

     

       467
       522
        
                       <div class="offline-tunnel" data-tunnel="${proxy.name}">

     

       468
       468
       -
                         <span class="offline-tunnel-name">${displayName || 'unnamed'}${label ? ` [${label}]` : ''}</span>

     

       523
       523
       +
                         <span class="offline-tunnel-name">${displayName || 'unnamed'}${labelStr}</span>

     

       469
       524
        
                         <span class="offline-tunnel-stats">in: <span data-traffic-in="${proxy.name}">0 B</span> • out: <span data-traffic-out="${proxy.name}">0 B</span></span>

     

       470
       525
        
                       </div>

     

       471
       526
        
                     `;

     
···

       475
       530
        
                   const url = `https://${subdomain}.bore.dunkirk.sh`;

     

       476
       531
        
                   return `

     

       477
       532
        
                     <div class="offline-tunnel" data-tunnel="${proxy.name}">

     

       478
       478
       -
                       <span class="offline-tunnel-name">${displayName || 'unnamed'}${label ? ` [${label}]` : ''} → ${url}</span>

     

       533
       533
       +
                       <span class="offline-tunnel-name">${displayName || 'unnamed'}${labelStr} → ${url}</span>

     

       479
       534
        
                       <span class="offline-tunnel-stats">in: <span data-traffic-in="${proxy.name}">0 B</span> • out: <span data-traffic-out="${proxy.name}">0 B</span></span>

     

       480
       535
        
                     </div>

     

       481
       536
        
                   `;

+48

packages/zmx.nix

···

       1
       1
       +
       { pkgs, lib, stdenv, fetchurl, autoPatchelfHook }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "zmx";

     

       5
       5
       +
         version = "0.1.0";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchurl {

     

       8
       8
       +
           url = if stdenv.isLinux then

     

       9
       9
       +
             (if stdenv.isAarch64 then

     

       10
       10
       +
               "https://zmx.sh/a/zmx-${version}-linux-aarch64.tar.gz"

     

       11
       11
       +
             else

     

       12
       12
       +
               "https://zmx.sh/a/zmx-${version}-linux-x86_64.tar.gz")

     

       13
       13
       +
           else if stdenv.isDarwin then

     

       14
       14
       +
             (if stdenv.isAarch64 then

     

       15
       15
       +
               "https://zmx.sh/a/zmx-${version}-macos-aarch64.tar.gz"

     

       16
       16
       +
             else

     

       17
       17
       +
               "https://zmx.sh/a/zmx-${version}-macos-x86_64.tar.gz")

     

       18
       18
       +
           else throw "Unsupported platform";

     

       19
       19
       +
           

     

       20
       20
       +
           hash = if stdenv.isLinux && stdenv.isAarch64 then

     

       21
       21
       +
             "sha256-sv83lR4DLJE+gsMtqCk6VCFdo5n4lhI0P1loxAf0iOg="

     

       22
       22
       +
           else if stdenv.isLinux then

     

       23
       23
       +
             "sha256-c+wCUcm7DEO55wXuHq0aP0Kn908jj1FM5Z+JQJnKE0M="

     

       24
       24
       +
           else if stdenv.isDarwin && stdenv.isAarch64 then

     

       25
       25
       +
             "sha256-dM6MFikdbpN+n8BK6fLbzyJfi88xetCWL9H5VfGB07o="

     

       26
       26
       +
           else

     

       27
       27
       +
             "sha256-B52NC8NEjVPDNSG11qPb0uRNExB66bllnK7ivXMJbHk=";

     

       28
       28
       +
         };

     

       29
       29
       +
       

     

       30
       30
       +
         nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];

     

       31
       31
       +
       

     

       32
       32
       +
         sourceRoot = ".";

     

       33
       33
       +
       

     

       34
       34
       +
         installPhase = ''

     

       35
       35
       +
           runHook preInstall

     

       36
       36
       +
           mkdir -p $out/bin

     

       37
       37
       +
           cp zmx $out/bin/

     

       38
       38
       +
           chmod +x $out/bin/zmx

     

       39
       39
       +
           runHook postInstall

     

       40
       40
       +
         '';

     

       41
       41
       +
       

     

       42
       42
       +
         meta = with lib; {

     

       43
       43
       +
           description = "Session persistence for terminal processes";

     

       44
       44
       +
           homepage = "https://zmx.sh";

     

       45
       45
       +
           license = licenses.mit;

     

       46
       46
       +
           platforms = platforms.unix;

     

       47
       47
       +
         };

     

       48
       48
       +
       }

Compare changes