diff options
author | Mark Nipper <nipsy@bitgnome.net> | 2025-02-07 12:41:47 -0800 |
---|---|---|
committer | Mark Nipper <nipsy@bitgnome.net> | 2025-02-07 12:41:47 -0800 |
commit | d14a52548744445c63f21a8c525468e6736e1733 (patch) | |
tree | 2faacec0c8dac7b2f6f0c52b0307515617bdac7f | |
parent | 3d9fc26ffa0dd0fbf2dd7b7e2d4fb8e47990a72b (diff) | |
download | nix-d14a52548744445c63f21a8c525468e6736e1733.tar nix-d14a52548744445c63f21a8c525468e6736e1733.tar.gz nix-d14a52548744445c63f21a8c525468e6736e1733.tar.bz2 nix-d14a52548744445c63f21a8c525468e6736e1733.tar.lz nix-d14a52548744445c63f21a8c525468e6736e1733.tar.xz nix-d14a52548744445c63f21a8c525468e6736e1733.tar.zst nix-d14a52548744445c63f21a8c525468e6736e1733.zip |
Revert "Fix syntax"
This reverts commit 3d9fc26ffa0dd0fbf2dd7b7e2d4fb8e47990a72b.
-rw-r--r-- | flake.nix | 191 |
1 files changed, 94 insertions, 97 deletions
@@ -130,108 +130,105 @@ # from https://nixos.wiki/wiki/Creating_a_NixOS_live_CD and https://chengeric.com/homelab/ iso = nixpkgs.lib.nixosSystem { modules = [ - ({ config, modulesPath, pkgs, ... }: { + ({ modulesPath, pkgs, ... }: { + allowUnfree = true; + + environment.systemPackages = with pkgs; [ + acl + bash + bc + bzip2 + conntrack-tools + coreutils + cpio + curl + diffutils + dig + dmidecode + elinks + ethtool + file + findutils + fping + git + gnugrep + gnupatch + gnused + gnutar + gptfdisk + gzip + htop + iperf + iproute2 + iputils + jq + less + lshw + lsof + lvm2 + moreutils + nano + netcat-openbsd + nettools + nmap + ntfs3g + openldap + openssl + p7zip + parted + pciutils + procps + progress + psmisc + pv + pwgen + recode + rsync + sg3_utils + smartmontools + socat + sqlite + strace + sysstat + tcpdump + tftp-hpa + traceroute + tree + tshark + unixtools.xxd + unrar + unzip + usbutils + util-linux + vim + wdiff + wget + whois + wireguard-tools + xz + zip + ]; + imports = [ (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") ]; + #isoImage.squashfsCompression = "gzip -Xcompression-level 1"; + + nix.settings.experimental-features = [ "nix-command" "flakes" ]; - config = { - allowUnfree = true; - - environment.systemPackages = with pkgs; [ - acl - bash - bc - bzip2 - conntrack-tools - coreutils - cpio - curl - diffutils - dig - dmidecode - elinks - ethtool - file - findutils - fping - git - gnugrep - gnupatch - gnused - gnutar - gptfdisk - gzip - htop - iperf - iproute2 - iputils - jq - less - lshw - lsof - lvm2 - moreutils - nano - netcat-openbsd - nettools - nmap - ntfs3g - openldap - openssl - p7zip - parted - pciutils - procps - progress - psmisc - pv - pwgen - recode - rsync - sg3_utils - smartmontools - socat - sqlite - strace - sysstat - tcpdump - tftp-hpa - traceroute - tree - tshark - unixtools.xxd - unrar - unzip - usbutils - util-linux - vim - wdiff - wget - whois - wireguard-tools - xz - zip - ]; - - #isoImage.squashfsCompression = "gzip -Xcompression-level 1"; - - nix.settings.experimental-features = [ "nix-command" "flakes" ]; - - services.openssh = { - enable = true; - openFirewall = true; - - settings = { - PasswordAuthentication = false; - KbdInteractiveAuthentication = false; - }; - }; - - users.users = { - nixos.openssh.authorizedKeys.keys = [ (builtins.readFile ./hosts/common/users/nipsy/keys/id_arrakis.pub) ]; - root.openssh.authorizedKeys.keys = [ (builtins.readFile ./hosts/common/users/nipsy/keys/id_arrakis.pub) ]; + services.openssh = { + enable = true; + openFirewall = true; + + settings = { + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; }; }; + + users.users = { + nixos.openssh.authorizedKeys.keys = [ (builtins.readFile ./hosts/common/users/nipsy/keys/id_arrakis.pub) ]; + root.openssh.authorizedKeys.keys = [ (builtins.readFile ./hosts/common/users/nipsy/keys/id_arrakis.pub) ]; + }; }) ]; system = "x86_64-linux"; |