From 711c24be5206ea0c638882d976c26de8405bad54 Mon Sep 17 00:00:00 2001 From: Julian Sutter Date: Fri, 3 Feb 2023 19:49:05 -0800 Subject: [PATCH 1/2] add android --- systems/framework.nix | 2 ++ users/jsutter.nix | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/systems/framework.nix b/systems/framework.nix index 0613151..b117a05 100644 --- a/systems/framework.nix +++ b/systems/framework.nix @@ -81,6 +81,8 @@ settings = { CPU_BOOST_ON_BAT = 0; CPU_SCALING_GOVERNOR_ON_BATTERY = "powersave"; + CPU_SCALING_GOVERNOR_ON_AC= "performance"; + CPU_ENERGY_PERF_POLICY_ON_AC= "balance_performance"; START_CHARGE_THRESH_BAT0 = 90; STOP_CHARGE_THRESH_BAT0 = 97; RUNTIME_PM_ON_BAT = "auto"; diff --git a/users/jsutter.nix b/users/jsutter.nix index b20e171..4afbcfb 100644 --- a/users/jsutter.nix +++ b/users/jsutter.nix @@ -74,6 +74,11 @@ in credential.helper = "cache"; }; }; + + # Android Dev + programs.adb.enable = true; + users.users..extraGroups = ["adbusers"]; + # Firefox programs.firefox = { enable = true; @@ -134,4 +139,4 @@ in }; }; }; -} \ No newline at end of file +} From 1d97e3a73f09e14e0e9442fe08258d3f2f2a8e67 Mon Sep 17 00:00:00 2001 From: Julian Sutter Date: Fri, 3 Feb 2023 23:14:13 -0800 Subject: [PATCH 2/2] virtualization --- flake.lock | 12 ++++++------ systems/common.nix | 4 ++-- users/jsutter.nix | 11 +++++------ 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 46c062f..fd08cac 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1674928308, - "narHash": "sha256-elVU4NUZEl11BdT4gC+lrpLYM8Ccxqxs19Ix84HTI9o=", + "lastModified": 1675462931, + "narHash": "sha256-JiOUSERBtA1lN/s9YTKGZoZ3XUicHDwr+C8swaPSh3M=", "owner": "nix-community", "repo": "home-manager", - "rev": "08a778d80308353f4f65c9dcd3790b5da02d6306", + "rev": "e2c1756e3ae001ca8696912016dd31cb1503ccf3", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1674641431, - "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", + "lastModified": 1675362331, + "narHash": "sha256-VmcnKPj5gJLxWK7Bxlhg2LoQvhKRss7Ax+uoFjd3qKY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc", + "rev": "a100acd7bbf105915b0004427802286c37738fef", "type": "github" }, "original": { diff --git a/systems/common.nix b/systems/common.nix index 3a266f5..bba29c2 100644 --- a/systems/common.nix +++ b/systems/common.nix @@ -127,8 +127,8 @@ }; }; virtualbox.host = { - enable = false; - enableExtensionPack = false; + enable = true; + enableExtensionPack = true; }; }; users.extraGroups.vboxusers.members = [ "jsutter" ]; diff --git a/users/jsutter.nix b/users/jsutter.nix index 4afbcfb..1faf4ee 100644 --- a/users/jsutter.nix +++ b/users/jsutter.nix @@ -3,7 +3,7 @@ let home-manager = builtins.fetchTarball { url = "https://github.com/nix-community/home-manager/archive/master.tar.gz"; - sha256 = "05msmzfa45l9sr9ngd2cfxw66kw0x76d68gp29v5ilrakf8nc90w"; +# sha256 = "05msmzfa45l9sr9ngd2cfxw66kw0x76d68gp29v5ilrakf8nc90w"; }; in @@ -22,7 +22,7 @@ in users.users.jsutter = { isNormalUser = true; description = "Julian Sutter"; - extraGroups = [ "networkmanager" "wheel" "docker" ]; + extraGroups = [ "networkmanager" "wheel" "docker" "adbusers"]; hashedPassword = "$6$tvkhGd24G6pVOsWr$j8ZAqSnXPTGwMGmIulU5Puzqd4iKdu8eAMSFis/cPqTW6u2xGQMqPHH1W9IZwKSL6.nS7Jc/NR2VwpPosyXDH/"; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBNVUh+RrcOSMRV6qysnsdPs5AyK8dSm4QhhnwgpikyI jsutter@symbiotrip.com" ]; packages = with pkgs; [ @@ -51,6 +51,9 @@ in dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server }; + # Android Dev + programs.adb.enable = true; + # Zerotier services.zerotierone.joinNetworks = [ "b15644912e748585" ]; services.zerotierone.enable= true; @@ -75,10 +78,6 @@ in }; }; - # Android Dev - programs.adb.enable = true; - users.users..extraGroups = ["adbusers"]; - # Firefox programs.firefox = { enable = true;