diff --git a/SwarselSystems.org b/SwarselSystems.org index c278452..4355beb 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -5012,7 +5012,7 @@ This ensures that all user-configuration happens here in the config file. isNormalUser = true; description = "Leon S"; hashedPasswordFile = lib.mkIf (!config.swarselsystems.initialSetup) config.sops.secrets.swarseluser.path; - extraGroups = [ "networkmanager" "wheel" "lp" "audio" "video" "vboxusers" "scanner" ]; + extraGroups = [ "networkmanager" "root" "docker""wheel" "lp" "audio" "video" "vboxusers" "scanner" ]; packages = with pkgs; [ ]; }; }; @@ -6424,8 +6424,10 @@ Integrates 1password mostly. There are more options at [[#h:f0b2ea93-94c8-48d8-8 enable = true; polkitPolicyOwners = [ "swarsel" ]; }; - + virtualisation.docker.enable = true; environment.systemPackages = with pkgs; [ + python39 + docker ]; @@ -8546,89 +8548,90 @@ The rest of the settings is at [[#h:fb3f3e01-7df4-4b06-9e91-aa9cac61a431][gaming The rest of the settings is at [[#h:bbf2ecb6-c8ff-4462-b5d5-d45b28604ddf][work]]. Here, I am setting up the different firefox profiles that I need for the SSO sites that I need to access at work as well as a few ssh shorthands. #+begin_src nix :tangle profiles/optional/home/work.nix :noweb yes -{ pkgs, ... }: + { pkgs, ... }: -{ - home.packages = with pkgs; [ - teams-for-linux - google-chrome - shellcheck - dig - ]; + { + home.packages = with pkgs; [ + teams-for-linux + google-chrome + shellcheck + dig + docker + ]; - programs.ssh = { - matchBlocks = { - "uc" = { - hostname = "uc.clip.vbc.ac.at"; - user = "stack"; - }; - "uc-stg" = { - hostname = "uc.staging.clip.vbc.ac.at"; - user = "stack"; - }; - "cbe" = { - hostname = "cbe.vbc.ac.at"; - user = "dc_adm_schwarzaeugl"; - }; - "cbe-stg" = { - hostname = "cbe.staging.vbc.ac.at"; - user = "dc_adm_schwarzaeugl"; - }; - "*.vbc.ac.at" = { - user = "dc_adm_schwarzaeugl"; - }; - }; - }; - - programs.firefox = { - profiles = { - dc_adm = { - id = 1; - <> - }; - cl_adm = { - id = 2; - <> - }; - ws_adm = { - id = 3; - <> - }; - }; - }; - - xdg.desktopEntries = - let - terminal = false; - categories = [ "Application" ]; - icon = "firefox"; - in - { - firefox_dc = { - name = "Firefox (dc_adm)"; - genericName = "Firefox dc"; - exec = "firefox -p dc_adm"; - inherit terminal categories icon; - }; - - firefox_ws = { - name = "Firefox (ws_adm)"; - genericName = "Firefox ws"; - exec = "firefox -p ws_adm"; - inherit terminal categories icon; - }; - - firefox_cl = { - name = "Firefox (cl_adm)"; - genericName = "Firefox cl"; - exec = "firefox -p cl_adm"; - inherit terminal categories icon; + programs.ssh = { + matchBlocks = { + "uc" = { + hostname = "uc.clip.vbc.ac.at"; + user = "stack"; + }; + "uc-stg" = { + hostname = "uc.staging.clip.vbc.ac.at"; + user = "stack"; + }; + "cbe" = { + hostname = "cbe.vbc.ac.at"; + user = "dc_adm_schwarzaeugl"; + }; + "cbe-stg" = { + hostname = "cbe.staging.vbc.ac.at"; + user = "dc_adm_schwarzaeugl"; + }; + "*.vbc.ac.at" = { + user = "dc_adm_schwarzaeugl"; + }; }; }; - programs.git.userEmail = "leon.schwarzaeugl@imba.oeaw.ac.at"; + programs.firefox = { + profiles = { + dc_adm = { + id = 1; + <> + }; + cl_adm = { + id = 2; + <> + }; + ws_adm = { + id = 3; + <> + }; + }; + }; -} + xdg.desktopEntries = + let + terminal = false; + categories = [ "Application" ]; + icon = "firefox"; + in + { + firefox_dc = { + name = "Firefox (dc_adm)"; + genericName = "Firefox dc"; + exec = "firefox -p dc_adm"; + inherit terminal categories icon; + }; + + firefox_ws = { + name = "Firefox (ws_adm)"; + genericName = "Firefox ws"; + exec = "firefox -p ws_adm"; + inherit terminal categories icon; + }; + + firefox_cl = { + name = "Firefox (cl_adm)"; + genericName = "Firefox cl"; + exec = "firefox -p cl_adm"; + inherit terminal categories icon; + }; + }; + + programs.git.userEmail = "leon.schwarzaeugl@imba.oeaw.ac.at"; + + } #+end_src diff --git a/profiles/common/nixos/users.nix b/profiles/common/nixos/users.nix index fb9c3de..a68c3e3 100644 --- a/profiles/common/nixos/users.nix +++ b/profiles/common/nixos/users.nix @@ -6,7 +6,7 @@ isNormalUser = true; description = "Leon S"; hashedPasswordFile = lib.mkIf (!config.swarselsystems.initialSetup) config.sops.secrets.swarseluser.path; - extraGroups = [ "networkmanager" "wheel" "lp" "audio" "video" "vboxusers" "scanner" ]; + extraGroups = [ "networkmanager" "root" "docker" "wheel" "lp" "audio" "video" "vboxusers" "scanner" ]; packages = with pkgs; [ ]; }; }; diff --git a/profiles/optional/home/work.nix b/profiles/optional/home/work.nix index 10ac616..a5588a5 100644 --- a/profiles/optional/home/work.nix +++ b/profiles/optional/home/work.nix @@ -6,6 +6,7 @@ google-chrome shellcheck dig + docker ]; programs.ssh = { diff --git a/profiles/optional/nixos/work.nix b/profiles/optional/nixos/work.nix index 01536b0..4cfb308 100644 --- a/profiles/optional/nixos/work.nix +++ b/profiles/optional/nixos/work.nix @@ -6,8 +6,10 @@ enable = true; polkitPolicyOwners = [ "swarsel" ]; }; - + virtualisation.docker.enable = true; environment.systemPackages = with pkgs; [ + python39 + docker ];