From 4874cd5230193893915fc7f2fea27e04006c6665 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 26 Mar 2024 18:27:48 +0100 Subject: [PATCH] remove some redundant shell profiles --- flake.nix | 2 +- hosts/bolle/default.nix | 4 +--- hosts/brumlebasse/default.nix | 4 +--- hosts/eple/default.nix | 4 +--- hosts/garp/default.nix | 4 +--- hosts/hasselknippe/default.nix | 4 +--- hosts/nord/default.nix | 4 +--- hosts/noximilien/default.nix | 4 +--- hosts/sopp/default.nix | 4 +--- profiles/{shell => }/binfmt-emu.nix | 0 profiles/{shell/base.nix => shell.nix} | 21 +++++++++++++++++++-- profiles/shell/archives.nix | 13 ------------- profiles/shell/nix-utils.nix | 10 ---------- 13 files changed, 28 insertions(+), 50 deletions(-) rename profiles/{shell => }/binfmt-emu.nix (100%) rename profiles/{shell/base.nix => shell.nix} (76%) delete mode 100644 profiles/shell/archives.nix delete mode 100644 profiles/shell/nix-utils.nix diff --git a/flake.nix b/flake.nix index 8bd4e46..a60ab22 100644 --- a/flake.nix +++ b/flake.nix @@ -260,7 +260,7 @@ hidpi = hw.common-hidpi; p1005 = ./hardware/printer/hp-laserjet-p1005.nix; au = ./profiles/auto-upgrade.nix; - binfmt = ./profiles/shell/binfmt-emu.nix; + binfmt = ./profiles/binfmt-emu.nix; dns64 = { config, ... }: { networking.nameservers = [ "2001:700:1:11::2:51" ]; # dns64.uninett.no networking.networkmanager.enable = true; diff --git a/hosts/bolle/default.nix b/hosts/bolle/default.nix index a9ae2d0..350d187 100644 --- a/hosts/bolle/default.nix +++ b/hosts/bolle/default.nix @@ -12,9 +12,7 @@ ../../users/pbsds ../../users/daniel - ../../profiles/shell/base.nix - ../../profiles/shell/archives.nix - ../../profiles/shell/nix-utils.nix + ../../profiles/shell.nix ../../profiles/domeneshop-dyndns #../../profiles/code-remote diff --git a/hosts/brumlebasse/default.nix b/hosts/brumlebasse/default.nix index bbdee4e..c8fb051 100644 --- a/hosts/brumlebasse/default.nix +++ b/hosts/brumlebasse/default.nix @@ -16,9 +16,7 @@ ../../users/pbsds - ../../profiles/shell/base.nix - ../../profiles/shell/archives.nix - ../../profiles/shell/nix-utils.nix + ../../profiles/shell.nix #../../profiles/domeneshop-dyndns ]; diff --git a/hosts/eple/default.nix b/hosts/eple/default.nix index 975e022..93acebd 100644 --- a/hosts/eple/default.nix +++ b/hosts/eple/default.nix @@ -13,9 +13,7 @@ ../../profiles/mounts/panorama-zfs.nix - ../../profiles/shell/base.nix - ../../profiles/shell/archives.nix - ../../profiles/shell/nix-utils.nix + ../../profiles/shell.nix ../../profiles/domeneshop-dyndns #../../profiles/code-remote diff --git a/hosts/garp/default.nix b/hosts/garp/default.nix index 48b7e40..3024d06 100644 --- a/hosts/garp/default.nix +++ b/hosts/garp/default.nix @@ -29,9 +29,7 @@ ../../users/pbsds - ../../profiles/shell/base.nix - ../../profiles/shell/archives.nix - ../../profiles/shell/nix-utils.nix + ../../profiles/shell.nix #../../profiles/desktop/base.nix #../../profiles/desktop/gnome # configures gdm diff --git a/hosts/hasselknippe/default.nix b/hosts/hasselknippe/default.nix index 78e1b31..dc38ce9 100644 --- a/hosts/hasselknippe/default.nix +++ b/hosts/hasselknippe/default.nix @@ -23,9 +23,7 @@ #../../profiles/mounts/reidun-nfs.nix #../../profiles/mounts/meconium-nfs.nix - ../../profiles/shell/base.nix - ../../profiles/shell/archives.nix - ../../profiles/shell/nix-utils.nix + ../../profiles/shell.nix ../../profiles/desktop/base.nix ../../profiles/desktop/gnome # configures gdm diff --git a/hosts/nord/default.nix b/hosts/nord/default.nix index 3146518..e114bf1 100644 --- a/hosts/nord/default.nix +++ b/hosts/nord/default.nix @@ -24,9 +24,7 @@ ../../profiles/mounts/meconium-nfs.nix ../../profiles/mounts/fridge-nfs.nix - ../../profiles/shell/base.nix - ../../profiles/shell/archives.nix - ../../profiles/shell/nix-utils.nix + ../../profiles/shell.nix ../../profiles/desktop/base.nix ../../profiles/desktop/gnome # configures gdm diff --git a/hosts/noximilien/default.nix b/hosts/noximilien/default.nix index 95044ea..92a46d4 100644 --- a/hosts/noximilien/default.nix +++ b/hosts/noximilien/default.nix @@ -19,9 +19,7 @@ ../../profiles/mounts/meconium-zfs.nix ../../profiles/mounts/fridge-nfs.nix - ../../profiles/shell/base.nix - ../../profiles/shell/archives.nix - ../../profiles/shell/nix-utils.nix + ../../profiles/shell.nix ../../profiles/services/tmate-server.nix # opens port 42244 diff --git a/hosts/sopp/default.nix b/hosts/sopp/default.nix index 9d4f9c2..90ea571 100644 --- a/hosts/sopp/default.nix +++ b/hosts/sopp/default.nix @@ -33,9 +33,7 @@ ../../profiles/mounts/reidun-nfs.nix ../../profiles/mounts/meconium-nfs.nix - ../../profiles/shell/base.nix - ../../profiles/shell/archives.nix - ../../profiles/shell/nix-utils.nix + ../../profiles/shell.nix ../../profiles/desktop/base.nix ../../profiles/desktop/gnome # configures gdm diff --git a/profiles/shell/binfmt-emu.nix b/profiles/binfmt-emu.nix similarity index 100% rename from profiles/shell/binfmt-emu.nix rename to profiles/binfmt-emu.nix diff --git a/profiles/shell/base.nix b/profiles/shell.nix similarity index 76% rename from profiles/shell/base.nix rename to profiles/shell.nix index 748d4bd..0169365 100644 --- a/profiles/shell/base.nix +++ b/profiles/shell.nix @@ -1,11 +1,11 @@ { pkgs, ... }: { environment.systemPackages = with pkgs; [ + # base utils lsof lshw file tmux - #parallel # already provided by moreutils pwgen git #gh @@ -16,7 +16,7 @@ gnused gnumake coreutils-full - moreutils + moreutils # includes 'parallel' binutils diffutils findutils @@ -54,5 +54,22 @@ visidata sqlite + + # archive + zip + unrar + unzip + atool + p7zip + bzip2 + gzip + atool + + # nix utils + nix-output-monitor + nix-top + nix-search-cli # nix-search + nix-diff + comma ]; } diff --git a/profiles/shell/archives.nix b/profiles/shell/archives.nix deleted file mode 100644 index 08a7f84..0000000 --- a/profiles/shell/archives.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - zip - unrar - unzip - atool - p7zip - bzip2 - gzip - atool - ]; -} diff --git a/profiles/shell/nix-utils.nix b/profiles/shell/nix-utils.nix deleted file mode 100644 index 9a7b3c8..0000000 --- a/profiles/shell/nix-utils.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - nix-output-monitor - nix-top - nix-search-cli # nix-search - nix-diff - comma - ]; -}