diff options
| -rwxr-xr-x | bin/nixos-deploy | 7 | ||||
| -rwxr-xr-x | deploy | 6 | ||||
| -rw-r--r-- | modules/lass/browsers.nix | 1 | ||||
| -rw-r--r-- | modules/lass/chromium-patched.nix | 48 | ||||
| -rw-r--r-- | modules/lass/games.nix | 2 |
5 files changed, 54 insertions, 10 deletions
diff --git a/bin/nixos-deploy b/bin/nixos-deploy index 6b8418696..d33e9a1d9 100755 --- a/bin/nixos-deploy +++ b/bin/nixos-deploy @@ -1,13 +1,12 @@ #! /bin/sh # -# deploy +# usage: nixos-deploy HOST [TARGET] [SYSTEM] # set -euf host=$1 -system=${2-$(nixos-build "$host")} - -target=root@$host +target=${2-root@$host} +system=${3-$(nixos-build "$host")} nix-copy-closure --gzip --to "$target" "$system" @@ -1,11 +1,9 @@ #! /bin/sh # -# usage: ./deploy HOST +# usage: ./deploy HOST [TARGET] # set -euf -host=$1 - export PATH="$PWD/bin:$PATH" #export nixpkgs=/var/nixpkgs export nixpkgs_root=$PWD/tmp/nixpkgs @@ -13,4 +11,4 @@ export config_root=$PWD export retiolum_hosts=$PWD/hosts export secrets_root=$PWD/secrets -exec nixos-deploy "$host" +exec nixos-deploy "$@" diff --git a/modules/lass/browsers.nix b/modules/lass/browsers.nix index 6301f2897..8aecea925 100644 --- a/modules/lass/browsers.nix +++ b/modules/lass/browsers.nix @@ -13,7 +13,6 @@ in { environment.systemPackages = with pkgs; [ firefox - chromium ]; users.extraUsers = { diff --git a/modules/lass/chromium-patched.nix b/modules/lass/chromium-patched.nix new file mode 100644 index 000000000..715181778 --- /dev/null +++ b/modules/lass/chromium-patched.nix @@ -0,0 +1,48 @@ +{ config, pkgs, ... }: + +#settings to test: +# + #"ForceEphemeralProfiles": true, +let + masterPolicy = pkgs.writeText "master.json" '' + { + "PasswordManagerEnabled": false, + "DefaultGeolocationSetting": 2, + "RestoreOnStartup": 1, + "AutoFillEnabled": false, + "BackgroundModeEnabled": false, + "DefaultBrowserSettingEnabled": false, + "SafeBrowsingEnabled": false, + "ExtensionInstallForcelist": [ + "cjpalhdlnbpafiamejdnhcphjbkeiagm;https://clients2.google.com/service/update2/crx", + "ihlenndgcmojhcghmfjfneahoeklbjjh;https://clients2.google.com/service/update2/crx" + ] + } + ''; + + master_preferences = pkgs.writeText "master_preferences" '' + { + "browser": { + "custom_chrome_frame": true + }, + + "extensions": { + "theme": { + "id": "", + "use_system": true + } + } + } + ''; +in { + environment.etc."chromium/policies/managed/master.json".source = pkgs.lib.mkForce masterPolicy; + + environment.systemPackages = [ + #pkgs.chromium + (pkgs.lib.overrideDerivation pkgs.chromium (attrs: { + buildCommand = attrs.buildCommand + '' + touch $out/TEST123 + ''; + })) + ]; +} diff --git a/modules/lass/games.nix b/modules/lass/games.nix index 55e859983..6043a8759 100644 --- a/modules/lass/games.nix +++ b/modules/lass/games.nix @@ -13,7 +13,7 @@ in { name = "games"; description = "user playing games"; home = "/home/games"; - extraGroups = [ "audio" "video" ]; + extraGroups = [ "audio" "video" "input" ]; createHome = true; useDefaultShell = true; }; |