jsutter/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Julian Sutter 2023-02-06 10:11:24 -08:00
commit 5838196fd8
4 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
flake.lock generated
View file

@ -8,11 +8,19 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
<<<<<<< HEAD
"lastModified": 1675637696, "lastModified": 1675637696,
"narHash": "sha256-tilJS8zCS3PaDfVOfsBZ4zspuam8tc7IMZxtGa/K/uo=", "narHash": "sha256-tilJS8zCS3PaDfVOfsBZ4zspuam8tc7IMZxtGa/K/uo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c43d4a3d6d9ef8ddbe2438362f5c775b4186000b", "rev": "c43d4a3d6d9ef8ddbe2438362f5c775b4186000b",
=======
"lastModified": 1675462931,
"narHash": "sha256-JiOUSERBtA1lN/s9YTKGZoZ3XUicHDwr+C8swaPSh3M=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e2c1756e3ae001ca8696912016dd31cb1503ccf3",
>>>>>>> 1d97e3a73f09e14e0e9442fe08258d3f2f2a8e67
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -23,11 +31,19 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
<<<<<<< HEAD
"lastModified": 1675545634, "lastModified": 1675545634,
"narHash": "sha256-TbQeQcM5TA/wIho6xtzG+inUfiGzUXi8ewwttiQWYJE=", "narHash": "sha256-TbQeQcM5TA/wIho6xtzG+inUfiGzUXi8ewwttiQWYJE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0591d6b57bfeb55dfeec99a671843337bc2c3323", "rev": "0591d6b57bfeb55dfeec99a671843337bc2c3323",
=======
"lastModified": 1675362331,
"narHash": "sha256-VmcnKPj5gJLxWK7Bxlhg2LoQvhKRss7Ax+uoFjd3qKY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a100acd7bbf105915b0004427802286c37738fef",
>>>>>>> 1d97e3a73f09e14e0e9442fe08258d3f2f2a8e67
"type": "github" "type": "github"
}, },
"original": { "original": {

4
systems/common.nix
View file

@ -128,8 +128,8 @@
}; };
}; };
virtualbox.host = { virtualbox.host = {
enable = false; enable = true;
enableExtensionPack = false; enableExtensionPack = true;
}; };
}; };
users.extraGroups.vboxusers.members = [ "jsutter" ]; users.extraGroups.vboxusers.members = [ "jsutter" ];

2
systems/framework.nix
View file

@ -81,6 +81,8 @@
settings = { settings = {
CPU_BOOST_ON_BAT = 0; CPU_BOOST_ON_BAT = 0;
CPU_SCALING_GOVERNOR_ON_BATTERY = "powersave"; 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; START_CHARGE_THRESH_BAT0 = 90;
STOP_CHARGE_THRESH_BAT0 = 97; STOP_CHARGE_THRESH_BAT0 = 97;
RUNTIME_PM_ON_BAT = "auto"; RUNTIME_PM_ON_BAT = "auto";

8
users/jsutter.nix
View file

@ -3,7 +3,7 @@
let let
home-manager = builtins.fetchTarball { home-manager = builtins.fetchTarball {
url = "https://github.com/nix-community/home-manager/archive/master.tar.gz"; url = "https://github.com/nix-community/home-manager/archive/master.tar.gz";
sha256 = "05msmzfa45l9sr9ngd2cfxw66kw0x76d68gp29v5ilrakf8nc90w"; # sha256 = "05msmzfa45l9sr9ngd2cfxw66kw0x76d68gp29v5ilrakf8nc90w";
}; };
in in
@ -22,7 +22,7 @@ in
users.users.jsutter = { users.users.jsutter = {
isNormalUser = true; isNormalUser = true;
description = "Julian Sutter"; description = "Julian Sutter";
extraGroups = [ "networkmanager" "wheel" "docker" ]; extraGroups = [ "networkmanager" "wheel" "docker" "adbusers"];
hashedPassword = "$6$tvkhGd24G6pVOsWr$j8ZAqSnXPTGwMGmIulU5Puzqd4iKdu8eAMSFis/cPqTW6u2xGQMqPHH1W9IZwKSL6.nS7Jc/NR2VwpPosyXDH/"; hashedPassword = "$6$tvkhGd24G6pVOsWr$j8ZAqSnXPTGwMGmIulU5Puzqd4iKdu8eAMSFis/cPqTW6u2xGQMqPHH1W9IZwKSL6.nS7Jc/NR2VwpPosyXDH/";
openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBNVUh+RrcOSMRV6qysnsdPs5AyK8dSm4QhhnwgpikyI jsutter@symbiotrip.com" ]; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBNVUh+RrcOSMRV6qysnsdPs5AyK8dSm4QhhnwgpikyI jsutter@symbiotrip.com" ];
packages = with pkgs; [ packages = with pkgs; [
@ -51,6 +51,9 @@ in
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
}; };
# Android Dev
programs.adb.enable = true;
# Zerotier # Zerotier
services.zerotierone.joinNetworks = [ "b15644912e748585" ]; services.zerotierone.joinNetworks = [ "b15644912e748585" ];
services.zerotierone.enable= true; services.zerotierone.enable= true;
@ -74,6 +77,7 @@ in
credential.helper = "cache"; credential.helper = "cache";
}; };
}; };
# Firefox # Firefox
programs.firefox = { programs.firefox = {
enable = true; enable = true;