commit c6dae1f745f9b02f65e7ccda0b9341695e649ac8 · pyrox.dev/nix

+2 -13

modules/nixos/default-config/users.nix

···

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

     

       1
       1
       +
       { lib, ... }:

     

       2
       2
        
       {

     

       3
       3
        
         users.users = {

     

       4
       4
       -
           pyrox = {

     

       4
       4
       +
           pyrox = lib.mkDefault {

     

       5
       5
        
             isNormalUser = true;

     

       6
       6
        
             description = lib.mkDefault "Pyrox";

     

       7
       7
        
             extraGroups = [

     
···

       11
       11
        
               "wireshark"

     

       12
       12
        
             ];

     

       13
       13
        
           };

     

       14
       14
       -
         };

     

       15
       15
       -
         # Set default editor

     

       16
       16
       -
         programs.neovim = {

     

       17
       17
       -
           enable = true;

     

       18
       18
       -
           defaultEditor = true;

     

       19
       19
       -
           viAlias = true;

     

       20
       20
       -
           vimAlias = true;

     

       21
       21
       -
           withNodeJs = true;

     

       22
       22
       -
           withPython3 = true;

     

       23
       23
       -
           withRuby = false;

     

       24
       24
       -
           package = pkgs.py.nvim;

     

       25
       14
        
         };

     

       26
       15
        
       }

+26

modules/nixos/default-users/default.nix

···

       11
       11
        
         options.py.users.default.enable = lib.mkEnableOption "Default PyroNet Users";

     

       12
       12
        
       

     

       13
       13
        
         config = lib.mkIf cfg.enable {

     

       14
       14
       +
           users.users.pyrox = {

     

       15
       15
       +
             description = "Pyrox";

     

       16
       16
       +
             isNormalUser = true;

     

       17
       17
       +
             extraGroups = [

     

       18
       18
       +
               "adbusers"

     

       19
       19
       +
               "wheel"

     

       20
       20
       +
               "networkmanager"

     

       21
       21
       +
               "video"

     

       22
       22
       +
               "docker"

     

       23
       23
       +
               "wireshark"

     

       24
       24
       +
               "input"

     

       25
       25
       +
             ];

     

       26
       26
       +
             hashedPassword = "$6$6EtuZhVOJdfI9DYP$1Qnd7R8qdN.E5yE2kDQCNg2zgJ5cIjNBKsIW/qJgb8wcKlUpIoVg/fEKvBkAgCiLyojVG2kzfu4J9LR8rA8a2/";

     

       27
       27
       +
             shell = pkgs.fish;

     

       28
       28
       +
             openssh = {

     

       29
       29
       +
               authorizedKeys = {

     

       30
       30
       +
                 keyFiles = [

     

       31
       31
       +
                   ./yubikey-new.pub

     

       32
       32
       +
                   ./yubikey-main.pub

     

       33
       33
       +
                   ./yubikey-back.pub

     

       34
       34
       +
                   ./backup.pub

     

       35
       35
       +
                 ];

     

       36
       36
       +
                 keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP532AB5mkNvE29MkDDY8HEf8ZdktGWiI0PzLrvbmLQe" ];

     

       37
       37
       +
               };

     

       38
       38
       +
             };

     

       39
       39
       +
           };

     

       14
       40
        
           users.users.thehedgehog = {

     

       15
       41
        
             description = "The Hedgehog";

     

       16
       42
        
             isNormalUser = true;

+1 -1

modules/nixos/programs/neovim/default.nix

···

       8
       8
        
         cfg = config.py.programs.neovim;

     

       9
       9
        
       in

     

       10
       10
        
       {

     

       11
       11
       -
         options.py.programs.neovim = lib.mkEnableOption "Neovim configuration";

     

       11
       11
       +
         options.py.programs.neovim.enable = lib.mkEnableOption "Neovim configuration";

     

       12
       12
        
       

     

       13
       13
        
         config.programs.neovim = lib.mkIf cfg.enable {

     

       14
       14
        
           enable = true;

+6 -1

modules/nixos/services/buildbot/default.nix

···

       5
       5
        
       {

     

       6
       6
        
         options.py.services.buildbot.worker = {

     

       7
       7
        
           enable = lib.mkEnableOption "buildbot worker";

     

       8
       8
       +
           passwordFile = lib.mkOption {

     

       9
       9
       +
             type = lib.types.path;

     

       10
       10
       +
             description = "Password file for the worker";

     

       11
       11
       +
             default = null;

     

       12
       12
       +
           };

     

       8
       13
        
         };

     

       9
       14
        
         config.services.buildbot-nix.worker = lib.mkIf cfg.enable {

     

       10
       15
        
           enable = true;

     

       11
       16
        
           name = config.networking.hostName;

     

       12
       17
        
           masterUrl = "tcp:host=marvin:port=6915";

     

       13
       13
       -
           workerPasswordFile = config.age.secrets.buildbot-worker-password.path;

     

       18
       18
       +
           workerPasswordFile = cfg.passwordFile;

     

       14
       19
        
         };

     

       15
       20
        
       }