From 894230ee8a0c93e034ad36deb3501e6823c42919 Mon Sep 17 00:00:00 2001 From: randomuser Date: Mon, 8 Jan 2024 20:32:59 -0600 Subject: [PATCH] more changes --- boxes/x230t/default.nix | 2 +- boxes/x230t/home.nix | 1 + builds/flake.nix | 3 --- builds/utils.nix | 3 ++- flake.lock | 6 +++--- home/chromium/default.nix | 12 ++++++++++++ modules/bootstrap.nix | 4 ---- modules/tlp.nix | 5 +++++ 8 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 home/chromium/default.nix create mode 100644 modules/tlp.nix diff --git a/boxes/x230t/default.nix b/boxes/x230t/default.nix index 52ff85b..b5a8048 100644 --- a/boxes/x230t/default.nix +++ b/boxes/x230t/default.nix @@ -6,7 +6,7 @@ ../../modules/bootstrap.nix ../../modules/common.nix ../../modules/x11.nix - ../../modules/discord.nix + ../../modules/tlp.nix ]; boot.loader.grub.enable = true; diff --git a/boxes/x230t/home.nix b/boxes/x230t/home.nix index 144dd0e..8c118a1 100644 --- a/boxes/x230t/home.nix +++ b/boxes/x230t/home.nix @@ -3,6 +3,7 @@ { imports = [ ../../home/x11.nix + ../../home/chromium ]; home.stateVersion = "23.11"; diff --git a/builds/flake.nix b/builds/flake.nix index da05e7d..350b96a 100644 --- a/builds/flake.nix +++ b/builds/flake.nix @@ -10,9 +10,6 @@ lib.fold lib.recursiveUpdate { } ( map f [ "x86_64-linux" - "x86_64-darwin" - "aarch64-linux" - "aarch64-darwin" ] ); mkPackages = pkgs: { diff --git a/builds/utils.nix b/builds/utils.nix index d4612be..715de15 100644 --- a/builds/utils.nix +++ b/builds/utils.nix @@ -4,6 +4,7 @@ , bash , feh , jq +, fzy , figlet , curl , xrandr @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { src = ./utils; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ bash feh xrandr jq curl ]; + buildInputs = [ bash feh xrandr jq curl fzy ]; buildPhase = ""; diff --git a/flake.lock b/flake.lock index de0501b..975aab9 100644 --- a/flake.lock +++ b/flake.lock @@ -91,12 +91,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-xCQE9SSKWjmoYOaIkzdlGULeGbEF9Gau5TPgYJxalmw=", - "path": "/nix/store/rg6mp8f9i9grfp47chg801vxzz4w564f-source/builds", + "narHash": "sha256-PYg0MoGsZWtACHUwF/teZJ96wUhDs3rHgTe2A0sMQ/A=", + "path": "/nix/store/lnr366wiqiliymnv4j8h8j01m7mvcb5w-source/builds", "type": "path" }, "original": { - "path": "/nix/store/rg6mp8f9i9grfp47chg801vxzz4w564f-source/builds", + "path": "/nix/store/lnr366wiqiliymnv4j8h8j01m7mvcb5w-source/builds", "type": "path" } } diff --git a/home/chromium/default.nix b/home/chromium/default.nix new file mode 100644 index 0000000..57adeee --- /dev/null +++ b/home/chromium/default.nix @@ -0,0 +1,12 @@ +{ lib, inputs, config, pkgs, home, ... }: + +{ + home.packages = with pkgs; [ + ungoogled-chromium + ]; + + programs.chromium = { + enable = true; + package = pkgs.ungoogled-chromium; + }; +} diff --git a/modules/bootstrap.nix b/modules/bootstrap.nix index d2a053b..cdf4b36 100644 --- a/modules/bootstrap.nix +++ b/modules/bootstrap.nix @@ -1,10 +1,6 @@ { config, pkgs, ... }: { - imports = [ - ./hardware-configuration.nix - ]; - environment.systemPackages = with pkgs; [ git neovim diff --git a/modules/tlp.nix b/modules/tlp.nix new file mode 100644 index 0000000..1bb2484 --- /dev/null +++ b/modules/tlp.nix @@ -0,0 +1,5 @@ +{ lib, config, pkgs, inputs, ...}: + +{ + services.tlp.enable = true; +}