aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--flake.lock24
-rw-r--r--flake.nix6
-rw-r--r--home/nipsy/common/core/fonts.nix1
-rw-r--r--hosts/common/core/default.nix28
-rw-r--r--hosts/common/optional/misc.nix28
-rw-r--r--hosts/common/optional/multimedia.nix13
-rw-r--r--hosts/ginaz/default.nix2
-rw-r--r--hosts/richese/default.nix12
-rwxr-xr-xscripts/install-with-disko19
9 files changed, 83 insertions, 50 deletions
diff --git a/flake.lock b/flake.lock
index 63a92cd..2f1b6c8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
]
},
"locked": {
- "lastModified": 1712947906,
- "narHash": "sha256-T0eT2lMbcK7RLelkx0qx4SiFpOS/0dt0aSfLB+WsGV8=",
+ "lastModified": 1713152224,
+ "narHash": "sha256-k1aV06cotPwWO3FW+ho+dEoGjxNM303+UmhiG2o6XPs=",
"owner": "nix-community",
"repo": "disko",
- "rev": "8d4ae698eaac8bd717e23507da2ca8b345bec4b5",
+ "rev": "bb5ba68ebb73b5ca7996b64e1457fe885891e78e",
"type": "github"
},
"original": {
@@ -48,11 +48,11 @@
]
},
"locked": {
- "lastModified": 1713077896,
- "narHash": "sha256-Noot8H0EZEAFRQWyGxh9ryvhK96xpIqKbh78X447JWs=",
+ "lastModified": 1713166971,
+ "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "630a0992b3627c64e34f179fab68e3d48c6991c0",
+ "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609",
"type": "github"
},
"original": {
@@ -78,11 +78,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1713088269,
- "narHash": "sha256-x4RVSeo0qq099PEdCOGHrJ/mpUKIhTCJDTy4hI1U+Gs=",
+ "lastModified": 1713169627,
+ "narHash": "sha256-EvWZJXcrWfoBOs5ZnHAP0i0ZDVAaSgrzcbZQLRNJefQ=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "6ec8515bc79f396159a67b2ed8012b2e988d9dc6",
+ "rev": "14e7e6d8a6e3dc983f11b29e9afa8f62465611df",
"type": "github"
},
"original": {
@@ -94,11 +94,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1712791164,
- "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
+ "lastModified": 1712963716,
+ "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
+ "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 31916d3..a1dfb8e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -40,9 +40,9 @@
system = "x86_64-linux";
modules = [
./hosts/richese
- home-manager-unstable.nixosModules.home-manager {
- home-manager.users.nipsy = import ./home/nipsy/richese.nix;
- }
+ #home-manager-unstable.nixosModules.home-manager {
+ # home-manager.users.nipsy = import ./home/nipsy/richese.nix;
+ #}
];
};
};
diff --git a/home/nipsy/common/core/fonts.nix b/home/nipsy/common/core/fonts.nix
index 9ed0753..b152abe 100644
--- a/home/nipsy/common/core/fonts.nix
+++ b/home/nipsy/common/core/fonts.nix
@@ -5,5 +5,4 @@
pkgs.noto-fonts
pkgs.nerdfonts
];
-
}
diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix
index ba8a861..fdd5589 100644
--- a/hosts/common/core/default.nix
+++ b/hosts/common/core/default.nix
@@ -13,55 +13,35 @@
# inherit (pkgs)
environment.systemPackages = with pkgs; [
acl
- ansible
bash
bc
bind
binutils
- bpftools
bzip2
colordiff
conntrack-tools
coreutils
cpio
curl
- dict
diffutils
dig
dmidecode
- encfs
- enscript
ethtool
- expect
- ffmpeg
file
findutils
- fio
- flac
- fortune
fping
- ghostscript
git
gnugrep
gnupatch
gnused
gnutar
gzip
- imagemagick
- inxi
- iotop
- ipcalc
- iperf
iproute2
iputils
- jq
- lame
less
lshw
lsof
lvm2
- mkvtoolnix
- mutt
nano
netcat-openbsd
nettools
@@ -73,22 +53,16 @@
openssl
patchelf
pciutils
- poppler_utils
- powertop
procps
psmisc
pv
pwgen
qemu_kvm
- qrencode
- radeontop
recode
rsync
sg3_utils
socat
- speedtest-cli
sqlite
- sshfs
stoken
strace
sysstat
@@ -103,11 +77,9 @@
util-linux
vim
wdiff
- weechat
wget
whois
wireguard-tools
- x265
xz
zip
zstd#;
diff --git a/hosts/common/optional/misc.nix b/hosts/common/optional/misc.nix
new file mode 100644
index 0000000..60565a9
--- /dev/null
+++ b/hosts/common/optional/misc.nix
@@ -0,0 +1,28 @@
+{ pkgs, ... }:
+{
+ environment.systemPackages = with pkgs; [
+ ansible
+ bpftools
+ dict
+ encfs
+ enscript
+ expect
+ fio
+ fortune
+ ghostscript
+ imagemagick
+ inxi
+ iotop
+ ipcalc
+ iperf
+ jq
+ mutt
+ poppler_utils
+ powertop
+ qrencode
+ radeontop
+ speedtest-cli
+ sshfs
+ weechat
+ ];
+}
diff --git a/hosts/common/optional/multimedia.nix b/hosts/common/optional/multimedia.nix
new file mode 100644
index 0000000..fd8a83c
--- /dev/null
+++ b/hosts/common/optional/multimedia.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+{
+ #environment.systemPackages = builtins.attrValues {
+ # inherit (pkgs)
+ environment.systemPackages = with pkgs; [
+ ffmpeg
+ flac
+ lame
+ mkvtoolnix
+ x265#;
+ ];
+ #};
+}
diff --git a/hosts/ginaz/default.nix b/hosts/ginaz/default.nix
index f3ef8e2..d9b4526 100644
--- a/hosts/ginaz/default.nix
+++ b/hosts/ginaz/default.nix
@@ -23,6 +23,8 @@
../common/optional/dev.nix
../common/optional/games.nix
../common/optional/google-authenticator.nix
+ ../common/optional/misc.nix
+ ../common/optional/multimedia.nix
../common/optional/pipewire.nix
../common/optional/sdr.nix
../common/optional/services/openssh.nix
diff --git a/hosts/richese/default.nix b/hosts/richese/default.nix
index a404535..979bd24 100644
--- a/hosts/richese/default.nix
+++ b/hosts/richese/default.nix
@@ -14,13 +14,15 @@
imports = [
./hardware-configuration.nix
../common/core
- ../common/optional/db.nix
- ../common/optional/dev.nix
- ../common/optional/pipewire.nix
+ #../common/optional/db.nix
+ #../common/optional/dev.nix
+ #../common/optional/misc.nix
+ #../common/optional/multimedia.nix
+ #../common/optional/pipewire.nix
../common/optional/services/openssh.nix
- ../common/optional/services/xorg.nix
+ #../common/optional/services/xorg.nix
../common/optional/zfs.nix
- ../common/users/nipsy
+ #../common/users/nipsy
../common/users/root
];
diff --git a/scripts/install-with-disko b/scripts/install-with-disko
index 859a647..4a89676 100755
--- a/scripts/install-with-disko
+++ b/scripts/install-with-disko
@@ -28,10 +28,20 @@ if grep -q "data.keyfile" "${DIR}/../hosts/${TARGET_HOST}/disks.nix"; then
while true; do
echo -en "\n${TARGET_HOST} uses ZFS encryption. Enter a passphrase to encrypt your pool: "
read -s pass
- echo -e '\n'
+ echo
if [[ "${#pass}" -lt 8 ]]; then
echo 'ERROR! Passphrase must be at least 8 characters.' >&2
+ continue
+ fi
+
+ echo -n "Re-enter passphrase: "
+ read -s pass2
+ echo -e '\n'
+
+ if [[ "${pass}" != "${pass2}" ]]; then
+ echo 'ERROR! Passphrases must match.' >&2
+ continue
else
break
fi
@@ -65,4 +75,11 @@ if [[ "${REPLY}" == "y" ]]; then
sudo rsync -a --delete --exclude .git "${DIR}/.." /mnt/etc/nixos
cd /mnt/etc/nixos
sudo nixos-install --flake ".#${TARGET_HOST}"
+
+ if [[ "${?}" -eq 0 ]]; then
+ cd
+ mount | grep -v zfs | awk '$3 ~ /^\/mnt\// {print $3}' | xargs -i{} sudo umount -lf {}
+ while ! sudo umount -t zfs -a; do echo 'attempting to umount all ZFS file systems' >&2; sleep 1; done
+ while ! sudo zpool export -a; do echo 'attempting to export all zpools' >&2; sleep 1; done
+ fi
fi