diff --git a/hosts/aspi/default.nix b/hosts/aspi/default.nix index 127f172..d05c03c 100644 --- a/hosts/aspi/default.nix +++ b/hosts/aspi/default.nix @@ -5,6 +5,7 @@ ../common/global ../common/users/julian ../common/users/yukari + ../common/users/pob ../common/optional/binarycaches.nix ../common/optional/remote-builder.nix diff --git a/hosts/common/users/pob/default.nix b/hosts/common/users/pob/default.nix index 13e7219..beb5b6f 100644 --- a/hosts/common/users/pob/default.nix +++ b/hosts/common/users/pob/default.nix @@ -2,11 +2,9 @@ pkgs, config, ... -}: -let +}: let ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups; -in -{ +in { users.mutableUsers = false; users.users.pob = { description = "A helper user to use another profile for some applications"; @@ -18,8 +16,13 @@ in ]; packages = with pkgs; [ firefox - wine + wineWowPackages.stable # 32-bit and 64-bit wine + winetricks ]; }; - users.groups.pob = { }; + users.groups.pob = {}; + + security.sudo.extraConfig = '' + julian ALL=(pob) NOPASSWD: ALL + ''; } diff --git a/pkgs/default.nix b/pkgs/default.nix index 82710e1..8050149 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -13,4 +13,5 @@ pob2 = pkgs.callPackage ./pob2 {}; wl-ocr = pkgs.callPackage ./wl-ocr {}; rtklib = pkgs.qt6Packages.callPackage ./rtklib {}; + pob2-frajul = pkgs.callPackage ./pob2-frajul {}; } diff --git a/pkgs/pob2-frajul/default.nix b/pkgs/pob2-frajul/default.nix index 38027fa..90963f9 100644 --- a/pkgs/pob2-frajul/default.nix +++ b/pkgs/pob2-frajul/default.nix @@ -1,6 +1,6 @@ { writeShellApplication, - xhost + xhost, }: writeShellApplication { name = "pob2-frajul"; @@ -10,7 +10,7 @@ writeShellApplication { ]; text = '' - xhost + - sudo su pob -c "sh /home/pob/pob2.sh" + xhost + + sudo -u pob -i sh /home/pob/pob2.sh ''; }