mirror of
https://github.com/kmein/niveum
synced 2026-03-30 01:01:10 +02:00
fix: use pkgs.system
This commit is contained in:
@@ -2,12 +2,12 @@
|
||||
pkgs,
|
||||
niveumPackages,
|
||||
lib,
|
||||
system ? null,
|
||||
...
|
||||
}: let
|
||||
darwin = lib.strings.hasSuffix "-darwin" system;
|
||||
darwin = lib.strings.hasSuffix "-darwin" pkgs.system;
|
||||
in {
|
||||
environment.systemPackages = [
|
||||
environment.systemPackages =
|
||||
[
|
||||
pkgs.htop
|
||||
pkgs.w3m
|
||||
pkgs.wget
|
||||
@@ -44,7 +44,8 @@ in {
|
||||
niveumPackages.kpaste
|
||||
# HARDWARE
|
||||
pkgs.pciutils # for lspci
|
||||
] ++ lib.optionals (!darwin) [
|
||||
]
|
||||
++ lib.optionals (!darwin) [
|
||||
pkgs.usbutils # for lsusb
|
||||
pkgs.lshw # for lshw
|
||||
pkgs.iotop # I/O load monitor
|
||||
@@ -65,7 +66,8 @@ in {
|
||||
where = pkgs.writers.writeDash "where" ''
|
||||
readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname
|
||||
'';
|
||||
in {
|
||||
in
|
||||
{
|
||||
nixi = "nix repl '<nixpkgs>'";
|
||||
take = "source ${take}";
|
||||
wcd = "source ${wcd}";
|
||||
@@ -83,7 +85,11 @@ in {
|
||||
ls = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso";
|
||||
ll = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso -l";
|
||||
la = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso --almost-all -l";
|
||||
} // (if darwin then {} else {
|
||||
}
|
||||
// (
|
||||
if darwin
|
||||
then {}
|
||||
else {
|
||||
"ß" = "${pkgs.util-linux}/bin/setsid";
|
||||
ip = "${pkgs.iproute2}/bin/ip -c";
|
||||
# systemd
|
||||
@@ -91,5 +97,6 @@ in {
|
||||
us = "${pkgs.systemd}/bin/systemctl --user";
|
||||
j = "${pkgs.systemd}/bin/journalctl";
|
||||
uj = "${pkgs.systemd}/bin/journalctl --user";
|
||||
});
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
system ? "x86_64-linux",
|
||||
...
|
||||
}: let
|
||||
inherit (import ../lib) kieran ignorePaths;
|
||||
@@ -19,7 +17,7 @@ in {
|
||||
pkgs.gitstats
|
||||
pkgs.patch
|
||||
pkgs.patchutils
|
||||
inputs.self.packages.${system}.git-preview
|
||||
inputs.self.packages.${pkgs.system}.git-preview
|
||||
];
|
||||
|
||||
environment.shellAliases = {
|
||||
|
||||
Reference in New Issue
Block a user