From 2897ff5dc8d06c4ca83e655a00f6b235611c8a22 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 17 Feb 2024 15:10:50 -0500 Subject: [PATCH] latest setup (with amdgpu) --- .envrc | 3 + .gitignore | 11 +++ devenv.lock | 156 ++++++++++++++++++++++++++++++++++++++++ devenv.nix | 5 ++ devenv.yaml | 3 + modules/os/core.nix | 5 +- modules/os/services.nix | 25 +++++++ modules/user.nix | 3 + result | 1 + 9 files changed, 211 insertions(+), 1 deletion(-) create mode 100644 .envrc create mode 100644 devenv.lock create mode 100644 devenv.nix create mode 100644 devenv.yaml create mode 120000 result diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..6de8a8a --- /dev/null +++ b/.envrc @@ -0,0 +1,3 @@ +source_url "https://raw.githubusercontent.com/cachix/devenv/d1f7b48e35e6dee421cfd0f51481d17f77586997/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0=" + +use devenv \ No newline at end of file diff --git a/.gitignore b/.gitignore index 5a7692e..8de48af 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,12 @@ *.AppImage + +# Devenv +.devenv* +devenv.local.nix + +# direnv +.direnv + +# pre-commit +.pre-commit-config.yaml + diff --git a/devenv.lock b/devenv.lock new file mode 100644 index 0000000..97c9f18 --- /dev/null +++ b/devenv.lock @@ -0,0 +1,156 @@ +{ + "nodes": { + "devenv": { + "locked": { + "dir": "src/modules", + "lastModified": 1708141957, + "narHash": "sha256-IWkw+jsVpu7HFNPbOTJaQeMYQ5/eh7ZVScPvtlSo8vc=", + "owner": "cachix", + "repo": "devenv", + "rev": "40b567388381137a3c49acdff5f4b6946d645a5f", + "type": "github" + }, + "original": { + "dir": "src/modules", + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1708151420, + "narHash": "sha256-MGT/4aGCWQPQiu6COqJdCj9kSpLPiShgbwpbC38YXC8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6e2f00c83911461438301db0dba5281197fe4b3a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "gitignore": "gitignore", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1708018599, + "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "root": { + "inputs": { + "devenv": "devenv", + "nixpkgs": "nixpkgs", + "pre-commit-hooks": "pre-commit-hooks" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/devenv.nix b/devenv.nix new file mode 100644 index 0000000..e6ac520 --- /dev/null +++ b/devenv.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: + +{ + languages.nix.enable = true; +} diff --git a/devenv.yaml b/devenv.yaml new file mode 100644 index 0000000..c7cb5ce --- /dev/null +++ b/devenv.yaml @@ -0,0 +1,3 @@ +inputs: + nixpkgs: + url: github:NixOS/nixpkgs/nixpkgs-unstable diff --git a/modules/os/core.nix b/modules/os/core.nix index 9c76651..e528219 100644 --- a/modules/os/core.nix +++ b/modules/os/core.nix @@ -31,16 +31,19 @@ appimage-run htop nfs-utils + cachix + rocmPackages.rpp + rocmPackages.rocm-smi (import (fetchTarball "https://install.devenv.sh/latest")).default ]; services.nfs.server.enable = true; # Default Session Variables environment.sessionVariables = rec { -# PROMPT = "%(!.%{%F{yellow}%}.)\$USER@%{\$fg[white]%}%M \${ret_status} %{\$fg[cyan]%}%c%{\$reset_color%} $(git_prompt_info)"; }; # Exclude Gnome packages environment.gnome.excludePackages = [ pkgs.gnome-tour + pkgs.gnome-console ]; services.xserver.excludePackages = [ pkgs.xterm diff --git a/modules/os/services.nix b/modules/os/services.nix index 903eb02..01763c8 100644 --- a/modules/os/services.nix +++ b/modules/os/services.nix @@ -13,6 +13,31 @@ xkbVariant = ""; }; + # Advance Power Management + services.power-profiles-daemon.enable = false; + services.tlp = { + enable = true; + settings = { + CPU_BOOST_ON_BAT = 0; + CPU_SCALING_GOVERNOR_ON_BATTERY = "powersave"; + START_CHARGE_THRESH_BAT0 = 90; + STOP_CHARGE_THRESH_BAT0 = 97; + RUNTIME_PM_ON_BAT = "auto"; + PLATFORM_PROFILE_ON_AC = "balanced"; + PLATFORM_PROFILE_ON_BAT = "low-power"; + }; + }; + + # Logind + services.logind = { + lidSwitch = "suspend-then-hibernate"; + extraConfig = '' + HandlePowerKey=suspend-then-hibernate + IdleAction=suspend-then-hibernate + IdleActionSec=2m + ''; + }; + systemd.sleep.extraConfig = "HibernateDelaySec=30m"; # Enable CUPS to print documents. services.printing.enable = true; diff --git a/modules/user.nix b/modules/user.nix index 7af5845..0a297a0 100644 --- a/modules/user.nix +++ b/modules/user.nix @@ -15,6 +15,8 @@ bitwarden-cli jq zoom-us + terminator + nixd ]; }; home-manager.users.${user.name} = { @@ -29,6 +31,7 @@ }; programs = { bat.enable = true; + direnv.enable = true; lsd = { enable = true; enableAliases = true; diff --git a/result b/result new file mode 120000 index 0000000..8077e81 --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/rafw7hf7597z1jpsgvgjlw9jrk3q94mc-nixos-system-fwbook-23.11.4166.20f65b86b648 \ No newline at end of file