commit 0025e56e32fbd213f2b2d2d16e32b0aaf2c71ad4 · ptr.pet/ark

+5 -1

users/dusk@devel.mobi/default.nix

···

       37
       37
        
             inputs.agenix.homeManagerModules.default

     

       38
       38
        
             ../../modules/persist/null.nix

     

       39
       39
        
             (tlib.prefixStrings "${inputs.self}/users/modules/" modulesToEnable)

     

       40
       40
       +
             ./nsid-tracker.nix

     

       40
       41
        
           ];

     

       42
       42
       +
       

     

       43
       43
       +
         systemd.user.settings.Manager.DefaultEnvironment = {

     

       44
       44
       +
           PATH = "${pkgs.coreutils-full}/bin:$PATH";

     

       45
       45
       +
         };

     

       41
       46
        
       

     

       42
       47
        
         age.identityPaths = ["${config.home.homeDirectory}/.ssh/id_ed25519"];

     

       43
       48
        
         home = {

     
···

       49
       54
        
           shellAliases = {

     

       50
       55
        
             ctl = "systemctl --user";

     

       51
       56
        
             jtl = "journalctl --user";

     

       52
       52
       -
             jtlu = "journalctl --user --unit";

     

       53
       57
        
           };

     

       54
       58
        
         };

     

       55
       59

+27

users/dusk@devel.mobi/nsid-tracker.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         pkgs,

     

       3
       3
       +
         inputs,

     

       4
       4
       +
         ...

     

       5
       5
       +
       }:

     

       6
       6
       +
       let

     

       7
       7
       +
         server = inputs.nsid-tracker.packages.${pkgs.system}.server;

     

       8
       8
       +
         port = 6432;

     

       9
       9
       +
       in

     

       10
       10
       +
       {

     

       11
       11
       +
         systemd.user.services.nsid-tracker = {

     

       12
       12
       +
           Unit = {

     

       13
       13
       +
             Description = "nsid-tracker";

     

       14
       14
       +
             After = [ "network.target" ];

     

       15
       15
       +
           };

     

       16
       16
       +
       

     

       17
       17
       +
           Service = {

     

       18
       18
       +
             ExecStartPre="${pkgs.coreutils-full}/bin/mkdir -p %D/nsid-tracker";

     

       19
       19
       +
             ExecStart = "${pkgs.dash}/bin/dash -c 'cd %D/nsid-tracker && ${server}/bin/server'";

     

       20
       20
       +
             Restart = "on-failure";

     

       21
       21
       +
             RestartSec = 5;

     

       22
       22
       +
             Environment = ["PORT=${toString port};"];

     

       23
       23
       +
           };

     

       24
       24
       +
       

     

       25
       25
       +
           Install.WantedBy = [ "multi-user.target" ];

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+2 -3

users/modules/netbird/default.nix

···

       50
       50
        
               Restart = "on-failure";

     

       51
       51
        
               RestartSec = "5s";

     

       52
       52
        
               Environment = l.mapAttrsToList (k: v: "${k}=${toString v}") {

     

       53
       53
       -
                 PATH = "${pkgs.coreutils}/bin:$PATH";

     

       54
       54
       -
                 NB_WG_KERNEL_DISABLE = "true";

     

       53
       53
       +
                 NB_WG_KERNEL_DISABLED = "true";

     

       55
       54
        
                 NB_USE_NETSTACK_MODE = "true";

     

       55
       55
       +
                 NB_FORCE_USERSPACE_ROUTER = "true";

     

       56
       56
        
                 NB_ENABLE_NETSTACK_LOCAL_FORWARDING = "true";

     

       57
       57
        
                 NB_NETSTACK_SKIP_PROXY = "false";

     

       58
       58
        
                 NB_SOCKS5_LISTENER_PORT = 1080;

     

       59
       59
       -
                 NB_DISABLE_DNS = "false";

     

       60
       59
        
                 NB_SETUP_KEY_FILE = l.replaceString "\${XDG_RUNTIME_DIR}" "%t" cfg.setupKeyFile;

     

       61
       60
        
                 NB_MANAGEMENT_URL = cfg.managementUrl;

     

       62
       61
        
                 NB_CONFIG = "${config.xdg.configHome}/netbird/config.json";

+4 -4

users/modules/nushell/default.nix

···

       57
       57
        
                 algorithm: "fuzzy"    # prefix or fuzzy

     

       58
       58
        
                 external: {

     

       59
       59
        
                   # set to false to prevent nushell looking into $env.PATH to find more suggestions

     

       60
       60
       -
                   enable: true 

     

       60
       60
       +
                   enable: true

     

       61
       61
        
                   # set to lower can improve completion performance at the cost of omitting some options

     

       62
       62
       -
                   max_results: 100 

     

       62
       62
       +
                   max_results: 100

     

       63
       63
        
                   completer: $multiple_completers

     

       64
       64
        
                 }

     

       65
       65
        
               }

     

       66
       66
       -
             } 

     

       67
       67
       -
             $env.PATH = ($env.PATH | 

     

       66
       66
       +
             }

     

       67
       67
       +
             $env.PATH = ($env.PATH |

     

       68
       68
        
               split row (char esep) |

     

       69
       69
        
               append /usr/bin/env

     

       70
       70
        
             )