diff --git a/boxes/aristotle/home.nix b/boxes/aristotle/home.nix index 24f26c5..0de943a 100644 --- a/boxes/aristotle/home.nix +++ b/boxes/aristotle/home.nix @@ -3,7 +3,6 @@ { imports = [ ../../home/x11.nix - ../../home/chromium ]; home.stateVersion = "24.05"; diff --git a/boxes/copernicus/home.nix b/boxes/copernicus/home.nix index 8c118a1..144dd0e 100644 --- a/boxes/copernicus/home.nix +++ b/boxes/copernicus/home.nix @@ -3,7 +3,6 @@ { imports = [ ../../home/x11.nix - ../../home/chromium ]; home.stateVersion = "23.11"; diff --git a/home/brave/default.nix b/home/brave/default.nix index 3d43428..b676fde 100644 --- a/home/brave/default.nix +++ b/home/brave/default.nix @@ -1,16 +1,9 @@ { lib, inputs, config, pkgs, home, ... }: -let - plib = import ../../lib { inherit pkgs; }; -in { +{ programs.chromium = { enable = true; - package = lib.mkForce (plib.mkPackageWrapper - pkgs.brave - "export HOME=$HOME/.cache/brave" - "" - "--args --disable-frame-rate-limit" - ); + package = pkgs.brave; extensions = [ { id = "ecnphlgnajanjnkcmbpancdjoidceilk"; } ]; diff --git a/home/chromium/default.nix b/home/chromium/default.nix deleted file mode 100644 index 66707b3..0000000 --- a/home/chromium/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ lib, inputs, config, pkgs, home, ... }: - -{ - home.packages = with pkgs; [ - ungoogled-chromium - ]; - - programs.chromium = { - enable = true; - package = pkgs.ungoogled-chromium; - extensions = [ - { id = "ecnphlgnajanjnkcmbpancdjoidceilk"; } - ]; - }; -} diff --git a/home/x11-progs.nix b/home/x11-progs.nix index 6d13e9f..8bc5cdc 100644 --- a/home/x11-progs.nix +++ b/home/x11-progs.nix @@ -1,15 +1,13 @@ { lib, config, pkgs, ...}: -let - plib = import ../lib { inherit pkgs; }; -in { - home.packages = [ - pkgs.xclip - pkgs.xcape - pkgs.mpv - pkgs.sxiv - pkgs.xwallpaper - pkgs.xbrightness - pkgs.xdotool +{ + home.packages = with pkgs; [ + xclip + xcape + mpv + sxiv + xwallpaper + xbrightness + xdotool ]; } diff --git a/lappy/hardware-configuration.nix b/lappy/hardware-configuration.nix index d5030dd..80d56fe 100644 --- a/lappy/hardware-configuration.nix +++ b/lappy/hardware-configuration.nix @@ -5,7 +5,6 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot = { initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; initrd.kernelModules = [ ]; diff --git a/lib/default.nix b/lib/default.nix deleted file mode 100644 index 8e8de6e..0000000 --- a/lib/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ pkgs ? import {} }: -let - getPkgName = - pkg: - builtins.elemAt (builtins.split "-" pkg.name) 0; -in { - mkPackageWrapper = - pkg: - environ: - prefix: - postfix: - pkgs.writeScriptBin - (getPkgName pkg) - '' - #! ${pkgs.bash}/bin/bash - ${environ} - exec ${prefix} ${pkg}/bin/${getPkgName pkg} ${postfix} "$@" - ''; - mkQuarantinedPackage = - pkg: - pkgs.writeScriptBin - (getPkgName pkg) - '' - #! ${pkgs.bash}/bin/bash - export HOME=$HOME/.local/${getPkgName pkg} - exec ${pkg}/bin/${getPkgName pkg} - ''; -}