diff --git a/.direnv/bin/nix-direnv-reload b/.direnv/bin/nix-direnv-reload
new file mode 100755
index 0000000..ee4770f
--- /dev/null
+++ b/.direnv/bin/nix-direnv-reload
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -e
+if [[ ! -d "/home/tim/.dotfiles" ]]; then
+  echo "Cannot find source directory; Did you move it?"
+  echo "(Looking for "/home/tim/.dotfiles")"
+  echo 'Cannot force reload with this script - use "direnv reload" manually and then try again'
+  exit 1
+fi
+
+# rebuild the cache forcefully
+_nix_direnv_force_reload=1 direnv exec "/home/tim/.dotfiles" true
+
+# Update the mtime for .envrc.
+# This will cause direnv to reload again - but without re-building.
+touch "/home/tim/.dotfiles/.envrc"
+
+# Also update the timestamp of whatever profile_rc we have.
+# This makes sure that we know we are up to date.
+touch -r "/home/tim/.dotfiles/.envrc" "/home/tim/.dotfiles/.direnv"/*.rc
diff --git a/.direnv/flake-inputs/01x5k4nlxcpyd85nnr0b9gm89rm8ff4x-source b/.direnv/flake-inputs/01x5k4nlxcpyd85nnr0b9gm89rm8ff4x-source
new file mode 120000
index 0000000..f7fce9f
--- /dev/null
+++ b/.direnv/flake-inputs/01x5k4nlxcpyd85nnr0b9gm89rm8ff4x-source
@@ -0,0 +1 @@
+/nix/store/01x5k4nlxcpyd85nnr0b9gm89rm8ff4x-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/025da0v2wdyfk9vbgrwhmvbqzl022vad-source b/.direnv/flake-inputs/025da0v2wdyfk9vbgrwhmvbqzl022vad-source
new file mode 120000
index 0000000..b3d355e
--- /dev/null
+++ b/.direnv/flake-inputs/025da0v2wdyfk9vbgrwhmvbqzl022vad-source
@@ -0,0 +1 @@
+/nix/store/025da0v2wdyfk9vbgrwhmvbqzl022vad-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/1wnxdqr2n1pj80lirh9pzsymslx8zd9l-source b/.direnv/flake-inputs/1wnxdqr2n1pj80lirh9pzsymslx8zd9l-source
new file mode 120000
index 0000000..cbef3fe
--- /dev/null
+++ b/.direnv/flake-inputs/1wnxdqr2n1pj80lirh9pzsymslx8zd9l-source
@@ -0,0 +1 @@
+/nix/store/1wnxdqr2n1pj80lirh9pzsymslx8zd9l-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/1yyzg5ylalfv4xzbly9fzzxicm4yhpkl-source b/.direnv/flake-inputs/1yyzg5ylalfv4xzbly9fzzxicm4yhpkl-source
new file mode 120000
index 0000000..40cb115
--- /dev/null
+++ b/.direnv/flake-inputs/1yyzg5ylalfv4xzbly9fzzxicm4yhpkl-source
@@ -0,0 +1 @@
+/nix/store/1yyzg5ylalfv4xzbly9fzzxicm4yhpkl-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/3ghqsn3rjdq23nb9hn9flsmgipj0q72r-source b/.direnv/flake-inputs/3ghqsn3rjdq23nb9hn9flsmgipj0q72r-source
new file mode 120000
index 0000000..9e533e9
--- /dev/null
+++ b/.direnv/flake-inputs/3ghqsn3rjdq23nb9hn9flsmgipj0q72r-source
@@ -0,0 +1 @@
+/nix/store/3ghqsn3rjdq23nb9hn9flsmgipj0q72r-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/41v50c27snarkdqx6bbf8dg51j422faa-source b/.direnv/flake-inputs/41v50c27snarkdqx6bbf8dg51j422faa-source
new file mode 120000
index 0000000..0163941
--- /dev/null
+++ b/.direnv/flake-inputs/41v50c27snarkdqx6bbf8dg51j422faa-source
@@ -0,0 +1 @@
+/nix/store/41v50c27snarkdqx6bbf8dg51j422faa-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/4g7wzh5nfzvms5zx8hscb6xkh3m6bidn-source b/.direnv/flake-inputs/4g7wzh5nfzvms5zx8hscb6xkh3m6bidn-source
new file mode 120000
index 0000000..37b8bee
--- /dev/null
+++ b/.direnv/flake-inputs/4g7wzh5nfzvms5zx8hscb6xkh3m6bidn-source
@@ -0,0 +1 @@
+/nix/store/4g7wzh5nfzvms5zx8hscb6xkh3m6bidn-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/56grza1ymqf012b1c34w5rw2hakimhi3-source b/.direnv/flake-inputs/56grza1ymqf012b1c34w5rw2hakimhi3-source
new file mode 120000
index 0000000..b99efa0
--- /dev/null
+++ b/.direnv/flake-inputs/56grza1ymqf012b1c34w5rw2hakimhi3-source
@@ -0,0 +1 @@
+/nix/store/56grza1ymqf012b1c34w5rw2hakimhi3-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/5c108l3npg1bllinhs1pd9rdxmzff2c3-source b/.direnv/flake-inputs/5c108l3npg1bllinhs1pd9rdxmzff2c3-source
new file mode 120000
index 0000000..67af112
--- /dev/null
+++ b/.direnv/flake-inputs/5c108l3npg1bllinhs1pd9rdxmzff2c3-source
@@ -0,0 +1 @@
+/nix/store/5c108l3npg1bllinhs1pd9rdxmzff2c3-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/5gm805h91im063x5wbs200chgghdcrkk-source b/.direnv/flake-inputs/5gm805h91im063x5wbs200chgghdcrkk-source
new file mode 120000
index 0000000..ab1f46b
--- /dev/null
+++ b/.direnv/flake-inputs/5gm805h91im063x5wbs200chgghdcrkk-source
@@ -0,0 +1 @@
+/nix/store/5gm805h91im063x5wbs200chgghdcrkk-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/5vdba5pn48dsc9i1hwrfzkv1hrz8i9qf-source b/.direnv/flake-inputs/5vdba5pn48dsc9i1hwrfzkv1hrz8i9qf-source
new file mode 120000
index 0000000..d5e384c
--- /dev/null
+++ b/.direnv/flake-inputs/5vdba5pn48dsc9i1hwrfzkv1hrz8i9qf-source
@@ -0,0 +1 @@
+/nix/store/5vdba5pn48dsc9i1hwrfzkv1hrz8i9qf-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/8s0yr4cx4f8hyb4hj1z4078ix2672nsg-source b/.direnv/flake-inputs/8s0yr4cx4f8hyb4hj1z4078ix2672nsg-source
new file mode 120000
index 0000000..3fc5f50
--- /dev/null
+++ b/.direnv/flake-inputs/8s0yr4cx4f8hyb4hj1z4078ix2672nsg-source
@@ -0,0 +1 @@
+/nix/store/8s0yr4cx4f8hyb4hj1z4078ix2672nsg-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/9rksa0yx25gg28hkx31fhbng6fmalijd-source b/.direnv/flake-inputs/9rksa0yx25gg28hkx31fhbng6fmalijd-source
new file mode 120000
index 0000000..af65f66
--- /dev/null
+++ b/.direnv/flake-inputs/9rksa0yx25gg28hkx31fhbng6fmalijd-source
@@ -0,0 +1 @@
+/nix/store/9rksa0yx25gg28hkx31fhbng6fmalijd-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/annhr7vnqxnph0bvkhii0wz55kriddai-source b/.direnv/flake-inputs/annhr7vnqxnph0bvkhii0wz55kriddai-source
new file mode 120000
index 0000000..783f728
--- /dev/null
+++ b/.direnv/flake-inputs/annhr7vnqxnph0bvkhii0wz55kriddai-source
@@ -0,0 +1 @@
+/nix/store/annhr7vnqxnph0bvkhii0wz55kriddai-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/b0my5vy8pzfzjqrr3g58j0w6md9jf3ch-source b/.direnv/flake-inputs/b0my5vy8pzfzjqrr3g58j0w6md9jf3ch-source
new file mode 120000
index 0000000..6e52b23
--- /dev/null
+++ b/.direnv/flake-inputs/b0my5vy8pzfzjqrr3g58j0w6md9jf3ch-source
@@ -0,0 +1 @@
+/nix/store/b0my5vy8pzfzjqrr3g58j0w6md9jf3ch-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/b9vv0nv4m65f1a4ncakqpfh7qlkf9jz7-source b/.direnv/flake-inputs/b9vv0nv4m65f1a4ncakqpfh7qlkf9jz7-source
new file mode 120000
index 0000000..f8459b9
--- /dev/null
+++ b/.direnv/flake-inputs/b9vv0nv4m65f1a4ncakqpfh7qlkf9jz7-source
@@ -0,0 +1 @@
+/nix/store/b9vv0nv4m65f1a4ncakqpfh7qlkf9jz7-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/bl723qgsd7jqh3crigpvsq0mzrjj7vj2-source b/.direnv/flake-inputs/bl723qgsd7jqh3crigpvsq0mzrjj7vj2-source
new file mode 120000
index 0000000..47c523c
--- /dev/null
+++ b/.direnv/flake-inputs/bl723qgsd7jqh3crigpvsq0mzrjj7vj2-source
@@ -0,0 +1 @@
+/nix/store/bl723qgsd7jqh3crigpvsq0mzrjj7vj2-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/clnc7s9650iy97r85ci84m4cdq8gpqbr-source b/.direnv/flake-inputs/clnc7s9650iy97r85ci84m4cdq8gpqbr-source
new file mode 120000
index 0000000..3f73540
--- /dev/null
+++ b/.direnv/flake-inputs/clnc7s9650iy97r85ci84m4cdq8gpqbr-source
@@ -0,0 +1 @@
+/nix/store/clnc7s9650iy97r85ci84m4cdq8gpqbr-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/ddkd82p67kqrizn84sr3xcpljl94rbay-source b/.direnv/flake-inputs/ddkd82p67kqrizn84sr3xcpljl94rbay-source
new file mode 120000
index 0000000..f8948d3
--- /dev/null
+++ b/.direnv/flake-inputs/ddkd82p67kqrizn84sr3xcpljl94rbay-source
@@ -0,0 +1 @@
+/nix/store/ddkd82p67kqrizn84sr3xcpljl94rbay-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/f1zqan24k1x874c5z38zs44z4f1kvhd2-source b/.direnv/flake-inputs/f1zqan24k1x874c5z38zs44z4f1kvhd2-source
new file mode 120000
index 0000000..a638d52
--- /dev/null
+++ b/.direnv/flake-inputs/f1zqan24k1x874c5z38zs44z4f1kvhd2-source
@@ -0,0 +1 @@
+/nix/store/f1zqan24k1x874c5z38zs44z4f1kvhd2-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/g5v3sgqy6a0fsmas7mnapc196flrplix-source b/.direnv/flake-inputs/g5v3sgqy6a0fsmas7mnapc196flrplix-source
new file mode 120000
index 0000000..c425a39
--- /dev/null
+++ b/.direnv/flake-inputs/g5v3sgqy6a0fsmas7mnapc196flrplix-source
@@ -0,0 +1 @@
+/nix/store/g5v3sgqy6a0fsmas7mnapc196flrplix-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/gs1d4570bffhpg2704yb26p49fzgg343-source b/.direnv/flake-inputs/gs1d4570bffhpg2704yb26p49fzgg343-source
new file mode 120000
index 0000000..97bbcd0
--- /dev/null
+++ b/.direnv/flake-inputs/gs1d4570bffhpg2704yb26p49fzgg343-source
@@ -0,0 +1 @@
+/nix/store/gs1d4570bffhpg2704yb26p49fzgg343-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/i4vvs3jynf1q8gbjn9znmfclr0z5d1gz-source b/.direnv/flake-inputs/i4vvs3jynf1q8gbjn9znmfclr0z5d1gz-source
new file mode 120000
index 0000000..4893767
--- /dev/null
+++ b/.direnv/flake-inputs/i4vvs3jynf1q8gbjn9znmfclr0z5d1gz-source
@@ -0,0 +1 @@
+/nix/store/i4vvs3jynf1q8gbjn9znmfclr0z5d1gz-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/idq4fdi37mfvm54nlvfgrd3gjxf22lwr-source b/.direnv/flake-inputs/idq4fdi37mfvm54nlvfgrd3gjxf22lwr-source
new file mode 120000
index 0000000..e359a77
--- /dev/null
+++ b/.direnv/flake-inputs/idq4fdi37mfvm54nlvfgrd3gjxf22lwr-source
@@ -0,0 +1 @@
+/nix/store/idq4fdi37mfvm54nlvfgrd3gjxf22lwr-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/iiiq8zn29mz0yd8lllpnimn1dpm3ydn5-source b/.direnv/flake-inputs/iiiq8zn29mz0yd8lllpnimn1dpm3ydn5-source
new file mode 120000
index 0000000..73bd815
--- /dev/null
+++ b/.direnv/flake-inputs/iiiq8zn29mz0yd8lllpnimn1dpm3ydn5-source
@@ -0,0 +1 @@
+/nix/store/iiiq8zn29mz0yd8lllpnimn1dpm3ydn5-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/jqhdk959y3z5xx7crw6s8n030s1q0pk5-source b/.direnv/flake-inputs/jqhdk959y3z5xx7crw6s8n030s1q0pk5-source
new file mode 120000
index 0000000..0306080
--- /dev/null
+++ b/.direnv/flake-inputs/jqhdk959y3z5xx7crw6s8n030s1q0pk5-source
@@ -0,0 +1 @@
+/nix/store/jqhdk959y3z5xx7crw6s8n030s1q0pk5-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/ka839ivm6bhhwwfq7sf1d9abwc462dqq-source b/.direnv/flake-inputs/ka839ivm6bhhwwfq7sf1d9abwc462dqq-source
new file mode 120000
index 0000000..5317da2
--- /dev/null
+++ b/.direnv/flake-inputs/ka839ivm6bhhwwfq7sf1d9abwc462dqq-source
@@ -0,0 +1 @@
+/nix/store/ka839ivm6bhhwwfq7sf1d9abwc462dqq-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/kbjvsxnz3w9j29m2lmxv6psbcgn4mkdr-source b/.direnv/flake-inputs/kbjvsxnz3w9j29m2lmxv6psbcgn4mkdr-source
new file mode 120000
index 0000000..44484b7
--- /dev/null
+++ b/.direnv/flake-inputs/kbjvsxnz3w9j29m2lmxv6psbcgn4mkdr-source
@@ -0,0 +1 @@
+/nix/store/kbjvsxnz3w9j29m2lmxv6psbcgn4mkdr-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/m3ry7cqnzjydldmi7whmifi2v0bc8i6x-source b/.direnv/flake-inputs/m3ry7cqnzjydldmi7whmifi2v0bc8i6x-source
new file mode 120000
index 0000000..9534917
--- /dev/null
+++ b/.direnv/flake-inputs/m3ry7cqnzjydldmi7whmifi2v0bc8i6x-source
@@ -0,0 +1 @@
+/nix/store/m3ry7cqnzjydldmi7whmifi2v0bc8i6x-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/m9i30p1h6j40z25bwin59f9c2lhgsgj3-source b/.direnv/flake-inputs/m9i30p1h6j40z25bwin59f9c2lhgsgj3-source
new file mode 120000
index 0000000..6e29d1d
--- /dev/null
+++ b/.direnv/flake-inputs/m9i30p1h6j40z25bwin59f9c2lhgsgj3-source
@@ -0,0 +1 @@
+/nix/store/m9i30p1h6j40z25bwin59f9c2lhgsgj3-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/mgy7alvhlcvdlgsq28k3r1qd9b5vcj6w-source b/.direnv/flake-inputs/mgy7alvhlcvdlgsq28k3r1qd9b5vcj6w-source
new file mode 120000
index 0000000..061480e
--- /dev/null
+++ b/.direnv/flake-inputs/mgy7alvhlcvdlgsq28k3r1qd9b5vcj6w-source
@@ -0,0 +1 @@
+/nix/store/mgy7alvhlcvdlgsq28k3r1qd9b5vcj6w-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/q9az5f308q9ffvpli022pi8n5642z36n-source b/.direnv/flake-inputs/q9az5f308q9ffvpli022pi8n5642z36n-source
new file mode 120000
index 0000000..2beac1d
--- /dev/null
+++ b/.direnv/flake-inputs/q9az5f308q9ffvpli022pi8n5642z36n-source
@@ -0,0 +1 @@
+/nix/store/q9az5f308q9ffvpli022pi8n5642z36n-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/s6agnzjr3kg5sayjy0b0ms52bkvifqrv-source b/.direnv/flake-inputs/s6agnzjr3kg5sayjy0b0ms52bkvifqrv-source
new file mode 120000
index 0000000..86c0772
--- /dev/null
+++ b/.direnv/flake-inputs/s6agnzjr3kg5sayjy0b0ms52bkvifqrv-source
@@ -0,0 +1 @@
+/nix/store/s6agnzjr3kg5sayjy0b0ms52bkvifqrv-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/syx87xxvlmvvzjshyipbwbv05d5z6as2-source b/.direnv/flake-inputs/syx87xxvlmvvzjshyipbwbv05d5z6as2-source
new file mode 120000
index 0000000..034d1ed
--- /dev/null
+++ b/.direnv/flake-inputs/syx87xxvlmvvzjshyipbwbv05d5z6as2-source
@@ -0,0 +1 @@
+/nix/store/syx87xxvlmvvzjshyipbwbv05d5z6as2-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/vg5sns11cjm6gsrp61pa5bgxkzrm5846-source b/.direnv/flake-inputs/vg5sns11cjm6gsrp61pa5bgxkzrm5846-source
new file mode 120000
index 0000000..ba44c7c
--- /dev/null
+++ b/.direnv/flake-inputs/vg5sns11cjm6gsrp61pa5bgxkzrm5846-source
@@ -0,0 +1 @@
+/nix/store/vg5sns11cjm6gsrp61pa5bgxkzrm5846-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/vwpc14rqwrzrnr3rn733cc0f6i0rhyxk-source b/.direnv/flake-inputs/vwpc14rqwrzrnr3rn733cc0f6i0rhyxk-source
new file mode 120000
index 0000000..7d76149
--- /dev/null
+++ b/.direnv/flake-inputs/vwpc14rqwrzrnr3rn733cc0f6i0rhyxk-source
@@ -0,0 +1 @@
+/nix/store/vwpc14rqwrzrnr3rn733cc0f6i0rhyxk-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/vwwbg9chin0hq0snddfn0swzdi7frgia-source b/.direnv/flake-inputs/vwwbg9chin0hq0snddfn0swzdi7frgia-source
new file mode 120000
index 0000000..dcc6093
--- /dev/null
+++ b/.direnv/flake-inputs/vwwbg9chin0hq0snddfn0swzdi7frgia-source
@@ -0,0 +1 @@
+/nix/store/vwwbg9chin0hq0snddfn0swzdi7frgia-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/wm8s3y2q44fgcxlxf3mjb08szyh7rxlc-source b/.direnv/flake-inputs/wm8s3y2q44fgcxlxf3mjb08szyh7rxlc-source
new file mode 120000
index 0000000..3fb20dc
--- /dev/null
+++ b/.direnv/flake-inputs/wm8s3y2q44fgcxlxf3mjb08szyh7rxlc-source
@@ -0,0 +1 @@
+/nix/store/wm8s3y2q44fgcxlxf3mjb08szyh7rxlc-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/yj1wxm9hh8610iyzqnz75kvs6xl8j3my-source b/.direnv/flake-inputs/yj1wxm9hh8610iyzqnz75kvs6xl8j3my-source
new file mode 120000
index 0000000..f17959f
--- /dev/null
+++ b/.direnv/flake-inputs/yj1wxm9hh8610iyzqnz75kvs6xl8j3my-source
@@ -0,0 +1 @@
+/nix/store/yj1wxm9hh8610iyzqnz75kvs6xl8j3my-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/z62nvcz35lawxgpsz06wxfyzw019ikzs-source b/.direnv/flake-inputs/z62nvcz35lawxgpsz06wxfyzw019ikzs-source
new file mode 120000
index 0000000..0abb879
--- /dev/null
+++ b/.direnv/flake-inputs/z62nvcz35lawxgpsz06wxfyzw019ikzs-source
@@ -0,0 +1 @@
+/nix/store/z62nvcz35lawxgpsz06wxfyzw019ikzs-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/z7nd5r2dsny2jslmpc77a76zsh9zlckb-source b/.direnv/flake-inputs/z7nd5r2dsny2jslmpc77a76zsh9zlckb-source
new file mode 120000
index 0000000..be6b9fd
--- /dev/null
+++ b/.direnv/flake-inputs/z7nd5r2dsny2jslmpc77a76zsh9zlckb-source
@@ -0,0 +1 @@
+/nix/store/z7nd5r2dsny2jslmpc77a76zsh9zlckb-source
\ No newline at end of file
diff --git a/.direnv/flake-inputs/zakpbz2ymns1xpzfdiap9j6s4hyd4h38-source b/.direnv/flake-inputs/zakpbz2ymns1xpzfdiap9j6s4hyd4h38-source
new file mode 120000
index 0000000..2278f95
--- /dev/null
+++ b/.direnv/flake-inputs/zakpbz2ymns1xpzfdiap9j6s4hyd4h38-source
@@ -0,0 +1 @@
+/nix/store/zakpbz2ymns1xpzfdiap9j6s4hyd4h38-source
\ No newline at end of file
diff --git a/.direnv/flake-profile-a5d5b61aa8a61b7d9d765e1daf971a9a578f1cfa b/.direnv/flake-profile-a5d5b61aa8a61b7d9d765e1daf971a9a578f1cfa
new file mode 120000
index 0000000..219942b
--- /dev/null
+++ b/.direnv/flake-profile-a5d5b61aa8a61b7d9d765e1daf971a9a578f1cfa
@@ -0,0 +1 @@
+/nix/store/2mnb6wk7ycsqjxsgx4iqni1w1gml253d-nix-shell-env
\ No newline at end of file
diff --git a/.direnv/flake-profile-a5d5b61aa8a61b7d9d765e1daf971a9a578f1cfa.rc b/.direnv/flake-profile-a5d5b61aa8a61b7d9d765e1daf971a9a578f1cfa.rc
new file mode 100644
index 0000000..fbbe14b
--- /dev/null
+++ b/.direnv/flake-profile-a5d5b61aa8a61b7d9d765e1daf971a9a578f1cfa.rc
@@ -0,0 +1,2124 @@
+unset shellHook
+PATH=${PATH:-}
+nix_saved_PATH="$PATH"
+XDG_DATA_DIRS=${XDG_DATA_DIRS:-}
+nix_saved_XDG_DATA_DIRS="$XDG_DATA_DIRS"
+AR='ar'
+export AR
+AS='as'
+export AS
+BASH='/nix/store/ciarnmsx8lvsrmdbjddpmx0pqjrm8imb-bash-5.3p3/bin/bash'
+CC='gcc'
+export CC
+CONFIG_SHELL='/nix/store/ciarnmsx8lvsrmdbjddpmx0pqjrm8imb-bash-5.3p3/bin/bash'
+export CONFIG_SHELL
+CXX='g++'
+export CXX
+HOSTTYPE='x86_64'
+HOST_PATH='/nix/store/60440kg5c51rrlpinkk2rkg020q5q6kv-git-2.51.0/bin:/nix/store/w5fdhasggwfnfvwg9a6qc2wfczm4bn4j-nixfmt-1.1.0/bin:/nix/store/xs8scz9w9jp4hpqycx3n3bah5y07ymgj-coreutils-9.8/bin:/nix/store/qqvfnxa9jg71wp4hfg1l63r4m78iwvl9-findutils-4.10.0/bin:/nix/store/7ql4x9i7w7ihxw23vkanvcvrvqhay23c-diffutils-3.12/bin:/nix/store/zppkx0lkizglyqa9h26wf495qkllrjgy-gnused-4.9/bin:/nix/store/22r4s6lqhl43jkazn51f3c18qwk894g4-gnugrep-3.12/bin:/nix/store/8c4l9cqqj7pixqlmljx5d495pfpw8pys-gawk-5.3.2/bin:/nix/store/3m0zcl1by8ifylmgdcaa317cnhqn8q95-gnutar-1.35/bin:/nix/store/vjj9x3dzszbzjpkzwx63z4gpypiqphzf-gzip-1.14/bin:/nix/store/vzj5iy2png2rs6q2kb3svzp0cnd878f1-bzip2-1.0.8-bin/bin:/nix/store/43lv2nr7pj7wy09qyicjq57bl209ccis-gnumake-4.4.1/bin:/nix/store/ciarnmsx8lvsrmdbjddpmx0pqjrm8imb-bash-5.3p3/bin:/nix/store/miap8jjp87z0gibkrzh68lw2w8kzy4yx-patch-2.8/bin:/nix/store/vwx988887gsrdvg9lbg5f03sy91wrjjv-xz-5.8.1-bin/bin:/nix/store/n686xm9c2ak4x02pj9izvkm0zx7ilwir-file-5.45/bin'
+export HOST_PATH
+IFS=' 	
+'
+IN_NIX_SHELL='impure'
+export IN_NIX_SHELL
+LD='ld'
+export LD
+LINENO='76'
+MACHTYPE='x86_64-pc-linux-gnu'
+NIX_BINTOOLS='/nix/store/918ldr9axgh5kdmpp5fnj2n37pyghwbx-binutils-wrapper-2.44'
+export NIX_BINTOOLS
+NIX_BINTOOLS_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu='1'
+export NIX_BINTOOLS_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu
+NIX_BUILD_CORES='4'
+export NIX_BUILD_CORES
+NIX_CC='/nix/store/x8mydcgbry214s802nzvy7fdljx404ym-gcc-wrapper-14.3.0'
+export NIX_CC
+NIX_CC_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu='1'
+export NIX_CC_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu
+NIX_CFLAGS_COMPILE=' -frandom-seed=2mnb6wk7yc'
+export NIX_CFLAGS_COMPILE
+NIX_ENFORCE_NO_NATIVE='1'
+export NIX_ENFORCE_NO_NATIVE
+NIX_HARDENING_ENABLE='bindnow format fortify fortify3 pic relro stackclashprotection stackprotector strictoverflow zerocallusedregs'
+export NIX_HARDENING_ENABLE
+NIX_LDFLAGS='-rpath /home/tim/.dotfiles/outputs/out/lib '
+export NIX_LDFLAGS
+NIX_NO_SELF_RPATH='1'
+NIX_STORE='/nix/store'
+export NIX_STORE
+NM='nm'
+export NM
+OBJCOPY='objcopy'
+export OBJCOPY
+OBJDUMP='objdump'
+export OBJDUMP
+OLDPWD=''
+export OLDPWD
+OPTERR='1'
+OSTYPE='linux-gnu'
+PATH='/nix/store/85n78yrssyfc65f32yxpqqcpzkgbjv8c-patchelf-0.15.2/bin:/nix/store/x8mydcgbry214s802nzvy7fdljx404ym-gcc-wrapper-14.3.0/bin:/nix/store/ffrg0560kj0066s4k9pznjand907nlnz-gcc-14.3.0/bin:/nix/store/76zn66xib0r80s5y7p0m1ba3y036sxwh-glibc-2.40-66-bin/bin:/nix/store/xs8scz9w9jp4hpqycx3n3bah5y07ymgj-coreutils-9.8/bin:/nix/store/918ldr9axgh5kdmpp5fnj2n37pyghwbx-binutils-wrapper-2.44/bin:/nix/store/416ykpc2bksb90sd1ia8cybxb3p83mrd-binutils-2.44/bin:/nix/store/60440kg5c51rrlpinkk2rkg020q5q6kv-git-2.51.0/bin:/nix/store/w5fdhasggwfnfvwg9a6qc2wfczm4bn4j-nixfmt-1.1.0/bin:/nix/store/xs8scz9w9jp4hpqycx3n3bah5y07ymgj-coreutils-9.8/bin:/nix/store/qqvfnxa9jg71wp4hfg1l63r4m78iwvl9-findutils-4.10.0/bin:/nix/store/7ql4x9i7w7ihxw23vkanvcvrvqhay23c-diffutils-3.12/bin:/nix/store/zppkx0lkizglyqa9h26wf495qkllrjgy-gnused-4.9/bin:/nix/store/22r4s6lqhl43jkazn51f3c18qwk894g4-gnugrep-3.12/bin:/nix/store/8c4l9cqqj7pixqlmljx5d495pfpw8pys-gawk-5.3.2/bin:/nix/store/3m0zcl1by8ifylmgdcaa317cnhqn8q95-gnutar-1.35/bin:/nix/store/vjj9x3dzszbzjpkzwx63z4gpypiqphzf-gzip-1.14/bin:/nix/store/vzj5iy2png2rs6q2kb3svzp0cnd878f1-bzip2-1.0.8-bin/bin:/nix/store/43lv2nr7pj7wy09qyicjq57bl209ccis-gnumake-4.4.1/bin:/nix/store/ciarnmsx8lvsrmdbjddpmx0pqjrm8imb-bash-5.3p3/bin:/nix/store/miap8jjp87z0gibkrzh68lw2w8kzy4yx-patch-2.8/bin:/nix/store/vwx988887gsrdvg9lbg5f03sy91wrjjv-xz-5.8.1-bin/bin:/nix/store/n686xm9c2ak4x02pj9izvkm0zx7ilwir-file-5.45/bin'
+export PATH
+PS4='+ '
+RANLIB='ranlib'
+export RANLIB
+READELF='readelf'
+export READELF
+SHELL='/nix/store/ciarnmsx8lvsrmdbjddpmx0pqjrm8imb-bash-5.3p3/bin/bash'
+export SHELL
+SIZE='size'
+export SIZE
+SOURCE_DATE_EPOCH='315532800'
+export SOURCE_DATE_EPOCH
+STRINGS='strings'
+export STRINGS
+STRIP='strip'
+export STRIP
+XDG_DATA_DIRS='/nix/store/85n78yrssyfc65f32yxpqqcpzkgbjv8c-patchelf-0.15.2/share'
+export XDG_DATA_DIRS
+__structuredAttrs=''
+export __structuredAttrs
+_substituteStream_has_warned_replace_deprecation='false'
+buildInputs='/nix/store/60440kg5c51rrlpinkk2rkg020q5q6kv-git-2.51.0 /nix/store/w5fdhasggwfnfvwg9a6qc2wfczm4bn4j-nixfmt-1.1.0'
+export buildInputs
+buildPhase='{ echo "------------------------------------------------------------";
+  echo " WARNING: the existence of this path is not guaranteed.";
+  echo " It is an internal implementation detail for pkgs.mkShell.";
+  echo "------------------------------------------------------------";
+  echo;
+  # Record all build inputs as runtime dependencies
+  export;
+} >> "$out"
+'
+export buildPhase
+builder='/nix/store/ciarnmsx8lvsrmdbjddpmx0pqjrm8imb-bash-5.3p3/bin/bash'
+export builder
+cmakeFlags=''
+export cmakeFlags
+configureFlags=''
+export configureFlags
+defaultBuildInputs=''
+defaultNativeBuildInputs='/nix/store/85n78yrssyfc65f32yxpqqcpzkgbjv8c-patchelf-0.15.2 /nix/store/lbfg38p9kgm2dadwjqa7fgv0sjjh3ban-update-autotools-gnu-config-scripts-hook /nix/store/0y5xmdb7qfvimjwbq7ibg1xdgkgjwqng-no-broken-symlinks.sh /nix/store/cv1d7p48379km6a85h4zp6kr86brh32q-audit-tmpdir.sh /nix/store/85clx3b0xkdf58jn161iy80y5223ilbi-compress-man-pages.sh /nix/store/wgrbkkaldkrlrni33ccvm3b6vbxzb656-make-symlinks-relative.sh /nix/store/5yzw0vhkyszf2d179m0qfkgxmp5wjjx4-move-docs.sh /nix/store/fyaryjvghbkpfnsyw97hb3lyb37s1pd6-move-lib64.sh /nix/store/kd4xwxjpjxi71jkm6ka0np72if9rm3y0-move-sbin.sh /nix/store/pag6l61paj1dc9sv15l7bm5c17xn5kyk-move-systemd-user-units.sh /nix/store/cmzya9irvxzlkh7lfy6i82gbp0saxqj3-multiple-outputs.sh /nix/store/x8c40nfigps493a07sdr2pm5s9j1cdc0-patch-shebangs.sh /nix/store/cickvswrvann041nqxb0rxilc46svw1n-prune-libtool-files.sh /nix/store/xyff06pkhki3qy1ls77w10s0v79c9il0-reproducible-builds.sh /nix/store/z7k98578dfzi6l3hsvbivzm7hfqlk0zc-set-source-date-epoch-to-latest.sh /nix/store/pilsssjjdxvdphlg2h19p0bfx5q0jzkn-strip.sh /nix/store/x8mydcgbry214s802nzvy7fdljx404ym-gcc-wrapper-14.3.0'
+depsBuildBuild=''
+export depsBuildBuild
+depsBuildBuildPropagated=''
+export depsBuildBuildPropagated
+depsBuildTarget=''
+export depsBuildTarget
+depsBuildTargetPropagated=''
+export depsBuildTargetPropagated
+depsHostHost=''
+export depsHostHost
+depsHostHostPropagated=''
+export depsHostHostPropagated
+depsTargetTarget=''
+export depsTargetTarget
+depsTargetTargetPropagated=''
+export depsTargetTargetPropagated
+doCheck=''
+export doCheck
+doInstallCheck=''
+export doInstallCheck
+dontAddDisableDepTrack='1'
+export dontAddDisableDepTrack
+declare -a envBuildBuildHooks=()
+declare -a envBuildHostHooks=()
+declare -a envBuildTargetHooks=()
+declare -a envHostHostHooks=('ccWrapper_addCVars' 'bintoolsWrapper_addLDVars' )
+declare -a envHostTargetHooks=('ccWrapper_addCVars' 'bintoolsWrapper_addLDVars' )
+declare -a envTargetTargetHooks=()
+declare -a fixupOutputHooks=('if [ -z "${dontPatchELF-}" ]; then patchELF "$prefix"; fi' 'if [[ -z "${noAuditTmpdir-}" && -e "$prefix" ]]; then auditTmpdir "$prefix"; fi' 'if [ -z "${dontGzipMan-}" ]; then compressManPages "$prefix"; fi' '_moveLib64' '_moveSbin' '_moveSystemdUserUnits' 'patchShebangsAuto' '_pruneLibtoolFiles' '_doStrip' )
+initialPath='/nix/store/xs8scz9w9jp4hpqycx3n3bah5y07ymgj-coreutils-9.8 /nix/store/qqvfnxa9jg71wp4hfg1l63r4m78iwvl9-findutils-4.10.0 /nix/store/7ql4x9i7w7ihxw23vkanvcvrvqhay23c-diffutils-3.12 /nix/store/zppkx0lkizglyqa9h26wf495qkllrjgy-gnused-4.9 /nix/store/22r4s6lqhl43jkazn51f3c18qwk894g4-gnugrep-3.12 /nix/store/8c4l9cqqj7pixqlmljx5d495pfpw8pys-gawk-5.3.2 /nix/store/3m0zcl1by8ifylmgdcaa317cnhqn8q95-gnutar-1.35 /nix/store/vjj9x3dzszbzjpkzwx63z4gpypiqphzf-gzip-1.14 /nix/store/vzj5iy2png2rs6q2kb3svzp0cnd878f1-bzip2-1.0.8-bin /nix/store/43lv2nr7pj7wy09qyicjq57bl209ccis-gnumake-4.4.1 /nix/store/ciarnmsx8lvsrmdbjddpmx0pqjrm8imb-bash-5.3p3 /nix/store/miap8jjp87z0gibkrzh68lw2w8kzy4yx-patch-2.8 /nix/store/vwx988887gsrdvg9lbg5f03sy91wrjjv-xz-5.8.1-bin /nix/store/n686xm9c2ak4x02pj9izvkm0zx7ilwir-file-5.45'
+mesonFlags=''
+export mesonFlags
+name='nix-shell-env'
+export name
+nativeBuildInputs=''
+export nativeBuildInputs
+out='/home/tim/.dotfiles/outputs/out'
+export out
+outputBin='out'
+outputDev='out'
+outputDevdoc='REMOVE'
+outputDevman='out'
+outputDoc='out'
+outputInclude='out'
+outputInfo='out'
+outputLib='out'
+outputMan='out'
+outputs='out'
+export outputs
+patches=''
+export patches
+phases='buildPhase'
+export phases
+pkg='/nix/store/x8mydcgbry214s802nzvy7fdljx404ym-gcc-wrapper-14.3.0'
+declare -a pkgsBuildBuild=()
+declare -a pkgsBuildHost=('/nix/store/85n78yrssyfc65f32yxpqqcpzkgbjv8c-patchelf-0.15.2' '/nix/store/lbfg38p9kgm2dadwjqa7fgv0sjjh3ban-update-autotools-gnu-config-scripts-hook' '/nix/store/0y5xmdb7qfvimjwbq7ibg1xdgkgjwqng-no-broken-symlinks.sh' '/nix/store/cv1d7p48379km6a85h4zp6kr86brh32q-audit-tmpdir.sh' '/nix/store/85clx3b0xkdf58jn161iy80y5223ilbi-compress-man-pages.sh' '/nix/store/wgrbkkaldkrlrni33ccvm3b6vbxzb656-make-symlinks-relative.sh' '/nix/store/5yzw0vhkyszf2d179m0qfkgxmp5wjjx4-move-docs.sh' '/nix/store/fyaryjvghbkpfnsyw97hb3lyb37s1pd6-move-lib64.sh' '/nix/store/kd4xwxjpjxi71jkm6ka0np72if9rm3y0-move-sbin.sh' '/nix/store/pag6l61paj1dc9sv15l7bm5c17xn5kyk-move-systemd-user-units.sh' '/nix/store/cmzya9irvxzlkh7lfy6i82gbp0saxqj3-multiple-outputs.sh' '/nix/store/x8c40nfigps493a07sdr2pm5s9j1cdc0-patch-shebangs.sh' '/nix/store/cickvswrvann041nqxb0rxilc46svw1n-prune-libtool-files.sh' '/nix/store/xyff06pkhki3qy1ls77w10s0v79c9il0-reproducible-builds.sh' '/nix/store/z7k98578dfzi6l3hsvbivzm7hfqlk0zc-set-source-date-epoch-to-latest.sh' '/nix/store/pilsssjjdxvdphlg2h19p0bfx5q0jzkn-strip.sh' '/nix/store/x8mydcgbry214s802nzvy7fdljx404ym-gcc-wrapper-14.3.0' '/nix/store/918ldr9axgh5kdmpp5fnj2n37pyghwbx-binutils-wrapper-2.44' )
+declare -a pkgsBuildTarget=()
+declare -a pkgsHostHost=()
+declare -a pkgsHostTarget=('/nix/store/60440kg5c51rrlpinkk2rkg020q5q6kv-git-2.51.0' '/nix/store/w5fdhasggwfnfvwg9a6qc2wfczm4bn4j-nixfmt-1.1.0' )
+declare -a pkgsTargetTarget=()
+declare -a postFixupHooks=('noBrokenSymlinksInAllOutputs' '_makeSymlinksRelativeInAllOutputs' '_multioutPropagateDev' )
+declare -a postUnpackHooks=('_updateSourceDateEpochFromSourceRoot' )
+declare -a preConfigureHooks=('_multioutConfig' )
+preConfigurePhases=' updateAutotoolsGnuConfigScriptsPhase'
+declare -a preFixupHooks=('_moveToShare' '_multioutDocs' '_multioutDevs' )
+preferLocalBuild='1'
+export preferLocalBuild
+prefix='/home/tim/.dotfiles/outputs/out'
+declare -a propagatedBuildDepFiles=('propagated-build-build-deps' 'propagated-native-build-inputs' 'propagated-build-target-deps' )
+propagatedBuildInputs=''
+export propagatedBuildInputs
+declare -a propagatedHostDepFiles=('propagated-host-host-deps' 'propagated-build-inputs' )
+propagatedNativeBuildInputs=''
+export propagatedNativeBuildInputs
+declare -a propagatedTargetDepFiles=('propagated-target-target-deps' )
+shell='/nix/store/ciarnmsx8lvsrmdbjddpmx0pqjrm8imb-bash-5.3p3/bin/bash'
+export shell
+shellHook=''
+export shellHook
+stdenv='/nix/store/jsj1sql9id9c10sxmg7rvq3pj0f1l19b-stdenv-linux'
+export stdenv
+strictDeps=''
+export strictDeps
+system='x86_64-linux'
+export system
+declare -a unpackCmdHooks=('_defaultUnpack' )
+_activatePkgs ()
+{
+ 
+    local hostOffset targetOffset;
+    local pkg;
+    for hostOffset in "${allPlatOffsets[@]}";
+    do
+        local pkgsVar="${pkgAccumVarVars[hostOffset + 1]}";
+        for targetOffset in "${allPlatOffsets[@]}";
+        do
+            (( hostOffset <= targetOffset )) || continue;
+            local pkgsRef="${pkgsVar}[$targetOffset - $hostOffset]";
+            local pkgsSlice="${!pkgsRef}[@]";
+            for pkg in ${!pkgsSlice+"${!pkgsSlice}"};
+            do
+                activatePackage "$pkg" "$hostOffset" "$targetOffset";
+            done;
+        done;
+    done
+}
+_addRpathPrefix ()
+{
+ 
+    if [ "${NIX_NO_SELF_RPATH:-0}" != 1 ]; then
+        export NIX_LDFLAGS="-rpath $1/lib ${NIX_LDFLAGS-}";
+    fi
+}
+_addToEnv ()
+{
+ 
+    local depHostOffset depTargetOffset;
+    local pkg;
+    for depHostOffset in "${allPlatOffsets[@]}";
+    do
+        local hookVar="${pkgHookVarVars[depHostOffset + 1]}";
+        local pkgsVar="${pkgAccumVarVars[depHostOffset + 1]}";
+        for depTargetOffset in "${allPlatOffsets[@]}";
+        do
+            (( depHostOffset <= depTargetOffset )) || continue;
+            local hookRef="${hookVar}[$depTargetOffset - $depHostOffset]";
+            if [[ -z "${strictDeps-}" ]]; then
+                local visitedPkgs="";
+                for pkg in "${pkgsBuildBuild[@]}" "${pkgsBuildHost[@]}" "${pkgsBuildTarget[@]}" "${pkgsHostHost[@]}" "${pkgsHostTarget[@]}" "${pkgsTargetTarget[@]}";
+                do
+                    if [[ "$visitedPkgs" = *"$pkg"* ]]; then
+                        continue;
+                    fi;
+                    runHook "${!hookRef}" "$pkg";
+                    visitedPkgs+=" $pkg";
+                done;
+            else
+                local pkgsRef="${pkgsVar}[$depTargetOffset - $depHostOffset]";
+                local pkgsSlice="${!pkgsRef}[@]";
+                for pkg in ${!pkgsSlice+"${!pkgsSlice}"};
+                do
+                    runHook "${!hookRef}" "$pkg";
+                done;
+            fi;
+        done;
+    done
+}
+_allFlags ()
+{
+ 
+    export system pname name version;
+    while IFS='' read -r varName; do
+        nixTalkativeLog "@${varName}@ -> ${!varName}";
+        args+=("--subst-var" "$varName");
+    done < <(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }')
+}
+_assignFirst ()
+{
+ 
+    local varName="$1";
+    local _var;
+    local REMOVE=REMOVE;
+    shift;
+    for _var in "$@";
+    do
+        if [ -n "${!_var-}" ]; then
+            eval "${varName}"="${_var}";
+            return;
+        fi;
+    done;
+    echo;
+    echo "error: _assignFirst: could not find a non-empty variable whose name to assign to ${varName}.";
+    echo "       The following variables were all unset or empty:";
+    echo "           $*";
+    if [ -z "${out:-}" ]; then
+        echo '       If you do not want an "out" output in your derivation, make sure to define';
+        echo '       the other specific required outputs. This can be achieved by picking one';
+        echo "       of the above as an output.";
+        echo '       You do not have to remove "out" if you want to have a different default';
+        echo '       output, because the first output is taken as a default.';
+        echo;
+    fi;
+    return 1
+}
+_callImplicitHook ()
+{
+ 
+    local def="$1";
+    local hookName="$2";
+    if declare -F "$hookName" > /dev/null; then
+        nixTalkativeLog "calling implicit '$hookName' function hook";
+        "$hookName";
+    else
+        if type -p "$hookName" > /dev/null; then
+            nixTalkativeLog "sourcing implicit '$hookName' script hook";
+            source "$hookName";
+        else
+            if [ -n "${!hookName:-}" ]; then
+                nixTalkativeLog "evaling implicit '$hookName' string hook";
+                eval "${!hookName}";
+            else
+                return "$def";
+            fi;
+        fi;
+    fi
+}
+_defaultUnpack ()
+{
+ 
+    local fn="$1";
+    local destination;
+    if [ -d "$fn" ]; then
+        destination="$(stripHash "$fn")";
+        if [ -e "$destination" ]; then
+            echo "Cannot copy $fn to $destination: destination already exists!";
+            echo "Did you specify two \"srcs\" with the same \"name\"?";
+            return 1;
+        fi;
+        cp -r --preserve=timestamps --reflink=auto -- "$fn" "$destination";
+    else
+        case "$fn" in 
+            *.tar.xz | *.tar.lzma | *.txz)
+                ( XZ_OPT="--threads=$NIX_BUILD_CORES" xz -d < "$fn";
+                true ) | tar xf - --mode=+w --warning=no-timestamp
+            ;;
+            *.tar | *.tar.* | *.tgz | *.tbz2 | *.tbz)
+                tar xf "$fn" --mode=+w --warning=no-timestamp
+            ;;
+            *)
+                return 1
+            ;;
+        esac;
+    fi
+}
+_doStrip ()
+{
+ 
+    local -ra flags=(dontStripHost dontStripTarget);
+    local -ra debugDirs=(stripDebugList stripDebugListTarget);
+    local -ra allDirs=(stripAllList stripAllListTarget);
+    local -ra stripCmds=(STRIP STRIP_FOR_TARGET);
+    local -ra ranlibCmds=(RANLIB RANLIB_FOR_TARGET);
+    stripDebugList=${stripDebugList[*]:-lib lib32 lib64 libexec bin sbin Applications Library/Frameworks};
+    stripDebugListTarget=${stripDebugListTarget[*]:-};
+    stripAllList=${stripAllList[*]:-};
+    stripAllListTarget=${stripAllListTarget[*]:-};
+    local i;
+    for i in ${!stripCmds[@]};
+    do
+        local -n flag="${flags[$i]}";
+        local -n debugDirList="${debugDirs[$i]}";
+        local -n allDirList="${allDirs[$i]}";
+        local -n stripCmd="${stripCmds[$i]}";
+        local -n ranlibCmd="${ranlibCmds[$i]}";
+        if [[ -n "${dontStrip-}" || -n "${flag-}" ]] || ! type -f "${stripCmd-}" 2> /dev/null 1>&2; then
+            continue;
+        fi;
+        stripDirs "$stripCmd" "$ranlibCmd" "$debugDirList" "${stripDebugFlags[*]:--S -p}";
+        stripDirs "$stripCmd" "$ranlibCmd" "$allDirList" "${stripAllFlags[*]:--s -p}";
+    done
+}
+_eval ()
+{
+ 
+    if declare -F "$1" > /dev/null 2>&1; then
+        "$@";
+    else
+        eval "$1";
+    fi
+}
+_logHook ()
+{
+ 
+    if [[ -z ${NIX_LOG_FD-} ]]; then
+        return;
+    fi;
+    local hookKind="$1";
+    local hookExpr="$2";
+    shift 2;
+    if declare -F "$hookExpr" > /dev/null 2>&1; then
+        nixTalkativeLog "calling '$hookKind' function hook '$hookExpr'" "$@";
+    else
+        if type -p "$hookExpr" > /dev/null; then
+            nixTalkativeLog "sourcing '$hookKind' script hook '$hookExpr'";
+        else
+            if [[ "$hookExpr" != "_callImplicitHook"* ]]; then
+                local exprToOutput;
+                if [[ ${NIX_DEBUG:-0} -ge 5 ]]; then
+                    exprToOutput="$hookExpr";
+                else
+                    local hookExprLine;
+                    while IFS= read -r hookExprLine; do
+                        hookExprLine="${hookExprLine#"${hookExprLine%%[![:space:]]*}"}";
+                        if [[ -n "$hookExprLine" ]]; then
+                            exprToOutput+="$hookExprLine\\n ";
+                        fi;
+                    done <<< "$hookExpr";
+                    exprToOutput="${exprToOutput%%\\n }";
+                fi;
+                nixTalkativeLog "evaling '$hookKind' string hook '$exprToOutput'";
+            fi;
+        fi;
+    fi
+}
+_makeSymlinksRelative ()
+{
+ 
+    local symlinkTarget;
+    if [ "${dontRewriteSymlinks-}" ] || [ ! -e "$prefix" ]; then
+        return;
+    fi;
+    while IFS= read -r -d '' f; do
+        symlinkTarget=$(readlink "$f");
+        if [[ "$symlinkTarget"/ != "$prefix"/* ]]; then
+            continue;
+        fi;
+        if [ ! -e "$symlinkTarget" ]; then
+            echo "the symlink $f is broken, it points to $symlinkTarget (which is missing)";
+        fi;
+        echo "rewriting symlink $f to be relative to $prefix";
+        ln -snrf "$symlinkTarget" "$f";
+    done < <(find $prefix -type l -print0)
+}
+_makeSymlinksRelativeInAllOutputs ()
+{
+ 
+    local output;
+    for output in $(getAllOutputNames);
+    do
+        prefix="${!output}" _makeSymlinksRelative;
+    done
+}
+_moveLib64 ()
+{
+ 
+    if [ "${dontMoveLib64-}" = 1 ]; then
+        return;
+    fi;
+    if [ ! -e "$prefix/lib64" -o -L "$prefix/lib64" ]; then
+        return;
+    fi;
+    echo "moving $prefix/lib64/* to $prefix/lib";
+    mkdir -p $prefix/lib;
+    shopt -s dotglob;
+    for i in $prefix/lib64/*;
+    do
+        mv --no-clobber "$i" $prefix/lib;
+    done;
+    shopt -u dotglob;
+    rmdir $prefix/lib64;
+    ln -s lib $prefix/lib64
+}
+_moveSbin ()
+{
+ 
+    if [ "${dontMoveSbin-}" = 1 ]; then
+        return;
+    fi;
+    if [ ! -e "$prefix/sbin" -o -L "$prefix/sbin" ]; then
+        return;
+    fi;
+    echo "moving $prefix/sbin/* to $prefix/bin";
+    mkdir -p $prefix/bin;
+    shopt -s dotglob;
+    for i in $prefix/sbin/*;
+    do
+        mv "$i" $prefix/bin;
+    done;
+    shopt -u dotglob;
+    rmdir $prefix/sbin;
+    ln -s bin $prefix/sbin
+}
+_moveSystemdUserUnits ()
+{
+ 
+    if [ "${dontMoveSystemdUserUnits:-0}" = 1 ]; then
+        return;
+    fi;
+    if [ ! -e "${prefix:?}/lib/systemd/user" ]; then
+        return;
+    fi;
+    local source="$prefix/lib/systemd/user";
+    local target="$prefix/share/systemd/user";
+    echo "moving $source/* to $target";
+    mkdir -p "$target";
+    ( shopt -s dotglob;
+    for i in "$source"/*;
+    do
+        mv "$i" "$target";
+    done );
+    rmdir "$source";
+    ln -s "$target" "$source"
+}
+_moveToShare ()
+{
+ 
+    if [ -n "$__structuredAttrs" ]; then
+        if [ -z "${forceShare-}" ]; then
+            forceShare=(man doc info);
+        fi;
+    else
+        forceShare=(${forceShare:-man doc info});
+    fi;
+    if [[ -z "$out" ]]; then
+        return;
+    fi;
+    for d in "${forceShare[@]}";
+    do
+        if [ -d "$out/$d" ]; then
+            if [ -d "$out/share/$d" ]; then
+                echo "both $d/ and share/$d/ exist!";
+            else
+                echo "moving $out/$d to $out/share/$d";
+                mkdir -p $out/share;
+                mv $out/$d $out/share/;
+            fi;
+        fi;
+    done
+}
+_multioutConfig ()
+{
+ 
+    if [ "$(getAllOutputNames)" = "out" ] || [ -z "${setOutputFlags-1}" ]; then
+        return;
+    fi;
+    if [ -z "${shareDocName:-}" ]; then
+        local confScript="${configureScript:-}";
+        if [ -z "$confScript" ] && [ -x ./configure ]; then
+            confScript=./configure;
+        fi;
+        if [ -f "$confScript" ]; then
+            local shareDocName="$(sed -n "s/^PACKAGE_TARNAME='\(.*\)'$/\1/p" < "$confScript")";
+        fi;
+        if [ -z "$shareDocName" ] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_-]'; then
+            shareDocName="$(echo "$name" | sed 's/-[^a-zA-Z].*//')";
+        fi;
+    fi;
+    prependToVar configureFlags --bindir="${!outputBin}"/bin --sbindir="${!outputBin}"/sbin --includedir="${!outputInclude}"/include --mandir="${!outputMan}"/share/man --infodir="${!outputInfo}"/share/info --docdir="${!outputDoc}"/share/doc/"${shareDocName}" --libdir="${!outputLib}"/lib --libexecdir="${!outputLib}"/libexec --localedir="${!outputLib}"/share/locale;
+    prependToVar installFlags pkgconfigdir="${!outputDev}"/lib/pkgconfig m4datadir="${!outputDev}"/share/aclocal aclocaldir="${!outputDev}"/share/aclocal
+}
+_multioutDevs ()
+{
+ 
+    if [ "$(getAllOutputNames)" = "out" ] || [ -z "${moveToDev-1}" ]; then
+        return;
+    fi;
+    moveToOutput include "${!outputInclude}";
+    moveToOutput lib/pkgconfig "${!outputDev}";
+    moveToOutput share/pkgconfig "${!outputDev}";
+    moveToOutput lib/cmake "${!outputDev}";
+    moveToOutput share/aclocal "${!outputDev}";
+    for f in "${!outputDev}"/{lib,share}/pkgconfig/*.pc;
+    do
+        echo "Patching '$f' includedir to output ${!outputInclude}";
+        sed -i "/^includedir=/s,=\${prefix},=${!outputInclude}," "$f";
+    done
+}
+_multioutDocs ()
+{
+ 
+    local REMOVE=REMOVE;
+    moveToOutput share/info "${!outputInfo}";
+    moveToOutput share/doc "${!outputDoc}";
+    moveToOutput share/gtk-doc "${!outputDevdoc}";
+    moveToOutput share/devhelp/books "${!outputDevdoc}";
+    moveToOutput share/man "${!outputMan}";
+    moveToOutput share/man/man3 "${!outputDevman}"
+}
+_multioutPropagateDev ()
+{
+ 
+    if [ "$(getAllOutputNames)" = "out" ]; then
+        return;
+    fi;
+    local outputFirst;
+    for outputFirst in $(getAllOutputNames);
+    do
+        break;
+    done;
+    local propagaterOutput="$outputDev";
+    if [ -z "$propagaterOutput" ]; then
+        propagaterOutput="$outputFirst";
+    fi;
+    if [ -z "${propagatedBuildOutputs+1}" ]; then
+        local po_dirty="$outputBin $outputInclude $outputLib";
+        set +o pipefail;
+        propagatedBuildOutputs=`echo "$po_dirty"             | tr -s ' ' '\n' | grep -v -F "$propagaterOutput"             | sort -u | tr '\n' ' ' `;
+        set -o pipefail;
+    fi;
+    if [ -z "$propagatedBuildOutputs" ]; then
+        return;
+    fi;
+    mkdir -p "${!propagaterOutput}"/nix-support;
+    for output in $propagatedBuildOutputs;
+    do
+        echo -n " ${!output}" >> "${!propagaterOutput}"/nix-support/propagated-build-inputs;
+    done
+}
+_nixLogWithLevel ()
+{
+ 
+    [[ -z ${NIX_LOG_FD-} || ${NIX_DEBUG:-0} -lt ${1:?} ]] && return 0;
+    local logLevel;
+    case "${1:?}" in 
+        0)
+            logLevel=ERROR
+        ;;
+        1)
+            logLevel=WARN
+        ;;
+        2)
+            logLevel=NOTICE
+        ;;
+        3)
+            logLevel=INFO
+        ;;
+        4)
+            logLevel=TALKATIVE
+        ;;
+        5)
+            logLevel=CHATTY
+        ;;
+        6)
+            logLevel=DEBUG
+        ;;
+        7)
+            logLevel=VOMIT
+        ;;
+        *)
+            echo "_nixLogWithLevel: called with invalid log level: ${1:?}" >&"$NIX_LOG_FD";
+            return 1
+        ;;
+    esac;
+    local callerName="${FUNCNAME[2]}";
+    if [[ $callerName == "_callImplicitHook" ]]; then
+        callerName="${hookName:?}";
+    fi;
+    printf "%s: %s: %s\n" "$logLevel" "$callerName" "${2:?}" >&"$NIX_LOG_FD"
+}
+_overrideFirst ()
+{
+ 
+    if [ -z "${!1-}" ]; then
+        _assignFirst "$@";
+    fi
+}
+_pruneLibtoolFiles ()
+{
+ 
+    if [ "${dontPruneLibtoolFiles-}" ] || [ ! -e "$prefix" ]; then
+        return;
+    fi;
+    find "$prefix" -type f -name '*.la' -exec grep -q '^# Generated by .*libtool' {} \; -exec grep -q "^old_library=''" {} \; -exec sed -i {} -e "/^dependency_libs='[^']/ c dependency_libs='' #pruned" \;
+}
+_updateSourceDateEpochFromSourceRoot ()
+{
+ 
+    if [ -n "$sourceRoot" ]; then
+        updateSourceDateEpoch "$sourceRoot";
+    fi
+}
+activatePackage ()
+{
+ 
+    local pkg="$1";
+    local -r hostOffset="$2";
+    local -r targetOffset="$3";
+    (( hostOffset <= targetOffset )) || exit 1;
+    if [ -f "$pkg" ]; then
+        nixTalkativeLog "sourcing setup hook '$pkg'";
+        source "$pkg";
+    fi;
+    if [[ -z "${strictDeps-}" || "$hostOffset" -le -1 ]]; then
+        addToSearchPath _PATH "$pkg/bin";
+    fi;
+    if (( hostOffset <= -1 )); then
+        addToSearchPath _XDG_DATA_DIRS "$pkg/share";
+    fi;
+    if [[ "$hostOffset" -eq 0 && -d "$pkg/bin" ]]; then
+        addToSearchPath _HOST_PATH "$pkg/bin";
+    fi;
+    if [[ -f "$pkg/nix-support/setup-hook" ]]; then
+        nixTalkativeLog "sourcing setup hook '$pkg/nix-support/setup-hook'";
+        source "$pkg/nix-support/setup-hook";
+    fi
+}
+addEnvHooks ()
+{
+ 
+    local depHostOffset="$1";
+    shift;
+    local pkgHookVarsSlice="${pkgHookVarVars[$depHostOffset + 1]}[@]";
+    local pkgHookVar;
+    for pkgHookVar in "${!pkgHookVarsSlice}";
+    do
+        eval "${pkgHookVar}s"'+=("$@")';
+    done
+}
+addToSearchPath ()
+{
+ 
+    addToSearchPathWithCustomDelimiter ":" "$@"
+}
+addToSearchPathWithCustomDelimiter ()
+{
+ 
+    local delimiter="$1";
+    local varName="$2";
+    local dir="$3";
+    if [[ -d "$dir" && "${!varName:+${delimiter}${!varName}${delimiter}}" != *"${delimiter}${dir}${delimiter}"* ]]; then
+        export "${varName}=${!varName:+${!varName}${delimiter}}${dir}";
+    fi
+}
+appendToVar ()
+{
+ 
+    local -n nameref="$1";
+    local useArray type;
+    if [ -n "$__structuredAttrs" ]; then
+        useArray=true;
+    else
+        useArray=false;
+    fi;
+    if type=$(declare -p "$1" 2> /dev/null); then
+        case "${type#* }" in 
+            -A*)
+                echo "appendToVar(): ERROR: trying to use appendToVar on an associative array, use variable+=([\"X\"]=\"Y\") instead." 1>&2;
+                return 1
+            ;;
+            -a*)
+                useArray=true
+            ;;
+            *)
+                useArray=false
+            ;;
+        esac;
+    fi;
+    shift;
+    if $useArray; then
+        nameref=(${nameref+"${nameref[@]}"} "$@");
+    else
+        nameref="${nameref-} $*";
+    fi
+}
+auditTmpdir ()
+{
+ 
+    local dir="$1";
+    [ -e "$dir" ] || return 0;
+    echo "checking for references to $TMPDIR/ in $dir...";
+    local tmpdir elf_fifo script_fifo;
+    tmpdir="$(mktemp -d)";
+    elf_fifo="$tmpdir/elf";
+    script_fifo="$tmpdir/script";
+    mkfifo "$elf_fifo" "$script_fifo";
+    ( find "$dir" -type f -not -path '*/.build-id/*' -print0 | while IFS= read -r -d '' file; do
+        if isELF "$file"; then
+            printf '%s\0' "$file" 1>&3;
+        else
+            if isScript "$file"; then
+                filename=${file##*/};
+                dir=${file%/*};
+                if [ -e "$dir/.$filename-wrapped" ]; then
+                    printf '%s\0' "$file" 1>&4;
+                fi;
+            fi;
+        fi;
+    done;
+    exec 3>&- 4>&- ) 3> "$elf_fifo" 4> "$script_fifo" & ( xargs -0 -r -P "$NIX_BUILD_CORES" -n 1 sh -c '
+            if { printf :; patchelf --print-rpath "$1"; } | grep -q -F ":$TMPDIR/"; then
+                echo "RPATH of binary $1 contains a forbidden reference to $TMPDIR/"
+                exit 1
+            fi
+        ' _ < "$elf_fifo" ) & local pid_elf=$!;
+    local pid_script;
+    ( xargs -0 -r -P "$NIX_BUILD_CORES" -n 1 sh -c '
+            if grep -q -F "$TMPDIR/" "$1"; then
+                echo "wrapper script $1 contains a forbidden reference to $TMPDIR/"
+                exit 1
+            fi
+        ' _ < "$script_fifo" ) & local pid_script=$!;
+    wait "$pid_elf" || { 
+        echo "Some binaries contain forbidden references to $TMPDIR/. Check the error above!";
+        exit 1
+    };
+    wait "$pid_script" || { 
+        echo "Some scripts contain forbidden references to $TMPDIR/. Check the error above!";
+        exit 1
+    };
+    rm -r "$tmpdir"
+}
+bintoolsWrapper_addLDVars ()
+{
+ 
+    local role_post;
+    getHostRoleEnvHook;
+    if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then
+        export NIX_LDFLAGS${role_post}+=" -L$1/lib64";
+    fi;
+    if [[ -d "$1/lib" ]]; then
+        local -a glob=($1/lib/lib*);
+        if [ "${#glob[*]}" -gt 0 ]; then
+            export NIX_LDFLAGS${role_post}+=" -L$1/lib";
+        fi;
+    fi
+}
+buildPhase ()
+{
+ 
+    runHook preBuild;
+    if [[ -z "${makeFlags-}" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then
+        echo "no Makefile or custom buildPhase, doing nothing";
+    else
+        foundMakefile=1;
+        local flagsArray=(${enableParallelBuilding:+-j${NIX_BUILD_CORES}} SHELL="$SHELL");
+        concatTo flagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray;
+        echoCmd 'build flags' "${flagsArray[@]}";
+        make ${makefile:+-f $makefile} "${flagsArray[@]}";
+        unset flagsArray;
+    fi;
+    runHook postBuild
+}
+ccWrapper_addCVars ()
+{
+ 
+    local role_post;
+    getHostRoleEnvHook;
+    local found=;
+    if [ -d "$1/include" ]; then
+        export NIX_CFLAGS_COMPILE${role_post}+=" -isystem $1/include";
+        found=1;
+    fi;
+    if [ -d "$1/Library/Frameworks" ]; then
+        export NIX_CFLAGS_COMPILE${role_post}+=" -iframework $1/Library/Frameworks";
+        found=1;
+    fi;
+    if [[ -n "" && -n ${NIX_STORE:-} && -n $found ]]; then
+        local scrubbed="$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${1#"$NIX_STORE"/*-}";
+        export NIX_CFLAGS_COMPILE${role_post}+=" -fmacro-prefix-map=$1=$scrubbed";
+    fi
+}
+checkPhase ()
+{
+ 
+    runHook preCheck;
+    if [[ -z "${foundMakefile:-}" ]]; then
+        echo "no Makefile or custom checkPhase, doing nothing";
+        runHook postCheck;
+        return;
+    fi;
+    if [[ -z "${checkTarget:-}" ]]; then
+        if make -n ${makefile:+-f $makefile} check > /dev/null 2>&1; then
+            checkTarget="check";
+        else
+            if make -n ${makefile:+-f $makefile} test > /dev/null 2>&1; then
+                checkTarget="test";
+            fi;
+        fi;
+    fi;
+    if [[ -z "${checkTarget:-}" ]]; then
+        echo "no check/test target in ${makefile:-Makefile}, doing nothing";
+    else
+        local flagsArray=(${enableParallelChecking:+-j${NIX_BUILD_CORES}} SHELL="$SHELL");
+        concatTo flagsArray makeFlags makeFlagsArray checkFlags=VERBOSE=y checkFlagsArray checkTarget;
+        echoCmd 'check flags' "${flagsArray[@]}";
+        make ${makefile:+-f $makefile} "${flagsArray[@]}";
+        unset flagsArray;
+    fi;
+    runHook postCheck
+}
+compressManPages ()
+{
+ 
+    local dir="$1";
+    if [ -L "$dir"/share ] || [ -L "$dir"/share/man ] || [ ! -d "$dir/share/man" ]; then
+        return;
+    fi;
+    echo "gzipping man pages under $dir/share/man/";
+    find "$dir"/share/man/ -type f -a '!' -regex '.*\.\(bz2\|gz\|xz\)$' -print0 | xargs -0 -n1 -P "$NIX_BUILD_CORES" gzip -n -f;
+    find "$dir"/share/man/ -type l -a '!' -regex '.*\.\(bz2\|gz\|xz\)$' -print0 | sort -z | while IFS= read -r -d '' f; do
+        local target;
+        target="$(readlink -f "$f")";
+        if [ -f "$target".gz ]; then
+            ln -sf "$target".gz "$f".gz && rm "$f";
+        fi;
+    done
+}
+concatStringsSep ()
+{
+ 
+    local sep="$1";
+    local name="$2";
+    local type oldifs;
+    if type=$(declare -p "$name" 2> /dev/null); then
+        local -n nameref="$name";
+        case "${type#* }" in 
+            -A*)
+                echo "concatStringsSep(): ERROR: trying to use concatStringsSep on an associative array." 1>&2;
+                return 1
+            ;;
+            -a*)
+                local IFS="$(printf '\036')"
+            ;;
+            *)
+                local IFS=" "
+            ;;
+        esac;
+        local ifs_separated="${nameref[*]}";
+        echo -n "${ifs_separated//"$IFS"/"$sep"}";
+    fi
+}
+concatTo ()
+{
+ 
+    local -;
+    set -o noglob;
+    local -n targetref="$1";
+    shift;
+    local arg default name type;
+    for arg in "$@";
+    do
+        IFS="=" read -r name default <<< "$arg";
+        local -n nameref="$name";
+        if [[ -z "${nameref[*]}" && -n "$default" ]]; then
+            targetref+=("$default");
+        else
+            if type=$(declare -p "$name" 2> /dev/null); then
+                case "${type#* }" in 
+                    -A*)
+                        echo "concatTo(): ERROR: trying to use concatTo on an associative array." 1>&2;
+                        return 1
+                    ;;
+                    -a*)
+                        targetref+=("${nameref[@]}")
+                    ;;
+                    *)
+                        if [[ "$name" = *"Array" ]]; then
+                            nixErrorLog "concatTo(): $name is not declared as array, treating as a singleton. This will become an error in future";
+                            targetref+=(${nameref+"${nameref[@]}"});
+                        else
+                            targetref+=(${nameref-});
+                        fi
+                    ;;
+                esac;
+            fi;
+        fi;
+    done
+}
+configurePhase ()
+{
+ 
+    runHook preConfigure;
+    : "${configureScript=}";
+    if [[ -z "$configureScript" && -x ./configure ]]; then
+        configureScript=./configure;
+    fi;
+    if [ -z "${dontFixLibtool:-}" ]; then
+        export lt_cv_deplibs_check_method="${lt_cv_deplibs_check_method-pass_all}";
+        local i;
+        find . -iname "ltmain.sh" -print0 | while IFS='' read -r -d '' i; do
+            echo "fixing libtool script $i";
+            fixLibtool "$i";
+        done;
+        CONFIGURE_MTIME_REFERENCE=$(mktemp configure.mtime.reference.XXXXXX);
+        find . -executable -type f -name configure -exec grep -l 'GNU Libtool is free software; you can redistribute it and/or modify' {} \; -exec touch -r {} "$CONFIGURE_MTIME_REFERENCE" \; -exec sed -i s_/usr/bin/file_file_g {} \; -exec touch -r "$CONFIGURE_MTIME_REFERENCE" {} \;;
+        rm -f "$CONFIGURE_MTIME_REFERENCE";
+    fi;
+    if [[ -z "${dontAddPrefix:-}" && -n "$prefix" ]]; then
+        prependToVar configureFlags "${prefixKey:---prefix=}$prefix";
+    fi;
+    if [[ -f "$configureScript" ]]; then
+        if [ -z "${dontAddDisableDepTrack:-}" ]; then
+            if grep -q dependency-tracking "$configureScript"; then
+                prependToVar configureFlags --disable-dependency-tracking;
+            fi;
+        fi;
+        if [ -z "${dontDisableStatic:-}" ]; then
+            if grep -q enable-static "$configureScript"; then
+                prependToVar configureFlags --disable-static;
+            fi;
+        fi;
+        if [ -z "${dontPatchShebangsInConfigure:-}" ]; then
+            patchShebangs --build "$configureScript";
+        fi;
+    fi;
+    if [ -n "$configureScript" ]; then
+        local -a flagsArray;
+        concatTo flagsArray configureFlags configureFlagsArray;
+        echoCmd 'configure flags' "${flagsArray[@]}";
+        $configureScript "${flagsArray[@]}";
+        unset flagsArray;
+    else
+        echo "no configure script, doing nothing";
+    fi;
+    runHook postConfigure
+}
+consumeEntire ()
+{
+ 
+    if IFS='' read -r -d '' "$1"; then
+        echo "consumeEntire(): ERROR: Input null bytes, won't process" 1>&2;
+        return 1;
+    fi
+}
+distPhase ()
+{
+ 
+    runHook preDist;
+    local flagsArray=();
+    concatTo flagsArray distFlags distFlagsArray distTarget=dist;
+    echo 'dist flags: %q' "${flagsArray[@]}";
+    make ${makefile:+-f $makefile} "${flagsArray[@]}";
+    if [ "${dontCopyDist:-0}" != 1 ]; then
+        mkdir -p "$out/tarballs";
+        cp -pvd ${tarballs[*]:-*.tar.gz} "$out/tarballs";
+    fi;
+    runHook postDist
+}
+dumpVars ()
+{
+ 
+    if [[ "${noDumpEnvVars:-0}" != 1 && -d "$NIX_BUILD_TOP" ]]; then
+        local old_umask;
+        old_umask=$(umask);
+        umask 0077;
+        export 2> /dev/null > "$NIX_BUILD_TOP/env-vars";
+        umask "$old_umask";
+    fi
+}
+echoCmd ()
+{
+ 
+    printf "%s:" "$1";
+    shift;
+    printf ' %q' "$@";
+    echo
+}
+exitHandler ()
+{
+ 
+    exitCode="$?";
+    set +e;
+    if [ -n "${showBuildStats:-}" ]; then
+        read -r -d '' -a buildTimes < <(times);
+        echo "build times:";
+        echo "user time for the shell             ${buildTimes[0]}";
+        echo "system time for the shell           ${buildTimes[1]}";
+        echo "user time for all child processes   ${buildTimes[2]}";
+        echo "system time for all child processes ${buildTimes[3]}";
+    fi;
+    if (( "$exitCode" != 0 )); then
+        runHook failureHook;
+        if [ -n "${succeedOnFailure:-}" ]; then
+            echo "build failed with exit code $exitCode (ignored)";
+            mkdir -p "$out/nix-support";
+            printf "%s" "$exitCode" > "$out/nix-support/failed";
+            exit 0;
+        fi;
+    else
+        runHook exitHook;
+    fi;
+    return "$exitCode"
+}
+findInputs ()
+{
+ 
+    local -r pkg="$1";
+    local -r hostOffset="$2";
+    local -r targetOffset="$3";
+    (( hostOffset <= targetOffset )) || exit 1;
+    local varVar="${pkgAccumVarVars[hostOffset + 1]}";
+    local varRef="$varVar[$((targetOffset - hostOffset))]";
+    local var="${!varRef}";
+    unset -v varVar varRef;
+    local varSlice="$var[*]";
+    case " ${!varSlice-} " in 
+        *" $pkg "*)
+            return 0
+        ;;
+    esac;
+    unset -v varSlice;
+    eval "$var"'+=("$pkg")';
+    if ! [ -e "$pkg" ]; then
+        echo "build input $pkg does not exist" 1>&2;
+        exit 1;
+    fi;
+    function mapOffset () 
+    { 
+        local -r inputOffset="$1";
+        local -n outputOffset="$2";
+        if (( inputOffset <= 0 )); then
+            outputOffset=$((inputOffset + hostOffset));
+        else
+            outputOffset=$((inputOffset - 1 + targetOffset));
+        fi
+    };
+    local relHostOffset;
+    for relHostOffset in "${allPlatOffsets[@]}";
+    do
+        local files="${propagatedDepFilesVars[relHostOffset + 1]}";
+        local hostOffsetNext;
+        mapOffset "$relHostOffset" hostOffsetNext;
+        (( -1 <= hostOffsetNext && hostOffsetNext <= 1 )) || continue;
+        local relTargetOffset;
+        for relTargetOffset in "${allPlatOffsets[@]}";
+        do
+            (( "$relHostOffset" <= "$relTargetOffset" )) || continue;
+            local fileRef="${files}[$relTargetOffset - $relHostOffset]";
+            local file="${!fileRef}";
+            unset -v fileRef;
+            local targetOffsetNext;
+            mapOffset "$relTargetOffset" targetOffsetNext;
+            (( -1 <= hostOffsetNext && hostOffsetNext <= 1 )) || continue;
+            [[ -f "$pkg/nix-support/$file" ]] || continue;
+            local pkgNext;
+            read -r -d '' pkgNext < "$pkg/nix-support/$file" || true;
+            for pkgNext in $pkgNext;
+            do
+                findInputs "$pkgNext" "$hostOffsetNext" "$targetOffsetNext";
+            done;
+        done;
+    done
+}
+fixLibtool ()
+{
+ 
+    local search_path;
+    for flag in $NIX_LDFLAGS;
+    do
+        case $flag in 
+            -L*)
+                search_path+=" ${flag#-L}"
+            ;;
+        esac;
+    done;
+    sed -i "$1" -e "s^eval \(sys_lib_search_path=\).*^\1'${search_path:-}'^" -e 's^eval sys_lib_.+search_path=.*^^'
+}
+fixupPhase ()
+{
+ 
+    local output;
+    for output in $(getAllOutputNames);
+    do
+        if [ -e "${!output}" ]; then
+            chmod -R u+w,u-s,g-s "${!output}";
+        fi;
+    done;
+    runHook preFixup;
+    local output;
+    for output in $(getAllOutputNames);
+    do
+        prefix="${!output}" runHook fixupOutput;
+    done;
+    recordPropagatedDependencies;
+    if [ -n "${setupHook:-}" ]; then
+        mkdir -p "${!outputDev}/nix-support";
+        substituteAll "$setupHook" "${!outputDev}/nix-support/setup-hook";
+    fi;
+    if [ -n "${setupHooks:-}" ]; then
+        mkdir -p "${!outputDev}/nix-support";
+        local hook;
+        for hook in ${setupHooks[@]};
+        do
+            local content;
+            consumeEntire content < "$hook";
+            substituteAllStream content "file '$hook'" >> "${!outputDev}/nix-support/setup-hook";
+            unset -v content;
+        done;
+        unset -v hook;
+    fi;
+    if [ -n "${propagatedUserEnvPkgs[*]:-}" ]; then
+        mkdir -p "${!outputBin}/nix-support";
+        printWords "${propagatedUserEnvPkgs[@]}" > "${!outputBin}/nix-support/propagated-user-env-packages";
+    fi;
+    runHook postFixup
+}
+genericBuild ()
+{
+ 
+    export GZIP_NO_TIMESTAMPS=1;
+    if [ -f "${buildCommandPath:-}" ]; then
+        source "$buildCommandPath";
+        return;
+    fi;
+    if [ -n "${buildCommand:-}" ]; then
+        eval "$buildCommand";
+        return;
+    fi;
+    if [ -z "${phases[*]:-}" ]; then
+        phases="${prePhases[*]:-} unpackPhase patchPhase ${preConfigurePhases[*]:-}             configurePhase ${preBuildPhases[*]:-} buildPhase checkPhase             ${preInstallPhases[*]:-} installPhase ${preFixupPhases[*]:-} fixupPhase installCheckPhase             ${preDistPhases[*]:-} distPhase ${postPhases[*]:-}";
+    fi;
+    for curPhase in ${phases[*]};
+    do
+        runPhase "$curPhase";
+    done
+}
+getAllOutputNames ()
+{
+ 
+    if [ -n "$__structuredAttrs" ]; then
+        echo "${!outputs[*]}";
+    else
+        echo "$outputs";
+    fi
+}
+getHostRole ()
+{
+ 
+    getRole "$hostOffset"
+}
+getHostRoleEnvHook ()
+{
+ 
+    getRole "$depHostOffset"
+}
+getRole ()
+{
+ 
+    case $1 in 
+        -1)
+            role_post='_FOR_BUILD'
+        ;;
+        0)
+            role_post=''
+        ;;
+        1)
+            role_post='_FOR_TARGET'
+        ;;
+        *)
+            echo "binutils-wrapper-2.44: used as improper sort of dependency" 1>&2;
+            return 1
+        ;;
+    esac
+}
+getTargetRole ()
+{
+ 
+    getRole "$targetOffset"
+}
+getTargetRoleEnvHook ()
+{
+ 
+    getRole "$depTargetOffset"
+}
+getTargetRoleWrapper ()
+{
+ 
+    case $targetOffset in 
+        -1)
+            export NIX_BINTOOLS_WRAPPER_TARGET_BUILD_x86_64_unknown_linux_gnu=1
+        ;;
+        0)
+            export NIX_BINTOOLS_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu=1
+        ;;
+        1)
+            export NIX_BINTOOLS_WRAPPER_TARGET_TARGET_x86_64_unknown_linux_gnu=1
+        ;;
+        *)
+            echo "binutils-wrapper-2.44: used as improper sort of dependency" 1>&2;
+            return 1
+        ;;
+    esac
+}
+installCheckPhase ()
+{
+ 
+    runHook preInstallCheck;
+    if [[ -z "${foundMakefile:-}" ]]; then
+        echo "no Makefile or custom installCheckPhase, doing nothing";
+    else
+        if [[ -z "${installCheckTarget:-}" ]] && ! make -n ${makefile:+-f $makefile} "${installCheckTarget:-installcheck}" > /dev/null 2>&1; then
+            echo "no installcheck target in ${makefile:-Makefile}, doing nothing";
+        else
+            local flagsArray=(${enableParallelChecking:+-j${NIX_BUILD_CORES}} SHELL="$SHELL");
+            concatTo flagsArray makeFlags makeFlagsArray installCheckFlags installCheckFlagsArray installCheckTarget=installcheck;
+            echoCmd 'installcheck flags' "${flagsArray[@]}";
+            make ${makefile:+-f $makefile} "${flagsArray[@]}";
+            unset flagsArray;
+        fi;
+    fi;
+    runHook postInstallCheck
+}
+installPhase ()
+{
+ 
+    runHook preInstall;
+    if [[ -z "${makeFlags-}" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then
+        echo "no Makefile or custom installPhase, doing nothing";
+        runHook postInstall;
+        return;
+    else
+        foundMakefile=1;
+    fi;
+    if [ -n "$prefix" ]; then
+        mkdir -p "$prefix";
+    fi;
+    local flagsArray=(${enableParallelInstalling:+-j${NIX_BUILD_CORES}} SHELL="$SHELL");
+    concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray installTargets=install;
+    echoCmd 'install flags' "${flagsArray[@]}";
+    make ${makefile:+-f $makefile} "${flagsArray[@]}";
+    unset flagsArray;
+    runHook postInstall
+}
+isELF ()
+{
+ 
+    local fn="$1";
+    local fd;
+    local magic;
+    exec {fd}< "$fn";
+    LANG=C read -r -n 4 -u "$fd" magic;
+    exec {fd}>&-;
+    if [ "$magic" = 'ELF' ]; then
+        return 0;
+    else
+        return 1;
+    fi
+}
+isMachO ()
+{
+ 
+    local fn="$1";
+    local fd;
+    local magic;
+    exec {fd}< "$fn";
+    LANG=C read -r -n 4 -u "$fd" magic;
+    exec {fd}>&-;
+    if [[ "$magic" = $(echo -ne "\xfe\xed\xfa\xcf") || "$magic" = $(echo -ne "\xcf\xfa\xed\xfe") ]]; then
+        return 0;
+    else
+        if [[ "$magic" = $(echo -ne "\xfe\xed\xfa\xce") || "$magic" = $(echo -ne "\xce\xfa\xed\xfe") ]]; then
+            return 0;
+        else
+            if [[ "$magic" = $(echo -ne "\xca\xfe\xba\xbe") || "$magic" = $(echo -ne "\xbe\xba\xfe\xca") ]]; then
+                return 0;
+            else
+                return 1;
+            fi;
+        fi;
+    fi
+}
+isScript ()
+{
+ 
+    local fn="$1";
+    local fd;
+    local magic;
+    exec {fd}< "$fn";
+    LANG=C read -r -n 2 -u "$fd" magic;
+    exec {fd}>&-;
+    if [[ "$magic" =~ \#! ]]; then
+        return 0;
+    else
+        return 1;
+    fi
+}
+mapOffset ()
+{
+ 
+    local -r inputOffset="$1";
+    local -n outputOffset="$2";
+    if (( inputOffset <= 0 )); then
+        outputOffset=$((inputOffset + hostOffset));
+    else
+        outputOffset=$((inputOffset - 1 + targetOffset));
+    fi
+}
+moveToOutput ()
+{
+ 
+    local patt="$1";
+    local dstOut="$2";
+    local output;
+    for output in $(getAllOutputNames);
+    do
+        if [ "${!output}" = "$dstOut" ]; then
+            continue;
+        fi;
+        local srcPath;
+        for srcPath in "${!output}"/$patt;
+        do
+            if [ ! -e "$srcPath" ] && [ ! -L "$srcPath" ]; then
+                continue;
+            fi;
+            if [ "$dstOut" = REMOVE ]; then
+                echo "Removing $srcPath";
+                rm -r "$srcPath";
+            else
+                local dstPath="$dstOut${srcPath#${!output}}";
+                echo "Moving $srcPath to $dstPath";
+                if [ -d "$dstPath" ] && [ -d "$srcPath" ]; then
+                    rmdir "$srcPath" --ignore-fail-on-non-empty;
+                    if [ -d "$srcPath" ]; then
+                        mv -t "$dstPath" "$srcPath"/*;
+                        rmdir "$srcPath";
+                    fi;
+                else
+                    mkdir -p "$(readlink -m "$dstPath/..")";
+                    mv "$srcPath" "$dstPath";
+                fi;
+            fi;
+            local srcParent="$(readlink -m "$srcPath/..")";
+            if [ -n "$(find "$srcParent" -maxdepth 0 -type d -empty 2> /dev/null)" ]; then
+                echo "Removing empty $srcParent/ and (possibly) its parents";
+                rmdir -p --ignore-fail-on-non-empty "$srcParent" 2> /dev/null || true;
+            fi;
+        done;
+    done
+}
+nixChattyLog ()
+{
+ 
+    _nixLogWithLevel 5 "$*"
+}
+nixDebugLog ()
+{
+ 
+    _nixLogWithLevel 6 "$*"
+}
+nixErrorLog ()
+{
+ 
+    _nixLogWithLevel 0 "$*"
+}
+nixInfoLog ()
+{
+ 
+    _nixLogWithLevel 3 "$*"
+}
+nixLog ()
+{
+ 
+    [[ -z ${NIX_LOG_FD-} ]] && return 0;
+    local callerName="${FUNCNAME[1]}";
+    if [[ $callerName == "_callImplicitHook" ]]; then
+        callerName="${hookName:?}";
+    fi;
+    printf "%s: %s\n" "$callerName" "$*" >&"$NIX_LOG_FD"
+}
+nixNoticeLog ()
+{
+ 
+    _nixLogWithLevel 2 "$*"
+}
+nixTalkativeLog ()
+{
+ 
+    _nixLogWithLevel 4 "$*"
+}
+nixVomitLog ()
+{
+ 
+    _nixLogWithLevel 7 "$*"
+}
+nixWarnLog ()
+{
+ 
+    _nixLogWithLevel 1 "$*"
+}
+noBrokenSymlinks ()
+{
+ 
+    local -r output="${1:?}";
+    local path;
+    local pathParent;
+    local symlinkTarget;
+    local -i numDanglingSymlinks=0;
+    local -i numReflexiveSymlinks=0;
+    local -i numUnreadableSymlinks=0;
+    if [[ ! -e $output ]]; then
+        nixWarnLog "skipping non-existent output $output";
+        return 0;
+    fi;
+    nixInfoLog "running on $output";
+    while IFS= read -r -d '' path; do
+        pathParent="$(dirname "$path")";
+        if ! symlinkTarget="$(readlink "$path")"; then
+            nixErrorLog "the symlink $path is unreadable";
+            numUnreadableSymlinks+=1;
+            continue;
+        fi;
+        if [[ $symlinkTarget == /* ]]; then
+            nixInfoLog "symlink $path points to absolute target $symlinkTarget";
+        else
+            nixInfoLog "symlink $path points to relative target $symlinkTarget";
+            symlinkTarget="$(realpath --no-symlinks --canonicalize-missing "$pathParent/$symlinkTarget")";
+        fi;
+        if [[ $symlinkTarget = "$TMPDIR"/* ]]; then
+            nixErrorLog "the symlink $path points to $TMPDIR directory: $symlinkTarget";
+            numDanglingSymlinks+=1;
+            continue;
+        fi;
+        if [[ $symlinkTarget != "$NIX_STORE"/* ]]; then
+            nixInfoLog "symlink $path points outside the Nix store; ignoring";
+            continue;
+        fi;
+        if [[ $path == "$symlinkTarget" ]]; then
+            nixErrorLog "the symlink $path is reflexive";
+            numReflexiveSymlinks+=1;
+        else
+            if [[ ! -e $symlinkTarget ]]; then
+                nixErrorLog "the symlink $path points to a missing target: $symlinkTarget";
+                numDanglingSymlinks+=1;
+            else
+                nixDebugLog "the symlink $path is irreflexive and points to a target which exists";
+            fi;
+        fi;
+    done < <(find "$output" -type l -print0);
+    if ((numDanglingSymlinks > 0 || numReflexiveSymlinks > 0 || numUnreadableSymlinks > 0)); then
+        nixErrorLog "found $numDanglingSymlinks dangling symlinks, $numReflexiveSymlinks reflexive symlinks and $numUnreadableSymlinks unreadable symlinks";
+        exit 1;
+    fi;
+    return 0
+}
+noBrokenSymlinksInAllOutputs ()
+{
+ 
+    if [[ -z ${dontCheckForBrokenSymlinks-} ]]; then
+        for output in $(getAllOutputNames);
+        do
+            noBrokenSymlinks "${!output}";
+        done;
+    fi
+}
+patchELF ()
+{
+ 
+    local dir="$1";
+    [ -e "$dir" ] || return 0;
+    echo "shrinking RPATHs of ELF executables and libraries in $dir";
+    local i;
+    while IFS= read -r -d '' i; do
+        if [[ "$i" =~ .build-id ]]; then
+            continue;
+        fi;
+        if ! isELF "$i"; then
+            continue;
+        fi;
+        echo "shrinking $i";
+        patchelf --shrink-rpath "$i" || true;
+    done < <(find "$dir" -type f -print0)
+}
+patchPhase ()
+{
+ 
+    runHook prePatch;
+    local -a patchesArray;
+    concatTo patchesArray patches;
+    local -a flagsArray;
+    concatTo flagsArray patchFlags=-p1;
+    for i in "${patchesArray[@]}";
+    do
+        echo "applying patch $i";
+        local uncompress=cat;
+        case "$i" in 
+            *.gz)
+                uncompress="gzip -d"
+            ;;
+            *.bz2)
+                uncompress="bzip2 -d"
+            ;;
+            *.xz)
+                uncompress="xz -d"
+            ;;
+            *.lzma)
+                uncompress="lzma -d"
+            ;;
+        esac;
+        $uncompress < "$i" 2>&1 | patch "${flagsArray[@]}";
+    done;
+    runHook postPatch
+}
+patchShebangs ()
+{
+ 
+    local pathName;
+    local update=false;
+    while [[ $# -gt 0 ]]; do
+        case "$1" in 
+            --host)
+                pathName=HOST_PATH;
+                shift
+            ;;
+            --build)
+                pathName=PATH;
+                shift
+            ;;
+            --update)
+                update=true;
+                shift
+            ;;
+            --)
+                shift;
+                break
+            ;;
+            -* | --*)
+                echo "Unknown option $1 supplied to patchShebangs" 1>&2;
+                return 1
+            ;;
+            *)
+                break
+            ;;
+        esac;
+    done;
+    echo "patching script interpreter paths in $@";
+    local f;
+    local oldPath;
+    local newPath;
+    local arg0;
+    local args;
+    local oldInterpreterLine;
+    local newInterpreterLine;
+    if [[ $# -eq 0 ]]; then
+        echo "No arguments supplied to patchShebangs" 1>&2;
+        return 0;
+    fi;
+    local f;
+    while IFS= read -r -d '' f; do
+        isScript "$f" || continue;
+        read -r oldInterpreterLine < "$f" || [ "$oldInterpreterLine" ];
+        read -r oldPath arg0 args <<< "${oldInterpreterLine:2}";
+        if [[ -z "${pathName:-}" ]]; then
+            if [[ -n $strictDeps && $f == "$NIX_STORE"* ]]; then
+                pathName=HOST_PATH;
+            else
+                pathName=PATH;
+            fi;
+        fi;
+        if [[ "$oldPath" == *"/bin/env" ]]; then
+            if [[ $arg0 == "-S" ]]; then
+                arg0=${args%% *};
+                [[ "$args" == *" "* ]] && args=${args#* } || args=;
+                newPath="$(PATH="${!pathName}" type -P "env" || true)";
+                args="-S $(PATH="${!pathName}" type -P "$arg0" || true) $args";
+            else
+                if [[ $arg0 == "-"* || $arg0 == *"="* ]]; then
+                    echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" 1>&2;
+                    exit 1;
+                else
+                    newPath="$(PATH="${!pathName}" type -P "$arg0" || true)";
+                fi;
+            fi;
+        else
+            if [[ -z $oldPath ]]; then
+                oldPath="/bin/sh";
+            fi;
+            newPath="$(PATH="${!pathName}" type -P "$(basename "$oldPath")" || true)";
+            args="$arg0 $args";
+        fi;
+        newInterpreterLine="$newPath $args";
+        newInterpreterLine=${newInterpreterLine%${newInterpreterLine##*[![:space:]]}};
+        if [[ -n "$oldPath" && ( "$update" == true || "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ) ]]; then
+            if [[ -n "$newPath" && "$newPath" != "$oldPath" ]]; then
+                echo "$f: interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\"";
+                escapedInterpreterLine=${newInterpreterLine//\\/\\\\};
+                timestamp=$(stat --printf "%y" "$f");
+                tmpFile=$(mktemp -t patchShebangs.XXXXXXXXXX);
+                sed -e "1 s|.*|#\!$escapedInterpreterLine|" "$f" > "$tmpFile";
+                local restoreReadOnly;
+                if [[ ! -w "$f" ]]; then
+                    chmod +w "$f";
+                    restoreReadOnly=true;
+                fi;
+                cat "$tmpFile" > "$f";
+                rm "$tmpFile";
+                if [[ -n "${restoreReadOnly:-}" ]]; then
+                    chmod -w "$f";
+                fi;
+                touch --date "$timestamp" "$f";
+            fi;
+        fi;
+    done < <(find "$@" -type f -perm -0100 -print0)
+}
+patchShebangsAuto ()
+{
+ 
+    if [[ -z "${dontPatchShebangs-}" && -e "$prefix" ]]; then
+        if [[ "$output" != out && "$output" = "$outputDev" ]]; then
+            patchShebangs --build "$prefix";
+        else
+            patchShebangs --host "$prefix";
+        fi;
+    fi
+}
+prependToVar ()
+{
+ 
+    local -n nameref="$1";
+    local useArray type;
+    if [ -n "$__structuredAttrs" ]; then
+        useArray=true;
+    else
+        useArray=false;
+    fi;
+    if type=$(declare -p "$1" 2> /dev/null); then
+        case "${type#* }" in 
+            -A*)
+                echo "prependToVar(): ERROR: trying to use prependToVar on an associative array." 1>&2;
+                return 1
+            ;;
+            -a*)
+                useArray=true
+            ;;
+            *)
+                useArray=false
+            ;;
+        esac;
+    fi;
+    shift;
+    if $useArray; then
+        nameref=("$@" ${nameref+"${nameref[@]}"});
+    else
+        nameref="$* ${nameref-}";
+    fi
+}
+printLines ()
+{
+ 
+    (( "$#" > 0 )) || return 0;
+    printf '%s\n' "$@"
+}
+printWords ()
+{
+ 
+    (( "$#" > 0 )) || return 0;
+    printf '%s ' "$@"
+}
+recordPropagatedDependencies ()
+{
+ 
+    declare -ra flatVars=(depsBuildBuildPropagated propagatedNativeBuildInputs depsBuildTargetPropagated depsHostHostPropagated propagatedBuildInputs depsTargetTargetPropagated);
+    declare -ra flatFiles=("${propagatedBuildDepFiles[@]}" "${propagatedHostDepFiles[@]}" "${propagatedTargetDepFiles[@]}");
+    local propagatedInputsIndex;
+    for propagatedInputsIndex in "${!flatVars[@]}";
+    do
+        local propagatedInputsSlice="${flatVars[$propagatedInputsIndex]}[@]";
+        local propagatedInputsFile="${flatFiles[$propagatedInputsIndex]}";
+        [[ -n "${!propagatedInputsSlice}" ]] || continue;
+        mkdir -p "${!outputDev}/nix-support";
+        printWords ${!propagatedInputsSlice} > "${!outputDev}/nix-support/$propagatedInputsFile";
+    done
+}
+runHook ()
+{
+ 
+    local hookName="$1";
+    shift;
+    local hooksSlice="${hookName%Hook}Hooks[@]";
+    local hook;
+    for hook in "_callImplicitHook 0 $hookName" ${!hooksSlice+"${!hooksSlice}"};
+    do
+        _logHook "$hookName" "$hook" "$@";
+        _eval "$hook" "$@";
+    done;
+    return 0
+}
+runOneHook ()
+{
+ 
+    local hookName="$1";
+    shift;
+    local hooksSlice="${hookName%Hook}Hooks[@]";
+    local hook ret=1;
+    for hook in "_callImplicitHook 1 $hookName" ${!hooksSlice+"${!hooksSlice}"};
+    do
+        _logHook "$hookName" "$hook" "$@";
+        if _eval "$hook" "$@"; then
+            ret=0;
+            break;
+        fi;
+    done;
+    return "$ret"
+}
+runPhase ()
+{
+ 
+    local curPhase="$*";
+    if [[ "$curPhase" = unpackPhase && -n "${dontUnpack:-}" ]]; then
+        return;
+    fi;
+    if [[ "$curPhase" = patchPhase && -n "${dontPatch:-}" ]]; then
+        return;
+    fi;
+    if [[ "$curPhase" = configurePhase && -n "${dontConfigure:-}" ]]; then
+        return;
+    fi;
+    if [[ "$curPhase" = buildPhase && -n "${dontBuild:-}" ]]; then
+        return;
+    fi;
+    if [[ "$curPhase" = checkPhase && -z "${doCheck:-}" ]]; then
+        return;
+    fi;
+    if [[ "$curPhase" = installPhase && -n "${dontInstall:-}" ]]; then
+        return;
+    fi;
+    if [[ "$curPhase" = fixupPhase && -n "${dontFixup:-}" ]]; then
+        return;
+    fi;
+    if [[ "$curPhase" = installCheckPhase && -z "${doInstallCheck:-}" ]]; then
+        return;
+    fi;
+    if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then
+        return;
+    fi;
+    showPhaseHeader "$curPhase";
+    dumpVars;
+    local startTime endTime;
+    startTime=$(date +"%s");
+    eval "${!curPhase:-$curPhase}";
+    endTime=$(date +"%s");
+    showPhaseFooter "$curPhase" "$startTime" "$endTime";
+    if [ "$curPhase" = unpackPhase ]; then
+        [ -n "${sourceRoot:-}" ] && chmod +x -- "${sourceRoot}";
+        cd -- "${sourceRoot:-.}";
+    fi
+}
+showPhaseFooter ()
+{
+ 
+    local phase="$1";
+    local startTime="$2";
+    local endTime="$3";
+    local delta=$(( endTime - startTime ));
+    (( delta < 30 )) && return;
+    local H=$((delta/3600));
+    local M=$((delta%3600/60));
+    local S=$((delta%60));
+    echo -n "$phase completed in ";
+    (( H > 0 )) && echo -n "$H hours ";
+    (( M > 0 )) && echo -n "$M minutes ";
+    echo "$S seconds"
+}
+showPhaseHeader ()
+{
+ 
+    local phase="$1";
+    echo "Running phase: $phase";
+    if [[ -z ${NIX_LOG_FD-} ]]; then
+        return;
+    fi;
+    printf "@nix { \"action\": \"setPhase\", \"phase\": \"%s\" }\n" "$phase" >&"$NIX_LOG_FD"
+}
+stripDirs ()
+{
+ 
+    local cmd="$1";
+    local ranlibCmd="$2";
+    local paths="$3";
+    local stripFlags="$4";
+    local excludeFlags=();
+    local pathsNew=;
+    [ -z "$cmd" ] && echo "stripDirs: Strip command is empty" 1>&2 && exit 1;
+    [ -z "$ranlibCmd" ] && echo "stripDirs: Ranlib command is empty" 1>&2 && exit 1;
+    local pattern;
+    if [ -n "${stripExclude:-}" ]; then
+        for pattern in "${stripExclude[@]}";
+        do
+            excludeFlags+=(-a '!' '(' -name "$pattern" -o -wholename "$prefix/$pattern" ')');
+        done;
+    fi;
+    local p;
+    for p in ${paths};
+    do
+        if [ -e "$prefix/$p" ]; then
+            pathsNew="${pathsNew} $prefix/$p";
+        fi;
+    done;
+    paths=${pathsNew};
+    if [ -n "${paths}" ]; then
+        echo "stripping (with command $cmd and flags $stripFlags) in $paths";
+        local striperr;
+        striperr="$(mktemp --tmpdir="$TMPDIR" 'striperr.XXXXXX')";
+        find $paths -type f "${excludeFlags[@]}" -a '!' -path "$prefix/lib/debug/*" -printf '%D-%i,%p\0' | sort -t, -k1,1 -u -z | cut -d, -f2- -z | xargs -r -0 -n1 -P "$NIX_BUILD_CORES" -- $cmd $stripFlags 2> "$striperr" || exit_code=$?;
+        [[ "$exit_code" = 123 || -z "$exit_code" ]] || ( cat "$striperr" 1>&2 && exit 1 );
+        rm "$striperr";
+        find $paths -name '*.a' -type f -exec $ranlibCmd '{}' \; 2> /dev/null;
+    fi
+}
+stripHash ()
+{
+ 
+    local strippedName casematchOpt=0;
+    strippedName="$(basename -- "$1")";
+    shopt -q nocasematch && casematchOpt=1;
+    shopt -u nocasematch;
+    if [[ "$strippedName" =~ ^[a-z0-9]{32}- ]]; then
+        echo "${strippedName:33}";
+    else
+        echo "$strippedName";
+    fi;
+    if (( casematchOpt )); then
+        shopt -s nocasematch;
+    fi
+}
+substitute ()
+{
+ 
+    local input="$1";
+    local output="$2";
+    shift 2;
+    if [ ! -f "$input" ]; then
+        echo "substitute(): ERROR: file '$input' does not exist" 1>&2;
+        return 1;
+    fi;
+    local content;
+    consumeEntire content < "$input";
+    if [ -e "$output" ]; then
+        chmod +w "$output";
+    fi;
+    substituteStream content "file '$input'" "$@" > "$output"
+}
+substituteAll ()
+{
+ 
+    local input="$1";
+    local output="$2";
+    local -a args=();
+    _allFlags;
+    substitute "$input" "$output" "${args[@]}"
+}
+substituteAllInPlace ()
+{
+ 
+    local fileName="$1";
+    shift;
+    substituteAll "$fileName" "$fileName" "$@"
+}
+substituteAllStream ()
+{
+ 
+    local -a args=();
+    _allFlags;
+    substituteStream "$1" "$2" "${args[@]}"
+}
+substituteInPlace ()
+{
+ 
+    local -a fileNames=();
+    for arg in "$@";
+    do
+        if [[ "$arg" = "--"* ]]; then
+            break;
+        fi;
+        fileNames+=("$arg");
+        shift;
+    done;
+    if ! [[ "${#fileNames[@]}" -gt 0 ]]; then
+        echo "substituteInPlace called without any files to operate on (files must come before options!)" 1>&2;
+        return 1;
+    fi;
+    for file in "${fileNames[@]}";
+    do
+        substitute "$file" "$file" "$@";
+    done
+}
+substituteStream ()
+{
+ 
+    local var=$1;
+    local description=$2;
+    shift 2;
+    while (( "$#" )); do
+        local replace_mode="$1";
+        case "$1" in 
+            --replace)
+                if ! "$_substituteStream_has_warned_replace_deprecation"; then
+                    echo "substituteStream() in derivation $name: WARNING: '--replace' is deprecated, use --replace-{fail,warn,quiet}. ($description)" 1>&2;
+                    _substituteStream_has_warned_replace_deprecation=true;
+                fi;
+                replace_mode='--replace-warn'
+            ;&
+            --replace-quiet | --replace-warn | --replace-fail)
+                pattern="$2";
+                replacement="$3";
+                shift 3;
+                if ! [[ "${!var}" == *"$pattern"* ]]; then
+                    if [ "$replace_mode" == --replace-warn ]; then
+                        printf "substituteStream() in derivation $name: WARNING: pattern %q doesn't match anything in %s\n" "$pattern" "$description" 1>&2;
+                    else
+                        if [ "$replace_mode" == --replace-fail ]; then
+                            printf "substituteStream() in derivation $name: ERROR: pattern %q doesn't match anything in %s\n" "$pattern" "$description" 1>&2;
+                            return 1;
+                        fi;
+                    fi;
+                fi;
+                eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}'
+            ;;
+            --subst-var)
+                local varName="$2";
+                shift 2;
+                if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then
+                    echo "substituteStream() in derivation $name: ERROR: substitution variables must be valid Bash names, \"$varName\" isn't." 1>&2;
+                    return 1;
+                fi;
+                if [ -z ${!varName+x} ]; then
+                    echo "substituteStream() in derivation $name: ERROR: variable \$$varName is unset" 1>&2;
+                    return 1;
+                fi;
+                pattern="@$varName@";
+                replacement="${!varName}";
+                eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}'
+            ;;
+            --subst-var-by)
+                pattern="@$2@";
+                replacement="$3";
+                eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}';
+                shift 3
+            ;;
+            *)
+                echo "substituteStream() in derivation $name: ERROR: Invalid command line argument: $1" 1>&2;
+                return 1
+            ;;
+        esac;
+    done;
+    printf "%s" "${!var}"
+}
+unpackFile ()
+{
+ 
+    curSrc="$1";
+    echo "unpacking source archive $curSrc";
+    if ! runOneHook unpackCmd "$curSrc"; then
+        echo "do not know how to unpack source archive $curSrc";
+        exit 1;
+    fi
+}
+unpackPhase ()
+{
+ 
+    runHook preUnpack;
+    if [ -z "${srcs:-}" ]; then
+        if [ -z "${src:-}" ]; then
+            echo 'variable $src or $srcs should point to the source';
+            exit 1;
+        fi;
+        srcs="$src";
+    fi;
+    local -a srcsArray;
+    concatTo srcsArray srcs;
+    local dirsBefore="";
+    for i in *;
+    do
+        if [ -d "$i" ]; then
+            dirsBefore="$dirsBefore $i ";
+        fi;
+    done;
+    for i in "${srcsArray[@]}";
+    do
+        unpackFile "$i";
+    done;
+    : "${sourceRoot=}";
+    if [ -n "${setSourceRoot:-}" ]; then
+        runOneHook setSourceRoot;
+    else
+        if [ -z "$sourceRoot" ]; then
+            for i in *;
+            do
+                if [ -d "$i" ]; then
+                    case $dirsBefore in 
+                        *\ $i\ *)
+
+                        ;;
+                        *)
+                            if [ -n "$sourceRoot" ]; then
+                                echo "unpacker produced multiple directories";
+                                exit 1;
+                            fi;
+                            sourceRoot="$i"
+                        ;;
+                    esac;
+                fi;
+            done;
+        fi;
+    fi;
+    if [ -z "$sourceRoot" ]; then
+        echo "unpacker appears to have produced no directories";
+        exit 1;
+    fi;
+    echo "source root is $sourceRoot";
+    if [ "${dontMakeSourcesWritable:-0}" != 1 ]; then
+        chmod -R u+w -- "$sourceRoot";
+    fi;
+    runHook postUnpack
+}
+updateAutotoolsGnuConfigScriptsPhase ()
+{
+ 
+    if [ -n "${dontUpdateAutotoolsGnuConfigScripts-}" ]; then
+        return;
+    fi;
+    for script in config.sub config.guess;
+    do
+        for f in $(find . -type f -name "$script");
+        do
+            echo "Updating Autotools / GNU config script to a newer upstream version: $f";
+            cp -f "/nix/store/ambacmwlhkwlx6ngxccsa9z1wdszgwjx-gnu-config-2024-01-01/$script" "$f";
+        done;
+    done
+}
+updateSourceDateEpoch ()
+{
+ 
+    local path="$1";
+    [[ $path == -* ]] && path="./$path";
+    local -a res=($(find "$path" -type f -not -newer "$NIX_BUILD_TOP/.." -printf '%T@ "%p"\0' | sort -n --zero-terminated | tail -n1 --zero-terminated | head -c -1));
+    local time="${res[0]//\.[0-9]*/}";
+    local newestFile="${res[1]}";
+    if [ "${time:-0}" -gt "$SOURCE_DATE_EPOCH" ]; then
+        echo "setting SOURCE_DATE_EPOCH to timestamp $time of file $newestFile";
+        export SOURCE_DATE_EPOCH="$time";
+        local now="$(date +%s)";
+        if [ "$time" -gt $((now - 60)) ]; then
+            echo "warning: file $newestFile may be generated; SOURCE_DATE_EPOCH may be non-deterministic";
+        fi;
+    fi
+}
+PATH="$PATH${nix_saved_PATH:+:$nix_saved_PATH}"
+XDG_DATA_DIRS="$XDG_DATA_DIRS${nix_saved_XDG_DATA_DIRS:+:$nix_saved_XDG_DATA_DIRS}"
+export NIX_BUILD_TOP="$(mktemp -d -t nix-shell.XXXXXX)"
+export TMP="$NIX_BUILD_TOP"
+export TMPDIR="$NIX_BUILD_TOP"
+export TEMP="$NIX_BUILD_TOP"
+export TEMPDIR="$NIX_BUILD_TOP"
+eval "${shellHook:-}"
diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..3550a30
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/;q b/;q
deleted file mode 100644
index f48b4b8..0000000
--- a/;q
+++ /dev/null
@@ -1,45 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [
-    ./git.nix
-  ];
-
-  # Development tools
-  home.packages = with pkgs; [
-    # Version control
-    gh
-    lazygit
-    
-    # Development environments
-    devenv
-    direnv
-    
-    # Languages
-    (python3.withPackages (ps: with ps; [ tkinter ]))
-    nodejs
-    
-    # Tools
-    postman
-    lazydocker
-    
-    # AI tools
-    github-copilot-cli
-    ollama
-    gollama
-    jan
-    
-    # Terminals
-    warp-terminal
-
-    # Database
-    dolt
-  ];
-
-  # Enable direnv
-  programs.direnv = {
-    enable = true;
-    enableZshIntegration = true;
-    nix-direnv.enable = true;
-  };
-}
diff --git a/Makefile b/Makefile
index 75ef116..2c2d63b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: help setup check check-fast build-system build-home switch-system switch-home update clean
+.PHONY: help setup check check-fast check-updates build-system build-home switch-system switch-home update update-system clean
 
 # Default target
 help:
@@ -6,11 +6,13 @@ help:
 	@echo "  setup         - Initial setup (check syntax, validate flake)"
 	@echo "  check         - Comprehensive configuration validity check"
 	@echo "  check-fast    - Quick syntax check only"
+	@echo "  check-updates - Check for available updates without installing"
 	@echo "  build-system  - Build NixOS system (dry run)"
 	@echo "  build-home    - Build Home Manager (dry run)" 
 	@echo "  switch-system - Switch to new NixOS configuration"
 	@echo "  switch-home   - Switch to new Home Manager configuration"
-	@echo "  update        - Update flake inputs"
+	@echo "  update        - Update flake inputs only"
+	@echo "  update-system - Complete system update with progress feedback"
 	@echo "  clean         - Clean old generations"
 
 # Initial setup
@@ -46,6 +48,21 @@ check-fast:
 		exit 1; \
 	fi
 
+# Check for available updates
+check-updates:
+	@echo "🔍 Checking for updates..."
+	@echo ""
+	@echo "📦 Current flake inputs:"
+	@nix flake metadata --json | jq -r '.locks.nodes | to_entries[] | select(.value.locked.type != null) | "\(.key): \(.value.locked.rev // .value.locked.narHash | .[0:12])"' 2>/dev/null || nix flake metadata
+	@echo ""
+	@echo "🔢 Checking potential system updates..."
+	@sudo nixos-rebuild dry-build --flake .#nixos 2>&1 | grep "will be built\|will be fetched" | head -3 || echo "  ℹ️  No major system updates detected"
+	@echo ""
+	@echo "🏠 Checking potential Home Manager updates..."
+	@home-manager build --flake .#tim@nixos --dry-run 2>&1 | grep "will be built\|will be fetched" | head -3 || echo "  ℹ️  No major home updates detected"
+	@echo ""
+	@echo "✅ Check complete. Run 'make update-system' to apply updates."
+
 # Build configurations (dry run)
 build-system:
 	@echo "Building NixOS system configuration..."
@@ -69,8 +86,23 @@ update:
 	@echo "Updating flake inputs..."
 	@nix flake update
 
+# Full system update with better feedback
+update-system:
+	@./scripts/update-system.sh
+
 # Clean old generations
 clean:
 	@echo "Cleaning old generations..."
 	@sudo nix-collect-garbage -d
-	@home-manager expire-generations "-7 days"
\ No newline at end of file
+	@home-manager expire-generations "-7 days"
+
+# System health check
+health:
+	@./scripts/system-monitor.sh
+
+# rollback commands
+rollback-system:
+	@./scripts/rollback.sh system --list
+
+rollback-home:
+	@./scripts/rollback home --list
diff --git a/backup/configuration.nix b/backup/configuration.nix
deleted file mode 100644
index 67e13a6..0000000
--- a/backup/configuration.nix
+++ /dev/null
@@ -1,126 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, ... }:
-
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
-
-  # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  networking.hostName = "nixos"; # Define your hostname.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Enable networking
-  networking.networkmanager.enable = true;
-
-  # Set your time zone.
-  time.timeZone = "Africa/Nairobi";
-  system.stateVersion = "25.05";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  # Configure keymap in X11
-  services.xserver.xkb = {
-    layout = "us";
-    variant = "";
-  };
-  nix.settings.trusted-users = [ "root" "tim" ];
-   
-  programs.zsh.enable = true;
-  users.defaultUserShell = pkgs.zsh;
-  users.users.root.shell = pkgs.zsh;
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.tim = {
-    isNormalUser = true;
-    description = "tim";
-    extraGroups = [ "networkmanager" "wheel" "audio" "video" "storage" "podman" "adbusers" ];
-    packages = with pkgs; [];
-    ignoreShellProgramCheck = true;
-  };
-
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  # nixpkgs.config.experimental-features = [ "nix-command" "flakes"];
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
-  environment.systemPackages = with pkgs; [
-  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-  #  wget
-kitty
-waybar
-firefoxpwa
-kdePackages.dolphin
-wofi
-brightnessctl
-playerctl
-neovim
-home-manager
-wget
-git
-polkit
-polkit_gnome
-libsecret
-gnome-keyring
-seahorse
-# docker-compose
-podman-compose
-podman-desktop
-podman-tui
-kubectl
-kind
-dive                # Explore container layers
-    skopeo              # Work with container images
-    buildah
-    libsForQt5.qt5.qtgraphicaleffects
-    (catppuccin-sddm.override {
-	flavor = "mocha";
-	font = "JetbrainsMono Nerd Font";
-	fontSize = "10";
-	loginBackground = true;
-    })
-  ];
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
-  programs.hyprland = {
-	enable = true;
-	portalPackage = pkgs.xdg-desktop-portal-hyprland;
-	xwayland.enable = true;
-  };
-  programs.dconf.enable = true;
-  services.displayManager.sddm = {
-	enable = true;
-	package = pkgs.kdePackages.sddm;
-	wayland.enable = true;
-	theme = "catppuccin-mocha";
-  };
-  services.gvfs.enable = true;
-  services.udisks2.enable = true;
-  security.polkit.enable = true;
-services.postgresql = {
-  enable = true;
-  package = pkgs.postgresql_16;
-  enableTCPIP = true;
-  authentication = pkgs.lib.mkOverride 10 ''
-    local all all trust
-    host all all 127.0.0.1/32 trust
-  '';
-};
-}
diff --git a/backup/home.nix b/backup/home.nix
deleted file mode 100644
index efbfe72..0000000
--- a/backup/home.nix
+++ /dev/null
@@ -1,232 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  # Home Manager needs a bit of information about you and the paths it should
-  # manage.
-  home.username = "tim";
-  home.homeDirectory = "/home/tim";
-  nixpkgs.config.allowUnfree = true;
-
-  # This value determines the Home Manager release that your configuration is
-  # compatible with. This helps avoid breakage when a new Home Manager release
-  # introduces backwards incompatible changes
-  # You should not change this value, even if you update Home Manager. If you do
-  # want to update the value, then make sure to first check the Home Manager
-  # release notes.
-  home.stateVersion = "24.11"; # Please read the comment before changing.
-
-  # The home.packages option allows you to install Nix packages into your
-  # environment.
-  home.packages = with pkgs; [
-  	hello
-	nerd-fonts.jetbrains-mono
-	tradingview
-	vscode
-	zsh
-	gh
-	devenv
-	direnv
-	emacs
-	spotify
-	ripgrep
-	fd
-	tldr
-	zoxide
-	pyprland
-	wl-clipboard
-	fastfetch
-	clang
-	xh
-	choose
-	bottom
-	cava
-	mailspring
-	rofi
-	aerc
-	thunderbird
-	qbittorrent
-	python3
-	mpv
-	google-chrome
-	vlc
-	hyprsunset
-	pyprland
-	hyprlock
-	hypridle
-	hyprpaper
-	pavucontrol
-	pwvucontrol
-	wlogout
-	cliphist
-	hyprpicker
-	grimblast
-	zellij
-	starship
-	zoxide
-	fzf
-	bat
-	eza
-	atuin
-	zfs
-	helix
-	notion-app-enhanced
-	xfce.thunar
-	xfce.thunar-volman
-	yazi
-	imv
-	zathura
-	libreoffice-fresh
-	vesktop
-	telegram-desktop
-	zoom-us
-	slack
-	teams-for-linux
-	lazygit
-	postman
-	lazydocker
-	btop
-	bitwarden-desktop
-	protonvpn-gui
-	nix-tree
-	nix-du
-	nh
-	github-copilot-cli
-	claude-code	
-	ollama
-	gollama
-	jan
-	warp-terminal
-	gemini-cli
-	peazip
-	p7zip
-	unzip
-	zstd
-  ];
-
-  stylix = {
-    enable = true;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
-
-    image = pkgs.fetchurl {
-      url =
-        "https://www.pixelstalk.net/wp-content/uploads/2025/05/A-dense-forest-with-towering-evergreens-and-a-glowing-mist-rising-from-the-ground.webp";
-      hash = "sha256-e8RDn46vsP4b/kLAmYXKgBL12soOXJxAqpRvSruqbXA=";
-    };
-    polarity = "dark";
-
-    cursor = {
-      package = pkgs.bibata-cursors;
-      name = "Bibata-Modern-Classic";
-      size = 18;
-    };
-
-    fonts = {
-      monospace = {
-        package = pkgs.nerd-fonts.jetbrains-mono;
-        name = "JetbrainsMono Nerd Font";
-
-      };
-      sizes = {
-        applications = 11;
-        desktop = 11;
-        popups = 11;
-        terminal = 11;
-      };
-      serif = config.stylix.fonts.monospace;
-      sansSerif = config.stylix.fonts.monospace;
-      emoji = config.stylix.fonts.monospace;
-    };
-    targets = {
-    	gtk.enable = true;
-	qt = {
-		enable = true;
-		platform = "qtct";
-	};
-	xfce.enable = true;
-	kde.enable = true;
-    };
-  };
-
-  # Home Manager is pretty good at managing dotfiles. The primary way to manage
-  # plain files is through 'home.file'.
-  home.file = {
-    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
-    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
-    # # symlink to the Nix store copy.
-    # ".screenrc".source = dotfiles/screenrc;
-
-    # # You can also set the file content immediately.
-    # ".gradle/gradle.properties".text = ''
-    #   org.gradle.console=verbose
-    #   org.gradle.daemon.idletimeout=3600000
-    # '';
-  };
-
-  # Home Manager can also manage your environment variables through
-  # 'home.sessionVariables'. These will be explicitly sourced when using a
-  # shell provided by Home Manager. If you don't want to manage your shell
-  # through Home Manager then you have to manually source 'hm-session-vars.sh'
-  # located at either
-  #
-  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  /etc/profiles/per-user/tim/etc/profile.d/hm-session-vars.sh
-  #
-  home.sessionVariables = {
-    # EDITOR = "emacs";
-  };
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-  services.gnome-keyring = {
-    enable = true;
-    components = [ "secrets" "ssh" "pkcs11" ];
-  };
-  services.udiskie.enable = true;
-
-  programs.kitty = {
-	enable = true;
-	settings = {
-		confirm_os_window_close = 0;
-		enable_audio_bell = "no";
-		hide_window_decorations = "yes";
-		window_padding_width = 4;
-		window_margin_width = 4;
-	};
-  };
-
-  programs.zsh = {
-	enable = true;
-	shellAliases = {
-		ls = "eza";
-		hms = "home-manager switch";
-		nrs = "sudo nixos-rebuild switch";
-	};
-	enableCompletion = true;
-	syntaxHighlighting.enable = true;
-	autosuggestion.enable = true;
-	oh-my-zsh = {
-		enable = true;
-		plugins = [ "sudo" "git" "docker" "docker-compose" "aliases" "gh" ];
-	};
-  };
-  programs.starship.enable = true;
-  programs.cava.enable = true;
-  programs.fzf.enable = true;
-  programs.skim.enable = true;
-  programs.eza = {
-	enable = true;
-	icons = "auto";
-	git = true;
-	colors = "never";
-	enableZshIntegration = true;
-  };
-
-}
-
diff --git a/configs/hyprland/hyprland-additions.nix b/configs/hyprland/hyprland-additions.nix
new file mode 100644
index 0000000..df2c2e9
--- /dev/null
+++ b/configs/hyprland/hyprland-additions.nix
@@ -0,0 +1,152 @@
+# Additional Hyprland Configuration
+# Add these to your main hyprland.conf file
+
+###################
+### SCREENSHOTS ###
+###################
+
+# Screenshot keybindings
+bind = $mainMod SHIFT, S, exec, grimblast copy area
+bind = $mainMod, Print, exec, grimblast copy output
+bind = , Print, exec, grimblast copy screen
+bind = $mainMod CTRL, S, exec, grimblast save area ~/Pictures/Screenshots/$(date +%Y%m%d_%H%M%S).png
+bind = $mainMod ALT, S, exec, grimblast --freeze copy area
+
+####################
+### WINDOW RULES ###
+####################
+
+# Float specific windows
+windowrulev2 = float, class:^(pavucontrol)$
+windowrulev2 = float, class:^(org.pulseaudio.pavucontrol)$
+windowrulev2 = float, class:^(pwvucontrol)$
+windowrulev2 = float, class:^(blueman-manager)$
+windowrulev2 = float, class:^(nm-connection-editor)$
+windowrulev2 = float, class:^(xfce-polkit)$
+windowrulev2 = float, class:^(qt5ct)$
+windowrulev2 = float, class:^(qt6ct)$
+windowrulev2 = float, class:^(nwg-look)$
+windowrulev2 = float, title:^(Picture-in-Picture)$
+
+# Center floating windows
+windowrulev2 = center, class:^(pavucontrol)$
+windowrulev2 = center, class:^(blueman-manager)$
+
+# Size specific windows
+windowrulev2 = size 800 600, class:^(pavucontrol)$
+windowrulev2 = size 1000 700, class:^(thunar)$, title:^(File Operation Progress)$
+
+# Workspace assignments
+# windowrulev2 = workspace 1 silent, class:^(kitty)$
+windowrulev2 = workspace 2 silent, class:^(firefox)$
+windowrulev2 = workspace 2 silent, class:^(Google-chrome)$
+windowrulev2 = workspace 3 silent, class:^(Code)$
+windowrulev2 = workspace 3 silent, class:^(code-url-handler)$
+windowrulev2 = workspace 4 silent, class:^(Postman)$
+windowrulev2 = workspace 5 silent, class:^(Spotify)$
+windowrulev2 = workspace 6 silent, class:^(vesktop)$
+windowrulev2 = workspace 6 silent, class:^(discord)$
+windowrulev2 = workspace 7 silent, class:^(Slack)$
+windowrulev2 = workspace 7 silent, class:^(Microsoft Teams)$
+windowrulev2 = workspace 8 silent, class:^(Thunderbird)$
+windowrulev2 = workspace 9 silent, class:^(obs)$
+
+# Opacity rules
+# windowrulev2 = opacity 0.95 0.85, class:^(kitty)$
+windowrulev2 = opacity 1.0 override 1.0 override, class:^(firefox)$
+windowrulev2 = opacity 1.0 override 1.0 override, class:^(Google-chrome)$
+windowrulev2 = opacity 1.0 override 1.0 override, title:^(.*YouTube.*)$
+windowrulev2 = opacity 1.0 override 1.0 override, title:^(.*Twitch.*)$
+
+# Picture-in-Picture
+windowrulev2 = float, title:^(Picture-in-Picture)$
+windowrulev2 = pin, title:^(Picture-in-Picture)$
+windowrulev2 = move 70% 70%, title:^(Picture-in-Picture)$
+windowrulev2 = size 25% 25%, title:^(Picture-in-Picture)$
+
+# Dialog windows
+windowrulev2 = float, class:^(.*), title:^(Open File)$
+windowrulev2 = float, class:^(.*), title:^(Save File)$
+windowrulev2 = float, class:^(.*), title:^(Open Folder)$
+windowrulev2 = center, class:^(.*), title:^(Open File)$
+windowrulev2 = center, class:^(.*), title:^(Save File)$
+
+# Game mode (disable animations and effects for better performance)
+windowrulev2 = immediate, class:^(steam_app).*
+windowrulev2 = immediate, class:^(gamescope).*
+
+#########################
+### CLIPBOARD MANAGER ###
+#########################
+
+# Clipboard history
+exec-once = wl-paste --type text --watch cliphist store
+exec-once = wl-paste --type image --watch cliphist store
+
+# Clipboard keybind
+bind = $mainMod, C, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy
+
+#####################
+### COLOR PICKER ###
+#####################
+
+bind = $mainMod ALT, C, exec, hyprpicker -a
+
+########################
+### SCREEN RECORDING ###
+########################
+
+# Note: Install wf-recorder or obs-studio for screen recording
+# bind = $mainMod SHIFT, R, exec, wf-recorder -g "$(slurp)" -f ~/Videos/recording_$(date +%Y%m%d_%H%M%S).mp4
+# bind = $mainMod CTRL SHIFT, R, exec, killall -s SIGINT wf-recorder
+
+#########################
+### WINDOW MANAGEMENT ###
+#########################
+
+# Resize mode (vim-like)
+bind = $mainMod, I, submap, resize
+submap = resize
+binde = , h, resizeactive, -20 0
+binde = , l, resizeactive, 20 0
+binde = , k, resizeactive, 0 -20
+binde = , j, resizeactive, 0 20
+bind = , escape, submap, reset
+submap = reset
+
+# Move windows (vim-like)
+bind = $mainMod SHIFT, h, movewindow, l
+bind = $mainMod SHIFT, l, movewindow, r
+bind = $mainMod SHIFT, k, movewindow, u
+bind = $mainMod SHIFT, j, movewindow, d
+
+# Focus windows (vim-like)
+bind = $mainMod, h, movefocus, l
+bind = $mainMod, l, movefocus, r
+bind = $mainMod, k, movefocus, u
+bind = $mainMod, j, movefocus, d
+
+# Fullscreen
+bind = $mainMod, F, fullscreen, 0
+bind = $mainMod SHIFT, F, fullscreen, 1
+
+# Pin window
+bind = $mainMod SHIFT, P, pin
+
+# Group windows (tabbed layout)
+bind = $mainMod, G, togglegroup
+bind = $mainMod, Tab, changegroupactive, f
+bind = $mainMod SHIFT, Tab, changegroupactive, b
+
+######################
+### SYSTEM CONTROL ###
+######################
+
+# Lock screen
+bind = $mainMod, Escape, exec, hyprlock
+
+# Logout menu
+bind = $mainMod SHIFT, E, exec, wlogout
+
+# Power menu script (create this if needed)
+# bind = $mainMod SHIFT, Escape, exec, ~/.local/bin/power-menu
diff --git a/configs/hyprland/hyprland.conf b/configs/hyprland/hyprland.conf
index 9c8d793..edaf688 100644
--- a/configs/hyprland/hyprland.conf
+++ b/configs/hyprland/hyprland.conf
@@ -34,7 +34,7 @@ monitor=,preferred,auto,auto
 
 # Set programs that you use
 $terminal = kitty
-$fileManager = dolphin
+$fileManager = thunar
 $menu = rofi -show drun
 
 
@@ -59,8 +59,8 @@ exec-once = pypr
 
 # See https://wiki.hyprland.org/Configuring/Environment-variables/
 
-env = XCURSOR_SIZE,24
-env = HYPRCURSOR_SIZE,24
+env = XCURSOR_SIZE,18
+env = HYPRCURSOR_SIZE,18
 
 
 ###################
@@ -125,9 +125,11 @@ decoration {
     # https://wiki.hyprland.org/Configuring/Variables/#blur
     blur {
         enabled = true
-        size = 3
-        passes = 1
-
+        size = 8
+        passes = 3
+        new_optimizations = true
+        xray = false
+        ignore_opacity = false
         vibrancy = 0.1696
     }
 }
@@ -211,8 +213,22 @@ input {
     }
 }
 
-# Gestures configuration has been removed in newer Hyprland versions
-# See https://wiki.hyprland.org/Configuring/Variables/ for current options
+# https://wiki.hypr.land/Configuring/Gestures/
+# 3 finger horizontal → workspace switching
+gesture = 3, horizontal, workspace
+# gesture = 3, right, workspace
+
+# 3 finger up → fullscreen toggle
+gesture = 3, up, fullscreen
+
+# 3 finger down → close the window
+gesture = 3, down, close
+
+# 4 finger pinch out → open special "overview" workspace
+gesture = 4, pinchout, special, overview
+
+# 4 finger pinch in → move back from special workspace
+gesture = 4, pinchin, special, overview
 
 # Example per-device config
 # See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
@@ -221,7 +237,6 @@ device {
     sensitivity = -0.5
 }
 
-
 ###################
 ### KEYBINDINGS ###
 ###################
@@ -231,19 +246,18 @@ $mainMod = SUPER # Sets "Windows" key as main modifier
 
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
 bind = $mainMod, Q, exec, $terminal
-bind = $mainMod, C, killactive,
+bind = $mainMod SHIFT, Q, killactive,
 bind = $mainMod, M, exit,
 bind = $mainMod, E, exec, $fileManager
 bind = $mainMod, V, togglefloating,
 bind = $mainMod, R, exec, $menu
 bind = $mainMod, P, pseudo, # dwindle
-bind = $mainMod, J, togglesplit, # dwindle
+bind = $mainMod, T, togglesplit, # dwindle
 
-# Move focus with mainMod + arrow keys
-bind = $mainMod, left, movefocus, l
-bind = $mainMod, right, movefocus, r
-bind = $mainMod, up, movefocus, u
-bind = $mainMod, down, movefocus, d
+# Move focus with mainMod + arrow keys (workspace navigation)
+bind = $mainMod, left, workspace, e-1
+bind = $mainMod, right, workspace, e+1
+# Vim keys are used for window focus (see hyprland-additions.nix)
 
 # Switch workspaces with mainMod + [0-9]
 bind = $mainMod, 1, workspace, 1
@@ -270,8 +284,8 @@ bind = $mainMod SHIFT, 9, movetoworkspace, 9
 bind = $mainMod SHIFT, 0, movetoworkspace, 10
 
 # Example special workspace (scratchpad)
-bind = $mainMod, S, togglespecialworkspace, magic
-bind = $mainMod SHIFT, S, movetoworkspace, special:magic
+bind = $mainMod, minus, togglespecialworkspace, magic
+bind = $mainMod SHIFT, minus, movetoworkspace, special:magic
 
 # Scroll through existing workspaces with mainMod + scroll
 bind = $mainMod, mouse_down, workspace, e+1
@@ -300,13 +314,12 @@ $pypr = pypr
 bind = $mainMod SHIFT,  Z, exec, $pypr zoom
 bind = $mainMod ALT,    P, exec, $pypr toggle_dpms
 bind = $mainMod SHIFT,  O, exec, $pypr shift_monitors +1
-bind = $mainMod,        B, exec, $pypr expose
-bind = $mainMod,        K, exec, $pypr change_workspace +1
-bind = $mainMod,        J, exec, $pypr change_workspace -1
-bind = $mainMod,        L, exec, $pypr toggle_dpms
+bind = $mainMod ALT,    B, exec, $pypr expose
+bind = $mainMod, bracketleft, exec, $pypr change_workspace -1
+bind = $mainMod, bracketright, exec, $pypr change_workspace +1
 bind = $mainMod  SHIFT, M, exec, $pypr toggle stb stb-logs
 bind = $mainMod,        A, exec, $pypr toggle term
-bind = $mainMod,        V, exec, $pypr toggle volume
+bind = $mainMod SHIFT,  V, exec, $pypr toggle volume
 
 # Waybar toggle
 bind = $mainMod,        W, exec, pkill waybar || waybar
@@ -316,6 +329,54 @@ bind = $mainMod,        F1, exec, /home/tim/.dotfiles/scripts/keybind-viewer.py
 bind = $mainMod SHIFT,  F1, exec, /home/tim/.dotfiles/scripts/keybinds-rofi.sh
 bind = $mainMod CTRL,   F1, exec, $terminal -e /home/tim/.dotfiles/scripts/keybinds-show.sh
 
+# Add these to your ~/.dotfiles/configs/hyprland/hyprland.conf
+
+# === ROFI NETWORK KEYBINDINGS ===
+
+# Main network menu (connect/disconnect WiFi/Ethernet)
+bind = $mainMod, N, exec, ~/.dotfiles/scripts/rofi-network.sh
+
+# Quick WiFi toggle (on/off)
+bind = $mainMod SHIFT, N, exec, ~/.dotfiles/scripts/rofi-wifi-toggle.sh
+
+# === ADI1090X ROFI THEME KEYBINDINGS ===
+
+# Launcher (Type-1 Style-6) - Main app launcher
+bind = $mainMod, D, exec, ~/.dotfiles/scripts/rofi-launcher.sh
+
+# Screenshot menu (Type-2)
+bind = $mainMod, S, exec, ~/.dotfiles/scripts/rofi-screenshot.sh
+bind = , Print, exec, ~/.dotfiles/scripts/rofi-screenshot.sh
+
+# Volume control (Type-2)
+bind = $mainMod CTRL, V, exec, ~/.dotfiles/scripts/rofi-volume.sh
+
+# Apps as Root (Type-2) - WARNING: Use with caution
+bind = $mainMod SHIFT, A, exec, ~/.dotfiles/scripts/rofi-root-apps.sh
+
+# Power menu (Type-2 Style-2)
+bind = $mainMod SHIFT, P, exec, ~/.dotfiles/scripts/rofi-powermenu.sh
+bind = $mainMod, X, exec, ~/.dotfiles/scripts/rofi-powermenu.sh
+
+# Network information display
+bind = $mainMod CTRL, N, exec, rofi-network-info
+
+# Advanced settings (only when needed)
+bind = $mainMod ALT, N, exec, nm-connection-editor
+
+# === WINDOW RULES FOR NETWORK GUI ===
+# (Only used when launching nm-connection-editor for advanced settings)
+
+windowrulev2 = float, class:^(nm-connection-editor)$
+windowrulev2 = center, class:^(nm-connection-editor)$
+windowrulev2 = size 800 600, class:^(nm-connection-editor)$
+windowrulev2 = opacity 0.95, class:^(nm-connection-editor)$
+
+# WiFi password dialog
+windowrulev2 = float, title:^(Authentication Required)$
+windowrulev2 = center, title:^(Authentication Required)$
+windowrulev2 = size 500 300, title:^(Authentication Required)$
+
 ##############################
 ### WINDOWS AND WORKSPACES ###
 ##############################
@@ -331,3 +392,6 @@ windowrule = suppressevent maximize, class:.*
 
 # Fix some dragging issues with XWayland
 windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
+
+# Source additional configurations
+source = ~/.dotfiles/configs/hyprland/hyprland-additions.nix
diff --git a/configs/pyprland.toml b/configs/pyprland.toml
index e10a284..dbc5451 100644
--- a/configs/pyprland.toml
+++ b/configs/pyprland.toml
@@ -6,7 +6,7 @@ plugins = [
   "toggle_dpms",
   "magnify",
   "expose",
-  "shift_monitors",
+  "shift_monjdkitors",
   "workspaces_follow_focus",
 ]
 
diff --git a/configs/rofi/catppuccin-mocha.rasi b/configs/rofi/catppuccin-mocha.rasi
new file mode 100644
index 0000000..02e6ffc
--- /dev/null
+++ b/configs/rofi/catppuccin-mocha.rasi
@@ -0,0 +1,30 @@
+/**
+ * Catppuccin Mocha color scheme for Rofi
+ */
+
+* {
+    /* Catppuccin Mocha Colors */
+    bg0:    #1e1e2eff;
+    bg1:    #181825ff;
+    bg2:    #313244ff;
+    bg3:    #45475aff;
+    
+    fg0:    #cdd6f4ff;
+    fg1:    #bac2deff;
+    fg2:    #a6adc8ff;
+    
+    red:     #f38ba8ff;
+    green:   #a6e3a1ff;
+    yellow:  #f9e2afff;
+    blue:    #89b4faff;
+    magenta: #cba6f7ff;
+    cyan:    #94e2d5ff;
+    
+    accent: @blue;
+    urgent: @red;
+    on: @green;
+    off: @red;
+    
+    background-color: transparent;
+    text-color: @fg0;
+}
diff --git a/configs/waybar/style.css b/configs/waybar/style.css
index 928a4bb..d97c35f 100644
--- a/configs/waybar/style.css
+++ b/configs/waybar/style.css
@@ -2,16 +2,25 @@
     border: none;
     border-radius: 0;
     font-family: "JetbrainsMono Nerd Font", "Font Awesome 6 Free";
-    font-size: 14px;
+    font-size: 12px;
     min-height: 0;
 }
 
-window#waybar {
+/* window#waybar {
     background: rgba(30, 30, 46, 0.9);
     color: #cdd6f4;
     transition-property: background-color;
     transition-duration: 0.5s;
     border-radius: 6px;
+} */
+
+window#waybar {
+    background: rgba(30, 30, 46, 0.85);
+    color: #cdd6f4;
+    border-radius: 6px;
+    transition-property: background-color;
+    transition-duration: 0.5s;
+    box-shadow: 0 4px 20px rgba(0, 0, 0, 0.4);
 }
 
 window#waybar.hidden {
@@ -22,7 +31,7 @@ window#waybar.hidden {
     background: transparent;
     margin: 2px 4px 2px 2px;
     padding: 0 5px;
-    border-radius: 6px;
+    border-radius: 8px;
 }
 
 #workspaces button {
@@ -76,74 +85,50 @@ window#waybar.hidden {
 }
 
 #cpu,
-#memory {
-    background: #a6e3a1;
-    color: #1e1e2e;
-    padding: 0 10px;
-    margin: 2px 2px;
-    border-radius: 6px;
-    font-weight: bold;
-}
-
-#memory {
-    background: #f9e2af;
-}
-
-#battery {
-    background: #fab387;
-    color: #1e1e2e;
-    padding: 0 10px;
-    margin: 2px 2px;
-    border-radius: 6px;
+#memory,
+#temperature,
+#battery,
+#uptime,
+#network,
+#pulseaudio,
+#tray {
+    padding: 5px 10px;
+    margin: 3px;
+    border-radius: 8px;
+    background: rgba(255, 255, 255, 0.05);
     font-weight: bold;
 }
 
-#battery.charging {
-    background: #a6e3a1;
+#pulseaudio {
+    color: #8aadf4;
 }
 
-#battery.warning:not(.charging) {
-    background: #f9e2af;
-    animation: blink 1s linear infinite alternate;
+#network {
+    color: #a6da95;
 }
 
-#battery.critical:not(.charging) {
-    background: #f38ba8;
-    animation: blink 0.5s linear infinite alternate;
+#cpu {
+    color: #eed49f;
 }
 
-#network {
-    background: #cba6f7;
-    color: #1e1e2e;
-    padding: 0 10px;
-    margin: 2px 2px;
-    border-radius: 6px;
-    font-weight: bold;
+#memory {
+    color: #f5a97f;
 }
 
-#network.disconnected {
-    background: #f38ba8;
+#temperature {
+    color: #a6da95;
 }
 
-#pulseaudio {
-    background: #f5c2e7;
-    color: #1e1e2e;
-    padding: 0 10px;
-    margin: 2px 2px;
-    border-radius: 6px;
-    font-weight: bold;
+#battery {
+    color: #a6da95;
 }
 
-#pulseaudio.muted {
-    background: #6c7086;
-    color: #cdd6f4;
+#uptime {
+    color: #8aadf4;
 }
 
 #tray {
-    background: #45475a;
-    padding: 0 10px;
-    margin: 2px 2px 2px 4px;
-    border-radius: 6px;
+    color: #cdd6f4;
 }
 
 #tray > .passive {
diff --git a/docs/ANDROID-DEVELOPMENT.md b/docs/ANDROID-DEVELOPMENT.md
new file mode 100644
index 0000000..f54bd90
--- /dev/null
+++ b/docs/ANDROID-DEVELOPMENT.md
@@ -0,0 +1,298 @@
+# Android & Mobile Development Setup
+
+## Overview
+
+Your NixOS configuration now includes comprehensive tools for .NET, Java, and Android development.
+
+## Installed Packages
+
+### System-Level (NixOS)
+
+- **Android SDK**: Full Android SDK with platform tools, build tools, and emulator
+  - Platform versions: 34, 33, 31
+  - Build tools: 34.0.0, 33.0.0
+  - NDK included for native development
+  - System images for emulator (Google Play Store variants)
+  - ABI support: x86_64, arm64-v8a
+- **ADB (Android Debug Bridge)**: Enabled system-wide
+
+### User-Level (Home Manager)
+
+- **dotnet-sdk**: .NET SDK for C# development
+- **dotnet-aspnetcore**: ASP.NET Core runtime
+- **jdk**: Java Development Kit (for Android & general Java development)
+- **android-tools**: Android platform tools (adb, fastboot, etc.)
+- **android-studio**: Full Android Studio IDE
+- **qemu**: Emulation support
+- **Development utilities**: curl, unzip, which, file
+
+## Environment Variables
+
+The following environment variables are automatically set:
+
+```bash
+ANDROID_HOME=/nix/store/.../libexec/android-sdk
+ANDROID_SDK_ROOT=/nix/store/.../libexec/android-sdk
+```
+
+## User Permissions
+
+Your user (`tim`) has been added to the `adbusers` group, allowing you to:
+
+- Use ADB without root
+- Debug Android devices via USB
+- Access Android emulators
+
+## Getting Started
+
+### Android Studio
+
+Launch Android Studio:
+
+```bash
+android-studio
+```
+
+On first launch, Android Studio will:
+
+1. Detect the pre-installed Android SDK
+2. Offer to download additional components
+3. Set up the Android Virtual Device (AVD) Manager
+
+### Using ADB
+
+Check connected devices:
+
+```bash
+adb devices
+```
+
+Install an APK:
+
+```bash
+adb install app.apk
+```
+
+Access device shell:
+
+```bash
+adb shell
+```
+
+### Android Emulator
+
+List available system images:
+
+```bash
+${ANDROID_HOME}/emulator/emulator -list-avds
+```
+
+Create a new AVD (through Android Studio or command line):
+
+```bash
+# Through Android Studio
+Tools > Device Manager > Create Device
+
+# Or via command line
+avdmanager create avd -n "Pixel_API_34" -k "system-images;android-34;google_apis_playstore;x86_64"
+```
+
+Start emulator:
+
+```bash
+${ANDROID_HOME}/emulator/emulator -avd Pixel_API_34
+```
+
+### .NET Development
+
+Check .NET version:
+
+```bash
+dotnet --version
+```
+
+Create a new console app:
+
+```bash
+dotnet new console -n MyApp
+cd MyApp
+dotnet run
+```
+
+Create an ASP.NET Core web app:
+
+```bash
+dotnet new webapp -n MyWebApp
+cd MyWebApp
+dotnet run
+```
+
+### Java Development
+
+Check Java version:
+
+```bash
+java -version
+javac -version
+```
+
+Compile and run Java:
+
+```bash
+javac HelloWorld.java
+java HelloWorld
+```
+
+## Connecting Physical Android Devices
+
+### Enable USB Debugging on Android Device
+
+1. Go to **Settings** > **About Phone**
+2. Tap **Build Number** 7 times to enable Developer Options
+3. Go to **Settings** > **Developer Options**
+4. Enable **USB Debugging**
+
+### Connect Device
+
+1. Connect device via USB
+2. On the device, authorize the computer when prompted
+3. Verify connection:
+
+```bash
+adb devices
+```
+
+You should see your device listed.
+
+## Troubleshooting
+
+### ADB not finding device
+
+```bash
+# Restart adb server
+adb kill-server
+adb start-server
+
+# Check USB permissions
+lsusb
+```
+
+### Emulator won't start
+
+```bash
+# Check KVM access (required for fast emulation)
+ls -la /dev/kvm
+
+# Your user should have access via the kvm group
+# If not, you may need to add yourself to the kvm group
+```
+
+### Android Studio SDK issues
+
+If Android Studio doesn't detect the SDK:
+
+1. Open Android Studio
+2. Go to **File** > **Settings** > **Appearance & Behavior** > **System Settings** > **Android SDK**
+3. Set SDK Location to: `$ANDROID_HOME`
+
+### .NET SSL Certificate Issues
+
+If you encounter SSL/HTTPS issues:
+
+```bash
+# Trust the .NET development certificate
+dotnet dev-certs https --trust
+```
+
+## Updating the Configuration
+
+### Add More Android Platform Versions
+
+Edit `/home/tim/.dotfiles/modules/nixos/programs/development.nix`:
+
+```nix
+platformVersions = [ "34" "33" "31" "30" ];  # Add version 30
+```
+
+### Change .NET Version
+
+Edit `/home/tim/.dotfiles/modules/home-manager/programs/development/default.nix`:
+
+```nix
+dotnet-sdk_9  # Use .NET 9 instead of default (8)
+```
+
+### Add More System Images
+
+Edit the `systemImageTypes` in `development.nix`:
+
+```nix
+systemImageTypes = [ "google_apis_playstore" "google_apis" "default" ];
+```
+
+## Building Your Configuration
+
+After making changes:
+
+```bash
+cd /home/tim/.dotfiles
+
+# For system-level changes (Android SDK, ADB)
+sudo nixos-rebuild switch --flake .#nixos
+
+# For user-level changes (.NET, Android Studio)
+home-manager switch --flake .#tim@nixos
+```
+
+## Resources
+
+- [Android Developers](https://developer.android.com/)
+- [.NET Documentation](https://docs.microsoft.com/dotnet/)
+- [NixOS Android Development](https://nixos.wiki/wiki/Android)
+- [Android Studio User Guide](https://developer.android.com/studio/intro)
+
+## Known Limitations
+
+1. **Android SDK Updates**: Android SDK components are managed by Nix. Use `nix flake update` to get newer versions.
+2. **Emulator Performance**: For best performance, ensure KVM is enabled and your user is in the `kvm` group.
+3. **Google Play Services**: Some features may require additional setup for development builds.
+
+## Example Projects
+
+### React Native with Expo
+
+```bash
+# Install Expo CLI
+npm install -g expo-cli
+
+# Create new project
+npx create-expo-app my-app
+cd my-app
+
+# Start development server
+npx expo start
+```
+
+### Flutter
+
+Flutter requires additional setup. See the Flutter template in `/home/tim/.dotfiles/templates/` (if available) or install separately.
+
+### Xamarin/.NET MAUI
+
+```bash
+# Install MAUI workload
+dotnet workload install maui
+
+# Create MAUI app
+dotnet new maui -n MyMauiApp
+cd MyMauiApp
+dotnet build
+```
+
+## Next Steps
+
+1. **Launch Android Studio**: Set up your first project
+2. **Create an AVD**: Set up an emulator for testing
+3. **Connect a device**: Test with a physical Android device
+4. **Build a sample app**: Try the "Hello World" tutorials
+5. **Explore templates**: Check `/home/tim/.dotfiles/templates/` for development shells
diff --git a/CUSTOMIZE.md b/docs/CUSTOMIZE.md
similarity index 100%
rename from CUSTOMIZE.md
rename to docs/CUSTOMIZE.md
diff --git a/INSTALL.md b/docs/INSTALL.md
similarity index 100%
rename from INSTALL.md
rename to docs/INSTALL.md
diff --git a/docs/INTEGRATION.md b/docs/INTEGRATION.md
new file mode 100644
index 0000000..2b218d3
--- /dev/null
+++ b/docs/INTEGRATION.md
@@ -0,0 +1,310 @@
+# Integration Guide for New Enhancements
+
+This guide shows you how to integrate all the new enhancement files into your existing dotfiles.
+
+## Step-by-Step Integration
+
+### 1. Add System Modules
+
+Edit `modules/nixos/system/default.nix`:
+```nix
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./security.nix      # NEW
+    ./maintenance.nix   # NEW
+  ];
+
+  # ... rest of existing config
+}
+```
+
+### 2. Add Home Manager Service Modules
+
+Edit `modules/home-manager/services/default.nix`:
+```nix
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./backup.nix        # NEW
+  ];
+
+  # Home manager services
+  services = {
+    # ... existing services
+  };
+}
+```
+
+### 3. Add Desktop Modules
+
+Edit `modules/home-manager/desktop/default.nix`:
+```nix
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./hyprland.nix
+    ./waybar.nix
+    ./notifications.nix   # NEW
+  ];
+}
+```
+
+### 4. Add Network Module
+
+Edit `modules/home-manager/programs/default.nix`:
+```nix
+{ inputs, outputs, ... }:
+
+{
+  imports = [
+    ./shell
+    ./terminal
+    ./editor
+    ./browser
+    ./media
+    ./development
+    ./productivity
+    ./communication
+    ./utilities
+    ./keybind-viewer.nix
+    ./network            # NEW
+  ];
+}
+```
+
+### 5. Update Hyprland Configuration
+
+Edit `configs/hyprland/hyprland.conf` and add at the end:
+```conf
+# Source additional configurations
+source = ~/.dotfiles/configs/hyprland/hyprland-additions.conf
+```
+
+### 6. Make Scripts Executable
+
+```bash
+cd ~/.dotfiles
+chmod +x scripts/system-monitor.sh
+chmod +x scripts/power-menu.sh
+chmod +x scripts/rollback.sh
+```
+
+### 7. Add Scripts to PATH
+
+The scripts should be automatically available through home-manager, but you can also add to `.local/bin`:
+
+```bash
+ln -sf ~/.dotfiles/scripts/system-monitor.sh ~/.local/bin/system-monitor
+ln -sf ~/.dotfiles/scripts/power-menu.sh ~/.local/bin/power-menu
+ln -sf ~/.dotfiles/scripts/rollback.sh ~/.local/bin/rollback
+```
+
+### 8. Configure Backups (Optional)
+
+Edit `modules/home-manager/services/backup.nix` and uncomment the restic configuration:
+```nix
+services.restic.backups = {
+  homeBackup = {
+    # ... configure your backup destination
+    repository = "/mnt/backup/restic";  # Change this!
+    passwordFile = "/home/tim/.config/restic/password";
+  };
+};
+```
+
+Create password file:
+```bash
+mkdir -p ~/.config/restic
+echo "your-secure-password" > ~/.config/restic/password
+chmod 600 ~/.config/restic/password
+```
+
+### 9. Update Makefile (Optional)
+
+Add new commands to your `Makefile`:
+```makefile
+# System health check
+health:
+	@./scripts/system-monitor.sh
+
+# Rollback commands
+rollback-system:
+	@./scripts/rollback.sh system --list
+
+rollback-home:
+	@./scripts/rollback.sh home --list
+```
+
+### 10. Test Configuration
+
+```bash
+cd ~/.dotfiles
+make check-fast
+```
+
+### 11. Apply Changes
+
+```bash
+# Apply system changes
+make switch-system
+
+# Apply home-manager changes  
+make switch-home
+```
+
+## New Features Available
+
+After integration, you'll have:
+
+### System-Level
+- ✅ Firewall enabled with sensible defaults
+- ✅ Fail2ban for SSH protection
+- ✅ AppArmor security profiles
+- ✅ Automatic garbage collection (weekly)
+- ✅ SMART disk monitoring
+- ✅ Automatic SSD TRIM
+
+### User-Level
+- ✅ Mako notifications with Catppuccin theme
+- ✅ Backup scripts (manual and automated)
+- ✅ Syncthing for file synchronization
+- ✅ Network diagnostic tools
+- ✅ SSH configuration management
+
+### Hyprland Enhancements
+- ✅ Screenshot keybinds (`Super+Shift+S` for area)
+- ✅ Window rules for common applications
+- ✅ Workspace assignments
+- ✅ Clipboard manager integration
+- ✅ Color picker (`Super+Shift+C`)
+- ✅ Vim-like window navigation
+- ✅ Resize mode
+- ✅ Lock screen (`Super+L`)
+
+### Development Tools
+- ✅ Python development shell template
+- ✅ Node.js development shell template
+- ✅ Rust development shell template
+- ✅ System monitoring script
+- ✅ Power menu script
+- ✅ Rollback script
+
+### Scripts
+- ✅ `system-monitor` - Check system health
+- ✅ `power-menu` - Power options menu
+- ✅ `rollback` - Rollback system or home-manager
+- ✅ `network-status` - Show network information
+- ✅ `network-restart` - Restart network services
+- ✅ `backup-now` - Manual backup
+- ✅ `test-notifications` - Test notification system
+
+## Testing New Features
+
+### Test Notifications
+```bash
+test-notifications
+```
+
+### Test System Monitor
+```bash
+system-monitor
+```
+
+### Test Power Menu
+```bash
+power-menu
+```
+
+### Test Rollback
+```bash
+rollback system --list
+rollback home --list
+```
+
+### Test Network Tools
+```bash
+network-status
+```
+
+### Test Screenshots (Hyprland)
+- `Super+Shift+S` - Select area
+- `Super+Print` - Current output
+- `Print` - Full screen
+
+### Test Color Picker (Hyprland)
+- `Super+Shift+C` - Pick color
+
+### Test Development Shells
+```bash
+cd ~/dev/my-python-project
+cp -r ~/.dotfiles/templates/devshells/python/* .
+nix develop
+```
+
+## Customization
+
+### Firewall Ports
+Edit `modules/nixos/system/security.nix`:
+```nix
+allowedTCPPorts = [ 5432 80 443 ];  # Add your ports
+```
+
+### Garbage Collection Frequency
+Edit `modules/nixos/system/maintenance.nix`:
+```nix
+nix.gc.dates = "daily";  # or "weekly", "monthly"
+```
+
+### Notification Timeout
+Edit `modules/home-manager/desktop/notifications.nix`:
+```nix
+defaultTimeout = 3000;  # milliseconds
+```
+
+### Backup Paths
+Edit `modules/home-manager/services/backup.nix`:
+```nix
+paths = [
+  "/home/tim/Documents"
+  "/home/tim/Pictures"
+  # Add more paths
+];
+```
+
+## Troubleshooting
+
+If you encounter issues:
+
+1. Check syntax: `make check-fast`
+2. View detailed errors: `make check`
+3. Test build without switching: `make build-system` or `make build-home`
+4. View the troubleshooting guide: `docs/TROUBLESHOOTING.md`
+
+## Rollback if Needed
+
+If something breaks:
+```bash
+# System rollback
+sudo nixos-rebuild switch --rollback
+
+# Home-manager rollback
+./scripts/rollback.sh home
+```
+
+## Next Steps
+
+1. **Configure Backups**: Set up automated backups with restic
+2. **Customize Window Rules**: Add your applications to Hyprland window rules
+3. **Create Dev Shells**: Set up development shells for your projects
+4. **Fine-tune Security**: Review and adjust firewall and fail2ban settings
+5. **Set Up Monitoring**: Review system health regularly with `system-monitor`
+
+## Questions?
+
+- Check `docs/TROUBLESHOOTING.md`
+- Review NixOS options: https://search.nixos.org
+- Ask on NixOS Discourse: https://discourse.nixos.org
diff --git a/docs/KEYBINDING-FIXES.md b/docs/KEYBINDING-FIXES.md
new file mode 100644
index 0000000..5a5219c
--- /dev/null
+++ b/docs/KEYBINDING-FIXES.md
@@ -0,0 +1,167 @@
+# Keybinding Collision Fixes - Applied on November 2, 2025
+
+## Summary
+Fixed 7 keybinding collisions in Hyprland configuration files.
+
+---
+
+## Changes Applied
+
+### 1. **$mainMod + C** - Moved from killactive to clipboard
+- **Before**: `killactive`
+- **After**: Clipboard manager (cliphist)
+- **Note**: Kill window moved to `$mainMod + SHIFT + Q` (more intentional)
+
+### 2. **$mainMod + SHIFT + Q** - New keybinding for killactive
+- **Before**: Not assigned
+- **After**: `killactive` (close window)
+- **Reason**: More intentional than just C
+
+### 3. **$mainMod + V** - Resolved triple collision
+- **Kept**: `togglefloating` (most common use)
+- **Moved pypr volume**: To `$mainMod + SHIFT + V`
+- **Moved clipboard**: To `$mainMod + C`
+
+### 4. **$mainMod + SHIFT + S** - Kept for screenshots
+- **Kept**: `grimblast copy area` (screenshots)
+- **Moved scratchpad**: To `$mainMod + minus` and `$mainMod + SHIFT + minus`
+
+### 5. **$mainMod + J** - Resolved double collision
+- **Before**: `togglesplit` AND `$pypr change_workspace -1`
+- **After**: Only vim-style focus down (`movefocus, d`)
+- **togglesplit moved to**: `$mainMod + T`
+- **pypr workspace navigation moved to**: `$mainMod + bracketleft`
+
+### 6. **$mainMod + K** - Resolved collision
+- **Before**: `$pypr change_workspace +1` conflicted with vim nav
+- **After**: Only vim-style focus up (`movefocus, u`)
+- **pypr workspace navigation moved to**: `$mainMod + bracketright`
+
+### 7. **$mainMod + L** - Resolved triple collision
+- **Before**: `$pypr toggle_dpms`, `hyprlock`, and vim focus right
+- **After**: Only vim-style focus right (`movefocus, r`)
+- **hyprlock moved to**: `$mainMod + Escape`
+- **toggle_dpms removed**: Duplicate of `$mainMod + ALT + P`
+
+### 8. **Arrow Keys** - Repurposed for workspace navigation
+- **Before**: `movefocus` (duplicated vim keys)
+- **After**: `workspace, e-1` and `workspace, e+1` for left/right
+- **Reason**: Vim keys (h/j/k/l) handle focus movement
+
+### 9. **Color Picker** - Moved to avoid future conflicts
+- **Before**: `$mainMod + SHIFT + C`
+- **After**: `$mainMod + ALT + C`
+- **Reason**: SHIFT+C might be needed for other functions
+
+### 10. **$mainMod + T** - New binding for togglesplit
+- **Before**: Not assigned
+- **After**: `togglesplit` (dwindle layout)
+- **Reason**: Moved from J to avoid vim navigation conflict
+
+### 11. **$mainMod + [ and ]** - New pypr workspace navigation
+- **Before**: Not assigned
+- **After**: `$pypr change_workspace -1` (prev) and `+1` (next)
+- **Reason**: Intuitive bracket keys for workspace switching
+
+### 12. **$mainMod + ALT + B** - Moved pypr expose
+- **Before**: `$mainMod + B`
+- **After**: `$mainMod + ALT + B`
+- **Reason**: Reserved B for potential browser shortcut
+
+---
+
+## Quick Reference - Updated Keybindings
+
+### Window Management
+| Key | Action |
+|-----|--------|
+| `$mainMod + h/j/k/l` | Focus window (vim-style) |
+| `$mainMod + SHIFT + h/j/k/l` | Move window (vim-style) |
+| `$mainMod + I` | Enter resize mode |
+| `$mainMod + V` | Toggle floating |
+| `$mainMod + SHIFT + Q` | Kill window |
+| `$mainMod + T` | Toggle split (dwindle) |
+| `$mainMod + F` | Fullscreen |
+| `$mainMod + SHIFT + F` | Maximize |
+| `$mainMod + SHIFT + P` | Pin window |
+| `$mainMod + G` | Toggle group (tabbed) |
+
+### Workspaces
+| Key | Action |
+|-----|--------|
+| `$mainMod + 0-9` | Switch to workspace |
+| `$mainMod + SHIFT + 0-9` | Move window to workspace |
+| `$mainMod + [ / ]` | Previous/Next workspace (pypr) |
+| `$mainMod + left/right` | Previous/Next workspace (scroll) |
+| `$mainMod + minus` | Toggle scratchpad |
+| `$mainMod + SHIFT + minus` | Move to scratchpad |
+
+### Applications
+| Key | Action |
+|-----|--------|
+| `$mainMod + Q` | Terminal |
+| `$mainMod + E` | File manager |
+| `$mainMod + R` | App launcher (rofi) |
+| `$mainMod + A` | Toggle pypr terminal |
+
+### Utilities
+| Key | Action |
+|-----|--------|
+| `$mainMod + C` | Clipboard history |
+| `$mainMod + SHIFT + V` | Volume control (pypr) |
+| `$mainMod + N` | Network menu |
+| `$mainMod + SHIFT + N` | WiFi toggle |
+| `$mainMod + CTRL + N` | Network info |
+| `$mainMod + W` | Toggle waybar |
+
+### Screenshots
+| Key | Action |
+|-----|--------|
+| `$mainMod + SHIFT + S` | Screenshot area |
+| `$mainMod + Print` | Screenshot output |
+| `Print` | Screenshot screen |
+| `$mainMod + CTRL + S` | Save screenshot to file |
+| `$mainMod + ALT + S` | Screenshot area (frozen) |
+
+### System
+| Key | Action |
+|-----|--------|
+| `$mainMod + Escape` | Lock screen |
+| `$mainMod + SHIFT + E` | Logout menu (wlogout) |
+| `$mainMod + M` | Exit Hyprland |
+| `$mainMod + ALT + C` | Color picker |
+
+### Pypr Specific
+| Key | Action |
+|-----|--------|
+| `$mainMod + SHIFT + Z` | Zoom |
+| `$mainMod + ALT + P` | Toggle DPMS |
+| `$mainMod + SHIFT + O` | Shift monitors |
+| `$mainMod + ALT + B` | Expose windows |
+| `$mainMod + SHIFT + M` | Toggle stb logs |
+
+### Keybinding Viewers
+| Key | Action |
+|-----|--------|
+| `$mainMod + F1` | GUI keybind viewer |
+| `$mainMod + SHIFT + F1` | Rofi keybind viewer |
+| `$mainMod + CTRL + F1` | Terminal keybind viewer |
+
+---
+
+## Files Modified
+1. `/home/tim/.dotfiles/configs/hyprland/hyprland.conf`
+2. `/home/tim/.dotfiles/configs/hyprland/hyprland-additions.nix`
+
+## Next Steps
+1. Reload Hyprland configuration: `hyprctl reload` or `$mainMod + SHIFT + R` (if configured)
+2. Test all keybindings to ensure they work as expected
+3. Update any personal documentation or cheat sheets
+
+## Rollback
+If you need to revert these changes, use git:
+```bash
+cd /home/tim/.dotfiles
+git diff configs/hyprland/
+git checkout configs/hyprland/hyprland.conf configs/hyprland/hyprland-additions.nix
+```
diff --git a/docs/KEYBINDINGS-QUICK-REF.md b/docs/KEYBINDINGS-QUICK-REF.md
new file mode 100644
index 0000000..b226585
--- /dev/null
+++ b/docs/KEYBINDINGS-QUICK-REF.md
@@ -0,0 +1,147 @@
+# Hyprland Keybindings Quick Reference
+
+> **Updated**: November 2, 2025 - All collisions resolved ✓
+
+## 🪟 Window Management
+
+| Keybinding | Action |
+|------------|--------|
+| `Super + h/j/k/l` | Focus window (left/down/up/right) |
+| `Super + Shift + h/j/k/l` | Move window |
+| `Super + I` then `h/j/k/l` | Resize window (exit with `Esc`) |
+| `Super + V` | Toggle floating |
+| `Super + Shift + Q` | Close window |
+| `Super + T` | Toggle split (dwindle) |
+| `Super + F` | Fullscreen |
+| `Super + Shift + F` | Maximize |
+| `Super + Shift + P` | Pin window |
+| `Super + G` | Toggle group/tabbed |
+| `Super + Tab` | Next tab in group |
+| `Super + Shift + Tab` | Previous tab in group |
+
+## 🖥️ Workspaces
+
+| Keybinding | Action |
+|------------|--------|
+| `Super + 1-9/0` | Switch to workspace 1-10 |
+| `Super + Shift + 1-9/0` | Move window to workspace |
+| `Super + [` | Previous workspace (pypr) |
+| `Super + ]` | Next workspace (pypr) |
+| `Super + Left` | Previous workspace (scroll) |
+| `Super + Right` | Next workspace (scroll) |
+| `Super + -` (minus) | Toggle scratchpad |
+| `Super + Shift + -` | Move window to scratchpad |
+
+## 🚀 Applications
+
+| Keybinding | Action |
+|------------|--------|
+| `Super + Q` | Terminal (kitty) |
+| `Super + E` | File manager (thunar) |
+| `Super + R` | App launcher (wofi) |
+| `Super + A` | Toggle dropdown terminal (pypr) |
+
+## 🛠️ Utilities
+
+| Keybinding | Action |
+|------------|--------|
+| `Super + C` | Clipboard history (cliphist) |
+| `Super + Shift + V` | Volume control menu (pypr) |
+| `Super + N` | Network menu (rofi-network) |
+| `Super + Shift + N` | WiFi toggle |
+| `Super + Ctrl + N` | Network information |
+| `Super + Alt + N` | Advanced network settings |
+| `Super + W` | Toggle Waybar |
+
+## 📸 Screenshots
+
+| Keybinding | Action |
+|------------|--------|
+| `Super + Shift + S` | Select area & copy |
+| `Super + Print` | Current monitor & copy |
+| `Print` | Full screen & copy |
+| `Super + Ctrl + S` | Select area & save to file |
+| `Super + Alt + S` | Select area (frozen) & copy |
+
+## 🔒 System Control
+
+| Keybinding | Action |
+|------------|--------|
+| `Super + Escape` | Lock screen (hyprlock) |
+| `Super + Shift + E` | Logout menu (wlogout) |
+| `Super + M` | Exit Hyprland |
+| `Super + Alt + C` | Color picker (hyprpicker) |
+
+## 🎛️ Pypr Features
+
+| Keybinding | Action |
+|------------|--------|
+| `Super + Shift + Z` | Zoom window |
+| `Super + Alt + P` | Toggle DPMS (display power) |
+| `Super + Shift + O` | Shift monitors |
+| `Super + Alt + B` | Expose all windows |
+| `Super + Shift + M` | Toggle status bar logs |
+
+## 📖 Help & Information
+
+| Keybinding | Action |
+|------------|--------|
+| `Super + F1` | GUI keybind viewer |
+| `Super + Shift + F1` | Rofi keybind viewer |
+| `Super + Ctrl + F1` | Terminal keybind viewer |
+
+## 🎵 Media Controls
+
+| Keybinding | Action |
+|------------|--------|
+| `XF86AudioRaiseVolume` | Volume up 5% |
+| `XF86AudioLowerVolume` | Volume down 5% |
+| `XF86AudioMute` | Toggle mute |
+| `XF86AudioMicMute` | Toggle mic mute |
+| `XF86AudioNext` | Next track |
+| `XF86AudioPrev` | Previous track |
+| `XF86AudioPlay/Pause` | Play/Pause |
+
+## 💡 Brightness (Laptop)
+
+| Keybinding | Action |
+|------------|--------|
+| `XF86MonBrightnessUp` | Increase brightness |
+| `XF86MonBrightnessDown` | Decrease brightness |
+
+## 🖱️ Mouse Bindings
+
+| Keybinding | Action |
+|------------|--------|
+| `Super + Left Click` | Move window |
+| `Super + Right Click` | Resize window |
+| `Super + Scroll Up` | Next workspace |
+| `Super + Scroll Down` | Previous workspace |
+
+---
+
+## 🎯 Pro Tips
+
+1. **Vim Navigation**: All `h/j/k/l` keys follow vim conventions
+   - `h` = left, `j` = down, `k` = up, `l` = right
+
+2. **Workspace Switching**: Three methods available
+   - Numbers (1-9/0) for direct access
+   - Brackets ([/]) for sequential navigation
+   - Arrow keys (left/right) for sequential navigation
+
+3. **Scratchpad**: Use minus key (`-`) as it's easy to reach and remember
+
+4. **Quick Lock**: `Super + Escape` is intuitive for locking
+
+5. **Close vs Exit**: 
+   - `Super + Shift + Q` closes current window
+   - `Super + M` exits entire Hyprland session
+
+6. **Screenshot Workflow**:
+   - Quick share: `Super + Shift + S` (copies to clipboard)
+   - Save file: `Super + Ctrl + S` (saves to ~/Pictures/Screenshots/)
+
+---
+
+**Legend**: `Super` = Windows/Command key (mainMod)
diff --git a/docs/LAPTOP-SETUP.md b/docs/LAPTOP-SETUP.md
new file mode 100644
index 0000000..316b3b9
--- /dev/null
+++ b/docs/LAPTOP-SETUP.md
@@ -0,0 +1,279 @@
+# Laptop-Specific Configuration Guide
+
+## 🖥️ Your Hardware
+
+- **CPU**: Intel Core i5-6300U (6th Gen Skylake, 2 cores/4 threads)
+- **RAM**: 7.4GB
+- **Graphics**: Intel HD Graphics 520 (integrated)
+- **Display**: 1366x768 @ 60Hz (eDP-1)
+- **Boot**: UEFI mode
+- **Disk**: /dev/sda (238.5GB)
+  - sda1: 1GB (/boot)
+  - sda2: 228.7GB (/)
+  - sda3: 8.8GB (swap)
+
+## ⚙️ Optimizations Applied
+
+### Power Management
+✅ **TLP enabled** for battery optimization
+- Performance mode on AC power
+- Powersave mode on battery
+- CPU boost disabled on battery
+- WiFi power saving on battery
+- USB autosuspend enabled
+
+### Memory Management
+✅ **Zram**: 3.7GB compressed swap (50% of RAM)
+✅ **Tmpfs**: 2GB for /tmp
+✅ **Earlyoom**: Prevents system freezes on low memory
+✅ **Swappiness**: 10 (prefer RAM over swap)
+
+### CPU Settings
+✅ **Governor**: powersave on battery, performance on AC
+✅ **Intel microcode**: Updates enabled
+✅ **Thermal management**: thermald enabled
+✅ **Build jobs**: Limited to 2 (save battery during builds)
+
+### Graphics
+✅ **Intel HD 520 drivers**: Full VA-API support
+✅ **Hardware acceleration**: Enabled for video playback
+✅ **Framebuffer compression**: Enabled
+✅ **Panel self-refresh**: Enabled (saves power)
+
+### Display
+✅ **Resolution**: 1366x768 configured everywhere
+✅ **GRUB**: Sized for your screen
+✅ **SDDM**: Optimized cursor and font sizes
+✅ **Font sizes**: Reduced for laptop screen
+
+## 🔋 Battery Tips
+
+### Check Battery Status
+```bash
+# Battery info
+cat /sys/class/power_supply/BAT0/capacity
+cat /sys/class/power_supply/BAT0/status
+
+# Power consumption
+sudo powertop
+
+# TLP status
+sudo tlp-stat
+```
+
+### Extend Battery Life
+```bash
+# Enable power saving mode
+sudo tlp bat
+
+# Disable bluetooth when not needed
+sudo systemctl stop bluetooth
+
+# Reduce screen brightness
+brightnessctl set 30%
+
+# Check what's draining battery
+sudo powertop --auto-tune
+```
+
+## 💾 Resource Management
+
+### Database Services
+Start only what you need:
+```bash
+# Start PostgreSQL
+sudo systemctl start postgresql
+
+# Start Redis
+sudo systemctl start redis
+
+# Start MongoDB
+sudo systemctl start mongodb
+
+# Stop when not needed
+sudo systemctl stop postgresql redis mongodb
+```
+
+### Monitor Resources
+```bash
+# System resources
+btop
+
+# Memory usage
+free -h
+
+# Disk usage
+df -h
+
+# Process list
+htop
+```
+
+### Clean Up Space
+```bash
+# Clean Nix store
+sudo nix-collect-garbage -d
+home-manager expire-generations "-7 days"
+
+# Optimize Nix store
+nix-store --optimise
+
+# Clean package caches
+sudo pacman -Sc  # If coming from Arch
+```
+
+## 🎯 Performance vs Battery Trade-offs
+
+### For Maximum Battery Life
+```bash
+# Edit modules/nixos/performance.nix
+powerManagement.cpuFreqGovernor = "powersave";
+
+# Reduce brightness
+brightnessctl set 40%
+
+# Disable unused services
+sudo systemctl disable bluetooth
+sudo systemctl disable cups  # If not printing
+```
+
+### For Maximum Performance (AC Power)
+```bash
+# Edit modules/nixos/performance.nix
+powerManagement.cpuFreqGovernor = "performance";
+
+# Ensure TLP uses performance profile
+services.tlp.settings.CPU_SCALING_GOVERNOR_ON_AC = "performance";
+```
+
+## 🐛 Common Issues & Solutions
+
+### Issue: System feels slow
+**Solutions:**
+1. Check if databases are running: `ps aux | grep postgres`
+2. Check memory: `free -h`
+3. Close heavy applications
+4. Run `btop` to see resource usage
+5. Consider disabling some services in `modules/nixos/services/`
+
+### Issue: High CPU usage
+**Solutions:**
+1. Check with `htop` what's using CPU
+2. Limit Nix build jobs in `performance.nix`
+3. Close browser tabs (Chromium/Firefox can be heavy)
+
+### Issue: Running out of memory
+**Solutions:**
+1. Check Zram: `zramctl`
+2. Close heavy IDEs (VSCode, RStudio)
+3. Stop unused databases
+4. Increase Zram percentage in `performance.nix` (currently 50%)
+
+### Issue: Battery drains quickly
+**Solutions:**
+1. Check TLP status: `sudo tlp-stat`
+2. Reduce screen brightness
+3. Close unused applications
+4. Check power consumption: `sudo powertop`
+5. Disable bluetooth: `sudo systemctl stop bluetooth`
+
+### Issue: Overheating
+**Solutions:**
+1. Check thermals: `sensors`
+2. Clean laptop vents
+3. Use cooling pad
+4. Reduce CPU frequency temporarily:
+   ```bash
+   sudo cpupower frequency-set --max 1.5GHz
+   ```
+
+## 📊 Recommended Workflow
+
+### For Data Science Work
+```bash
+# Start only PostgreSQL and Redis
+sudo systemctl start postgresql redis
+
+# Launch Jupyter Lab
+jlab
+
+# Use lightweight data tools
+duck  # DuckDB for SQL
+```
+
+### For Backend Development
+```bash
+# Use Docker Compose for services
+cd ~/.config/docker-compose
+docker-compose -f dev-stack.yml up -d
+
+# This keeps databases in containers (easier to stop)
+```
+
+### For General Development
+```bash
+# Use direnv for project environments
+# It automatically loads .envrc when you cd into project
+
+# Example .envrc
+echo "use flake" > .envrc
+direnv allow
+```
+
+## 🔧 Customization for Your Laptop
+
+### Change Display Scaling (if text too small)
+Edit `modules/home-manager/theming/default.nix`:
+```nix
+fonts.sizes = {
+  applications = 11;  # Increase from 10
+  terminal = 12;      # Increase from 11
+};
+```
+
+### Adjust Zram Size
+Edit `modules/nixos/performance.nix`:
+```nix
+zramSwap = {
+  memoryPercent = 60;  # Increase from 50% if needed
+};
+```
+
+### Change CPU Governor
+Edit `modules/nixos/performance.nix`:
+```nix
+# For always performance:
+powerManagement.cpuFreqGovernor = "performance";
+
+# For always powersave:
+powerManagement.cpuFreqGovernor = "powersave";
+
+# For automatic (recommended):
+powerManagement.cpuFreqGovernor = "schedutil";
+```
+
+## 📱 Laptop-Specific Keybindings
+
+Already configured in Hyprland:
+- **Brightness**: Fn + F5/F6 (or brightness keys)
+- **Volume**: Fn + F10/F11/F12
+- **Media**: Fn + Play/Pause/Next/Prev
+
+## 🎓 Learning Resources
+
+- **TLP Documentation**: https://linrunner.de/tlp/
+- **Intel Graphics**: https://wiki.archlinux.org/title/Intel_graphics
+- **Power Management**: https://wiki.archlinux.org/title/Power_management
+
+## ✅ Final Checklist
+
+- [ ] TLP enabled and configured
+- [ ] Zram configured (50% of RAM)
+- [ ] Database services set to manual start
+- [ ] Intel microcode updates enabled
+- [ ] Graphics drivers configured
+- [ ] Display resolution correct (1366x768)
+- [ ] Font sizes comfortable for your screen
+- [ ] Power button action configured in SDDM
+
+Your laptop is now optimized for data engineering, development, and daily driving! 🚀
diff --git a/docs/ROFI-THEMES.md b/docs/ROFI-THEMES.md
new file mode 100644
index 0000000..3c74f81
--- /dev/null
+++ b/docs/ROFI-THEMES.md
@@ -0,0 +1,156 @@
+# Rofi Adi1090x Themes - Keybindings Reference
+
+## 🎨 **Theme Configuration**
+
+All themes use **Catppuccin Mocha** color scheme with the following adi1090x styles:
+
+- **Launcher**: Type-1 Style-6
+- **Apps as Root**: Type-2
+- **Power Menu**: Type-2 Style-2
+- **Screenshot**: Type-2
+- **Volume**: Type-2
+
+---
+
+## ⌨️ **Keybindings**
+
+### **Main Launcher**
+- `Super + D` - Open application launcher (Type-1 Style-6)
+- `Super + R` - Alternative launcher (original rofi)
+s
+### **Screenshot**
+- `Super + S` - Screenshot menu
+- `Print` - Screenshot menu (alternative)
+
+**Screenshot Options:**
+- 󰹑 Fullscreen
+- 🖱 Selection (click and drag)
+- 🪟 Window (active window)
+- ⏲ Delay 3s (3-second delay)
+
+Screenshots saved to: `~/Pictures/Screenshots/`
+Auto-copied to clipboard with `wl-clipboard`
+
+### **Volume Control**
+- `Super + Ctrl + V` - Volume control menu
+- `XF86AudioRaiseVolume` - Increase volume (hardware key)
+- `XF86AudioLowerVolume` - Decrease volume (hardware key)
+- `XF86AudioMute` - Toggle mute (hardware key)
+
+**Volume Menu Options:**
+- 󰝝 Increase (+5%)
+- 󰝞 Decrease (-5%)
+- 󰝟 Mute/Unmute
+- 🔊 Max Volume (100%)
+- 🔉 50%
+- 🎛 Pavucontrol (GUI mixer)
+
+### **Apps as Root** ⚠️
+- `Super + Shift + A` - Run applications as root (USE WITH CAUTION)
+
+**Root Apps Available:**
+- 📁 File Manager (Thunar)
+- 💻 Terminal
+- 📝 Text Editor (Neovim)
+- 󰒓 System Monitor (btop)
+- 📦 Package Manager
+- 💾 Disk Usage Analyzer
+
+### **Power Menu**
+- `Super + Shift + P` - Power menu
+- `Super + X` - Power menu (alternative)
+
+**Power Options:**
+- ⏻ Shutdown
+- 🔄 Reboot
+- 💤 Suspend
+- 🛏 Hibernate
+- 󰒲 Logout
+- 🔒 Lock
+
+### **Network** (Existing)
+- `Super + N` - Network menu
+- `Super + Shift + N` - WiFi toggle
+
+### **Window Management** (Existing - No Conflicts)
+- `Super + Q` - Terminal
+- `Super + Shift + Q` - Kill active window
+- `Super + M` - Exit Hyprland
+- `Super + E` - File manager
+- `Super + V` - Toggle floating
+- `Super + T` - Toggle split
+- `Super + W` - Toggle Waybar
+
+---
+
+## 🎯 **No Keybinding Conflicts**
+
+All new keybindings have been carefully chosen to avoid conflicts with existing ones:
+
+**Existing bindings preserved:**
+- `Super + [1-9,0]` - Workspaces
+- `Super + Arrow Keys` - Workspace navigation
+- `Super + Vim keys` - Window focus  
+- `Super + Shift + [1-9,0]` - Move to workspace
+- `Super + A` - Pypr toggle term
+- `Super + Shift + V` - Pypr toggle volume
+- `Super + Ctrl + V` - **NEW** Rofi volume menu
+- `Super + Shift + M` - Pypr toggle stb
+- `Super + F1` - Keybind viewer
+- `Super + Shift + F1` - Keybinds rofi
+
+**New bindings added:**
+- `Super + D` - Rofi launcher ✨
+- `Super + S` / `Print` - Screenshot ✨
+- `Super + Ctrl + V` - Volume menu ✨
+- `Super + Shift + A` - Root apps ✨
+- `Super + Shift + P` / `Super + X` - Power menu ✨
+
+---
+
+## 📦 **Dependencies Installed**
+
+- `grim` - Screenshot utility for Wayland
+- `slurp` - Region selector for screenshots
+- `wl-clipboard` - Clipboard manager for Wayland
+- `jq` - JSON processor
+- `rofi-themes-adi1090x` - Theme collection
+
+---
+
+## 🎨 **Color Scheme**
+
+All menus use Catppuccin Mocha colors:
+- **Background**: #1e1e2e, #313244
+- **Foreground**: #cdd6f4
+- **Accent (Blue)**: #89b4fa
+- **Urgent (Red)**: #f38ba8
+- **Green**: #a6e3a1
+- **Yellow**: #f9e2af
+
+---
+
+## 📁 **Script Locations**
+
+All scripts are located in `~/.dotfiles/scripts/`:
+- `rofi-launcher.sh`
+- `rofi-powermenu.sh`
+- `rofi-screenshot.sh`
+- `rofi-volume.sh`
+- `rofi-root-apps.sh`
+
+Configuration file: `~/.config/rofi/catppuccin-mocha.rasi`
+
+---
+
+## 🔧 **Customization**
+
+To modify themes, edit the respective script in `~/.dotfiles/scripts/` and adjust the RASI theme code.
+
+To add more options to menus, edit the `options` variable in each script.
+
+---
+
+**Created**: November 6, 2025
+**Theme**: Catppuccin Mocha
+**Style**: adi1090x Type-1 & Type-2
diff --git a/docs/TROUBLESHOOTING.md b/docs/TROUBLESHOOTING.md
new file mode 100644
index 0000000..e59caaa
--- /dev/null
+++ b/docs/TROUBLESHOOTING.md
@@ -0,0 +1,401 @@
+# Troubleshooting Guide
+
+## Common Issues and Solutions
+
+### Build Failures
+
+#### Issue: `nixpkgs` options conflict with `useGlobalPkgs`
+```
+Failed assertions:
+- tim profile: `nixpkgs` options are disabled when `home-manager.useGlobalPkgs` is enabled.
+```
+
+**Solution:**
+Remove `nixpkgs.config` from any Home Manager files. Add this to `home/tim/default.nix`:
+```nix
+nixpkgs.config = lib.mkForce {};
+```
+
+#### Issue: Flake syntax error
+**Solution:**
+```bash
+nix-instantiate --parse flake.nix
+```
+Look for missing semicolons, brackets, or quotes.
+
+#### Issue: Hash mismatch for fetchurl
+**Solution:**
+```bash
+# Get new hash
+nix-prefetch-url <url>
+
+# Or use this in your config
+hash = lib.fakeSha256;  # Will show actual hash in error
+```
+
+### Home Manager Issues
+
+#### Issue: Activation fails with collision
+```
+error: collision between ... and ...
+```
+
+**Solution:**
+```bash
+# Remove conflicting files
+rm ~/.config/problematic-file
+
+# Or use backup extension
+home-manager switch --flake . -b backup
+```
+
+#### Issue: Service fails to start
+**Solution:**
+```bash
+# Check service status
+systemctl --user status service-name
+
+# Check logs
+journalctl --user -xeu service-name
+
+# Test service manually
+/nix/store/xxx-service/bin/service-name
+```
+
+### Hyprland Issues
+
+#### Issue: Hyprland won't start
+**Solution:**
+```bash
+# Check logs
+journalctl -b | grep hyprland
+
+# Try running from TTY
+Hyprland
+
+# Check if required packages are installed
+which waybar kitty
+```
+
+#### Issue: Screen tearing or stuttering
+**Solution:**
+Add to `hyprland.conf`:
+```conf
+env = WLR_NO_HARDWARE_CURSORS,1
+env = WLR_DRM_NO_ATOMIC,1
+```
+
+#### Issue: Applications not appearing in rofi
+**Solution:**
+```bash
+# Update desktop database
+update-desktop-database ~/.local/share/applications
+
+# Or rebuild home-manager
+home-manager switch --flake .
+```
+
+### Display Manager Issues
+
+#### Issue: SDDM doesn't show theme
+**Solution:**
+```bash
+# Check theme directory
+ls /run/current-system/sw/share/sddm/themes/
+
+# Rebuild system
+sudo nixos-rebuild switch --flake .
+
+# Check SDDM config
+cat /etc/sddm.conf
+```
+
+#### Issue: Can't login after rebuild
+**Solution:**
+1. Switch to TTY (Ctrl+Alt+F2)
+2. Login as root or user
+3. Check logs: `journalctl -xeu display-manager`
+4. Rollback: `sudo nixos-rebuild switch --rollback`
+
+### Network Issues
+
+#### Issue: No internet after boot
+**Solution:**
+```bash
+# Check NetworkManager status
+systemctl status NetworkManager
+
+# Restart NetworkManager
+sudo systemctl restart NetworkManager
+
+# Check connections
+nmcli device status
+nmcli connection show
+```
+
+#### Issue: DNS not resolving
+**Solution:**
+```bash
+# Check DNS
+cat /etc/resolv.conf
+
+# Test DNS
+nslookup google.com
+
+# Restart resolved
+sudo systemctl restart systemd-resolved
+```
+
+### Audio Issues
+
+#### Issue: No audio output
+**Solution:**
+```bash
+# Check PipeWire status
+systemctl --user status pipewire pipewire-pulse wireplumber
+
+# Restart audio services
+systemctl --user restart pipewire pipewire-pulse wireplumber
+
+# Check sinks
+wpctl status
+```
+
+#### Issue: Wrong default audio device
+**Solution:**
+```bash
+# List devices
+wpctl status
+
+# Set default
+wpctl set-default <device-id>
+```
+
+### Graphics Issues
+
+#### Issue: NVIDIA drivers not working
+**Solution:**
+Add to `hosts/nixos/default.nix`:
+```nix
+services.xserver.videoDrivers = [ "nvidia" ];
+hardware.nvidia = {
+  modesetting.enable = true;
+  open = false;  # Use proprietary driver
+  nvidiaSettings = true;
+};
+```
+
+#### Issue: Screen flickering on Intel
+**Solution:**
+```nix
+boot.kernelParams = [ "i915.enable_psr=0" ];
+```
+
+### Performance Issues
+
+#### Issue: System is slow
+**Solution:**
+```bash
+# Check what's using resources
+btop
+
+# Check disk I/O
+iotop
+
+# Check journal size
+journalctl --disk-usage
+
+# Clean up if needed
+sudo journalctl --vacuum-size=100M
+```
+
+#### Issue: Nix store taking too much space
+**Solution:**
+```bash
+# Check store size
+du -sh /nix/store
+
+# List generations
+sudo nix-env --list-generations --profile /nix/var/nix/profiles/system
+
+# Delete old generations
+sudo nix-collect-garbage -d
+
+# Optimize store
+nix-store --optimise
+```
+
+### Backup and Recovery
+
+#### Issue: Need to rollback system
+**Solution:**
+```bash
+# List generations
+sudo nix-env --list-generations --profile /nix/var/nix/profiles/system
+
+# Switch to specific generation
+sudo nixos-rebuild switch --rollback
+
+# Or boot into previous generation from GRUB/systemd-boot menu
+```
+
+#### Issue: Configuration lost
+**Solution:**
+```bash
+# If dotfiles are backed up
+cd ~/.dotfiles
+git log  # Find good commit
+git checkout <commit-hash>
+make switch-system
+make switch-home
+
+# If using backup service
+~/.local/bin/backup-restore
+```
+
+### Package Issues
+
+#### Issue: Package not found
+**Solution:**
+```bash
+# Search for package
+nix search nixpkgs <package-name>
+
+# Update flake
+nix flake update
+
+# Check if in unstable
+nix search nixpkgs#<package-name>
+```
+
+#### Issue: Package fails to build
+**Solution:**
+```bash
+# Try with more details
+nixos-rebuild switch --flake . --show-trace
+
+# Check if package is broken
+nix eval nixpkgs#<package>.meta.broken
+
+# Try different version/channel
+```
+
+### Hyprlock Issues
+
+#### Issue: Hyprlock won't unlock
+**Solution:**
+- Ensure PAM is configured correctly
+- Switch to TTY (Ctrl+Alt+F2) and kill hyprlock
+- Check logs: `journalctl --user -xeu hyprlock`
+
+### Git Issues
+
+#### Issue: Git credentials not saved
+**Solution:**
+```bash
+# Check keyring
+secret-tool lookup protocol git
+
+# Start keyring daemon
+eval $(gnome-keyring-daemon --start)
+
+# Configure git credential helper
+git config --global credential.helper libsecret
+```
+
+## Debugging Commands
+
+### System Information
+```bash
+# NixOS version
+nixos-version
+
+# Check flake inputs
+nix flake metadata
+
+# Show configuration
+nixos-option <option.path>
+
+# Evaluate config value
+nix eval .#nixosConfigurations.nixos.config.<option>
+```
+
+### Log Analysis
+```bash
+# System logs
+journalctl -b           # Current boot
+journalctl -b -1        # Previous boot
+journalctl -f           # Follow logs
+journalctl -p err       # Errors only
+journalctl -u <unit>    # Specific unit
+
+# User logs
+journalctl --user -f
+```
+
+### Service Management
+```bash
+# System services
+systemctl status <service>
+systemctl restart <service>
+systemctl enable <service>
+
+# User services
+systemctl --user status <service>
+systemctl --user restart <service>
+```
+
+### Network Debugging
+```bash
+# Test connectivity
+ping 1.1.1.1
+ping google.com
+
+# Check routes
+ip route
+
+# Check DNS
+resolvectl status
+
+# Monitor network
+nethogs
+iftop
+```
+
+## Recovery Mode
+
+If system is completely broken:
+
+1. Boot from NixOS installer USB
+2. Mount your system:
+```bash
+mount /dev/sdXY /mnt
+mount /dev/sdXZ /mnt/boot
+```
+3. Chroot:
+```bash
+nixos-enter
+```
+4. Rollback:
+```bash
+nix-env --list-generations --profile /nix/var/nix/profiles/system
+nix-env --switch-generation <number> --profile /nix/var/nix/profiles/system
+/nix/var/nix/profiles/system/bin/switch-to-configuration boot
+```
+
+## Getting Help
+
+1. **Check logs first**: `journalctl -xef`
+2. **Search NixOS options**: https://search.nixos.org
+3. **NixOS Wiki**: https://nixos.wiki
+4. **Discourse**: https://discourse.nixos.org
+5. **GitHub Issues**: Check relevant package issues
+6. **IRC/Matrix**: #nixos on libera.chat
+
+## Prevention
+
+- Always test before switching: `nixos-rebuild test`
+- Keep backups of working configurations
+- Use git for dotfiles
+- Keep at least 3-4 old generations
+- Test major changes in VM first
diff --git a/flake.lock b/flake.lock
index 7c101af..1432350 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759499898,
-        "narHash": "sha256-UNzYHLWfkSzLHDep5Ckb5tXc0fdxwPIrT+MY4kpQttM=",
+        "lastModified": 1761420899,
+        "narHash": "sha256-kxGCip6GNbcbNWKu4J2iKbNYfFTS8Zbjg9CWp0zmFoM=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "655e067f96fd44b3f5685e17f566b0e4d535d798",
+        "rev": "62479232aae42c1ef09c2c027c8cfd91df060897",
         "type": "github"
       },
       "original": {
@@ -54,16 +54,17 @@
     "base16-fish": {
       "flake": false,
       "locked": {
-        "lastModified": 1622559957,
-        "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
+        "lastModified": 1754405784,
+        "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
         "owner": "tomyun",
         "repo": "base16-fish",
-        "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
+        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
         "type": "github"
       },
       "original": {
         "owner": "tomyun",
         "repo": "base16-fish",
+        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
         "type": "github"
       }
     },
@@ -140,11 +141,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759362264,
-        "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
+        "lastModified": 1760948891,
+        "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
+        "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
         "type": "github"
       },
       "original": {
@@ -154,6 +155,27 @@
       }
     },
     "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733312601,
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_3": {
       "inputs": {
         "nixpkgs-lib": [
           "stylix",
@@ -254,11 +276,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759853171,
-        "narHash": "sha256-uqbhyXtqMbYIiMqVqUhNdSuh9AEEkiasoK3mIPIVRhk=",
+        "lastModified": 1762367206,
+        "narHash": "sha256-c/164YOPkV09BH8KIUdvVvJs3VF2LNIbE2piKGgXPxk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1a09eb84fa9e33748432a5253102d01251f72d6d",
+        "rev": "af119feb17cb242398e0fb97f92b867d25882522",
         "type": "github"
       },
       "original": {
@@ -312,11 +334,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759490292,
-        "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=",
+        "lastModified": 1760445448,
+        "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "9431db625cd9bb66ac55525479dce694101d6d7a",
+        "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
         "type": "github"
       },
       "original": {
@@ -341,11 +363,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1760143218,
-        "narHash": "sha256-nHgQ3UTtQXzaOBwGqOFJ/zc69IGaT+U1ddFv4CpSjtU=",
+        "lastModified": 1762387591,
+        "narHash": "sha256-dl7DWqriniz7J0S46U8bj342BZHUKcAlm1yVIIZY48A=",
         "ref": "refs/heads/main",
-        "rev": "d599513d4a72d66ac62ffdedc41d6653fa81b39e",
-        "revCount": 6493,
+        "rev": "c757fd375cce299e3da922190ddf1a0622ce807c",
+        "revCount": 6552,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -368,11 +390,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749046714,
-        "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
+        "lastModified": 1759610243,
+        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
+        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
         "type": "github"
       },
       "original": {
@@ -490,11 +512,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759619523,
-        "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=",
+        "lastModified": 1762208756,
+        "narHash": "sha256-hC1jb4tdjFfEuU18KQiMgz5XPAO+d5SfbjAUS7haLl4=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef",
+        "rev": "164a30b3d8b3174a32ac7326782476f1188e6118",
         "type": "github"
       },
       "original": {
@@ -558,11 +580,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1759381078,
-        "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
+        "lastModified": 1762111121,
+        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
+        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
         "type": "github"
       },
       "original": {
@@ -574,11 +596,27 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1759831965,
-        "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=",
+        "lastModified": 1762111121,
+        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1762111121,
+        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c9b6fb798541223bbb396d287d16f43520250518",
+        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
         "type": "github"
       },
       "original": {
@@ -598,11 +636,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1759927289,
-        "narHash": "sha256-EWdwR9l+JG466rPuNmjjzDPvQAuh37lmhgWa2xeaMdk=",
+        "lastModified": 1762415351,
+        "narHash": "sha256-Uvpzi75PDuVpLqecUMVdjCxUgZoTEAMM/zJLhyzSa9Y=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "57006a3ace4a3c889ab61b70fd5d8b197de8314e",
+        "rev": "deb32aecac40d21706f41004b52e0310943ec5c8",
         "type": "github"
       },
       "original": {
@@ -612,6 +650,25 @@
       }
     },
     "nur": {
+      "inputs": {
+        "flake-parts": "flake-parts_2",
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1762418631,
+        "narHash": "sha256-ThPEPp7BSdPvkmoWh+YksUq3UNuqgPB+rFWxqyEK4ew=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "f0ce8aec351492d255c1d67c2b1bc0d8a2f1d569",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
+    "nur_2": {
       "inputs": {
         "flake-parts": [
           "stylix",
@@ -646,11 +703,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758662783,
-        "narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=",
+        "lastModified": 1761730856,
+        "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4",
+        "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
         "type": "github"
       },
       "original": {
@@ -669,11 +726,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758108966,
-        "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
+        "lastModified": 1760663237,
+        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
+        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
         "type": "github"
       },
       "original": {
@@ -688,9 +745,32 @@
         "hyprland": "hyprland",
         "nixpkgs": "nixpkgs_2",
         "nixvim": "nixvim",
+        "nur": "nur",
+        "spicetify-nix": "spicetify-nix",
         "stylix": "stylix"
       }
     },
+    "spicetify-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1762057664,
+        "narHash": "sha256-mdEEvepIi8ebpGP1WWOHNvNQyd8rF0mUrKAiU6mwHCk=",
+        "owner": "Gerg-L",
+        "repo": "spicetify-nix",
+        "rev": "4aa6e43d29e3c8acf544aa6782a1963a11369208",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerg-L",
+        "repo": "spicetify-nix",
+        "type": "github"
+      }
+    },
     "stylix": {
       "inputs": {
         "base16": "base16",
@@ -698,13 +778,13 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts_3",
         "gnome-shell": "gnome-shell",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nur": "nur",
-        "systems": "systems_4",
+        "nur": "nur_2",
+        "systems": "systems_5",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
@@ -712,11 +792,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1759690047,
-        "narHash": "sha256-Vlpa0d1xOgPO9waHwxJNi6LcD2PYqB3EjwLRtSxXlHc=",
+        "lastModified": 1762264356,
+        "narHash": "sha256-QVfC53Ri+8n3e7Ujx9kq6all3+TLBRRPRnc6No5qY5w=",
         "owner": "nix-community",
         "repo": "stylix",
-        "rev": "09022804b2bcd217f3a41a644d26b23d30375d12",
+        "rev": "647bb8dd96a206a1b79c4fd714affc88b409e10b",
         "type": "github"
       },
       "original": {
@@ -785,6 +865,21 @@
         "type": "github"
       }
     },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "tinted-foot": {
       "flake": false,
       "locked": {
@@ -894,11 +989,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755354946,
-        "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=",
+        "lastModified": 1761431178,
+        "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0",
+        "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index faaea3b..6f29bdd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,12 +25,28 @@
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    
+    # NUR - Nix User Repository (for Firefox extensions)
+    nur.url = "github:nix-community/NUR";
+    
+    # Spicetify
+    spicetify-nix = {
+      url = "github:Gerg-L/spicetify-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { self, nixpkgs, home-manager, hyprland, stylix, nixvim, ... }@inputs:
+  outputs = { self, nixpkgs, home-manager, hyprland, stylix, nixvim, nur, spicetify-nix, ... }@inputs:
     let
       inherit (self) outputs;
       system = "x86_64-linux";
+      pkgs = nixpkgs.legacyPackages.${system};
+      
+      # Custom packages overlay - define inline to avoid circular dependency
+      customOverlay = final: prev: {
+        dbeaver-ee = final.callPackage "${self}/pkgs/dbeaver-ee" { };
+        rofi-themes-adi1090x = final.callPackage "${self}/pkgs/rofi-themes-adi1090x" { };
+      };
       
       # Helper function for generating system configs
       mkSystem = modules: nixpkgs.lib.nixosSystem {
@@ -39,13 +55,16 @@
         modules = modules ++ [
           home-manager.nixosModules.home-manager
           {
-            home-manager.useGlobalPkgs = true;
+            home-manager.useGlobalPkgs = false;  # Temporarily disable to fix nixpkgs config conflict
             home-manager.useUserPackages = true;
             home-manager.backupFileExtension = "backup";
             home-manager.extraSpecialArgs = { inherit inputs outputs; };
             home-manager.sharedModules = [
               nixvim.homeModules.nixvim
               stylix.homeModules.stylix
+              spicetify-nix.homeManagerModules.default
+              # Add NUR and custom overlays
+              { nixpkgs.overlays = [ nur.overlays.default customOverlay ]; }
             ];
           }
         ];
@@ -53,12 +72,26 @@
       
       # Helper function for generating home configs
       mkHome = modules: home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages.${system};
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [ nur.overlays.default customOverlay ];  # Add NUR and custom overlays
+          config.allowUnfree = true;
+        };
         extraSpecialArgs = { inherit inputs outputs; };
-        modules = modules;
+        modules = modules ++ [
+          nixvim.homeModules.nixvim
+          stylix.homeModules.stylix
+          spicetify-nix.homeManagerModules.default
+        ];
       };
     in
     {
+      # Custom packages - export for easy testing
+      packages.${system} = {
+        dbeaver-ee = pkgs.callPackage ./pkgs/dbeaver-ee { };
+        rofi-themes-adi1090x = pkgs.callPackage ./pkgs/rofi-themes-adi1090x { };
+      };
+
       # NixOS configurations
       nixosConfigurations = {
         # Main desktop configuration
@@ -73,8 +106,6 @@
       homeConfigurations = {
         "tim@nixos" = mkHome [
           ./home/tim
-          stylix.homeModules.stylix
-          nixvim.homeModules.nixvim
         ];
       };
 
@@ -82,6 +113,7 @@
       devShells.${system}.default = nixpkgs.legacyPackages.${system}.mkShell {
         buildInputs = with nixpkgs.legacyPackages.${system}; [
           git
+          nixfmt
         ];
       };
     };
diff --git a/home/tim/default.nix b/home/tim/default.nix
index 166467b..76f9f4a 100644
--- a/home/tim/default.nix
+++ b/home/tim/default.nix
@@ -1,4 +1,4 @@
-{ inputs, outputs, config, pkgs, ... }:
+{ inputs, outputs, config, pkgs, lib, ... }:
 
 {
   imports = [
@@ -20,6 +20,9 @@
     TERMINAL = "kitty";
   };
 
+  # Allow unfree packages since useGlobalPkgs is disabled
+  nixpkgs.config.allowUnfree = true;
+
   # Enable home manager
   programs.home-manager.enable = true;
 }
diff --git a/hosts/nixos/default.nix b/hosts/nixos/default.nix
index 88e1e49..60e94a7 100644
--- a/hosts/nixos/default.nix
+++ b/hosts/nixos/default.nix
@@ -54,9 +54,12 @@
     experimental-features = [ "nix-command" "flakes" ];
     trusted-users = [ "root" "tim" ];
   };
-
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
+  
+  # Allow unfree packages (needed for Android SDK, VS Code, etc.)
+  nixpkgs.config = {
+    allowUnfree = true;
+    android_sdk.accept_license = true;  # Accept Android SDK license
+  };
 
   # System state version
   system.stateVersion = "25.05";
diff --git a/modules/common/aliases.nix b/modules/common/aliases.nix
new file mode 100644
index 0000000..c90b615
--- /dev/null
+++ b/modules/common/aliases.nix
@@ -0,0 +1,49 @@
+# Centralized Shell Aliases
+# Single source of truth for all shell aliases across all modules
+{ }:
+
+{
+  # === NAVIGATION ===
+  ".." = "cd ..";
+  "..." = "cd ../..";
+  "...." = "cd ../../..";
+  "....." = "cd ../../../..";
+
+  # === DOCKER ===
+  dps = "docker ps";
+  dpa = "docker ps -a";
+  di = "docker images";
+  dex = "docker exec -it";
+  dlog = "docker logs -f";
+
+  # === KUBERNETES ===
+  k = "kubectl";
+  kgp = "kubectl get pods";
+  kgs = "kubectl get services";
+  kgd = "kubectl get deployments";
+  klog = "kubectl logs -f";
+  kex = "kubectl exec -it";
+
+  # === API TESTING ===
+  curl-json = "curl -H 'Content-Type: application/json'";
+  curl-post = "curl -X POST -H 'Content-Type: application/json'";
+
+  # === NETWORKING ===
+  ports = "netstat -tulpn";
+
+  # === DATA SCIENCE ===
+  jlab = "jupyter lab";
+  jnb = "jupyter notebook";
+  psql-local = "psql -U tim -h localhost";
+  mysql-local = "mysql -u tim -h localhost";
+  mongo-local = "mongosh";
+  redis-cli-local = "redis-cli";
+  duck = "duckdb";
+  jsonpp = "python -m json.tool";
+
+  # === AI TOOLS ===
+  chat = "ollama run llama3.2";
+  "ollama-start" = "systemctl --user start ollama";
+  "ollama-stop" = "systemctl --user stop ollama";
+  "ollama-status" = "systemctl --user status ollama";
+}
diff --git a/modules/common/packages.nix b/modules/common/packages.nix
new file mode 100644
index 0000000..eef5588
--- /dev/null
+++ b/modules/common/packages.nix
@@ -0,0 +1,154 @@
+# Centralized Package Registry
+# Single source of truth for all package installations
+# Categorized by domain to eliminate duplication
+{ pkgs }:
+
+{
+  # === VERSION CONTROL ===
+  vcs = with pkgs; [
+    git
+    gh
+    lazygit
+  ];
+
+  # === SYSTEM MONITORING ===
+  monitoring = with pkgs; [
+    bottom
+    htop
+  ];
+
+  # === DEVELOPMENT UTILITIES ===
+  devUtils = with pkgs; [
+    hyperfine # Benchmarking
+    direnv
+    devenv
+  ];
+
+  # === NETWORK TOOLS ===
+  network = with pkgs; [
+    curl
+    dog # Modern dig
+    netcat
+    nmap
+  ];
+
+  # === BACKUP & SYNC ===
+  backup = with pkgs; [
+    restic
+    rclone
+    rsync
+  ];
+
+  # === FILE MANAGEMENT ===
+  files = with pkgs; [
+    yazi # Terminal file manager
+    xfce.thunar # GUI file manager
+    xfce.thunar-volman # Thunar volume manager
+    kdePackages.dolphin # KDE file manager
+    peazip
+    p7zip
+    unzip
+    zstd
+  ];
+
+  # === NIX HELPERS ===
+  nixHelpers = with pkgs; [
+    nix-tree
+    nix-du
+    nh
+  ];
+
+  # === SHELL UTILITIES ===
+  shellUtils = with pkgs; [
+    tldr
+    dust
+    procs
+    choose
+    sd
+    tokei
+    gitui
+  ];
+
+  # === CLIPBOARD & SCREENSHOTS ===
+  desktop = with pkgs; [
+    wl-clipboard
+    cliphist
+    grimblast
+    hyprpicker
+  ];
+
+  # === AUDIO/VIDEO ===
+  audioVideo = with pkgs; [
+    pavucontrol
+    pwvucontrol
+  ];
+
+  # === HYPRLAND EXTRAS ===
+  hyprland = with pkgs; [
+    pyprland
+    hyprsunset
+    hyprlock
+    hypridle
+    hyprpaper
+  ];
+
+  # === CONTAINERS ===
+  containers = with pkgs; [
+    buildah
+    skopeo
+    dive
+  ];
+
+  # === KUBERNETES ===
+  kubernetes = with pkgs; [
+    kubectl
+    kubectx
+    k9s
+    helm
+    kustomize
+    stern
+  ];
+
+  # === INFRASTRUCTURE AS CODE ===
+  iac = with pkgs; [
+    terraform
+    ansible
+  ];
+
+  # === API TESTING ===
+  apiTools = with pkgs; [
+    insomnia
+    bruno
+    httpie
+    xh
+    grpcurl
+    evans
+  ];
+
+  # === LOAD TESTING ===
+  loadTesting = with pkgs; [
+    k6
+    hey
+    wrk
+  ];
+
+  # === SECURITY ===
+  security = with pkgs; [
+    sops
+    age
+    trivy
+    openssl
+    mkcert
+  ];
+
+  # === PROTOCOL BUFFERS ===
+  protobuf = with pkgs; [
+    protobuf
+    buf
+  ];
+
+  # === DOCUMENTATION ===
+  docs = with pkgs; [
+    mkdocs
+  ];
+}
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 7095054..bf8afee 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -7,4 +7,7 @@
     ./desktop
     ./theming
   ];
-}
\ No newline at end of file
+
+  # Import centralized aliases at the home-manager level
+  programs.zsh.shellAliases = import ../common/aliases.nix { };
+}
diff --git a/modules/home-manager/desktop/default.nix b/modules/home-manager/desktop/default.nix
index bccd7ac..c4172e6 100644
--- a/modules/home-manager/desktop/default.nix
+++ b/modules/home-manager/desktop/default.nix
@@ -4,5 +4,6 @@
   imports = [
     ./hyprland.nix
     ./waybar.nix
+    ./notifications.nix
   ];
-}
\ No newline at end of file
+}
diff --git a/modules/home-manager/desktop/hyprland.nix b/modules/home-manager/desktop/hyprland.nix
index 0fc530d..110e3fe 100644
--- a/modules/home-manager/desktop/hyprland.nix
+++ b/modules/home-manager/desktop/hyprland.nix
@@ -4,7 +4,8 @@
   # Hyprland configuration
   wayland.windowManager.hyprland = {
     enable = true;
-    package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+    # Using nixpkgs version instead of flake input for faster updates
+    # package = inputs.hyprland.packages.${pkgs.system}.hyprland;
     xwayland.enable = true;
     
     # Source the existing config file
diff --git a/modules/home-manager/desktop/notifications.nix b/modules/home-manager/desktop/notifications.nix
new file mode 100644
index 0000000..1db0dc6
--- /dev/null
+++ b/modules/home-manager/desktop/notifications.nix
@@ -0,0 +1,93 @@
+{ config, pkgs, ... }:
+
+{
+  # Mako notification daemon
+  services.mako = {
+    enable = true;
+    
+    # Appearance
+    # backgroundColor = "#1e1e2e";
+    # textColor = "#cdd6f4";
+    # borderColor = "#89b4fa";
+    # progressColor = "over #313244";
+    settings = { 
+    # Dimensions
+    width = 400;
+    height = 150;
+    margin = "10";
+    padding = "15";
+    border-size = 2;
+    border-radius = 8;
+    
+    # Icons
+    icons = true;
+    max-icon-size = 48;
+    icon-path = "${pkgs.catppuccin-papirus-folders}/share/icons/Papirus-Dark";
+    
+    # Behavior
+    default-timeout = 5000;  # 5 seconds
+    # ignoreTimeout = false;
+    
+    # Position (top-right)
+    anchor = "top-right";
+    
+    # Font
+    # font = "JetBrains Mono 11";
+    
+    # Grouping
+    group-by = "app-name";
+    
+    # Multiple monitors
+    output = "";  # Show on focused monitor
+    };
+    # Extra config
+    extraConfig = ''
+      [urgency=low]
+      border-color=#94e2d5
+      default-timeout=3000
+      
+      [urgency=normal]
+      border-color=#89b4fa
+      default-timeout=5000
+      
+      [urgency=high]
+      border-color=#f38ba8
+      default-timeout=0
+      ignore-timeout=1
+      
+      [app-name="Spotify"]
+      border-color=#a6e3a1
+      
+      [app-name="Volume"]
+      border-color=#fab387
+      default-timeout=2000
+      
+      [app-name="Brightness"]
+      border-color=#f9e2af
+      default-timeout=2000
+    '';
+  };
+
+  # Notification testing script
+  home.file.".local/bin/test-notifications" = {
+    executable = true;
+    text = ''
+      #!/usr/bin/env bash
+      # Test notification system
+      
+      ${pkgs.libnotify}/bin/notify-send "Low Priority" "This is a low priority notification" -u low
+      sleep 2
+      ${pkgs.libnotify}/bin/notify-send "Normal Priority" "This is a normal notification" -u normal
+      sleep 2
+      ${pkgs.libnotify}/bin/notify-send "High Priority" "This is an urgent notification!" -u critical
+      sleep 2
+      ${pkgs.libnotify}/bin/notify-send "With Icon" "This notification has an icon" -i dialog-information
+    '';
+  };
+
+  # Notification utilities
+  home.packages = with pkgs; [
+    libnotify     # notify-send command
+    dunst         # Alternative notification daemon (if you want to try it)
+  ];
+}
diff --git a/modules/home-manager/desktop/waybar.nix b/modules/home-manager/desktop/waybar.nix
index 2389491..af4ba7a 100644
--- a/modules/home-manager/desktop/waybar.nix
+++ b/modules/home-manager/desktop/waybar.nix
@@ -13,33 +13,34 @@
       layer = "top";
       position = "top";
       height = 30;
-      spacing = 4;
-      margin-top = 8;
+      spacing = 3;
+      margin-top = 5;
       margin-left = 8;
       margin-right = 8;
       modules-left = ["hyprland/workspaces" "hyprland/mode"];
       modules-center = ["clock"];
-      modules-right = ["pulseaudio" "network" "cpu" "memory" "battery" "tray"];
+      modules-right = ["pulseaudio" "network" "cpu" "memory" "temperature" "battery" "uptime" "tray"];
 
       "hyprland/workspaces" = {
         format = "{icon}";
         format-icons = {
-          "1" = "";
-          "2" = "";
-          "3" = "";
-          "4" = "";
-          "5" = "";
-          "6" = "";
-          "7" = "";
-          "8" = "";
-          "9" = "";
-          "10" = "";
-        };
-        persistent-workspaces = {
-          "*" = 10;
-        };
-        on-click = "activate";
-      };
+    "1" = "";
+    "2" = "";
+    "3" = "";
+    "4" = "";
+    "5" = "";
+    "6" = "";
+    "7" = "";
+    "8" = "";
+    "9" = "";
+    "10" = "";
+  };
+  persistent-workspaces = {
+    "*" = 10;
+  };
+  on-click = "activate";
+};
+
 
       "hyprland/mode" = {
         format = "<span style=\"italic\">{}</span>";
@@ -52,54 +53,53 @@
       };
 
       cpu = {
-        format = "  {usage}%";
-        tooltip = false;
+        format = "󰻠 {usage}%";
+        tooltip = true;
         interval = 2;
       };
 
       memory = {
-        format = "  {}%";
-        tooltip = false;
+        format = "󰍛 {percentage}%";
+        tooltip = true;
         interval = 2;
       };
 
+      temperature = {
+        format = "󰔄 {temperatureC}°C";
+        critical-threshold = 80;
+        tooltip = true;
+      };
+
       battery = {
-        states = {
-          warning = 30;
-          critical = 15;
-        };
-        format = "{icon}  {capacity}%";
-        format-charging = "  {capacity}%";
-        format-plugged = "  {capacity}%";
-        format-alt = "{time} {icon}";
-        format-icons = ["" "" "" "" ""];
+        format = "{icon} {capacity}%";
+        format-icons = ["󱃍" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀"];
+        tooltip = true;
       };
 
       network = {
-        format-wifi = "  {signalStrength}%";
-        format-ethernet = "  Connected";
-        format-linked = "  (No IP)";
-        format-disconnected = "  Disconnected";
-        format-alt = "{ifname}: {ipaddr}/{cidr}";
-        tooltip-format = "{essid} via {gwaddr}";
+        format-wifi = "󰖩 {signalStrength}%";
+        format-ethernet = "󰈀";
+        format-disconnected = "󰖪";
+        tooltip-format-wifi = "{essid} ({signalStrength}%)";
+        tooltip-format-ethernet = "{ifname}: {ipaddr}/{cidr}";
+        tooltip-format-disconnected = "Disconnected";
+        tooltip = true;
       };
 
       pulseaudio = {
-        format = "{icon}  {volume}%";
-        format-bluetooth = "{icon}  {volume}%";
-        format-bluetooth-muted = " {icon}";
-        format-muted = "";
+        format = "{icon} {volume}%";
+        format-muted = "󰝟 muted";
         format-icons = {
-          headphone = "";
-          hands-free = "";
-          headset = "";
-          phone = "";
-          portable = "";
-          car = "";
-          default = ["" "" ""];
+          default = "󰕾";
         };
         on-click = "pavucontrol";
         scroll-step = 5;
+        tooltip = true;
+      };
+
+      uptime = {
+        format = "󰤷";
+        tooltip = true;
       };
 
       tray = {
diff --git a/modules/home-manager/programs/backend/api-tools.nix b/modules/home-manager/programs/backend/api-tools.nix
new file mode 100644
index 0000000..8c302ae
--- /dev/null
+++ b/modules/home-manager/programs/backend/api-tools.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+let
+  packages = import ../../../common/packages.nix { inherit pkgs; };
+in
+{
+  # API Development & Testing Tools
+  home.packages = packages.apiTools ++ packages.loadTesting;
+}
diff --git a/modules/home-manager/programs/backend/containers.nix b/modules/home-manager/programs/backend/containers.nix
new file mode 100644
index 0000000..6817d92
--- /dev/null
+++ b/modules/home-manager/programs/backend/containers.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+let
+  packages = import ../../../common/packages.nix { inherit pkgs; };
+in
+{
+  # Container Development Tools
+  home.packages = packages.containers;
+}
diff --git a/modules/home-manager/programs/backend/default.nix b/modules/home-manager/programs/backend/default.nix
new file mode 100644
index 0000000..74c1247
--- /dev/null
+++ b/modules/home-manager/programs/backend/default.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+
+{
+  # Backend Development - Modularized by domain
+  imports = [
+    ./api-tools.nix
+    ./containers.nix
+    ./kubernetes.nix
+    ./infrastructure.nix
+    ./network-tools.nix
+    ./docker-compose.nix
+  ];
+}
diff --git a/modules/home-manager/programs/backend/docker-compose.nix b/modules/home-manager/programs/backend/docker-compose.nix
new file mode 100644
index 0000000..9932659
--- /dev/null
+++ b/modules/home-manager/programs/backend/docker-compose.nix
@@ -0,0 +1,35 @@
+{ config, pkgs, ... }:
+
+{
+  # Docker Compose Development Stack Template
+  home.file.".config/docker-compose/dev-stack.yml".text = ''
+    version: '3.8'
+
+    services:
+      postgres:
+        image: postgres:16
+        environment:
+          POSTGRES_USER: tim
+          POSTGRES_PASSWORD: postgres
+        ports:
+          - "5432:5432"
+        volumes:
+          - postgres-data:/var/lib/postgresql/data
+      
+      redis:
+        image: redis:7-alpine
+        ports:
+          - "6379:6379"
+      
+      mongodb:
+        image: mongo:7
+        ports:
+          - "27017:27017"
+        volumes:
+          - mongo-data:/data/db
+
+    volumes:
+      postgres-data:
+      mongo-data:
+  '';
+}
diff --git a/modules/home-manager/programs/backend/infrastructure.nix b/modules/home-manager/programs/backend/infrastructure.nix
new file mode 100644
index 0000000..731b1a2
--- /dev/null
+++ b/modules/home-manager/programs/backend/infrastructure.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+let
+  packages = import ../../../common/packages.nix { inherit pkgs; };
+in
+{
+  # Infrastructure as Code Tools
+  home.packages = packages.iac;
+}
diff --git a/modules/home-manager/programs/backend/kubernetes.nix b/modules/home-manager/programs/backend/kubernetes.nix
new file mode 100644
index 0000000..e17a1fe
--- /dev/null
+++ b/modules/home-manager/programs/backend/kubernetes.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+let
+  packages = import ../../../common/packages.nix { inherit pkgs; };
+in
+{
+  # Kubernetes Tools
+  home.packages = packages.kubernetes;
+}
diff --git a/modules/home-manager/programs/backend/network-tools.nix b/modules/home-manager/programs/backend/network-tools.nix
new file mode 100644
index 0000000..71fb6de
--- /dev/null
+++ b/modules/home-manager/programs/backend/network-tools.nix
@@ -0,0 +1,15 @@
+{ config, pkgs, ... }:
+
+let
+  packages = import ../../../common/packages.nix { inherit pkgs; };
+in
+{
+  # Network & Security Tools
+  home.packages =
+    packages.network
+    ++ packages.security
+    ++ packages.protobuf
+    ++ (with pkgs; [
+      nginx # Reverse proxy
+    ]);
+}
diff --git a/modules/home-manager/programs/communication/default.nix b/modules/home-manager/programs/communication/default.nix
index 92f007f..348a3d4 100644
--- a/modules/home-manager/programs/communication/default.nix
+++ b/modules/home-manager/programs/communication/default.nix
@@ -1,8 +1,27 @@
 { config, pkgs, ... }:
 
+let
+  # Wrapper for mailspring that ensures keyring socket is available
+  mailspring-wrapped = pkgs.writeShellScriptBin "mailspring" ''
+    # Set keyring control socket path
+    export GNOME_KEYRING_CONTROL="$XDG_RUNTIME_DIR/keyring"
+    
+    # Ensure dbus session is available
+    if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+      export DBUS_SESSION_BUS_ADDRESS="unix:path=$XDG_RUNTIME_DIR/bus"
+    fi
+    
+    # Launch mailspring with gnome-libsecret password store
+    exec ${pkgs.mailspring}/bin/mailspring --password-store="gnome-libsecret" "$@"
+  '';
+in
 {
   # Communication applications
   home.packages = with pkgs; [
+    # Email (wrapped to ensure keyring access)
+    mailspring-wrapped
+    # Note: libsecret is provided at system level
+
     # Chat/Video
     vesktop          # Better Discord client
     telegram-desktop
@@ -10,4 +29,20 @@
     slack
     teams-for-linux
   ];
+  
+  # Desktop entry for Mailspring to appear in Rofi
+  home.file.".local/share/applications/mailspring.desktop".text = ''
+    [Desktop Entry]
+    Type=Application
+    Name=Mailspring
+    GenericName=Email Client
+    Comment=Send and receive email
+    Exec=mailspring %U
+    Icon=mailspring
+    Terminal=false
+    Categories=Network;Email;Office;
+    MimeType=x-scheme-handler/mailto;x-scheme-handler/mailspring;
+    StartupNotify=true
+    StartupWMClass=Mailspring
+  '';
 }
\ No newline at end of file
diff --git a/modules/home-manager/programs/data-science/default.nix b/modules/home-manager/programs/data-science/default.nix
new file mode 100644
index 0000000..7b93513
--- /dev/null
+++ b/modules/home-manager/programs/data-science/default.nix
@@ -0,0 +1,43 @@
+{ config, pkgs, ... }:
+
+{
+  # Data Science and Analytics Tools
+  home.packages = with pkgs; [
+    # R and RStudio for statistical computing
+    R
+    rstudio
+
+    # Apache tools for big data
+    # spark  # Commented - large package, install when needed
+
+    # Data processing
+    duckdb
+
+    # Database tools
+    sqlite
+    sqlitebrowser
+    dbeaver-ee  # DBeaver Enterprise Edition
+
+    # Graph visualization
+    graphviz
+
+    # Spreadsheet tools
+    gnumeric
+
+    # CSV/JSON processing
+    miller
+
+    # DVC (Data Version Control)
+    dvc
+
+    # Geographic information systems
+    # qgis  # Commented - large package, install when needed
+  ];
+
+  # Environment variables for data science
+  home.sessionVariables = {
+    JUPYTER_CONFIG_DIR = "${config.home.homeDirectory}/.jupyter";
+  };
+
+  # Shell aliases moved to centralized modules/common/aliases.nix
+}
diff --git a/modules/home-manager/programs/default.nix b/modules/home-manager/programs/default.nix
index 68f1793..479b265 100644
--- a/modules/home-manager/programs/default.nix
+++ b/modules/home-manager/programs/default.nix
@@ -8,9 +8,14 @@
     ./browser
     ./media
     ./development
+    ./data-science
+    ./backend
     ./productivity
     ./communication
     ./utilities
     ./keybind-viewer.nix
+    ./network
+    ./network-gui
+    ./rofi
   ];
-}
\ No newline at end of file
+}
diff --git a/modules/home-manager/programs/development/default.nix b/modules/home-manager/programs/development/default.nix
index 87e51a9..91e8ee2 100644
--- a/modules/home-manager/programs/development/default.nix
+++ b/modules/home-manager/programs/development/default.nix
@@ -1,46 +1,56 @@
 { config, pkgs, ... }:
 
+let
+  packages = import ../../../common/packages.nix { inherit pkgs; };
+in
 {
   imports = [
     ./git.nix
   ];
 
   # Development tools
-  home.packages = with pkgs; [
-    # Version control
-    gh
-    lazygit
-    
-    # Development environments
-    devenv
-    direnv
-    
-    # Languages
-    (python3.withPackages (ps: with ps; [ tkinter ]))
-    nodejs
-    
-    # Tools
-    postman
-    lazydocker
-    
-    # AI tools
-    github-copilot-cli
-    ollama
-    gollama
-    jan
-    lmstudio
-    
-    # Terminals
-    warp-terminal
-
-    # Database
-    dolt
-
-    # Office
-    wpsoffice
-
-    vivaldi
-  ];
+  home.packages =
+    packages.vcs
+    ++ packages.devUtils
+    ++ (with pkgs; [
+      # Languages
+      (python3.withPackages (
+        ps: with ps; [
+          tkinter
+          jupyter
+          notebook
+          jupyterlab
+        ]
+      ))
+      nodejs
+
+      # .NET SDK
+      dotnet-sdk
+      dotnet-aspnetcore
+
+      # Java (required for Android development)
+      jdk
+      flutter
+
+      # Android SDK and tools
+      android-tools
+      android-studio
+
+      # Tools
+      postman
+      lazydocker
+
+      # General development utilities (not in packages.nix yet)
+      unzip
+      which
+      file
+
+      # For emulation
+      qemu
+
+      # Office
+      brave
+    ]);
 
   # Enable direnv
   programs.direnv = {
diff --git a/modules/home-manager/programs/development/git.nix b/modules/home-manager/programs/development/git.nix
index 622b3cf..feedfd7 100644
--- a/modules/home-manager/programs/development/git.nix
+++ b/modules/home-manager/programs/development/git.nix
@@ -3,15 +3,22 @@
 {
   programs.git = {
     enable = true;
-    userName = "tim";  # Change this to your actual name
-    userEmail = "timothynn08@gmail.com";  # Change this to your actual email
     
-    extraConfig = {
+    settings = {
+      user.name = "tim";  # Change this to your actual name
+      user.email = "timothynn08@gmail.com";  # Change this to your actual email
+      
       init.defaultBranch = "main";
       push.default = "simple";
       pull.rebase = false;
       core.editor = "nvim";
       
+      # Automatic remote setup
+      push.autoSetupRemote = true;
+      branch.autosetupmerge = "always";
+      branch.autosetuprebase = "always";
+      remote.pushDefault = "origin";
+      
       # Better diffs
       diff.tool = "vimdiff";
       merge.tool = "vimdiff";
@@ -26,23 +33,22 @@
       core.preloadindex = true;
       core.fscache = true;
       gc.auto = 256;
-    };
-    
-    aliases = {
-      st = "status";
-      co = "checkout";
-      br = "branch";
-      ci = "commit";
-      ca = "commit -a";
-      cam = "commit -am";
-      cl = "clone";
-      df = "diff";
-      lg = "log --oneline --graph --decorate";
-      lga = "log --oneline --graph --decorate --all";
-      ls = "log --pretty=format:'%C(yellow)%h %C(blue)%ad %C(red)%d %C(reset)%s %C(green)[%cn]' --decorate --date=short";
-      unstage = "reset HEAD --";
-      last = "log -1 HEAD";
-      visual = "!gitk";
+      
+      # Aliases
+      alias.st = "status";
+      alias.co = "checkout";
+      alias.br = "branch";
+      alias.ci = "commit";
+      alias.ca = "commit -a";
+      alias.cam = "commit -am";
+      alias.cl = "clone";
+      alias.df = "diff";
+      alias.lg = "log --oneline --graph --decorate";
+      alias.lga = "log --oneline --graph --decorate --all";
+      alias.ls = "log --pretty=format:'%C(yellow)%h %C(blue)%ad %C(red)%d %C(reset)%s %C(green)[%cn]' --decorate --date=short";
+      alias.unstage = "reset HEAD --";
+      alias.last = "log -1 HEAD";
+      alias.visual = "!gitk";
     };
   };
 }
diff --git a/modules/home-manager/programs/development/npm-packages.nix b/modules/home-manager/programs/development/npm-packages.nix
new file mode 100644
index 0000000..b82a7dd
--- /dev/null
+++ b/modules/home-manager/programs/development/npm-packages.nix
@@ -0,0 +1,36 @@
+{ config, pkgs, ... }:
+
+{
+  # Configure npm and install global packages
+  home.file.".npmrc".text = ''
+    prefix=${config.home.homeDirectory}/.npm-global
+    cache=${config.home.homeDirectory}/.npm-cache
+  '';
+
+  # Add npm global bin to PATH
+  home.sessionPath = [
+    "${config.home.homeDirectory}/.npm-global/bin"
+  ];
+
+  # Install npm packages globally via shell hook
+  home.activation.npmPackages = ''
+    if [ -x "$(command -v npm)" ]; then
+      # Ensure npm is configured correctly
+      npm config set prefix ${config.home.homeDirectory}/.npm-global
+      
+      # Install GitHub Copilot CLI if not already installed
+      if ! [ -x "$(command -v github-copilot-cli)" ]; then
+        echo "Installing GitHub Copilot CLI via npm..."
+        npm install -g @githubnext/github-copilot-cli
+      fi
+    fi
+  '';
+
+  # Alternative: use programs.npm if available in your Home Manager version
+  # programs.npm = {
+  #   enable = true;
+  #   packages = [
+  #     "@githubnext/github-copilot-cli"
+  #   ];
+  # };
+}
\ No newline at end of file
diff --git a/modules/home-manager/programs/editor/default.nix b/modules/home-manager/programs/editor/default.nix
index 9f97faa..97127f9 100644
--- a/modules/home-manager/programs/editor/default.nix
+++ b/modules/home-manager/programs/editor/default.nix
@@ -10,5 +10,6 @@
     helix
     emacs
     vscode
+    code-cursor
   ];
-}
\ No newline at end of file
+}
diff --git a/modules/home-manager/programs/media/default.nix b/modules/home-manager/programs/media/default.nix
index eaf0328..7bd891f 100644
--- a/modules/home-manager/programs/media/default.nix
+++ b/modules/home-manager/programs/media/default.nix
@@ -1,6 +1,10 @@
 { config, pkgs, ... }:
 
 {
+  imports = [
+    ./spicetify.nix
+  ];
+  
   # Media applications
   home.packages = with pkgs; [
     # Video/Audio players
@@ -9,17 +13,60 @@
     
     # Image viewers
     imv
+    feh
+        
+    # Music - Spotify is provided by spicetify
+    # spotify  # REMOVED - conflicts with spicetify
     
-    # Audio visualization
-    cava
-    
-    # Music
-    spotify
     
     # Document viewers
     zathura
+
+    # Markdown Viewers
+    glow
+    mdcat
+
   ];
 
-  # Audio visualization
-  programs.cava.enable = true;
+  # Audio visualization with Catppuccin theme
+  programs.cava = {
+    enable = true;
+    settings = {
+      general = {
+        mode = "normal";
+        framerate = 60;
+        bars = 0;
+        bar_width = 2;
+        bar_spacing = 1;
+      };
+      
+      input = {
+        method = "pulse";
+        source = "auto";
+      };
+      
+      output = {
+        method = "noncurses";
+      };
+      
+      color = {
+        gradient = 1;
+        gradient_count = 6;
+        gradient_color_1 = "'#94e2d5'"; # Teal
+        gradient_color_2 = "'#89b4fa'"; # Blue
+        gradient_color_3 = "'#cba6f7'"; # Mauve
+        gradient_color_4 = "'#f38ba8'"; # Red
+        gradient_color_5 = "'#fab387'"; # Peach
+        gradient_color_6 = "'#f9e2af'"; # Yellow
+      };
+      
+      smoothing = {
+        monstercat = 1;
+        waves = 0;
+        gravity = 100;
+        ignore = 0;
+      };
+    };
+  };
+  
 }
\ No newline at end of file
diff --git a/modules/home-manager/programs/media/spicetify.nix b/modules/home-manager/programs/media/spicetify.nix
new file mode 100644
index 0000000..d478933
--- /dev/null
+++ b/modules/home-manager/programs/media/spicetify.nix
@@ -0,0 +1,26 @@
+{ config, pkgs, inputs, lib, ... }:
+
+{
+  # Spicetify - Spotify customization
+  programs.spicetify = 
+    let
+      spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
+    in
+    {
+      enable = true;
+      
+      # Catppuccin Mocha theme - override Stylix
+      theme = lib.mkForce spicePkgs.themes.catppuccin;
+      colorScheme = lib.mkForce "mocha";
+
+      # Enable extensions
+      enabledExtensions = with spicePkgs.extensions; [
+        adblock
+        hidePodcasts
+        shuffle # shuffle+ (special characters are sanitized out of extension names)
+        keyboardShortcut
+        fullAppDisplay
+        betterGenres
+      ];
+    };
+}
diff --git a/modules/home-manager/programs/network-gui/default.nix b/modules/home-manager/programs/network-gui/default.nix
new file mode 100644
index 0000000..d40d2f3
--- /dev/null
+++ b/modules/home-manager/programs/network-gui/default.nix
@@ -0,0 +1,91 @@
+{ config, pkgs, ... }:
+
+{
+  # Rofi-focused network management
+  home.packages = with pkgs; [
+    # Primary: NetworkManager with rofi interface
+    networkmanager_dmenu  # Rofi interface for NetworkManager
+    
+    # Minimal GUI for advanced settings only
+    networkmanagerapplet  # Provides nm-connection-editor for rare advanced config
+  ];
+  
+  # NetworkManager Dmenu configuration for rofi
+  home.file.".config/networkmanager-dmenu/config.ini".text = ''
+    [dmenu]
+    dmenu_command = rofi -dmenu -i
+    rofi_highlight = True
+    compact = True
+    wifi_chars = ▂▄▆█
+    wifi_icons = 󰤯󰤟󰤢󰤥󰤨
+    format = {name}  {sec}  {signal}
+    
+    [dmenu_passphrase]
+    obscure = True
+    obscure_color = #1e1e2e
+    
+    [editor]
+    terminal = kitty
+    gui_if_available = False
+  '';
+  
+  # Custom rofi network script with better styling
+  home.file.".local/bin/rofi-network" = {
+    executable = true;
+    text = ''
+      #!/usr/bin/env bash
+      # Rofi network manager with custom styling
+      
+      networkmanager_dmenu \
+        -theme-str 'window { width: 50%; }' \
+        -theme-str 'listview { lines: 12; }' \
+        -p "Network" \
+        "$@"
+    '';
+  };
+  
+  # Quick WiFi toggle script
+  home.file.".local/bin/rofi-wifi-toggle" = {
+    executable = true;
+    text = ''
+      #!/usr/bin/env bash
+      # Quick WiFi toggle with rofi notification
+      
+      STATUS=$(nmcli radio wifi)
+      
+      if [ "$STATUS" = "enabled" ]; then
+        nmcli radio wifi off
+        notify-send -i network-wireless-disabled "WiFi" "Disabled" -t 2000
+      else
+        nmcli radio wifi on
+        notify-send -i network-wireless-enabled "WiFi" "Enabled" -t 2000
+      fi
+    '';
+  };
+  
+  # Network info display
+  home.file.".local/bin/rofi-network-info" = {
+    executable = true;
+    text = ''
+      #!/usr/bin/env bash
+      # Display network info in rofi
+      
+      info=$(nmcli -t -f DEVICE,TYPE,STATE,CONNECTION device status | column -t -s ':')
+      active=$(nmcli -t -f NAME,TYPE,DEVICE connection show --active)
+      ip=$(ip -4 addr show | grep -oP '(?<=inet\s)\d+(\.\d+){3}' | grep -v '127.0.0.1')
+      gateway=$(ip route | grep default | awk '{print $3}')
+      dns=$(nmcli -t -f IP4.DNS device show | grep -oP '\d+(\.\d+){3}' | head -2)
+      
+      result="=== Network Devices ===\n$info\n\n"
+      result+="=== Active Connections ===\n$active\n\n"
+      result+="=== IP Addresses ===\n$ip\n\n"
+      result+="=== Gateway ===\n$gateway\n\n"
+      result+="=== DNS Servers ===\n$dns"
+      
+      echo -e "$result" | rofi -dmenu -i -p "Network Info" \
+        -theme-str 'window { width: 60%; }' \
+        -theme-str 'listview { lines: 20; }' \
+        -theme-str 'textbox { font: "JetBrainsMono Nerd Font 10"; }'
+    '';
+  };
+}
diff --git a/modules/home-manager/programs/network/default.nix b/modules/home-manager/programs/network/default.nix
new file mode 100644
index 0000000..4d609d2
--- /dev/null
+++ b/modules/home-manager/programs/network/default.nix
@@ -0,0 +1,132 @@
+{ config, pkgs, ... }:
+
+{
+  # Network diagnostic tools
+  home.packages = with pkgs; [
+    # Network analysis
+    mtr              # Network diagnostic tool
+    iperf3           # Network performance
+    netcat           # Network utility
+    nmap             # Port scanner
+    tcpdump          # Packet analyzer
+    wireshark        # Network protocol analyzer
+    
+    # DNS tools
+    dog
+    # dig              # DNS lookup
+    # bind             # DNS utilities (includes dig, nslookup)
+    # dogdns           # Modern DNS client
+    
+    # HTTP tools
+    curl
+    wget
+    httpie           # User-friendly HTTP client
+    
+    # Monitoring
+    bandwhich        # Display network utilization by process
+    nethogs          # Network bandwidth by process
+    iftop            # Network bandwidth monitoring
+  ];
+
+  # SSH configuration
+  programs.ssh = {
+    enable = true;
+    enableDefaultConfig = false;  # Disable default config as recommended
+    
+    # SSH config
+    matchBlocks = {
+      "*" = {
+        # Use SSH keys from keyring
+        identityFile = "~/.ssh/id_ed25519";
+        
+        # Security settings
+        extraOptions = {
+          AddKeysToAgent = "yes";
+          # UseKeychain = "no";
+        };
+      };
+      
+      # Example host configuration
+      # "github.com" = {
+      #   hostname = "github.com";
+      #   user = "git";
+      #   identityFile = "~/.ssh/id_ed25519_github";
+      # };
+    };
+  };
+
+  # Network status script
+  home.file.".local/bin/network-status" = {
+    executable = true;
+    text = ''
+      #!/usr/bin/env bash
+      # Display network status
+      
+      set -euo pipefail
+      
+      echo "🌐 Network Status"
+      echo "===================="
+      echo
+      
+      # Active connections
+      echo "📡 Active Interfaces:"
+      ip -br addr show | grep -v "^lo" | while read line; do
+        echo "  $line"
+      done
+      echo
+      
+      # Default route
+      echo "🚦 Default Route:"
+      ip route show default | head -1
+      echo
+      
+      # DNS servers
+      echo "🔍 DNS Servers:"
+      resolvectl status | grep "DNS Servers" | head -5
+      echo
+      
+      # Connectivity test
+      echo "🌍 Connectivity:"
+      if ping -c 1 -W 2 1.1.1.1 >/dev/null 2>&1; then
+        echo "  ✓ Internet: Connected"
+      else
+        echo "  ✗ Internet: Disconnected"
+      fi
+      
+      if ping -c 1 -W 2 google.com >/dev/null 2>&1; then
+        echo "  ✓ DNS: Working"
+      else
+        echo "  ✗ DNS: Not working"
+      fi
+      echo
+      
+      # Network speed (if speedtest is available)
+      if command -v speedtest >/dev/null 2>&1; then
+        echo "📶 Speed Test:"
+        speedtest --simple 2>/dev/null || echo "  Speed test unavailable"
+      fi
+    '';
+  };
+
+  # Quick network restart script
+  home.file.".local/bin/network-restart" = {
+    executable = true;
+    text = ''
+      #!/usr/bin/env bash
+      # Restart network services
+      
+      echo "🔄 Restarting network services..."
+      
+      sudo systemctl restart NetworkManager
+      
+      # Wait for network to come back up
+      sleep 3
+      
+      if ping -c 1 1.1.1.1 >/dev/null 2>&1; then
+        echo "✓ Network is back up"
+      else
+        echo "✗ Network still down"
+      fi
+    '';
+  };
+}
diff --git a/modules/home-manager/programs/productivity/default.nix b/modules/home-manager/programs/productivity/default.nix
index 82b8143..a0bf2c9 100644
--- a/modules/home-manager/programs/productivity/default.nix
+++ b/modules/home-manager/programs/productivity/default.nix
@@ -11,10 +11,11 @@
     
     # Email
     thunderbird
-    mailspring
+    # mailspring moved to communication/default.nix with keyring wrapper
     aerc
     
-    # Password manager
+    # Password managers
     bitwarden-desktop
+    keepassxc
   ];
-}
\ No newline at end of file
+}
diff --git a/modules/home-manager/programs/rofi/default.nix b/modules/home-manager/programs/rofi/default.nix
new file mode 100644
index 0000000..9fd35e4
--- /dev/null
+++ b/modules/home-manager/programs/rofi/default.nix
@@ -0,0 +1,196 @@
+{ config, pkgs, ... }:
+
+{
+  programs.rofi = {
+    enable = true;
+    package = pkgs.rofi;
+    
+    plugins = with pkgs; [
+      rofi-calc          # Calculator plugin
+      rofi-emoji         # Emoji picker
+      rofi-file-browser  # File browser
+      rofi-power-menu    # Power menu
+    ];
+    
+    terminal = "${pkgs.kitty}/bin/kitty";
+    
+    extraConfig = {
+      modi = "drun,run,filebrowser,window,calc,emoji";
+      show-icons = true;
+      icon-theme = "Papirus-Dark";
+      display-drun = "  Apps";
+      display-run = "  Run";
+      display-filebrowser = "  Files";
+      display-window = "  Windows";
+      display-calc = " 󰃬 Calc";
+      display-emoji = " 󰞅 Emoji";
+      drun-display-format = "{name}";
+      window-format = "{w} · {c} · {t}";
+      
+      # Behavior
+      matching = "fuzzy";
+      sort = true;
+      sorting-method = "fzf";
+      scroll-method = 0;
+      disable-history = false;
+      
+      # Layout
+      width = 35;
+      lines = 10;
+      columns = 1;
+      location = 0;
+      xoffset = 0;
+      yoffset = 0;
+      font = "JetBrainsMono Nerd Font 11";
+      
+      # Keys
+      kb-cancel = "Escape";
+      kb-mode-next = "Shift+Right,Control+Tab";
+      kb-mode-previous = "Shift+Left,Control+ISO_Left_Tab";
+      kb-row-up = "Up";
+      kb-row-down = "Down";
+    };
+    
+    theme = let 
+      inherit (config.lib.formats.rasi) mkLiteral;
+    in {
+      "*" = {
+        bg0 = mkLiteral "#1e1e2e";
+        bg1 = mkLiteral "#313244";
+        bg2 = mkLiteral "#45475a";
+        fg0 = mkLiteral "#cdd6f4";
+        fg1 = mkLiteral "#bac2de";
+        accent = mkLiteral "#89b4fa";
+        urgent = mkLiteral "#f38ba8";
+        
+        background-color = mkLiteral "transparent";
+        text-color = mkLiteral "@fg0";
+        
+        margin = 0;
+        padding = 0;
+        spacing = 0;
+      };
+      
+      window = {
+        location = mkLiteral "center";
+        width = 640;
+        background-color = mkLiteral "@bg0";
+        border = mkLiteral "2px";
+        border-color = mkLiteral "@accent";
+        border-radius = mkLiteral "8px";
+      };
+      
+      inputbar = {
+        padding = mkLiteral "12px";
+        spacing = mkLiteral "12px";
+        children = map mkLiteral [ "prompt" "entry" ];
+        background-color = mkLiteral "@bg1";
+        border-radius = mkLiteral "8px 8px 0 0";
+      };
+      
+      prompt = {
+        text-color = mkLiteral "@accent";
+        font = "JetBrainsMono Nerd Font Bold 12";
+      };
+      
+      entry = {
+        placeholder = "Search...";
+        placeholder-color = mkLiteral "@bg2";
+        cursor = mkLiteral "pointer";
+      };
+      
+      message = {
+        margin = mkLiteral "12px 0 0";
+        border-radius = mkLiteral "8px";
+        border-color = mkLiteral "@accent";
+        background-color = mkLiteral "@bg1";
+      };
+      
+      textbox = {
+        padding = mkLiteral "8px 12px";
+        background-color = mkLiteral "@bg1";
+      };
+      
+      listview = {
+        background-color = mkLiteral "transparent";
+        margin = mkLiteral "12px 0 0";
+        lines = 8;
+        columns = 1;
+        fixed-height = false;
+        scrollbar = true;
+      };
+      
+      scrollbar = {
+        width = mkLiteral "4px";
+        border = 0;
+        handle-color = mkLiteral "@accent";
+        handle-width = mkLiteral "4px";
+        padding = 0;
+        margin = mkLiteral "0 0 0 8px";
+      };
+      
+      element = {
+        padding = mkLiteral "8px 12px";
+        spacing = mkLiteral "12px";
+        border-radius = mkLiteral "6px";
+      };
+      
+      "element normal normal" = {
+        background-color = mkLiteral "transparent";
+        text-color = mkLiteral "@fg0";
+      };
+      
+      "element normal urgent" = {
+        background-color = mkLiteral "@urgent";
+        text-color = mkLiteral "@bg0";
+      };
+      
+      "element normal active" = {
+        background-color = mkLiteral "@accent";
+        text-color = mkLiteral "@bg0";
+      };
+      
+      "element selected normal" = {
+        background-color = mkLiteral "@bg2";
+        text-color = mkLiteral "@accent";
+      };
+      
+      "element selected urgent" = {
+        background-color = mkLiteral "@urgent";
+        text-color = mkLiteral "@bg0";
+      };
+      
+      "element selected active" = {
+        background-color = mkLiteral "@accent";
+        text-color = mkLiteral "@bg0";
+      };
+      
+      "element-icon" = {
+        size = mkLiteral "1.2em";
+        vertical-align = mkLiteral "0.5";
+      };
+      
+      "element-text" = {
+        text-color = mkLiteral "inherit";
+        vertical-align = mkLiteral "0.5";
+      };
+    };
+  };
+  
+  # Additional rofi utilities and themes
+  home.packages = with pkgs; [
+    rofimoji              # Better emoji picker
+    rofi-themes-adi1090x  # adi1090x theme collection
+  ];
+  
+  # Copy Catppuccin color scheme
+  home.file.".config/rofi/catppuccin-mocha.rasi".source = ../../../../configs/rofi/catppuccin-mocha.rasi;
+  
+  # Rofi keybindings in Hyprland config
+  # Add to your hyprland.conf:
+  # bind = $mainMod, R, exec, rofi -show drun
+  # bind = $mainMod, period, exec, rofi -show emoji
+  # bind = $mainMod SHIFT, R, exec, rofi -show run
+  # bind = $mainMod, E, exec, rofi -show filebrowser
+  # bind = $mainMod, C, exec, rofi -show calc -no-show-match -no-sort
+}
diff --git a/modules/home-manager/programs/shell/default.nix b/modules/home-manager/programs/shell/default.nix
index f8e2e51..4b0a644 100644
--- a/modules/home-manager/programs/shell/default.nix
+++ b/modules/home-manager/programs/shell/default.nix
@@ -6,4 +6,4 @@
     ./starship.nix
     ./utilities.nix
   ];
-}
\ No newline at end of file
+}
diff --git a/modules/home-manager/programs/shell/utilities.nix b/modules/home-manager/programs/shell/utilities.nix
index b317676..bbee17d 100644
--- a/modules/home-manager/programs/shell/utilities.nix
+++ b/modules/home-manager/programs/shell/utilities.nix
@@ -1,5 +1,8 @@
 { config, pkgs, ... }:
 
+let
+  packages = import ../../../common/packages.nix { inherit pkgs; };
+in
 {
   # Shell utilities
   programs = {
@@ -39,22 +42,11 @@
 
     # Alternative grep
     ripgrep.enable = true;
-    
+
     # Alternative find
     fd.enable = true;
   };
 
-  # Additional utilities as packages
-  home.packages = with pkgs; [
-    tldr        # Better man pages
-    bottom      # Better top
-    du-dust     # Better du
-    procs       # Better ps
-    choose      # Better cut/awk
-    sd          # Better sed
-    hyperfine   # Benchmarking tool
-    tokei       # Code statistics
-    gitui       # Git TUI
-    lazygit     # Another Git TUI
-  ];
-}
\ No newline at end of file
+  # Use centralized package lists
+  home.packages = packages.monitoring ++ packages.shellUtils;
+}
diff --git a/modules/home-manager/programs/shell/zsh.nix b/modules/home-manager/programs/shell/zsh.nix
index 9c54427..f058862 100644
--- a/modules/home-manager/programs/shell/zsh.nix
+++ b/modules/home-manager/programs/shell/zsh.nix
@@ -6,7 +6,10 @@
     enableCompletion = true;
     syntaxHighlighting.enable = true;
     autosuggestion.enable = true;
-    
+
+    # Fix cache directory permissions
+    dotDir = "${config.xdg.configHome}/zsh";
+
     shellAliases = {
       # System management
       ls = "eza";
@@ -14,11 +17,11 @@
       la = "eza -a";
       tree = "eza --tree";
       cat = "bat";
-      
+
       # NixOS shortcuts
-      hms = "home-manager switch --flake .";
-      nrs = "sudo nixos-rebuild switch --flake .";
-      
+      hms = "home-manager switch --flake ~/.dotfiles";
+      nrs = "sudo nixos-rebuild switch --flake ~/.dotfiles";
+
       # Git shortcuts
       g = "git";
       gs = "git status";
@@ -26,29 +29,32 @@
       gc = "git commit";
       gp = "git push";
       gl = "git log --oneline";
-      
-      # Directory navigation
-      ".." = "cd ..";
-      "..." = "cd ../..";
-      "....." = "cd ../../../..";
+
+      # Additional aliases are in modules/common/aliases.nix
     };
-    
+
     oh-my-zsh = {
       enable = true;
-      plugins = [ 
-        "sudo" 
-        "git" 
-        "docker" 
-        "docker-compose" 
-        "aliases" 
-        "gh" 
+      plugins = [
+        "sudo"
+        "git"
+        "docker"
+        "docker-compose"
+        "aliases"
+        "gh"
         "kubectl"
       ];
       theme = "robbyrussell";
+      # Fix cache permissions
+      custom = "${config.xdg.configHome}/zsh/oh-my-zsh-custom";
     };
 
     # Additional configuration
     initContent = ''
+      # Fix Oh-My-Zsh cache directory
+      export ZSH_CACHE_DIR="$HOME/.cache/oh-my-zsh"
+      mkdir -p "$ZSH_CACHE_DIR/completions"
+
       # Custom functions
       mkcd() {
         mkdir -p "$1" && cd "$1"
@@ -62,6 +68,25 @@
       setopt HIST_IGNORE_DUPS
       setopt HIST_IGNORE_ALL_DUPS
       setopt HIST_IGNORE_SPACE
+
+      # Fix permissions on completions directory
+      if [[ -d "$HOME/.cache/oh-my-zsh/completions" ]]; then
+        chmod -R u+w "$HOME/.cache/oh-my-zsh/completions" 2>/dev/null || true
+      fi
     '';
+
+    history = {
+      size = 10000;
+      path = "${config.xdg.dataHome}/zsh/history";
+      ignoreDups = true;
+      ignoreSpace = true;
+      share = true;
+    };
   };
-}
\ No newline at end of file
+
+  # Ensure cache directories exist with correct permissions
+  home.activation.fixZshCache = config.lib.dag.entryAfter [ "writeBoundary" ] ''
+    mkdir -p $HOME/.cache/oh-my-zsh/completions
+    chmod -R u+w $HOME/.cache/oh-my-zsh 2>/dev/null || true
+  '';
+}
diff --git a/modules/home-manager/programs/terminal/kitty.nix b/modules/home-manager/programs/terminal/kitty.nix
index 6c61807..a62c14d 100644
--- a/modules/home-manager/programs/terminal/kitty.nix
+++ b/modules/home-manager/programs/terminal/kitty.nix
@@ -35,7 +35,7 @@
       tab_powerline_style = "slanted";
       
       # Font (will be overridden by stylix)
-      font_size = 11;
+      font_size = 10;
       
       # Shell integration - disable auto-launch of terminal multiplexers
       shell_integration = "no-cursor";
diff --git a/modules/home-manager/programs/utilities/audio-video.nix b/modules/home-manager/programs/utilities/audio-video.nix
new file mode 100644
index 0000000..5aeb4d4
--- /dev/null
+++ b/modules/home-manager/programs/utilities/audio-video.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+let
+  packages = import ../../../common/packages.nix { inherit pkgs; };
+in
+{
+  # Audio/Video Control Tools
+  home.packages = packages.audioVideo;
+}
diff --git a/modules/home-manager/programs/utilities/btop.nix b/modules/home-manager/programs/utilities/btop.nix
new file mode 100644
index 0000000..40e98e1
--- /dev/null
+++ b/modules/home-manager/programs/utilities/btop.nix
@@ -0,0 +1,48 @@
+{ config, pkgs, lib, ... }:
+
+{
+  # Btop - Beautiful system monitor
+  programs.btop = {
+    enable = true;
+    
+    settings = {
+      # Theme - override Stylix
+      color_theme = lib.mkForce "catppuccin_mocha";
+      theme_background = false;
+      
+      # Behavior
+      vim_keys = true;
+      rounded_corners = true;
+      
+      # Update rate
+      update_ms = 1000;
+      
+      # Processes
+      proc_sorting = "cpu lazy";
+      proc_tree = true;
+      proc_gradient = true;
+      proc_colors = true;
+      
+      # CPU
+      cpu_graph_upper = "total";
+      cpu_graph_lower = "total";
+      cpu_single_graph = false;
+      
+      # Memory
+      mem_graphs = true;
+      mem_below_net = false;
+      
+      # Network
+      net_auto = true;
+      net_sync = true;
+      net_iface = "";
+      
+      # Disks
+      show_disks = true;
+      disk_free_priv = true;
+      
+      # Show battery
+      show_battery = true;
+    };
+  };
+}
diff --git a/modules/home-manager/programs/utilities/default.nix b/modules/home-manager/programs/utilities/default.nix
index 9e8c149..6d0056f 100644
--- a/modules/home-manager/programs/utilities/default.nix
+++ b/modules/home-manager/programs/utilities/default.nix
@@ -1,58 +1,17 @@
 { config, pkgs, ... }:
 
 {
-  # Utility applications
-  home.packages = with pkgs; [
-    # System monitoring
-    btop
-    bottom
-    
-    # Network
-    protonvpn-gui
-    
-    # File management
-    yazi             # Terminal file manager
-    xfce.thunar     # GUI file manager
-    
-    # Archive tools
-    peazip
-    p7zip
-    unzip
-    zstd
-    
-    # Nix utilities
-    nix-tree
-    nix-du
-    nh              # Nix helper
-    
-    # System info
-    fastfetch
-    
-    # Clipboard
-    wl-clipboard
-    cliphist
-    
-    # Screenshots
-    grimblast
-    hyprpicker      # Color picker
-    
-    # Audio control
-    pavucontrol
-    pwvucontrol
-    
-    # System control
-    wlogout
-    
-    # Hyprland utilities
-    pyprland
-    hyprsunset
-    hyprlock
-    hypridle
-    hyprpaper
-    
-    # Other utilities
-    qbittorrent
-    tradingview
-    rofi
+  # Utility Applications - Modularized by domain
+  imports = [
+    ./system-monitoring.nix
+    ./file-management.nix
+    ./nix-helpers.nix
+    ./desktop-tools.nix
+    ./audio-video.nix
+    ./hyprland-extras.nix
+    ./misc.nix
+    ./btop.nix
+    ./zellij.nix
+    ./hyprlock.nix
   ];
 }
diff --git a/modules/home-manager/programs/utilities/desktop-tools.nix b/modules/home-manager/programs/utilities/desktop-tools.nix
new file mode 100644
index 0000000..f004e30
--- /dev/null
+++ b/modules/home-manager/programs/utilities/desktop-tools.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+let
+  packages = import ../../../common/packages.nix { inherit pkgs; };
+in
+{
+  # Desktop Tools - Clipboard, Screenshots, Color Picker
+  home.packages = packages.desktop;
+}
diff --git a/modules/home-manager/programs/utilities/file-management.nix b/modules/home-manager/programs/utilities/file-management.nix
new file mode 100644
index 0000000..b8401cc
--- /dev/null
+++ b/modules/home-manager/programs/utilities/file-management.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+let
+  packages = import ../../../common/packages.nix { inherit pkgs; };
+in
+{
+  # File Management Tools
+  home.packages = packages.files;
+}
diff --git a/modules/home-manager/programs/utilities/hyprland-extras.nix b/modules/home-manager/programs/utilities/hyprland-extras.nix
new file mode 100644
index 0000000..3cdcc41
--- /dev/null
+++ b/modules/home-manager/programs/utilities/hyprland-extras.nix
@@ -0,0 +1,17 @@
+{ config, pkgs, ... }:
+
+let
+  packages = import ../../../common/packages.nix { inherit pkgs; };
+in
+{
+  # Hyprland-specific Utilities
+  home.packages =
+    packages.hyprland
+    ++ (with pkgs; [
+      wlogout # Logout menu
+      grim    # Screenshot tool for Wayland
+      slurp   # Select region for screenshots
+      wl-clipboard # Clipboard utilities for Wayland
+      jq      # JSON processor (for window selection)
+    ]);
+}
diff --git a/modules/home-manager/programs/utilities/hyprlock.nix b/modules/home-manager/programs/utilities/hyprlock.nix
new file mode 100644
index 0000000..643f58a
--- /dev/null
+++ b/modules/home-manager/programs/utilities/hyprlock.nix
@@ -0,0 +1,86 @@
+{ config, pkgs, lib, ... }:
+
+{
+  # Disable Stylix for hyprlock to avoid conflicts
+  stylix.targets.hyprlock.enable = false;
+  
+  # Hyprlock - Screen locker for Hyprland
+  programs.hyprlock = {
+    enable = true;
+    
+    settings = {
+      general = {
+        disable_loading_bar = false;
+        hide_cursor = true;
+        grace = 0;
+        no_fade_in = false;
+        no_fade_out = false;
+      };
+      
+      background = [
+        {
+          path = "screenshot";
+          blur_passes = 3;
+          blur_size = 7;
+          noise = 0.0117;
+          contrast = 0.8916;
+          brightness = 0.8172;
+          vibrancy = 0.1696;
+          vibrancy_darkness = 0.0;
+        }
+      ];
+      
+      input-field = [
+        {
+          size = "300, 60";
+          position = "0, -80";
+          monitor = "";
+          dots_center = true;
+          fade_on_empty = false;
+          font_color = "rgb(205, 214, 244)";
+          inner_color = "rgb(30, 30, 46)";
+          outer_color = "rgb(137, 180, 250)";
+          outline_thickness = 2;
+          placeholder_text = "<span foreground='##cdd6f4'>Password...</span>";
+          shadow_passes = 2;
+        }
+      ];
+      
+      label = [
+        # Time
+        {
+          monitor = "";
+          text = "cmd[update:1000] echo \"$(date +\"%H:%M\")\"";
+          color = "rgb(205, 214, 244)";
+          font_size = 90;
+          font_family = "JetBrainsMono Nerd Font";
+          position = "0, 300";
+          halign = "center";
+          valign = "center";
+        }
+        # Date
+        {
+          monitor = "";
+          text = "cmd[update:1000] echo \"$(date +\"%A, %B %d\")\"";
+          color = "rgb(205, 214, 244)";
+          font_size = 25;
+          font_family = "JetBrainsMono Nerd Font";
+          position = "0, 200";
+          halign = "center";
+          valign = "center";
+        }
+        # User
+        {
+          monitor = "";
+          text = "  $USER";
+          color = "rgb(205, 214, 244)";
+          font_size = 18;
+          font_family = "JetBrainsMono Nerd Font";
+          position = "0, 20";
+          halign = "center";
+          valign = "center";
+        }
+      ];
+    };
+  };
+}
diff --git a/modules/home-manager/programs/utilities/misc.nix b/modules/home-manager/programs/utilities/misc.nix
new file mode 100644
index 0000000..84af148
--- /dev/null
+++ b/modules/home-manager/programs/utilities/misc.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+
+{
+  # Miscellaneous Utilities
+  home.packages = with pkgs; [
+    protonvpn-gui # VPN client
+    qbittorrent # Torrent client
+    libnotify # For notify-send command
+  ];
+}
diff --git a/modules/home-manager/programs/utilities/nix-helpers.nix b/modules/home-manager/programs/utilities/nix-helpers.nix
new file mode 100644
index 0000000..afd8fa2
--- /dev/null
+++ b/modules/home-manager/programs/utilities/nix-helpers.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+let
+  packages = import ../../../common/packages.nix { inherit pkgs; };
+in
+{
+  # Nix Helper Tools
+  home.packages = packages.nixHelpers;
+}
diff --git a/modules/home-manager/programs/utilities/system-monitoring.nix b/modules/home-manager/programs/utilities/system-monitoring.nix
new file mode 100644
index 0000000..ceec407
--- /dev/null
+++ b/modules/home-manager/programs/utilities/system-monitoring.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+
+let
+  packages = import ../../../common/packages.nix { inherit pkgs; };
+in
+{
+  # System Monitoring Tools
+  home.packages =
+    packages.monitoring
+    ++ (with pkgs; [
+      fastfetch # System info
+    ]);
+}
diff --git a/modules/home-manager/programs/utilities/zellij.nix b/modules/home-manager/programs/utilities/zellij.nix
new file mode 100644
index 0000000..6836070
--- /dev/null
+++ b/modules/home-manager/programs/utilities/zellij.nix
@@ -0,0 +1,48 @@
+{ config, pkgs, ... }:
+
+{
+  # Zellij - Modern terminal multiplexer
+  programs.zellij = {
+    enable = true;
+    
+    settings = {
+      # Theme
+      theme = "catppuccin-mocha";
+      
+      # UI settings
+      pane_frames = false;
+      simplified_ui = true;
+      default_layout = "compact";
+      
+      # Behavior
+      on_force_close = "quit";
+      scroll_buffer_size = 10000;
+      copy_on_select = true;
+      
+      # Mouse
+      mouse_mode = true;
+      
+      # Keybindings - use Ctrl+Space as prefix to avoid conflicts
+      keybinds = {
+        normal = {
+          "bind \"Ctrl g\"" = { SwitchToMode = "locked"; };
+        };
+      };
+      
+      # Themes
+      themes.catppuccin-mocha = {
+        fg = "#cdd6f4";
+        bg = "#1e1e2e";
+        black = "#45475a";
+        red = "#f38ba8";
+        green = "#a6e3a1";
+        yellow = "#f9e2af";
+        blue = "#89b4fa";
+        magenta = "#cba6f7";
+        cyan = "#94e2d5";
+        white = "#bac2de";
+        orange = "#fab387";
+      };
+    };
+  };
+}
diff --git a/modules/home-manager/services/backup.nix b/modules/home-manager/services/backup.nix
new file mode 100644
index 0000000..dca9349
--- /dev/null
+++ b/modules/home-manager/services/backup.nix
@@ -0,0 +1,78 @@
+{ config, pkgs, ... }:
+
+let
+  packages = import ../../common/packages.nix { inherit pkgs; };
+in
+{
+  # Syncthing for file synchronization
+  services.syncthing = {
+    enable = true;
+    # The web UI will be available at http://127.0.0.1:8384
+  };
+
+  # Backup utilities - using centralized package list
+  home.packages =
+    packages.backup
+    ++ (with pkgs; [
+      duplicati # GUI backup tool
+    ]);
+
+  # Backup script for manual backups
+  home.file.".local/bin/backup-now" = {
+    executable = true;
+    text = ''
+      #!/usr/bin/env bash
+      # Quick backup script
+      set -euo pipefail
+
+      BACKUP_DIR="''${BACKUP_DIR:-/mnt/backup}"
+      SOURCE_DIRS=(
+        "$HOME/Documents"
+        "$HOME/Pictures"
+        "$HOME/dev"
+        "$HOME/.dotfiles"
+      )
+
+      echo "🔄 Starting backup to $BACKUP_DIR..."
+
+      for dir in "''${SOURCE_DIRS[@]}"; do
+        if [[ -d "$dir" ]]; then
+          echo "📦 Backing up $dir..."
+          rsync -av --delete \
+            --exclude='.cache' \
+            --exclude='node_modules' \
+            --exclude='.git' \
+            --exclude='target' \
+            --exclude='__pycache__' \
+            "$dir" "$BACKUP_DIR/"
+        fi
+      done
+
+      echo "✅ Backup completed!"
+    '';
+  };
+
+  # Restore script
+  home.file.".local/bin/backup-restore" = {
+    executable = true;
+    text = ''
+      #!/usr/bin/env bash
+      # Restore from backup
+      set -euo pipefail
+
+      BACKUP_DIR="''${BACKUP_DIR:-/mnt/backup}"
+
+      echo "🔄 Restoring from $BACKUP_DIR..."
+      echo "⚠️  This will overwrite existing files!"
+      read -p "Continue? (y/N) " -n 1 -r
+      echo
+
+      if [[ $REPLY =~ ^[Yy]$ ]]; then
+        rsync -av "$BACKUP_DIR/" "$HOME/"
+        echo "✅ Restore completed!"
+      else
+        echo "❌ Restore cancelled"
+      fi
+    '';
+  };
+}
diff --git a/modules/home-manager/services/default.nix b/modules/home-manager/services/default.nix
index 7921323..f078880 100644
--- a/modules/home-manager/services/default.nix
+++ b/modules/home-manager/services/default.nix
@@ -1,6 +1,11 @@
 { config, pkgs, ... }:
 
 {
+
+  imports = [
+    ./backup.nix
+    ./hypridle.nix
+  ];
   # Home manager services
   services = {
     # Keyring
@@ -11,5 +16,14 @@
     
     # Auto mounting
     udiskie.enable = true;
+    
+    # Notification daemon
+    mako = {
+      enable = true;
+      settings = {
+        default-timeout = 5000;
+        ignore-timeout = true;
+      };
+    };
   };
-}
\ No newline at end of file
+}
diff --git a/modules/home-manager/services/hypridle.nix b/modules/home-manager/services/hypridle.nix
new file mode 100644
index 0000000..a62b763
--- /dev/null
+++ b/modules/home-manager/services/hypridle.nix
@@ -0,0 +1,33 @@
+{ config, pkgs, ... }:
+
+{
+  # Hypridle - Idle management for Hyprland
+  services.hypridle = {
+    enable = true;
+    
+    settings = {
+      general = {
+        lock_cmd = "pidof hyprlock || hyprlock";
+        before_sleep_cmd = "loginctl lock-session";
+        after_sleep_cmd = "hyprctl dispatch dpms on";
+        ignore_dbus_inhibit = false;
+      };
+      
+      listener = [
+        {
+          timeout = 300; # 5 minutes
+          on-timeout = "loginctl lock-session";
+        }
+        {
+          timeout = 330; # 5.5 minutes
+          on-timeout = "hyprctl dispatch dpms off";
+          on-resume = "hyprctl dispatch dpms on";
+        }
+        {
+          timeout = 1800; # 30 minutes
+          on-timeout = "systemctl suspend";
+        }
+      ];
+    };
+  };
+}
diff --git a/modules/home-manager/theming/default.nix b/modules/home-manager/theming/default.nix
index cf815be..aa9b189 100644
--- a/modules/home-manager/theming/default.nix
+++ b/modules/home-manager/theming/default.nix
@@ -7,15 +7,15 @@
     base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
 
     image = pkgs.fetchurl {
-      url = "https://www.pixelstalk.net/wp-content/uploads/2025/05/A-dense-forest-with-towering-evergreens-and-a-glowing-mist-rising-from-the-ground.webp";
-      hash = "sha256-e8RDn46vsP4b/kLAmYXKgBL12soOXJxAqpRvSruqbXA=";
+      url = "https://raw.githubusercontent.com/orangci/walls-catppuccin-mocha/master/voxel-city.jpg";
+      hash = "sha256-KChwMrsiX2XkPcq/Gsav7HDTFvaQ83kPpitONM64hL0=";
     };
     
     polarity = "dark";
 
     cursor = {
-      package = pkgs.bibata-cursors;
-      name = "Bibata-Modern-Classic";
+      package = pkgs.catppuccin-cursors.mochaDark;
+      name = "catppuccin-mocha-dark-cursors";
       size = 18;
     };
 
@@ -36,15 +36,15 @@
       };
       
       emoji = {
-        package = pkgs.noto-fonts-emoji;
+        package = pkgs.noto-fonts-color-emoji;
         name = "Noto Color Emoji";
       };
       
       sizes = {
-        applications = 11;
-        desktop = 11;
-        popups = 11;
-        terminal = 11;
+        applications = 10;
+        desktop = 10;
+        popups = 10;
+        terminal = 9;
       };
     };
 
@@ -54,6 +54,8 @@
       btop.enable = true;
       bat.enable = true;
       fzf.enable = true;
+      rofi.enable = false;
+      cava.enable = true;
     };
   };
 
@@ -84,7 +86,7 @@
     
     # Theme tools
     libsForQt5.qt5ct
-    qt6ct
+    qt6Packages.qt6ct
     plasma5Packages.qtstyleplugin-kvantum
   ];
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 5418448..76b7c3a 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -6,5 +6,6 @@
     ./programs
     ./services
     ./system
+    ./network.nix
   ];
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
index 22b513a..4bd249c 100644
--- a/modules/nixos/desktop/default.nix
+++ b/modules/nixos/desktop/default.nix
@@ -26,6 +26,16 @@
     extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
   };
 
+  # Enable GNOME Keyring daemon at system level
+  services.gnome.gnome-keyring.enable = true;
+
+  # Keyring packages
+  environment.systemPackages = with pkgs; [
+    gnome-keyring
+    libsecret
+    seahorse  # GUI for managing keyring
+  ];
+
   # Environment variables for wayland
   environment.sessionVariables = {
     NIXOS_OZONE_WL = "1";
diff --git a/modules/nixos/desktop/fonts.nix b/modules/nixos/desktop/fonts.nix
index 230c80c..2c04629 100644
--- a/modules/nixos/desktop/fonts.nix
+++ b/modules/nixos/desktop/fonts.nix
@@ -6,7 +6,7 @@
     packages = with pkgs; [
       nerd-fonts.jetbrains-mono
       noto-fonts
-      noto-fonts-emoji
+      noto-fonts-color-emoji
       font-awesome
       source-han-sans
       source-han-serif
diff --git a/modules/nixos/desktop/hyprland.nix b/modules/nixos/desktop/hyprland.nix
index 954d611..7fe03b6 100644
--- a/modules/nixos/desktop/hyprland.nix
+++ b/modules/nixos/desktop/hyprland.nix
@@ -1,10 +1,11 @@
 { inputs, config, pkgs, ... }:
 
 {
-  # Enable Hyprland
+  # Enable Hyprland from nixpkgs (faster updates)
   programs.hyprland = {
     enable = true;
-    package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+    # Using nixpkgs version instead of flake input for faster updates
+    # package = inputs.hyprland.packages.${pkgs.system}.hyprland;
     portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
     xwayland.enable = true;
   };
@@ -33,4 +34,4 @@
 
   # Security
   security.polkit.enable = true;
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/desktop/sddm.nix b/modules/nixos/desktop/sddm.nix
index 649c696..1660365 100644
--- a/modules/nixos/desktop/sddm.nix
+++ b/modules/nixos/desktop/sddm.nix
@@ -1,29 +1,100 @@
 { config, pkgs, ... }:
 
+# let
+#   # Sugar Dark SDDM theme - modern, minimal, beautiful
+#   sugar-dark-sddm = pkgs.stdenv.mkDerivation {
+#     name = "sddm-sugar-dark-theme";
+#     src = pkgs.fetchFromGitHub {
+#       owner = "MarianArlt";
+#       repo = "sddm-sugar-dark";
+#       rev = "v1.2";
+#       sha256 = "sha256-C3qB9hFUeuT5+Dos2zFj5SyQegnghpoFV9wHvE9VoD8=";
+#     };
+#     installPhase = ''
+#       mkdir -p $out/share/sddm/themes
+#       cp -r $src $out/share/sddm/themes/sugar-dark
+#     '';
+#   };
+# in
 {
   # Display manager
   services.displayManager.sddm = {
     enable = true;
     package = pkgs.kdePackages.sddm;
     wayland.enable = true;
-    theme = "catppuccin-mocha";
-    # Ensure themes directory exists
-    settings = {
-      Theme = {
-        Current = "catppuccin-mocha";
-        ThemeDir = "/run/current-system/sw/share/sddm/themes";
-      };
-    };
+    
+    # Use Catppuccin theme (theme name includes accent color)
+    theme = "catppuccin-mocha-blue";
+    
+    # settings = {
+    #   Theme = {
+    #     Current = "sugar-dark";
+    #     ThemeDir = "/run/current-system/sw/share/sddm/themes";
+    #     CursorTheme = "Bibata-Modern-Classic";
+    #   };
+    #   
+    #   General = {
+    #     # Display settings
+    #     DisplayServer = "wayland";
+    #     GreeterEnvironment = "QT_WAYLAND_SHELL_INTEGRATION=layer-shell";
+    #     
+    #     # User settings
+    #     InputMethod = "";
+    #   };
+    #   
+    #   Users = {
+    #     MaximumUid = 60000;
+    #     MinimumUid = 1000;
+    #     HideUsers = "";
+    #     HideShells = "/bin/false,/usr/bin/nologin";
+    #   };
+    #   
+    #   Wayland = {
+    #     CompositorCommand = "kwin_wayland --no-global-shortcuts --no-kactivities --no-lockscreen --locale1";
+    #   };
+    # };
   };
 
-  # SDDM theme
+  # SDDM dependencies
   environment.systemPackages = with pkgs; [
+    # Qt graphics
     libsForQt5.qt5.qtgraphicaleffects
+    # libsForQt5.qt5.qtsvg
+    # libsForQt5.qt5.qtquickcontrols2
+    
+    # Current theme
+    # sugar-dark-sddm
+    # sddm-sugar-dark
+    
+    # Alternative Catppuccin theme
     (catppuccin-sddm.override {
       flavor = "mocha";
+      accent = "blue";  # This sets the accent color in the theme name
       font = "JetbrainsMono Nerd Font";
-      fontSize = "10";
+      fontSize = "11";
+      background = "${pkgs.fetchurl {
+        url = "https://www.pixelstalk.net/wp-content/uploads/2025/05/A-dense-forest-with-towering-evergreens-and-a-glowing-mist-rising-from-the-ground.webp";
+        hash = "sha256-e8RDn46vsP4b/kLAmYXKgBL12soOXJxAqpRvSruqbXA=";
+      }}";
       loginBackground = true;
     })
   ];
-}
\ No newline at end of file
+  
+  # Cursor theme for SDDM
+  environment.variables = {
+    # Set cursor theme
+    XCURSOR_THEME = "Catppuccin-Mocha-Blue";
+    XCURSOR_SIZE = "18";
+  };
+}
+
+# Alternative themes to try:
+# 1. Sugar Dark (minimal, modern) - Currently configured
+# 2. Catppuccin (colorful, comfortable) - Available above
+# 3. Chili (elegant, simple):
+#    chili-sddm = pkgs.fetchFromGitHub {
+#      owner = "MarianArlt";
+#      repo = "sddm-chili";
+#      rev = "0.1.5";
+#      sha256 = "sha256-wxWsdRGC59YzDcSopDRzxg8TfjjmA3LHrdWjepTuzgw=";
+#    };
diff --git a/modules/nixos/network.nix b/modules/nixos/network.nix
new file mode 100644
index 0000000..382c611
--- /dev/null
+++ b/modules/nixos/network.nix
@@ -0,0 +1,43 @@
+{ config, pkgs, ... }:
+
+{
+  # Networking configuration
+  networking = {
+    # Firewall settings are configured in modules/nixos/system/security.nix
+    # Additional firewall ports for email services
+    firewall.allowedTCPPorts = [
+      # SMTP
+      25    # SMTP
+      587   # SMTP with STARTTLS
+      465   # SMTPS
+      
+      # IMAP
+      143   # IMAP
+      993   # IMAPS
+      
+      # POP3
+      110   # POP3
+      995   # POP3S
+    ];
+    
+    # DNS configuration - helps with email fetching
+    nameservers = [ 
+      "1.1.1.1"  # Cloudflare
+      "8.8.8.8"  # Google
+    ];
+    
+    # Enable systemd-resolved for better DNS handling
+    # Comment out if you prefer networkmanager's DNS
+    # networkmanager.dns = "systemd-resolved";
+  };
+  
+  # Enable systemd-resolved
+  services.resolved = {
+    enable = true;
+    dnssec = "allow-downgrade";
+    extraConfig = ''
+      DNS=1.1.1.1 8.8.8.8
+      FallbackDNS=1.0.0.1 8.8.4.4
+    '';
+  };
+}
diff --git a/modules/nixos/performance.nix b/modules/nixos/performance.nix
new file mode 100644
index 0000000..72316fa
--- /dev/null
+++ b/modules/nixos/performance.nix
@@ -0,0 +1,253 @@
+{ config, pkgs, lib, ... }:
+
+{
+  # Performance optimizations for Intel i5-6300U laptop with 7.4GB RAM
+
+  # Boot optimization
+  boot = {
+    # Use latest kernel
+    kernelPackages = pkgs.linuxPackages_latest;
+    
+    # Kernel modules
+    kernelModules = [ "tcp_bbr" ];
+    
+    # Kernel sysctl parameters - Conservative for laptop
+    kernel.sysctl = {
+      # Memory management - optimized for 7.4GB RAM
+      "vm.swappiness" = 10;
+      "vm.vfs_cache_pressure" = 50;
+      "vm.dirty_ratio" = 10;
+      "vm.dirty_background_ratio" = 5;
+      "vm.dirty_writeback_centisecs" = 1500;
+      
+      # Network optimization
+      "net.core.netdev_max_backlog" = 8192;
+      "net.core.somaxconn" = 4096;
+      "net.core.rmem_default" = 262144;
+      "net.core.rmem_max" = 4194304;
+      "net.core.wmem_default" = 262144;
+      "net.core.wmem_max" = 4194304;
+      "net.ipv4.tcp_rmem" = "4096 87380 4194304";
+      "net.ipv4.tcp_wmem" = "4096 65536 4194304";
+      "net.ipv4.tcp_fastopen" = 3;
+      "net.ipv4.tcp_congestion_control" = "bbr";
+      "net.ipv4.tcp_mtu_probing" = 1;
+      "net.ipv4.tcp_max_syn_backlog" = 4096;
+      "net.ipv4.tcp_slow_start_after_idle" = 0;
+      
+      # File system
+      "fs.file-max" = 1048576;
+      "fs.inotify.max_user_watches" = 524288;
+      "fs.inotify.max_user_instances" = 256;
+      
+      # Kernel
+      "kernel.sched_autogroup_enabled" = 1;
+    };
+    
+    # Faster initrd
+    initrd.systemd.enable = true;
+  };
+
+  # Systemd optimization
+  systemd = {
+    services = {
+      systemd-udev-settle.enable = false;
+      NetworkManager-wait-online.enable = false;
+    };
+    
+    extraConfig = ''
+      DefaultTimeoutStopSec=10s
+      DefaultLimitNOFILE=524288
+    '';
+    
+    user.extraConfig = ''
+      DefaultLimitNOFILE=524288
+    '';
+  };
+
+  # Nix optimization
+  nix = {
+    settings = {
+      # Use 2 cores for builds (save battery)
+      cores = 2;
+      max-jobs = 2;
+      
+      # Binary caches
+      substituters = [
+        "https://cache.nixos.org"
+        "https://nix-community.cachix.org"
+        "https://hyprland.cachix.org"
+      ];
+      
+      trusted-public-keys = [
+        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+      ];
+      
+      keep-build-log = true;
+      keep-derivations = true;
+      keep-outputs = true;
+      warn-dirty = false;
+    };
+    
+    # Automatic garbage collection
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than 7d";
+    };
+    
+    # Optimize store
+    optimise = {
+      automatic = true;
+      dates = [ "weekly" ];
+    };
+  };
+
+  # Power management for laptop
+  powerManagement = {
+    enable = true;
+    cpuFreqGovernor = "powersave";  # Laptop mode
+  };
+  
+  # TLP for advanced laptop power management
+  services.tlp = {
+    enable = true;
+    settings = {
+      # CPU settings
+      CPU_SCALING_GOVERNOR_ON_AC = "performance";
+      CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
+      
+      CPU_ENERGY_PERF_POLICY_ON_AC = "balance_performance";
+      CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
+      
+      CPU_MIN_PERF_ON_AC = 0;
+      CPU_MAX_PERF_ON_AC = 100;
+      CPU_MIN_PERF_ON_BAT = 0;
+      CPU_MAX_PERF_ON_BAT = 60;
+      
+      # CPU boost
+      CPU_BOOST_ON_AC = 1;
+      CPU_BOOST_ON_BAT = 0;
+      
+      # Platform profile
+      PLATFORM_PROFILE_ON_AC = "balanced";
+      PLATFORM_PROFILE_ON_BAT = "low-power";
+      
+      # Disk settings
+      DISK_DEVICES = "sda";
+      DISK_APM_LEVEL_ON_AC = "254 254";
+      DISK_APM_LEVEL_ON_BAT = "128 128";
+      
+      # SATA link power management
+      SATA_LINKPWR_ON_AC = "med_power_with_dipm";
+      SATA_LINKPWR_ON_BAT = "min_power";
+      
+      # WiFi power saving
+      WIFI_PWR_ON_AC = "off";
+      WIFI_PWR_ON_BAT = "on";
+      
+      # Runtime PM
+      RUNTIME_PM_ON_AC = "auto";
+      RUNTIME_PM_ON_BAT = "auto";
+      
+      # USB autosuspend
+      USB_AUTOSUSPEND = 1;
+      
+      # Sound power saving
+      SOUND_POWER_SAVE_ON_AC = 0;
+      SOUND_POWER_SAVE_ON_BAT = 1;
+    };
+  };
+
+  # Hardware acceleration for Intel HD Graphics 520
+  hardware = {
+    graphics = {
+      enable = true;
+      enable32Bit = true;
+      extraPackages = with pkgs; [
+        intel-media-driver    # VAAPI driver for Skylake+
+        intel-compute-runtime # OpenCL
+        vaapiIntel           # Legacy VAAPI
+        vaapiVdpau
+        libvdpau-va-gl
+      ];
+    };
+    
+    enableRedistributableFirmware = true;
+    enableAllFirmware = true;
+    
+    # Intel CPU microcode
+    cpu.intel.updateMicrocode = true;
+    
+    # Bluetooth
+    bluetooth = {
+      enable = true;
+      powerOnBoot = false;  # Save power, enable manually
+      settings = {
+        General = {
+          Enable = "Source,Sink,Media,Socket";
+          Experimental = true;
+        };
+      };
+    };
+  };
+
+  # Audio optimization with Pipewire
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
+    
+    # Optimized for laptop
+    extraConfig.pipewire = {
+      "10-clock-rate" = {
+        "context.properties" = {
+          "default.clock.rate" = 48000;
+          "default.clock.quantum" = 2048;  # Higher for battery
+          "default.clock.min-quantum" = 512;
+          "default.clock.max-quantum" = 4096;
+        };
+      };
+    };
+  };
+
+  # Zram for better memory management (4GB compressed swap)
+  zramSwap = {
+    enable = true;
+    algorithm = "zstd";
+    memoryPercent = 50;  # 3.7GB Zram from 7.4GB RAM
+  };
+
+  # Tmpfs for faster temporary files
+  boot.tmp = {
+    useTmpfs = true;
+    tmpfsSize = "2G";  # Conservative for your RAM
+  };
+
+  # Earlyoom to prevent system freezes on low memory
+  services.earlyoom = {
+    enable = true;
+    freeMemThreshold = 5;
+    freeSwapThreshold = 10;
+    enableNotifications = true;
+  };
+
+  # irqbalance for better interrupt handling
+  services.irqbalance.enable = true;
+
+  # Thermald for Intel thermal management
+  services.thermald.enable = true;
+
+  # Disable unused services to save resources
+  services = {
+    # Disable if not using printing
+    printing.enable = false;
+    
+    # Disable CUPS browsing
+    avahi.enable = false;
+  };
+}
diff --git a/modules/nixos/programs/default.nix b/modules/nixos/programs/default.nix
index 3655aa3..e31e6aa 100644
--- a/modules/nixos/programs/default.nix
+++ b/modules/nixos/programs/default.nix
@@ -6,24 +6,17 @@
     ./containers.nix
   ];
 
-  # Core system packages
+  # Core system packages (system-critical only)
   environment.systemPackages = with pkgs; [
-    # System tools
-    neovim
-    git
-    wget
-    curl
-    
-    # File managers
-    kdePackages.dolphin
-    xfce.thunar
-    xfce.thunar-volman
-    
-    # Security
+    # System essentials
+    neovim # System editor
+    wget # System downloader
+
+    # Security (system-level)
     polkit
     polkit_gnome
     libsecret
     gnome-keyring
     seahorse
   ];
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/programs/development.nix b/modules/nixos/programs/development.nix
index cc37dad..d5768d8 100644
--- a/modules/nixos/programs/development.nix
+++ b/modules/nixos/programs/development.nix
@@ -3,14 +3,6 @@
 {
   # Development tools
   environment.systemPackages = with pkgs; [
-    # Development
-    home-manager
-    gh
-    git
-    
-    # Languages
-    nodejs
-    
     # Build tools
     clang
     gcc
@@ -18,4 +10,10 @@
 
   # Enable development services
   programs.git.enable = true;
-}
\ No newline at end of file
+
+  # Android development setup
+  programs.adb.enable = true; # Enable Android Debug Bridge
+
+  # Note: Android SDK is installed via android-studio in home-manager
+  # which includes SDK, emulator, platform tools, and build tools
+}
diff --git a/modules/nixos/security.nix b/modules/nixos/security.nix
new file mode 100644
index 0000000..02950de
--- /dev/null
+++ b/modules/nixos/security.nix
@@ -0,0 +1,137 @@
+{ config, pkgs, lib, ... }:
+
+{
+  # Security hardening module
+
+  # Firewall configuration
+  networking.firewall = {
+    enable = true;
+    allowPing = false;
+    logRefusedConnections = false;  # Save resources on laptop
+  };
+
+  # Security services
+  services = {
+    # Fail2ban for brute force protection
+    fail2ban = {
+      enable = true;
+      maxretry = 5;
+      ignoreIP = [
+        "127.0.0.0/8"
+        "10.0.0.0/8"
+        "172.16.0.0/12"
+        "192.168.0.0/16"
+      ];
+      
+      jails.sshd = ''
+        enabled = true
+        port = ssh
+        filter = sshd
+        maxretry = 3
+      '';
+    };
+    
+    # AppArmor
+    apparmor = {
+      enable = true;
+      killUnconfinedConfinables = false;  # Less strict for development
+    };
+  };
+
+  # Security settings
+  security = {
+    # Sudo configuration
+    sudo = {
+      enable = true;
+      execWheelOnly = true;
+      extraConfig = ''
+        Defaults lecture = never
+        Defaults timestamp_timeout = 30
+      '';
+    };
+    
+    # PAM configuration
+    pam.services = {
+      # Enable GNOME Keyring for login
+      login.enableGnomeKeyring = true;
+      sddm.enableGnomeKeyring = true;
+      # Hyprland doesn't have a PAM service, but we enable it for SDDM
+    };
+    
+    # Disable coredumps
+    pam.loginLimits = [
+      { domain = "*"; type = "hard"; item = "core"; value = "0"; }
+      { domain = "*"; type = "soft"; item = "nofile"; value = "524288"; }
+      { domain = "*"; type = "hard"; item = "nofile"; value = "1048576"; }
+    ];
+  };
+
+  # Boot security
+  boot = {
+    # Kernel security parameters (balanced for development)
+    kernelParams = [
+      "page_alloc.shuffle=1"
+      "pti=on"
+    ];
+    
+    # Blacklist uncommon filesystems
+    blacklistedKernelModules = [
+      "cramfs"
+      "freevxfs"
+      "jffs2"
+      "hfs"
+      "hfsplus"
+      "udf"
+      "dccp"
+      "sctp"
+      "rds"
+      "tipc"
+    ];
+    
+    # Kernel hardening
+    kernel.sysctl = {
+      # Network security
+      "net.ipv4.conf.all.rp_filter" = 1;
+      "net.ipv4.conf.default.rp_filter" = 1;
+      "net.ipv4.conf.all.accept_redirects" = 0;
+      "net.ipv4.conf.default.accept_redirects" = 0;
+      "net.ipv4.conf.all.secure_redirects" = 0;
+      "net.ipv4.conf.default.secure_redirects" = 0;
+      "net.ipv4.conf.all.send_redirects" = 0;
+      "net.ipv4.conf.default.send_redirects" = 0;
+      "net.ipv4.conf.all.accept_source_route" = 0;
+      "net.ipv4.conf.default.accept_source_route" = 0;
+      "net.ipv4.tcp_syncookies" = 1;
+      "net.ipv4.icmp_echo_ignore_broadcasts" = 1;
+      "net.ipv4.icmp_ignore_bogus_error_responses" = 1;
+      "net.ipv6.conf.all.accept_redirects" = 0;
+      "net.ipv6.conf.default.accept_redirects" = 0;
+      "net.ipv6.conf.all.accept_source_route" = 0;
+      "net.ipv6.conf.default.accept_source_route" = 0;
+      
+      # Kernel security
+      "kernel.dmesg_restrict" = 1;
+      "kernel.kptr_restrict" = 2;
+      "kernel.unprivileged_bpf_disabled" = 1;
+      "kernel.yama.ptrace_scope" = 1;
+      
+      # File system
+      "fs.protected_fifos" = 2;
+      "fs.protected_regular" = 2;
+      "fs.suid_dumpable" = 0;
+    };
+  };
+
+  # Secure system packages
+  environment.systemPackages = with pkgs; [
+    # Security tools
+    cryptsetup
+    gnupg
+    openssl
+    age
+    sops
+    
+    # Password management
+    keepassxc
+  ];
+}
diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix
index 0aa22f9..09f0e6d 100644
--- a/modules/nixos/services/default.nix
+++ b/modules/nixos/services/default.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ./database.nix
+    ./opensnitch.nix
   ];
 
   # Essential services
@@ -13,5 +14,8 @@
     
     # Thumbnails
     tumbler.enable = true;
+    
+    # Tailscale 
+    tailscale.enable = true;
   };
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/services/opensnitch.nix b/modules/nixos/services/opensnitch.nix
new file mode 100644
index 0000000..87e898d
--- /dev/null
+++ b/modules/nixos/services/opensnitch.nix
@@ -0,0 +1,33 @@
+{ config, pkgs, ... }:
+
+{
+  # OpenSnitch - Application firewall GUI
+  services.opensnitch = {
+    enable = true;
+    
+    settings = {
+      DefaultAction = "allow"; # Can be "allow" or "deny"
+      DefaultDuration = "until restart";
+      
+      Firewall = "iptables";
+      
+      LogLevel = 1; # 0=error, 1=warning, 2=info, 3=debug
+      
+      ProcMonitorMethod = "ebpf"; # or "proc" for older kernels
+      
+      Stats = {
+        MaxEvents = 1000;
+        MaxStats = 1000;
+      };
+      
+      UI = {
+        Theme = "dark";
+      };
+    };
+  };
+  
+  # GUI package
+  environment.systemPackages = with pkgs; [
+    opensnitch-ui
+  ];
+}
diff --git a/modules/nixos/system/auto-gc.nix b/modules/nixos/system/auto-gc.nix
new file mode 100644
index 0000000..f4e9883
--- /dev/null
+++ b/modules/nixos/system/auto-gc.nix
@@ -0,0 +1,34 @@
+{ config, pkgs, ... }:
+
+{
+  # Automatic garbage collection and optimization
+  nix = {
+    # Garbage collection
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than 30d";
+    };
+    
+    # Store optimization
+    optimise = {
+      automatic = true;
+      dates = [ "weekly" ];
+    };
+    
+    # Additional settings
+    settings = {
+      auto-optimise-store = true;
+      
+      # Clean up build artifacts
+      min-free = "${toString (5 * 1024 * 1024 * 1024)}"; # 5GB
+      max-free = "${toString (10 * 1024 * 1024 * 1024)}"; # 10GB
+    };
+  };
+  
+  # Systemd tmpfiles cleanup
+  systemd.tmpfiles.rules = [
+    "d /tmp 1777 root root 10d"
+    "d /var/tmp 1777 root root 30d"
+  ];
+}
diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix
index 0a43c2b..694602e 100644
--- a/modules/nixos/system/default.nix
+++ b/modules/nixos/system/default.nix
@@ -1,6 +1,13 @@
 { config, pkgs, ... }:
 
 {
+  imports = [
+    ./security.nix
+    ./maintenance.nix
+    ./auto-gc.nix
+    ./laptop.nix
+  ];
+
   # System-wide configuration that doesn't fit elsewhere
   
   # Performance optimizations
@@ -18,4 +25,4 @@
 
   # Power management
   services.power-profiles-daemon.enable = true;
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/system/laptop.nix b/modules/nixos/system/laptop.nix
new file mode 100644
index 0000000..4f7d4b7
--- /dev/null
+++ b/modules/nixos/system/laptop.nix
@@ -0,0 +1,53 @@
+{ config, pkgs, lib, ... }:
+
+{
+  # Laptop-specific configurations
+  
+  # Disable power-profiles-daemon to avoid conflicts with auto-cpufreq
+  services.power-profiles-daemon.enable = lib.mkForce false;
+  
+  # Auto CPU frequency scaling
+  services.auto-cpufreq = {
+    enable = true;
+    settings = {
+      battery = {
+        governor = "powersave";
+        scaling_min_freq = 800000;
+        scaling_max_freq = 2400000;
+        turbo = "never";
+        enable_thresholds = true;
+        start_threshold = 20;
+        stop_threshold = 80;
+      };
+      
+      charger = {
+        governor = "performance";
+        scaling_min_freq = 1000000;
+        scaling_max_freq = 3500000;
+        turbo = "auto";
+        enable_thresholds = false;
+      };
+    };
+  };
+  
+  # TLP conflicts with auto-cpufreq, so disable it
+  services.tlp.enable = lib.mkForce false;
+  
+  # Battery optimization
+  services.upower = {
+    enable = true;
+    percentageLow = 20;
+    percentageCritical = 10;
+    percentageAction = 5;
+    criticalPowerAction = "Hibernate";
+  };
+  
+  # Thermald for Intel CPUs
+  services.thermald.enable = true;
+  
+  # Laptop mode tools
+  powerManagement = {
+    enable = true;
+    powertop.enable = true;
+  };
+}
diff --git a/modules/nixos/system/maintenance.nix b/modules/nixos/system/maintenance.nix
new file mode 100644
index 0000000..1f90f5a
--- /dev/null
+++ b/modules/nixos/system/maintenance.nix
@@ -0,0 +1,71 @@
+{ config, pkgs, ... }:
+
+{
+  # Automatic garbage collection
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 30d";
+  };
+
+  # Optimize nix store
+  nix.optimise = {
+    automatic = true;
+    dates = [ "weekly" ];
+  };
+
+  # Automatic system updates (optional - be careful with this)
+  # system.autoUpgrade = {
+  #   enable = true;
+  #   flake = "/home/tim/.dotfiles";
+  #   flags = [
+  #     "--update-input"
+  #     "nixpkgs"
+  #     "-L"  # print build logs
+  #   ];
+  #   dates = "weekly";
+  #   allowReboot = false;
+  # };
+
+  # SMART monitoring for disk health
+  services.smartd = {
+    enable = true;
+    autodetect = true;
+    notifications = {
+      wall.enable = true;
+      # Uncomment and configure if you want email notifications
+      # mail = {
+      #   enable = true;
+      #   sender = "root@localhost";
+      #   recipient = "tim@localhost";
+      # };
+    };
+  };
+
+  # Periodic SSD TRIM
+  services.fstrim = {
+    enable = true;
+    interval = "weekly";
+  };
+
+  # System monitoring tools
+  environment.systemPackages = with pkgs; [
+    smartmontools  # Disk health
+    lm_sensors     # Temperature sensors
+    pciutils       # lspci
+    usbutils       # lsusb
+    hdparm         # Disk info
+    iotop          # I/O monitoring
+    nethogs        # Network per-process monitoring
+    home-manager
+  ];
+
+  # Temperature and fan monitoring
+  services.thermald.enable = true;  # Intel only
+
+  # Logging configuration
+  services.journald.extraConfig = ''
+    SystemMaxUse=500M
+    MaxRetentionSec=7day
+  '';
+}
diff --git a/modules/nixos/system/security.nix b/modules/nixos/system/security.nix
new file mode 100644
index 0000000..721f133
--- /dev/null
+++ b/modules/nixos/system/security.nix
@@ -0,0 +1,78 @@
+{ config, pkgs, ... }:
+
+{
+  # Firewall configuration
+  networking.firewall = {
+    enable = true;
+    
+    # Allow specific ports
+    allowedTCPPorts = [
+      5432  # PostgreSQL
+      22    # SSH (if needed)
+      80    # HTTP (if needed)
+      443   # HTTPS (if needed)
+    ];
+    
+    allowedUDPPorts = [
+      53  # DNS
+    ];
+    
+    # Trusted interfaces (if using VPN)
+    trustedInterfaces = [ "lo" ];
+    
+    # Log refused connections
+    logRefusedConnections = true;
+    logRefusedPackets = false;  # Can be noisy
+  };
+
+  # Fail2ban for brute force protection
+  services.fail2ban = {
+    enable = true;
+    maxretry = 5;
+    bantime = "10m";
+    bantime-increment = {
+      enable = true;
+      maxtime = "168h";  # 1 week
+      factor = "4";
+    };
+  };
+
+  # USB Guard (optional - uncomment if you want USB device control)
+  # services.usbguard = {
+  #   enable = true;
+  #   rules = ''
+  #     # Allow all USB devices by default (customize as needed)
+  #     allow with-interface equals { 08:*:* }  # Mass storage
+  #     allow with-interface equals { 03:*:* }  # HID devices
+  #   '';
+  # };
+
+  # Security enhancements
+  security = {
+    # Sudo configuration
+    sudo.extraConfig = ''
+      Defaults timestamp_timeout=30
+      Defaults insults
+    '';
+    
+    # Polkit already enabled in desktop module
+    
+    # Additional security options
+    protectKernelImage = true;
+  };
+
+  # AppArmor profiles (optional but recommended)
+  security.apparmor = {
+    enable = true;
+    packages = [ pkgs.apparmor-profiles ];
+  };
+
+  # System audit
+  security.auditd.enable = true;
+  security.audit = {
+    enable = true;
+    rules = [
+      "-a exit,always -F arch=b64 -S execve"
+    ];
+  };
+}
diff --git a/pkgs/dbeaver-ee/default.nix b/pkgs/dbeaver-ee/default.nix
new file mode 100644
index 0000000..ca3b41e
--- /dev/null
+++ b/pkgs/dbeaver-ee/default.nix
@@ -0,0 +1,97 @@
+{ lib
+, stdenv
+, fetchurl
+, buildFHSEnv
+, makeDesktopItem
+, copyDesktopItems
+, jdk
+, gtk3
+, glib
+, libXtst
+, webkitgtk_4_1
+, libsecret
+, gsettings-desktop-schemas
+, wrapGAppsHook3
+}:
+
+let
+  pname = "dbeaver-ee";
+  version = "25.2.0";
+
+  dbeaver-ee-unwrapped = stdenv.mkDerivation {
+    inherit pname version;
+
+    src = fetchurl {
+      url = "https://dbeaver.com/files/${version}/dbeaver-ee-${version}-linux.gtk.x86_64-nojdk.tar.gz";
+      sha256 = "Sqi8un3FU680vhscTEw+zxdy0DdBKNYDL+vWxbRhnhk=";
+    };
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/opt/dbeaver
+      cp -r . $out/opt/dbeaver
+
+      # Copy icon
+      mkdir -p $out/share/pixmaps
+      cp dbeaver.png $out/share/pixmaps/dbeaver-ee.png
+
+      runHook postInstall
+    '';
+
+    meta = with lib; {
+      homepage = "https://dbeaver.com/";
+      description = "Universal Database Manager and SQL Client - Enterprise Edition";
+      platforms = platforms.linux;
+      license = licenses.unfree;
+    };
+  };
+
+in buildFHSEnv {
+  name = "dbeaver";
+
+  targetPkgs = pkgs: with pkgs; [
+    dbeaver-ee-unwrapped
+    jdk
+    gtk3
+    glib
+    libXtst
+    webkitgtk_4_1
+    libsecret
+    gsettings-desktop-schemas
+    
+    # Additional dependencies that might be needed
+    xorg.libX11
+    xorg.libXext
+    xorg.libXi
+    xorg.libXtst
+    xorg.libXrender
+    fontconfig
+    freetype
+    zlib
+  ];
+
+  runScript = "${dbeaver-ee-unwrapped}/opt/dbeaver/dbeaver";
+
+  extraInstallCommands = ''
+    mkdir -p $out/share/applications
+    cat > $out/share/applications/dbeaver-ee.desktop <<EOF
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=DBeaver Enterprise
+Comment=Universal Database Manager and SQL Client
+Exec=$out/bin/dbeaver
+Icon=${dbeaver-ee-unwrapped}/share/pixmaps/dbeaver-ee.png
+Terminal=false
+Categories=Development;Database;
+Keywords=SQL;MySQL;PostgreSQL;Oracle;Database;
+StartupWMClass=DBeaver
+EOF
+
+    mkdir -p $out/share/pixmaps
+    ln -s ${dbeaver-ee-unwrapped}/share/pixmaps/dbeaver-ee.png $out/share/pixmaps/
+  '';
+
+  meta = dbeaver-ee-unwrapped.meta;
+}
diff --git a/pkgs/default.nix b/pkgs/default.nix
new file mode 100644
index 0000000..9d731dc
--- /dev/null
+++ b/pkgs/default.nix
@@ -0,0 +1,4 @@
+final: prev: {
+  dbeaver-ee = final.callPackage ./dbeaver-ee { };
+  rofi-themes-adi1090x = final.callPackage ./rofi-themes-adi1090x { };
+}
diff --git a/pkgs/rofi-themes-adi1090x/default.nix b/pkgs/rofi-themes-adi1090x/default.nix
new file mode 100644
index 0000000..29728a5
--- /dev/null
+++ b/pkgs/rofi-themes-adi1090x/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation {
+  pname = "rofi-themes-adi1090x";
+  version = "2024-11-06";
+
+  src = fetchFromGitHub {
+    owner = "adi1090x";
+    repo = "rofi";
+    rev = "093c1a79f58daab358199c4246de50357e5bf462";
+    hash = "sha256-iUX0Quae06tGd7gDgXZo1B3KYgPHU+ADPBrowHlv02A=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/rofi/themes
+    cp -r files/* $out/share/rofi/themes/
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A huge collection of Rofi based custom Applets, Launchers & Powermenus";
+    homepage = "https://github.com/adi1090x/rofi";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ ];
+  };
+}
diff --git a/result b/result
index 4cdb979..da2cd98 120000
--- a/result
+++ b/result
@@ -1 +1 @@
-/nix/store/jwpjamx5yzwh85kbx4kxm098m34w8dqz-nixos-system-nixos-25.11.20251007.c9b6fb7
\ No newline at end of file
+/nix/store/jx5jvhwyk5fvwyisk7is2yk3xlm6d5l1-dbeaver
\ No newline at end of file
diff --git a/scripts/install-enhancements.sh b/scripts/install-enhancements.sh
new file mode 100755
index 0000000..24d0470
--- /dev/null
+++ b/scripts/install-enhancements.sh
@@ -0,0 +1,95 @@
+#!/usr/bin/env bash
+# Script to install the enhancement files to your dotfiles
+
+set -euo pipefail
+
+DOTFILES_DIR="${HOME}/.dotfiles"
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+# Colors
+GREEN='\033[0;32m'
+BLUE='\033[0;34m'
+YELLOW='\033[1;33m'
+NC='\033[0m'
+
+echo -e "${BLUE}Installing dotfiles enhancements...${NC}"
+echo
+
+# Create directories if they don't exist
+echo -e "${BLUE}Creating directories...${NC}"
+mkdir -p "${DOTFILES_DIR}/modules/nixos/system"
+mkdir -p "${DOTFILES_DIR}/modules/home-manager/services"
+mkdir -p "${DOTFILES_DIR}/modules/home-manager/desktop"
+mkdir -p "${DOTFILES_DIR}/modules/home-manager/programs/network"
+mkdir -p "${DOTFILES_DIR}/templates/devshells/python"
+mkdir -p "${DOTFILES_DIR}/templates/devshells/nodejs"
+mkdir -p "${DOTFILES_DIR}/templates/devshells/rust"
+mkdir -p "${DOTFILES_DIR}/docs"
+mkdir -p "${DOTFILES_DIR}/configs/hyprland"
+mkdir -p "${DOTFILES_DIR}/scripts"
+
+echo -e "${GREEN}✓ Directories created${NC}"
+echo
+
+# Instructions for manual file creation
+echo -e "${YELLOW}Please create the following files manually:${NC}"
+echo
+echo "1. Security Module:"
+echo "   ${DOTFILES_DIR}/modules/nixos/system/security.nix"
+echo
+echo "2. Maintenance Module:"
+echo "   ${DOTFILES_DIR}/modules/nixos/system/maintenance.nix"
+echo
+echo "3. Backup Module:"
+echo "   ${DOTFILES_DIR}/modules/home-manager/services/backup.nix"
+echo
+echo "4. Notifications Module:"
+echo "   ${DOTFILES_DIR}/modules/home-manager/desktop/notifications.nix"
+echo
+echo "5. Network Module:"
+echo "   ${DOTFILES_DIR}/modules/home-manager/programs/network/default.nix"
+echo
+echo "6. Hyprland Additions:"
+echo "   ${DOTFILES_DIR}/configs/hyprland/hyprland-additions.conf"
+echo
+echo "7. Scripts:"
+echo "   ${DOTFILES_DIR}/scripts/system-monitor.sh"
+echo "   ${DOTFILES_DIR}/scripts/power-menu.sh"
+echo "   ${DOTFILES_DIR}/scripts/rollback.sh"
+echo
+echo "8. Development Shell Templates:"
+echo "   ${DOTFILES_DIR}/templates/devshells/python/flake.nix"
+echo "   ${DOTFILES_DIR}/templates/devshells/nodejs/flake.nix"
+echo "   ${DOTFILES_DIR}/templates/devshells/rust/flake.nix"
+echo "   ${DOTFILES_DIR}/templates/README.md"
+echo
+echo "9. Documentation:"
+echo "   ${DOTFILES_DIR}/docs/TROUBLESHOOTING.md"
+echo
+echo -e "${BLUE}After creating the files, follow these steps:${NC}"
+echo
+echo "1. Update module imports:"
+echo "   Edit ${DOTFILES_DIR}/modules/home-manager/default.nix"
+echo "   Add: ./services/backup.nix"
+echo "   Add: ./programs/network"
+echo
+echo "2. Update desktop module imports:"
+echo "   Edit ${DOTFILES_DIR}/modules/home-manager/desktop/default.nix"
+echo "   Add: ./notifications.nix"
+echo
+echo "3. Make scripts executable:"
+echo "   chmod +x ${DOTFILES_DIR}/scripts/*.sh"
+echo
+echo "4. Add Hyprland additions to main config:"
+echo "   Add this line to ${DOTFILES_DIR}/configs/hyprland/hyprland.conf:"
+echo "   source = ~/.dotfiles/configs/hyprland/hyprland-additions.conf"
+echo
+echo "5. Test configuration:"
+echo "   cd ${DOTFILES_DIR}"
+echo "   make check"
+echo
+echo "6. Apply changes:"
+echo "   make switch-system"
+echo "   make switch-home"
+echo
+echo -e "${GREEN}✓ Setup instructions complete!${NC}"
diff --git a/scripts/power-menu.sh b/scripts/power-menu.sh
new file mode 100755
index 0000000..6475bc0
--- /dev/null
+++ b/scripts/power-menu.sh
@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+# Power menu using rofi
+
+set -euo pipefail
+
+# Options
+shutdown="⏻ Shutdown"
+reboot="⟳ Reboot"
+logout="⎆ Logout"
+lock="🔒 Lock"
+suspend="⏾ Suspend"
+hibernate="⏼ Hibernate"
+
+# Show menu
+chosen=$(echo -e "$lock\n$logout\n$suspend\n$hibernate\n$reboot\n$shutdown" | \
+    rofi -dmenu \
+    -i \
+    -p "Power Menu" \
+    -theme-str 'window { width: 300px; }' \
+    -theme-str 'listview { lines: 6; }')
+
+case "$chosen" in
+    "$shutdown")
+        systemctl poweroff
+        ;;
+    "$reboot")
+        systemctl reboot
+        ;;
+    "$logout")
+        # For Hyprland
+        hyprctl dispatch exit
+        ;;
+    "$lock")
+        hyprlock
+        ;;
+    "$suspend")
+        systemctl suspend
+        ;;
+    "$hibernate")
+        systemctl hibernate
+        ;;
+    *)
+        # Do nothing if cancelled
+        ;;
+esac
diff --git a/scripts/rofi-launcher.sh b/scripts/rofi-launcher.sh
new file mode 100755
index 0000000..87b80af
--- /dev/null
+++ b/scripts/rofi-launcher.sh
@@ -0,0 +1,154 @@
+#!/usr/bin/env bash
+
+# Rofi launcher with tabs (Apps, Run, Files, Windows)
+# Catppuccin Mocha Theme
+
+# Create temporary theme with Catppuccin colors
+TEMP_THEME="/tmp/rofi-launcher-catppuccin.rasi"
+
+cat > "$TEMP_THEME" << 'EOF'
+@import "~/.config/rofi/catppuccin-mocha.rasi"
+
+configuration {
+    font: "JetBrainsMono Nerd Font 8";
+    show-icons: true;
+    icon-theme: "Papirus-Dark";
+    display-drun: "  Apps";
+    display-run: " ﬿ Run";
+    display-filebrowser: "  Files";
+    display-window: "  Windows";
+    drun-display-format: "{name}";
+    disable-history: false;
+    sidebar-mode: false;
+}
+
+window {
+    transparency: "real";
+    background-color: @bg0;
+    text-color: @fg0;
+    border: 2px;
+    border-color: @accent;
+    border-radius: 10px;
+    width: 700px;
+    location: center;
+}
+
+prompt {
+    enabled: true;
+    padding: 8px;
+    background-color: @accent;
+    text-color: @bg0;
+    border-radius: 6px;
+}
+
+textbox-prompt-colon {
+    expand: false;
+    str: " ";
+    background-color: @accent;
+    text-color: @bg0;
+    padding: 8px 12px;
+    border-radius: 6px;
+}
+
+entry {
+    background-color: @bg2;
+    text-color: @fg0;
+    placeholder-color: @fg2;
+    placeholder: "Search...";
+    expand: true;
+    horizontal-align: 0;
+    blink: true;
+    padding: 8px;
+    border-radius: 6px;
+}
+
+inputbar {
+    children: [ textbox-prompt-colon, entry ];
+    background-color: @bg1;
+    text-color: @fg0;
+    expand: false;
+    border: 0px 0px 1px 0px;
+    border-radius: 6px;
+    border-color: @accent;
+    margin: 0px 0px 10px 0px;
+    padding: 10px;
+}
+
+listview {
+    background-color: transparent;
+    columns: 2;
+    lines: 8;
+    spacing: 4px;
+    cycle: true;
+    dynamic: true;
+    layout: vertical;
+}
+
+mainbox {
+    background-color: @bg0;
+    children: [ inputbar, mode-switcher, listview ];
+    spacing: 10px;
+    padding: 20px;
+}
+
+element {
+    background-color: @bg1;
+    text-color: @fg0;
+    orientation: horizontal;
+    border-radius: 6px;
+    padding: 8px;
+}
+
+element-icon {
+    background-color: transparent;
+    size: 24px;
+    border: 0;
+}
+
+element-text {
+    background-color: transparent;
+    text-color: inherit;
+    expand: true;
+    horizontal-align: 0;
+    vertical-align: 0.5;
+    margin: 0px 10px 0px 10px;
+}
+
+element selected {
+    background-color: @accent;
+    text-color: @bg0;
+    border-radius: 6px;
+}
+
+element-text selected {
+    text-color: @bg0;
+}
+
+mode-switcher {
+    background-color: @bg1;
+    text-color: @fg0;
+    spacing: 0;
+    border: 2px;
+    border-color: @accent;
+    border-radius: 6px;
+}
+
+button {
+    padding: 10px;
+    background-color: @bg1;
+    text-color: @fg0;
+    vertical-align: 0.5;
+    horizontal-align: 0.5;
+}
+
+button selected {
+    background-color: @accent;
+    text-color: @bg0;
+    border-radius: 4px;
+}
+EOF
+
+rofi -show drun \
+    -modi "drun,run,filebrowser,window" \
+    -theme "$TEMP_THEME"
+
diff --git a/scripts/rofi-network.sh b/scripts/rofi-network.sh
new file mode 100755
index 0000000..d38e9d3
--- /dev/null
+++ b/scripts/rofi-network.sh
@@ -0,0 +1,199 @@
+#!/usr/bin/env bash
+
+# Rofi network manager with Catppuccin Mocha theme
+
+TEMP_THEME="/tmp/rofi-network-catppuccin.rasi"
+
+cat > "$TEMP_THEME" << 'EOF'
+@import "~/.config/rofi/catppuccin-mocha.rasi"
+
+configuration {
+    font: "JetBrainsMono Nerd Font 11";
+}
+
+window {
+    transparency: "real";
+    background-color: @bg0;
+    text-color: @fg0;
+    border: 2px;
+    border-color: @accent;
+    border-radius: 10px;
+    width: 400px;
+    location: center;
+}
+
+mainbox {
+    background-color: @bg0;
+    children: [ message, listview ];
+    spacing: 15px;
+    padding: 20px;
+}
+
+message {
+    background-color: @bg1;
+    border-radius: 6px;
+    padding: 12px;
+}
+
+textbox {
+    text-color: @accent;
+    background-color: transparent;
+    horizontal-align: 0.5;
+    font: "JetBrainsMono Nerd Font Bold 11";
+}
+
+listview {
+    background-color: transparent;
+    columns: 1;
+    lines: 10;
+    spacing: 8px;
+    cycle: true;
+    scrollbar: true;
+}
+
+scrollbar {
+    width: 4px;
+    border: 0;
+    handle-color: @accent;
+    padding: 0;
+}
+
+element {
+    background-color: @bg1;
+    text-color: @fg0;
+    border-radius: 6px;
+    padding: 10px;
+}
+
+element-text {
+    background-color: transparent;
+    text-color: inherit;
+    horizontal-align: 0;
+}
+
+element selected {
+    background-color: @accent;
+    text-color: @bg0;
+}
+EOF
+
+# Check if NetworkManager is running
+if ! systemctl is-active --quiet NetworkManager; then
+    notify-send "Network Manager" "NetworkManager is not running" -u critical
+    exit 1
+fi
+
+# Get WiFi status
+wifi_status=$(nmcli radio wifi)
+if [ "$wifi_status" = "enabled" ]; then
+    wifi_icon="󰖩"
+    wifi_state="ON"
+else
+    wifi_icon="󰖪"
+    wifi_state="OFF"
+fi
+
+# Get current connection
+current_connection=$(nmcli -t -f NAME connection show --active | head -n1)
+if [ -n "$current_connection" ]; then
+    connection_status="Connected: $current_connection"
+else
+    connection_status="Not Connected"
+fi
+
+# Build menu
+options="󰖩  WiFi: $wifi_state\n"
+options+="󰈀  Ethernet Status\n"
+options+="  Scan WiFi Networks\n"
+options+="  Disconnect\n"
+options+="  Network Settings"
+
+chosen=$(echo -e "$options" | rofi -dmenu -p "$connection_status" -theme "$TEMP_THEME")
+
+case $chosen in
+    "󰖩  WiFi:"*)
+        if [ "$wifi_status" = "enabled" ]; then
+            nmcli radio wifi off
+            notify-send "WiFi" "WiFi disabled" -i network-wireless-disabled
+        else
+            nmcli radio wifi on
+            notify-send "WiFi" "WiFi enabled" -i network-wireless-enabled
+        fi
+        ;;
+    "󰈀  Ethernet Status")
+        ethernet_status=$(nmcli device status | grep ethernet)
+        notify-send "Ethernet" "$ethernet_status" -i network-wired
+        ;;
+    "  Scan WiFi Networks")
+        # Get list of WiFi networks
+        wifi_list=$(nmcli -t -f SSID,SIGNAL,SECURITY device wifi list | sort -t: -k2 -rn)
+        
+        if [ -z "$wifi_list" ]; then
+            notify-send "WiFi" "No networks found" -u normal
+            exit 0
+        fi
+        
+        # Format for rofi
+        formatted_list=""
+        while IFS=: read -r ssid signal security; do
+            if [ -n "$ssid" ]; then
+                # Show signal strength icon
+                if [ "$signal" -gt 75 ]; then
+                    icon="󰤨"
+                elif [ "$signal" -gt 50 ]; then
+                    icon="󰤥"
+                elif [ "$signal" -gt 25 ]; then
+                    icon="󰤢"
+                else
+                    icon="󰤟"
+                fi
+                
+                # Show lock icon if secured
+                if [ -n "$security" ] && [ "$security" != "--" ]; then
+                    lock="󰌾"
+                else
+                    lock=""
+                fi
+                
+                formatted_list+="$icon $lock  $ssid ($signal%)\n"
+            fi
+        done <<< "$wifi_list"
+        
+        # Show network selection
+        selected=$(echo -e "$formatted_list" | rofi -dmenu -p "Select Network" -theme "$TEMP_THEME")
+        
+        if [ -n "$selected" ]; then
+            # Extract SSID from selection
+            ssid=$(echo "$selected" | sed -E 's/^[^ ]+ [^ ]*  ([^(]+) \([0-9]+%\)$/\1/' | xargs)
+            
+            # Check if network requires password
+            security=$(nmcli -t -f SSID,SECURITY device wifi list | grep "^$ssid:" | cut -d: -f2)
+            
+            if [ -n "$security" ] && [ "$security" != "--" ]; then
+                # Ask for password
+                password=$(rofi -dmenu -p "Password for $ssid" -password -theme "$TEMP_THEME")
+                if [ -n "$password" ]; then
+                    nmcli device wifi connect "$ssid" password "$password" && \
+                        notify-send "WiFi" "Connected to $ssid" -i network-wireless || \
+                        notify-send "WiFi" "Failed to connect to $ssid" -u critical
+                fi
+            else
+                # Connect without password
+                nmcli device wifi connect "$ssid" && \
+                    notify-send "WiFi" "Connected to $ssid" -i network-wireless || \
+                    notify-send "WiFi" "Failed to connect to $ssid" -u critical
+            fi
+        fi
+        ;;
+    "  Disconnect")
+        if [ -n "$current_connection" ]; then
+            nmcli connection down "$current_connection"
+            notify-send "Network" "Disconnected from $current_connection" -i network-offline
+        else
+            notify-send "Network" "No active connection" -u normal
+        fi
+        ;;
+    "  Network Settings")
+        nm-connection-editor &
+        ;;
+esac
diff --git a/scripts/rofi-powermenu.sh b/scripts/rofi-powermenu.sh
new file mode 100755
index 0000000..4e7a9b7
--- /dev/null
+++ b/scripts/rofi-powermenu.sh
@@ -0,0 +1,100 @@
+#!/usr/bin/env bash
+
+# Rofi powermenu using adi1090x type-2 style-2 with Catppuccin Mocha
+
+TEMP_THEME="/tmp/rofi-powermenu-catppuccin.rasi"
+
+cat > "$TEMP_THEME" << 'EOF'
+@import "~/.config/rofi/catppuccin-mocha.rasi"
+
+configuration {
+    font: "JetBrainsMono Nerd Font 12";
+}
+
+window {
+    transparency: "real";
+    background-color: @bg0;
+    text-color: @fg0;
+    border: 2px;
+    border-color: @accent;
+    border-radius: 10px;
+    width: 400px;
+    location: center;
+}
+
+mainbox {
+    background-color: @bg0;
+    children: [ message, listview ];
+    spacing: 15px;
+    padding: 20px;
+}
+
+message {
+    background-color: @bg1;
+    border: 0px;
+    border-color: @accent;
+    border-radius: 6px;
+    padding: 15px;
+}
+
+textbox {
+    text-color: @fg0;
+    background-color: transparent;
+    horizontal-align: 0.5;
+}
+
+listview {
+    background-color: transparent;
+    columns: 3;
+    lines: 2;
+    spacing: 10px;
+    cycle: true;
+    dynamic: true;
+    layout: vertical;
+}
+
+element {
+    background-color: @bg1;
+    text-color: @fg0;
+    orientation: vertical;
+    border-radius: 8px;
+    padding: 20px 0px;
+}
+
+element-text {
+    background-color: transparent;
+    text-color: inherit;
+    font: "feather 32";
+    horizontal-align: 0.5;
+    vertical-align: 0.5;
+}
+
+element selected {
+    background-color: @accent;
+    text-color: @bg0;
+}
+EOF
+
+# Power menu options
+chosen=$(echo -e "⏻\n\n\n\n󰒲\n" | rofi -dmenu -p "Power Menu" -theme "$TEMP_THEME")
+
+case $chosen in
+    "⏻")
+        systemctl poweroff
+        ;;
+    "")
+        systemctl reboot
+        ;;
+    "")
+        systemctl suspend
+        ;;
+    "")
+        systemctl hibernate
+        ;;
+    "󰒲")
+        hyprctl dispatch exit
+        ;;
+    "")
+        swaylock
+        ;;
+esac
diff --git a/scripts/rofi-root-apps.sh b/scripts/rofi-root-apps.sh
new file mode 100755
index 0000000..e5f5d7d
--- /dev/null
+++ b/scripts/rofi-root-apps.sh
@@ -0,0 +1,98 @@
+#!/usr/bin/env bash
+
+# Rofi apps-as-root menu using type-2 with Catppuccin Mocha
+
+TEMP_THEME="/tmp/rofi-root-catppuccin.rasi"
+
+cat > "$TEMP_THEME" << 'EOF'
+@import "~/.config/rofi/catppuccin-mocha.rasi"
+
+configuration {
+    font: "JetBrainsMono Nerd Font 11";
+}
+
+window {
+    transparency: "real";
+    background-color: @bg0;
+    text-color: @fg0;
+    border: 2px;
+    border-color: @urgent;
+    border-radius: 10px;
+    width: 400px;
+    location: center;
+}
+
+mainbox {
+    background-color: @bg0;
+    children: [ message, listview ];
+    spacing: 15px;
+    padding: 20px;
+}
+
+message {
+    background-color: @bg1;
+    border: 1px;
+    border-color: @urgent;
+    border-radius: 6px;
+    padding: 12px;
+}
+
+textbox {
+    text-color: @urgent;
+    background-color: transparent;
+    horizontal-align: 0.5;
+    font: "JetBrainsMono Nerd Font Bold 11";
+}
+
+listview {
+    background-color: transparent;
+    columns: 1;
+    lines: 6;
+    spacing: 8px;
+    cycle: true;
+}
+
+element {
+    background-color: @bg1;
+    text-color: @fg0;
+    border-radius: 6px;
+    padding: 12px;
+}
+
+element-text {
+    background-color: transparent;
+    text-color: inherit;
+    horizontal-align: 0;
+}
+
+element selected {
+    background-color: @urgent;
+    text-color: @bg0;
+}
+EOF
+
+# Root apps options
+options="  File Manager (Thunar)\n  Terminal\n  Text Editor (Neovim)\n󰒓  System Monitor\n  Package Manager\n  Disk Usage Analyzer"
+
+chosen=$(echo -e "$options" | rofi -dmenu -p "⚠ Run as Root" -theme "$TEMP_THEME" -mesg "⚠ WARNING: Running apps as root can be dangerous!")
+
+case $chosen in
+    "  File Manager (Thunar)")
+        pkexec thunar &
+        ;;
+    "  Terminal")
+        pkexec kitty &
+        ;;
+    "  Text Editor (Neovim)")
+        pkexec kitty -e nvim &
+        ;;
+    "󰒓  System Monitor")
+        pkexec kitty -e btop &
+        ;;
+    "  Package Manager")
+        pkexec kitty -e nix-shell -p nix --run "nix-env -qaP" &
+        ;;
+    "  Disk Usage Analyzer")
+        pkexec baobab &
+        ;;
+esac
diff --git a/scripts/rofi-screenshot.sh b/scripts/rofi-screenshot.sh
new file mode 100755
index 0000000..8341203
--- /dev/null
+++ b/scripts/rofi-screenshot.sh
@@ -0,0 +1,103 @@
+#!/usr/bin/env bash
+
+# Rofi screenshot menu using type-2 with Catppuccin Mocha
+
+TEMP_THEME="/tmp/rofi-screenshot-catppuccin.rasi"
+SCREENSHOT_DIR="${HOME}/Pictures/Screenshots"
+mkdir -p "$SCREENSHOT_DIR"
+
+cat > "$TEMP_THEME" << 'EOF'
+@import "~/.config/rofi/catppuccin-mocha.rasi"
+
+configuration {
+    font: "JetBrainsMono Nerd Font 11";
+}
+
+window {
+    transparency: "real";
+    background-color: @bg0;
+    text-color: @fg0;
+    border: 2px;
+    border-color: @accent;
+    border-radius: 10px;
+    width: 350px;
+    location: center;
+}
+
+mainbox {
+    background-color: @bg0;
+    children: [ message, listview ];
+    spacing: 15px;
+    padding: 20px;
+}
+
+message {
+    background-color: @bg1;
+    border-radius: 6px;
+    padding: 12px;
+}
+
+textbox {
+    text-color: @fg0;
+    background-color: transparent;
+    horizontal-align: 0.5;
+}
+
+listview {
+    background-color: transparent;
+    columns: 1;
+    lines: 4;
+    spacing: 8px;
+    cycle: true;
+}
+
+element {
+    background-color: @bg1;
+    text-color: @fg0;
+    border-radius: 6px;
+    padding: 12px;
+}
+
+element-text {
+    background-color: transparent;
+    text-color: inherit;
+    horizontal-align: 0;
+}
+
+element selected {
+    background-color: @accent;
+    text-color: @bg0;
+}
+EOF
+
+# Screenshot options
+options="󰹑  Fullscreen\n  Selection\n  Window\n  Delay 3s"
+
+chosen=$(echo -e "$options" | rofi -dmenu -p "Screenshot" -theme "$TEMP_THEME")
+
+filename="${SCREENSHOT_DIR}/screenshot_$(date +%Y%m%d_%H%M%S).png"
+
+case $chosen in
+    "󰹑  Fullscreen")
+        grim "$filename"
+        notify-send "Screenshot" "Fullscreen saved to $filename" -i "$filename"
+        ;;
+    "  Selection")
+        grim -g "$(slurp)" "$filename"
+        notify-send "Screenshot" "Selection saved to $filename" -i "$filename"
+        ;;
+    "  Window")
+        grim -g "$(hyprctl -j activewindow | jq -r '"\(.at[0]),\(.at[1]) \(.size[0])x\(.size[1])"')" "$filename"
+        notify-send "Screenshot" "Window saved to $filename" -i "$filename"
+        ;;
+    "  Delay 3s")
+        sleep 3
+        grim "$filename"
+        notify-send "Screenshot" "Delayed screenshot saved to $filename" -i "$filename"
+        ;;
+esac
+
+# Copy to clipboard
+if [ -f "$filename" ]; then
+    wl-copy < "$filename"
+fi
diff --git a/scripts/rofi-volume.sh b/scripts/rofi-volume.sh
new file mode 100755
index 0000000..27238fc
--- /dev/null
+++ b/scripts/rofi-volume.sh
@@ -0,0 +1,106 @@
+#!/usr/bin/env bash
+
+# Rofi volume control using type-2 with Catppuccin Mocha
+
+TEMP_THEME="/tmp/rofi-volume-catppuccin.rasi"
+
+cat > "$TEMP_THEME" << 'EOF'
+@import "~/.config/rofi/catppuccin-mocha.rasi"
+
+configuration {
+    font: "JetBrainsMono Nerd Font 11";
+}
+
+window {
+    transparency: "real";
+    background-color: @bg0;
+    text-color: @fg0;
+    border: 2px;
+    border-color: @accent;
+    border-radius: 10px;
+    width: 300px;
+    location: center;
+}
+
+mainbox {
+    background-color: @bg0;
+    children: [ message, listview ];
+    spacing: 15px;
+    padding: 20px;
+}
+
+message {
+    background-color: @bg1;
+    border-radius: 6px;
+    padding: 12px;
+}
+
+textbox {
+    text-color: @accent;
+    background-color: transparent;
+    horizontal-align: 0.5;
+    font: "JetBrainsMono Nerd Font Bold 12";
+}
+
+listview {
+    background-color: transparent;
+    columns: 1;
+    lines: 6;
+    spacing: 8px;
+    cycle: true;
+}
+
+element {
+    background-color: @bg1;
+    text-color: @fg0;
+    border-radius: 6px;
+    padding: 10px;
+}
+
+element-text {
+    background-color: transparent;
+    text-color: inherit;
+    horizontal-align: 0;
+}
+
+element selected {
+    background-color: @accent;
+    text-color: @bg0;
+}
+EOF
+
+# Get current volume
+current_vol=$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | awk '{print int($2 * 100)}')
+is_muted=$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | grep -o "MUTED")
+
+if [ -n "$is_muted" ]; then
+    vol_status="󰝟 Muted ($current_vol%)"
+else
+    vol_status="󰕾 Volume: $current_vol%"
+fi
+
+# Volume options
+options="󰝝  Increase (+5%)\n󰝞  Decrease (-5%)\n󰝟  Mute/Unmute\n  Max Volume\n  50%\n  Pavucontrol"
+
+chosen=$(echo -e "$options" | rofi -dmenu -p "$vol_status" -theme "$TEMP_THEME" -mesg "Current: $current_vol%")
+
+case $chosen in
+    "󰝝  Increase (+5%)")
+        wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%+
+        ;;
+    "󰝞  Decrease (-5%)")
+        wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
+        ;;
+    "󰝟  Mute/Unmute")
+        wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+        ;;
+    "  Max Volume")
+        wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 100%
+        ;;
+    "  50%")
+        wpctl set-volume @DEFAULT_AUDIO_SINK@ 50%
+        ;;
+    "  Pavucontrol")
+        pavucontrol &
+        ;;
+esac
diff --git a/scripts/rofi-wifi-toggle.sh b/scripts/rofi-wifi-toggle.sh
new file mode 100755
index 0000000..7e31acb
--- /dev/null
+++ b/scripts/rofi-wifi-toggle.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+# Quick WiFi toggle script
+
+# Check if NetworkManager is running
+if ! systemctl is-active --quiet NetworkManager; then
+    notify-send "WiFi Toggle" "NetworkManager is not running" -u critical
+    exit 1
+fi
+
+# Get current WiFi status
+wifi_status=$(nmcli radio wifi)
+
+# Toggle WiFi
+if [ "$wifi_status" = "enabled" ]; then
+    nmcli radio wifi off
+    notify-send "WiFi" "WiFi Disabled" -i network-wireless-disabled
+else
+    nmcli radio wifi on
+    notify-send "WiFi" "WiFi Enabled" -i network-wireless-enabled
+fi
diff --git a/scripts/rollback.sh b/scripts/rollback.sh
new file mode 100755
index 0000000..5d55744
--- /dev/null
+++ b/scripts/rollback.sh
@@ -0,0 +1,132 @@
+#!/usr/bin/env bash
+# Rollback system or home-manager to previous generation
+
+set -euo pipefail
+
+# Colors
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m'
+BOLD='\033[1m'
+
+show_help() {
+    echo "Usage: $(basename "$0") [system|home] [OPTIONS]"
+    echo ""
+    echo "Rollback NixOS system or Home Manager to a previous generation"
+    echo ""
+    echo "Commands:"
+    echo "  system              Rollback NixOS system configuration"
+    echo "  home                Rollback Home Manager configuration"
+    echo ""
+    echo "Options:"
+    echo "  -l, --list          List available generations"
+    echo "  -n, --number NUM    Rollback to specific generation number"
+    echo "  -h, --help          Show this help message"
+    echo ""
+    echo "Examples:"
+    echo "  $(basename "$0") system --list"
+    echo "  $(basename "$0") system --number 42"
+    echo "  $(basename "$0") home"
+}
+
+list_system_generations() {
+    echo -e "${BLUE}${BOLD}System Generations:${NC}"
+    sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | tail -20
+}
+
+list_home_generations() {
+    echo -e "${BLUE}${BOLD}Home Manager Generations:${NC}"
+    home-manager generations | head -20
+}
+
+rollback_system() {
+    local generation="$1"
+    
+    if [ -n "$generation" ]; then
+        echo -e "${YELLOW}Rolling back system to generation $generation...${NC}"
+        sudo nix-env --switch-generation "$generation" --profile /nix/var/nix/profiles/system
+        sudo /nix/var/nix/profiles/system/bin/switch-to-configuration switch
+    else
+        echo -e "${YELLOW}Rolling back system to previous generation...${NC}"
+        sudo nixos-rebuild switch --rollback
+    fi
+    
+    echo -e "${GREEN}✓ System rollback completed!${NC}"
+}
+
+rollback_home() {
+    local generation="$1"
+    
+    if [ -n "$generation" ]; then
+        echo -e "${YELLOW}Rolling back home-manager to generation $generation...${NC}"
+        home-manager generations | grep "id $generation" | awk '{print $NF}' | while read path; do
+            "$path/activate"
+        done
+    else
+        echo -e "${YELLOW}Rolling back home-manager to previous generation...${NC}"
+        home-manager generations | head -2 | tail -1 | awk '{print $NF}' | while read path; do
+            "$path/activate"
+        done
+    fi
+    
+    echo -e "${GREEN}✓ Home Manager rollback completed!${NC}"
+}
+
+# Parse arguments
+TYPE=""
+ACTION="rollback"
+GENERATION=""
+
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        system|home)
+            TYPE="$1"
+            shift
+            ;;
+        -l|--list)
+            ACTION="list"
+            shift
+            ;;
+        -n|--number)
+            GENERATION="$2"
+            shift 2
+            ;;
+        -h|--help)
+            show_help
+            exit 0
+            ;;
+        *)
+            echo -e "${RED}Unknown option: $1${NC}"
+            show_help
+            exit 1
+            ;;
+    esac
+done
+
+# Validate type
+if [ -z "$TYPE" ]; then
+    echo -e "${RED}Error: Must specify 'system' or 'home'${NC}"
+    echo ""
+    show_help
+    exit 1
+fi
+
+# Execute action
+case "$ACTION" in
+    list)
+        if [ "$TYPE" = "system" ]; then
+            list_system_generations
+        else
+            list_home_generations
+        fi
+        ;;
+    rollback)
+        if [ "$TYPE" = "system" ]; then
+            rollback_system "$GENERATION"
+        else
+            rollback_home "$GENERATION"
+        fi
+        ;;
+esac
diff --git a/scripts/system-monitor.sh b/scripts/system-monitor.sh
new file mode 100755
index 0000000..940ab11
--- /dev/null
+++ b/scripts/system-monitor.sh
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+# System monitoring and health check script
+
+set -euo pipefail
+
+# Colors
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+CYAN='\033[0;36m'
+NC='\033[0m'
+BOLD='\033[1m'
+
+echo -e "${BLUE}${BOLD}╔══════════════════════════════════════════════════════════════════════════════╗${NC}"
+echo -e "${BLUE}${BOLD}║                           SYSTEM HEALTH CHECK                                ║${NC}"
+echo -e "${BLUE}${BOLD}╚══════════════════════════════════════════════════════════════════════════════╝${NC}"
+echo
+
+# Function to check status
+check_status() {
+    if [ $? -eq 0 ]; then
+        echo -e "${GREEN}✓${NC}"
+    else
+        echo -e "${RED}✗${NC}"
+    fi
+}
+
+# Disk Space
+echo -e "${CYAN}${BOLD}Disk Space:${NC}"
+df -h / /home | tail -n +2 | while read line; do
+    usage=$(echo $line | awk '{print $5}' | sed 's/%//')
+    mount=$(echo $line | awk '{print $6}')
+    if [ "$usage" -gt 90 ]; then
+        echo -e "${RED}  ⚠ $mount: ${usage}% used${NC}"
+    elif [ "$usage" -gt 75 ]; then
+        echo -e "${YELLOW}  ⚠ $mount: ${usage}% used${NC}"
+    else
+        echo -e "${GREEN}  ✓ $mount: ${usage}% used${NC}"
+    fi
+done
+echo
+
+# Memory Usage
+echo -e "${CYAN}${BOLD}Memory Usage:${NC}"
+mem_info=$(free -h | grep Mem)
+mem_used=$(echo $mem_info | awk '{print $3}')
+mem_total=$(echo $mem_info | awk '{print $2}')
+mem_percent=$(free | grep Mem | awk '{print int($3/$2 * 100)}')
+if [ "$mem_percent" -gt 90 ]; then
+    echo -e "${RED}  ⚠ ${mem_used}/${mem_total} (${mem_percent}%)${NC}"
+elif [ "$mem_percent" -gt 75 ]; then
+    echo -e "${YELLOW}  ⚠ ${mem_used}/${mem_total} (${mem_percent}%)${NC}"
+else
+    echo -e "${GREEN}  ✓ ${mem_used}/${mem_total} (${mem_percent}%)${NC}"
+fi
+echo
+
+# CPU Temperature
+echo -e "${CYAN}${BOLD}CPU Temperature:${NC}"
+if command -v sensors >/dev/null 2>&1; then
+    sensors | grep -E "Core|Tdie|Package" | while read line; do
+        temp=$(echo $line | grep -oP '\+\K[0-9]+' | head -1)
+        if [ -n "$temp" ]; then
+            if [ "$temp" -gt 80 ]; then
+                echo -e "${RED}  ⚠ $line${NC}"
+            elif [ "$temp" -gt 70 ]; then
+                echo -e "${YELLOW}  ⚠ $line${NC}"
+            else
+                echo -e "${GREEN}  ✓ $line${NC}"
+            fi
+        fi
+    done
+else
+    echo -e "${YELLOW}  ⚠ lm_sensors not installed${NC}"
+fi
+echo
+
+# Disk Health (SMART)
+echo -e "${CYAN}${BOLD}Disk Health:${NC}"
+if command -v smartctl >/dev/null 2>&1; then
+    for disk in /dev/sda /dev/nvme0n1; do
+        if [ -b "$disk" ]; then
+            health=$(sudo smartctl -H "$disk" 2>/dev/null | grep "SMART overall-health" | awk '{print $NF}')
+            if [ "$health" = "PASSED" ]; then
+                echo -e "${GREEN}  ✓ $disk: $health${NC}"
+            else
+                echo -e "${RED}  ✗ $disk: $health${NC}"
+            fi
+        fi
+    done
+else
+    echo -e "${YELLOW}  ⚠ smartmontools not installed${NC}"
+fi
+echo
+
+# Failed systemd services
+echo -e "${CYAN}${BOLD}Failed Services:${NC}"
+failed_services=$(systemctl --failed --no-legend | wc -l)
+if [ "$failed_services" -eq 0 ]; then
+    echo -e "${GREEN}  ✓ No failed services${NC}"
+else
+    echo -e "${RED}  ✗ $failed_services failed service(s):${NC}"
+    systemctl --failed --no-legend | while read line; do
+        echo -e "${RED}    - $line${NC}"
+    done
+fi
+echo
+
+# Journal errors (last hour)
+echo -e "${CYAN}${BOLD}Recent Errors (last hour):${NC}"
+error_count=$(journalctl -p err -S "1 hour ago" --no-pager | grep -c "^--" || true)
+if [ "$error_count" -eq 0 ]; then
+    echo -e "${GREEN}  ✓ No errors in the last hour${NC}"
+else
+    echo -e "${YELLOW}  ⚠ $error_count error(s) in the last hour${NC}"
+    echo -e "${YELLOW}    Run: journalctl -p err -S '1 hour ago' to view${NC}"
+fi
+echo
+
+# Nix store size
+echo -e "${CYAN}${BOLD}Nix Store:${NC}"
+store_size=$(du -sh /nix/store 2>/dev/null | awk '{print $1}')
+echo -e "  📦 Store size: ${store_size}"
+generations=$(sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | wc -l)
+echo -e "  📊 System generations: ${generations}"
+echo
+
+# Last garbage collection
+echo -e "${CYAN}${BOLD}Last Garbage Collection:${NC}"
+if [ -f /nix/var/nix/gcroots/auto/last-gc ]; then
+    last_gc=$(stat -c %y /nix/var/nix/gcroots/auto/last-gc 2>/dev/null | cut -d' ' -f1)
+    echo -e "  🗑️  Last GC: ${last_gc}"
+else
+    echo -e "${YELLOW}  ⚠ No GC information available${NC}"
+fi
+echo
+
+# Network connectivity
+echo -e "${CYAN}${BOLD}Network:${NC}"
+if ping -c 1 1.1.1.1 >/dev/null 2>&1; then
+    echo -e "${GREEN}  ✓ Internet connectivity${NC}"
+else
+    echo -e "${RED}  ✗ No internet connectivity${NC}"
+fi
+echo
+
+# Firewall status
+echo -e "${CYAN}${BOLD}Firewall:${NC}"
+if systemctl is-active --quiet firewall; then
+    echo -e "${GREEN}  ✓ Firewall active${NC}"
+else
+    echo -e "${YELLOW}  ⚠ Firewall not running${NC}"
+fi
+echo
+
+# Summary
+echo -e "${BLUE}${BOLD}╔══════════════════════════════════════════════════════════════════════════════╗${NC}"
+echo -e "${BLUE}${BOLD}║                              HEALTH CHECK COMPLETE                           ║${NC}"
+echo -e "${BLUE}${BOLD}╚══════════════════════════════════════════════════════════════════════════════╝${NC}"
diff --git a/scripts/update-system.sh b/scripts/update-system.sh
new file mode 100755
index 0000000..310a528
--- /dev/null
+++ b/scripts/update-system.sh
@@ -0,0 +1,87 @@
+#!/usr/bin/env bash
+
+# System update script for NixOS with better feedback
+# This script provides clearer feedback during system updates
+
+set -e
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m' # No Color
+
+# Helper functions
+log_info() {
+    echo -e "${BLUE}[INFO]${NC} $1"
+}
+
+log_success() {
+    echo -e "${GREEN}[SUCCESS]${NC} $1"
+}
+
+log_warning() {
+    echo -e "${YELLOW}[WARNING]${NC} $1"
+}
+
+log_error() {
+    echo -e "${RED}[ERROR]${NC} $1"
+}
+
+# Check if we're in the correct directory
+if [[ ! -f "flake.nix" ]]; then
+    log_error "flake.nix not found. Please run this script from your dotfiles directory."
+    exit 1
+fi
+
+log_info "Starting system update process..."
+
+# Step 1: Update flake inputs
+log_info "Step 1/4: Updating flake inputs..."
+if nix flake update; then
+    log_success "Flake inputs updated successfully"
+else
+    log_error "Failed to update flake inputs"
+    exit 1
+fi
+
+# Step 2: Check configuration syntax
+log_info "Step 2/4: Checking configuration syntax..."
+if nix-instantiate --parse flake.nix > /dev/null 2>&1; then
+    log_success "Configuration syntax is valid"
+else
+    log_error "Configuration syntax error found"
+    exit 1
+fi
+
+# Step 3: Build NixOS system (dry run first)
+log_info "Step 3/4: Building NixOS system configuration..."
+if sudo nixos-rebuild build --flake .#nixos; then
+    log_success "NixOS system built successfully"
+else
+    log_error "Failed to build NixOS system"
+    exit 1
+fi
+
+# Step 4: Switch to new configuration
+log_info "Step 4/4: Switching to new NixOS configuration..."
+if sudo nixos-rebuild switch --flake .#nixos; then
+    log_success "Successfully switched to new NixOS configuration"
+else
+    log_error "Failed to switch to new configuration"
+    exit 1
+fi
+
+# Optional: Update Home Manager if available
+if command -v home-manager > /dev/null; then
+    log_info "Updating Home Manager configuration..."
+    if home-manager switch --flake .#tim@nixos; then
+        log_success "Home Manager updated successfully"
+    else
+        log_warning "Home Manager update failed, but system update was successful"
+    fi
+fi
+
+log_success "System update completed! 🎉"
+log_info "You may want to reboot to ensure all changes take effect."
\ No newline at end of file
diff --git a/setup-complete-config.sh b/setup-complete-config.sh
new file mode 100755
index 0000000..3287cb4
--- /dev/null
+++ b/setup-complete-config.sh
@@ -0,0 +1,143 @@
+#!/usr/bin/env bash
+# Complete NixOS Configuration Setup Script
+# Run this after creating all the files
+
+set -e
+
+DOTFILES_DIR="$HOME/.dotfiles"
+BACKUP_DIR="$HOME/.dotfiles-backup-$(date +%Y%m%d-%H%M%S)"
+
+echo "╔════════════════════════════════════════════════════════════════╗"
+echo "║        NixOS Complete Configuration Setup Script              ║"
+echo "║        Intel i5-6300U Laptop Configuration                    ║"
+echo "╚════════════════════════════════════════════════════════════════╝"
+echo ""
+
+# Check if running as root
+if [ "$EUID" -eq 0 ]; then 
+   echo "❌ Please do not run as root"
+   exit 1
+fi
+
+# Create dotfiles directory if it doesn't exist
+if [ ! -d "$DOTFILES_DIR" ]; then
+    echo "📁 Creating $DOTFILES_DIR..."
+    mkdir -p "$DOTFILES_DIR"
+else
+    echo "✅ Dotfiles directory exists"
+fi
+
+cd "$DOTFILES_DIR"
+
+# Create directory structure
+echo ""
+echo "📂 Creating directory structure..."
+
+mkdir -p hosts/nixos
+mkdir -p home/tim
+mkdir -p modules/nixos/{desktop,programs,services,system}
+mkdir -p modules/home-manager/{desktop,programs,services,theming}
+mkdir -p modules/home-manager/programs/{browser,communication,development,data-science,backend,editor,media,productivity,shell,terminal,utilities}
+mkdir -p configs/{hyprland,waybar,docker-compose,nginx}
+mkdir -p scripts
+mkdir -p backup
+
+echo "✅ Directory structure created"
+
+# Backup existing hardware-configuration.nix if it exists
+if [ -f "/etc/nixos/hardware-configuration.nix" ]; then
+    echo ""
+    echo "💾 Backing up hardware-configuration.nix..."
+    sudo cp /etc/nixos/hardware-configuration.nix "$DOTFILES_DIR/hardware-configuration.nix"
+    echo "✅ Hardware configuration backed up"
+else
+    echo "⚠️  Warning: /etc/nixos/hardware-configuration.nix not found"
+    echo "   You'll need to generate it with: sudo nixos-generate-config"
+fi
+
+# Check if flake.nix exists
+if [ ! -f "$DOTFILES_DIR/flake.nix" ]; then
+    echo ""
+    echo "⚠️  Warning: flake.nix not found in $DOTFILES_DIR"
+    echo "   Please ensure all files are created before running this script"
+fi
+
+# Set proper permissions for scripts
+echo ""
+echo "🔐 Setting script permissions..."
+if [ -d "$DOTFILES_DIR/scripts" ]; then
+    chmod +x "$DOTFILES_DIR/scripts"/*.sh 2>/dev/null || true
+    chmod +x "$DOTFILES_DIR/scripts"/*.py 2>/dev/null || true
+    echo "✅ Script permissions set"
+fi
+
+# Initialize git repository if not already initialized
+if [ ! -d "$DOTFILES_DIR/.git" ]; then
+    echo ""
+    echo "🔧 Initializing git repository..."
+    git init
+    git add .
+    git commit -m "Initial commit: Complete NixOS configuration for Intel i5-6300U laptop"
+    echo "✅ Git repository initialized"
+else
+    echo "✅ Git repository already exists"
+fi
+
+# Validate flake syntax
+echo ""
+echo "🔍 Validating flake configuration..."
+if nix flake metadata "$DOTFILES_DIR" &>/dev/null; then
+    echo "✅ Flake syntax is valid"
+else
+    echo "❌ Flake has syntax errors. Please check flake.nix"
+    exit 1
+fi
+
+# Summary
+echo ""
+echo "╔════════════════════════════════════════════════════════════════╗"
+echo "║                    Setup Complete! 🎉                          ║"
+echo "╚════════════════════════════════════════════════════════════════╝"
+echo ""
+echo "📋 Next Steps:"
+echo ""
+echo "1️⃣  Review your configuration:"
+echo "   cd $DOTFILES_DIR"
+echo "   make check"
+echo ""
+echo "2️⃣  Update git configuration in:"
+echo "   modules/home-manager/programs/development/git.nix"
+echo ""
+echo "3️⃣  Build the system (first time may take a while):"
+echo "   sudo nixos-rebuild switch --flake .#nixos"
+echo ""
+echo "4️⃣  Build home-manager:"
+echo "   home-manager switch --flake .#tim@nixos"
+echo ""
+echo "5️⃣  Reboot your system:"
+echo "   sudo reboot"
+echo ""
+echo "6️⃣  After reboot, start databases as needed:"
+echo "   sudo systemctl start postgresql"
+echo "   sudo systemctl start redis"
+echo "   sudo systemctl start mongodb"
+echo ""
+echo "⚡ Performance Notes for your laptop:"
+echo "   - TLP is enabled for battery optimization"
+echo "   - CPU governor: powersave on battery, performance on AC"
+echo "   - Zram: 50% of RAM (~3.7GB compressed swap)"
+echo "   - Database services start manually to save resources"
+echo ""
+echo "🎨 Theme: Catppuccin Mocha throughout"
+echo "   - GRUB bootloader with theme"
+echo "   - SDDM login screen"
+echo "   - Hyprland, Waybar, Kitty"
+echo "   - All applications"
+echo ""
+echo "📚 Useful commands:"
+echo "   nrs  - Rebuild NixOS system"
+echo "   hms  - Rebuild home-manager"
+echo "   make check - Validate config"
+echo "   make clean - Clean old generations"
+echo ""
+echo "Happy coding! 🚀"
diff --git a/templates/README.md b/templates/README.md
new file mode 100644
index 0000000..0508be1
--- /dev/null
+++ b/templates/README.md
@@ -0,0 +1,117 @@
+# Development Shell Templates
+
+Quick start development environments for various languages and frameworks.
+
+## Available Templates
+
+### Python (`python/`)
+Python development environment with common tools and libraries.
+
+**Usage:**
+```bash
+cd your-project
+cp -r ~/.dotfiles/templates/devshells/python/* .
+nix develop
+```
+
+**Includes:**
+- Python 3.11 with pip, setuptools, wheel
+- Black, flake8, mypy, pytest
+- Poetry for dependency management
+- Automatic virtual environment setup
+
+### Node.js (`nodejs/`)
+Modern JavaScript/TypeScript development environment.
+
+**Usage:**
+```bash
+cd your-project
+cp -r ~/.dotfiles/templates/devshells/nodejs/* .
+nix develop
+```
+
+**Includes:**
+- Node.js 20 LTS
+- npm, pnpm, yarn
+- TypeScript, ESLint, Prettier
+- Vite, Webpack
+
+### Rust (`rust/`)
+Rust development environment with cargo tools.
+
+**Usage:**
+```bash
+cd your-project
+cp -r ~/.dotfiles/templates/devshells/rust/* .
+nix develop
+```
+
+**Includes:**
+- Latest stable Rust toolchain
+- rust-analyzer, rust-src
+- cargo-watch, cargo-edit, cargo-audit
+- Common system dependencies
+
+### .NET (`dotnet/`)
+.NET development environment for C#, F#, and ASP.NET Core projects.
+
+**Usage:**
+```bash
+cd your-project
+cp -r ~/.dotfiles/templates/devshells/dotnet/* .
+nix develop
+```
+
+**Includes:**
+- .NET 8 SDK
+- OmniSharp (C# language server)
+- Isolated NuGet package cache
+- Local dotnet tools directory
+- Telemetry disabled by default
+
+### .NET MAUI (`dotnet-maui/`)
+.NET MAUI development environment with Android support and workload installation.
+
+**Usage:**
+```bash
+cd your-project
+cp -r ~/.dotfiles/templates/devshells/dotnet-maui/* .
+nix develop
+# Then install workloads:
+dotnet workload install maui-android
+```
+
+**Includes:**
+- .NET 8 SDK in FHS environment (allows workload installation)
+- Android SDK integration
+- Java 17 for Android development
+- Support for Blazor Hybrid apps
+- MAUI workload support
+
+## Creating Custom Templates
+
+1. Copy an existing template as a base
+2. Modify the `buildInputs` section in `flake.nix`
+3. Update the `shellHook` for custom setup
+4. Add any required system dependencies
+
+## Using with direnv
+
+Add `.envrc` to your project:
+```bash
+use flake
+```
+
+Then run:
+```bash
+direnv allow
+```
+
+The shell will automatically activate when you enter the directory!
+
+## Tips
+
+- Use `nix flake update` to update dependencies
+- Use `nix develop --command zsh` to enter the shell with your preferred shell
+- Combine multiple templates by merging their `buildInputs`
+- Use `nix-shell -p <package>` for quick one-off package access
diff --git a/templates/devshells/dotnet-maui/.envrc b/templates/devshells/dotnet-maui/.envrc
new file mode 100644
index 0000000..3550a30
--- /dev/null
+++ b/templates/devshells/dotnet-maui/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/templates/devshells/dotnet-maui/README.md b/templates/devshells/dotnet-maui/README.md
new file mode 100644
index 0000000..b09f9e9
--- /dev/null
+++ b/templates/devshells/dotnet-maui/README.md
@@ -0,0 +1,233 @@
+# .NET MAUI Development Environment
+
+A Nix flake template for .NET MAUI development with Android support and workload installation capabilities.
+
+## Features
+
+- FHS environment allowing workload installation
+- .NET 8 SDK
+- Android SDK integration
+- Java 17 (required for Android)
+- Support for Blazor Hybrid apps
+
+## Prerequisites
+
+You need to manually install Android SDK command-line tools (Google's licensing prevents us from packaging them directly):
+
+### 1. Download Android cmdline-tools
+
+Visit: https://developer.android.com/studio#command-tools
+
+Download the Linux command-line tools zip file.
+
+### 2. Extract to the correct location
+
+```bash
+mkdir -p ~/.android/sdk/cmdline-tools
+unzip commandlinetools-linux-*.zip -d ~/.android/sdk/cmdline-tools
+mv ~/.android/sdk/cmdline-tools/cmdline-tools ~/.android/sdk/cmdline-tools/latest
+```
+
+### 3. Enter the development environment
+
+```bash
+cd your-maui-project
+cp -r ~/.dotfiles/templates/devshells/dotnet-maui/flake.nix .
+nix develop
+```
+
+### 4. Install MAUI workloads (inside the dev shell)
+
+```bash
+# Install MAUI Android workload
+dotnet workload install maui-android
+
+# Install WebAssembly tools (for Blazor)
+dotnet workload install wasm-tools
+
+# Verify workloads
+dotnet workload list
+```
+
+### 5. Accept Android licenses
+
+```bash
+sdkmanager --licenses
+```
+
+## Creating a MAUI Blazor App
+
+```bash
+# Create new MAUI Blazor app
+dotnet new maui-blazor -n MyMauiApp
+cd MyMauiApp
+
+# Build the app
+dotnet build
+
+# Run on Android emulator
+dotnet build -t:Run -f net8.0-android
+```
+
+## Running on Android
+
+### Option 1: Android Emulator
+
+Create an emulator through Android Studio or:
+
+```bash
+# List available system images
+sdkmanager --list | grep system-images
+
+# Install a system image (example: Android 34)
+sdkmanager "system-images;android-34;google_apis;x86_64"
+
+# Create AVD
+avdmanager create avd -n MyEmulator -k "system-images;android-34;google_apis;x86_64"
+
+# Start emulator
+emulator -avd MyEmulator
+```
+
+Then in another terminal:
+
+```bash
+dotnet build -t:Run -f net8.0-android
+```
+
+### Option 2: Physical Android Device
+
+1. Enable Developer Options on your Android device
+2. Enable USB Debugging
+3. Connect device via USB
+4. Verify connection:
+
+```bash
+adb devices
+```
+
+5. Run app:
+
+```bash
+dotnet build -t:Run -f net8.0-android
+```
+
+## Project Structure
+
+```
+my-maui-app/
+├── flake.nix              # Nix development environment
+├── .envrc                 # direnv configuration (optional)
+├── MyMauiApp/
+│   ├── MyMauiApp.csproj
+│   ├── App.xaml
+│   ├── AppShell.xaml
+│   ├── MainPage.xaml
+│   ├── MauiProgram.cs
+│   └── ...
+└── Platforms/
+    ├── Android/
+    ├── iOS/
+    ├── MacCatalyst/
+    └── Windows/
+```
+
+## Common Commands
+
+```bash
+# List installed workloads
+dotnet workload list
+
+# Update workloads
+dotnet workload update
+
+# Create new MAUI app
+dotnet new maui -n MyApp
+
+# Create new MAUI Blazor app
+dotnet new maui-blazor -n MyApp
+
+# Build for specific platform
+dotnet build -f net8.0-android
+
+# Run on Android
+dotnet build -t:Run -f net8.0-android
+
+# Clean build
+dotnet clean
+```
+
+## Troubleshooting
+
+### Workload installation fails
+
+Make sure you're inside the FHS environment (`nix develop`). The FHS wrapper allows mutable installations.
+
+### Android SDK not found
+
+Verify your Android SDK installation:
+
+```bash
+echo $ANDROID_HOME
+ls -la ~/.android/sdk/cmdline-tools/latest
+```
+
+### Emulator doesn't start
+
+You may need to enable hardware virtualization and install additional Android components:
+
+```bash
+sdkmanager "platform-tools" "platforms;android-34" "build-tools;34.0.0"
+```
+
+### Build fails with "android" workload error
+
+Install the workload:
+
+```bash
+dotnet workload install maui-android
+```
+
+### Java not found
+
+The template includes Java 17. Verify with:
+
+```bash
+echo $JAVA_HOME
+java -version
+```
+
+## Target Frameworks
+
+- `net8.0-android` - Android
+- `net8.0-ios` - iOS (macOS only)
+- `net8.0-maccatalyst` - macOS Catalyst (macOS only)
+- `net8.0-windows` - Windows (Windows only)
+
+On NixOS/Linux, you can primarily target Android.
+
+## Using with direnv
+
+Create `.envrc`:
+
+```bash
+use flake
+```
+
+Then:
+
+```bash
+direnv allow
+```
+
+## Limitations on NixOS
+
+- iOS and macOS Catalyst development requires macOS
+- Windows development requires Windows
+- Android is the primary target platform on Linux
+
+## See Also
+
+- [.NET MAUI Documentation](https://learn.microsoft.com/dotnet/maui/)
+- [Android Developer Guide](https://developer.android.com/studio/command-line)
+- [NixOS Android Development](https://nixos.wiki/wiki/Android)
diff --git a/templates/devshells/dotnet-maui/flake.nix b/templates/devshells/dotnet-maui/flake.nix
new file mode 100644
index 0000000..583839a
--- /dev/null
+++ b/templates/devshells/dotnet-maui/flake.nix
@@ -0,0 +1,104 @@
+{
+  description = ".NET MAUI development environment with workload support";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+        
+        # FHS environment for .NET MAUI with workload support
+        dotnet-maui-fhs = pkgs.buildFHSUserEnv {
+          name = "dotnet-maui";
+          targetPkgs = pkgs: (with pkgs; [
+            # .NET SDK
+            dotnet-sdk_8
+            
+            # Android SDK components
+            android-tools
+            jdk
+            
+            # Required libraries for Android
+            glibc
+            zlib
+            libz
+            openssl
+            icu
+            
+            # Build tools
+            git
+            curl
+            wget
+            unzip
+            
+            # GUI libraries (for Android emulator)
+            xorg.libX11
+            xorg.libXext
+            xorg.libXrender
+            xorg.libXtst
+            xorg.libXi
+            libGL
+            
+            # Additional dependencies
+            stdenv.cc.cc.lib
+            krb5
+            lttng-ust
+          ]);
+          
+          profile = ''
+            export DOTNET_ROOT="${pkgs.dotnet-sdk_8}"
+            export DOTNET_CLI_TELEMETRY_OPTOUT=1
+            export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+            
+            # Android SDK paths
+            export ANDROID_HOME="$HOME/.android/sdk"
+            export ANDROID_SDK_ROOT="$ANDROID_HOME"
+            export PATH="$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$PATH"
+            
+            # Java for Android
+            export JAVA_HOME="${pkgs.jdk}"
+            
+            # Allow workload installation in user directory
+            export DOTNET_CLI_HOME="$HOME/.dotnet"
+            mkdir -p "$DOTNET_CLI_HOME"
+          '';
+          
+          runScript = "zsh";
+        };
+        
+      in {
+        devShells.default = pkgs.mkShell {
+          buildInputs = [ dotnet-maui-fhs ];
+          
+          shellHook = ''
+            echo "🔷 .NET MAUI Development Environment (FHS)"
+            echo ""
+            echo "Entering FHS environment with workload support..."
+            echo ""
+            echo "First time setup:"
+            echo "  1. Install Android SDK cmdline-tools:"
+            echo "     mkdir -p ~/.android/sdk/cmdline-tools"
+            echo "     Download from: https://developer.android.com/studio#command-tools"
+            echo "     Extract to: ~/.android/sdk/cmdline-tools/latest"
+            echo ""
+            echo "  2. Install MAUI workloads:"
+            echo "     dotnet workload install maui-android"
+            echo "     dotnet workload install wasm-tools"
+            echo ""
+            echo "  3. Accept Android licenses:"
+            echo "     sdkmanager --licenses"
+            echo ""
+            echo "Common commands:"
+            echo "  dotnet new maui-blazor -n MyApp    - Create MAUI Blazor app"
+            echo "  dotnet build -t:Run -f net8.0-android  - Run on Android"
+            echo ""
+            exec dotnet-maui
+          '';
+        };
+      }
+    );
+}
diff --git a/templates/devshells/dotnet/.envrc b/templates/devshells/dotnet/.envrc
new file mode 100644
index 0000000..3550a30
--- /dev/null
+++ b/templates/devshells/dotnet/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/templates/devshells/dotnet/README.md b/templates/devshells/dotnet/README.md
new file mode 100644
index 0000000..a769e64
--- /dev/null
+++ b/templates/devshells/dotnet/README.md
@@ -0,0 +1,214 @@
+# .NET Development Environment Template
+
+A Nix flake template for .NET development projects with all necessary tools and dependencies.
+
+## Features
+
+- .NET 8 SDK
+- OmniSharp (C# language server for LSP support)
+- Isolated NuGet package cache
+- Local dotnet tools directory
+- Telemetry disabled by default
+- No first-time experience prompts
+
+## Quick Start
+
+### 1. Initialize a new .NET project
+
+```bash
+# Copy the template to your project
+mkdir my-dotnet-project
+cd my-dotnet-project
+cp -r ~/.dotfiles/templates/devshells/dotnet/flake.nix .
+
+# Or use nix flake init with a custom template path
+nix flake init -t ~/.dotfiles#dotnet
+```
+
+### 2. Enter the development environment
+
+```bash
+nix develop
+```
+
+### 3. Create your .NET project
+
+Inside the dev shell:
+
+```bash
+# Console application
+dotnet new console -n MyApp
+
+# Web API
+dotnet new webapi -n MyApi
+
+# Blazor app
+dotnet new blazor -n MyBlazorApp
+
+# Class library
+dotnet new classlib -n MyLibrary
+
+# xUnit test project
+dotnet new xunit -n MyTests
+```
+
+### 4. Build and run
+
+```bash
+cd MyApp
+dotnet build
+dotnet run
+```
+
+## Common Commands
+
+```bash
+# Restore dependencies
+dotnet restore
+
+# Build project
+dotnet build
+
+# Run project
+dotnet run
+
+# Run with hot reload
+dotnet watch run
+
+# Run tests
+dotnet test
+
+# Add a package
+dotnet add package Newtonsoft.Json
+
+# Install a global tool locally
+dotnet tool install --tool-path .dotnet/tools <tool-name>
+
+# Publish for production
+dotnet publish -c Release -o ./publish
+```
+
+## Project Structure Example
+
+```
+my-dotnet-project/
+├── flake.nix              # Nix development environment
+├── .envrc                 # direnv configuration (optional)
+├── MyApp/
+│   ├── MyApp.csproj
+│   ├── Program.cs
+│   └── ...
+├── MyApp.Tests/
+│   ├── MyApp.Tests.csproj
+│   └── ...
+└── .nuget/                # Local NuGet cache (auto-created)
+    └── packages/
+```
+
+## Using with direnv
+
+Create a `.envrc` file in your project root:
+
+```bash
+use flake
+```
+
+Then run:
+
+```bash
+direnv allow
+```
+
+The development environment will automatically activate when you enter the directory.
+
+## Customization
+
+### Change .NET version
+
+Edit `flake.nix` and replace `dotnet-sdk_8` with your desired version:
+
+```nix
+# .NET 9
+dotnet-sdk_9
+
+# .NET 7
+dotnet-sdk_7
+```
+
+### Add database support
+
+Uncomment database tools in the `buildInputs` section:
+
+```nix
+buildInputs = with pkgs; [
+  dotnet-sdk_8
+  
+  # Database tools
+  postgresql
+  sqlite
+  sqlitebrowser
+  
+  # ...
+];
+```
+
+### Add additional tools
+
+Add any packages you need:
+
+```nix
+buildInputs = with pkgs; [
+  dotnet-sdk_8
+  omnisharp-roslyn
+  
+  # Add your tools
+  azure-cli
+  docker
+  git
+];
+```
+
+## Troubleshooting
+
+### "Read-only file system" error
+
+This happens when trying to use `dotnet workload` commands. In NixOS, workloads should be managed through the Nix configuration, not at runtime.
+
+**Solution**: Use project-specific development shells (like this template) instead of global workload installation.
+
+### NuGet restore fails
+
+Make sure you're inside the nix development shell where `NUGET_PACKAGES` is set correctly.
+
+### OmniSharp not working in VS Code
+
+Make sure you have the C# extension installed and restart VS Code after entering the nix shell.
+
+## Examples
+
+### Web API with Entity Framework
+
+```bash
+nix develop
+dotnet new webapi -n MyApi
+cd MyApi
+dotnet add package Microsoft.EntityFrameworkCore
+dotnet add package Microsoft.EntityFrameworkCore.Sqlite
+dotnet run
+```
+
+### Console app with unit tests
+
+```bash
+nix develop
+dotnet new console -n MyApp
+dotnet new xunit -n MyApp.Tests
+dotnet add MyApp.Tests/MyApp.Tests.csproj reference MyApp/MyApp.csproj
+dotnet test
+```
+
+## See Also
+
+- [.NET Documentation](https://docs.microsoft.com/dotnet/)
+- [NixOS Wiki - DotNet](https://nixos.wiki/wiki/DotNet)
+- [Nix Flakes](https://nixos.wiki/wiki/Flakes)
diff --git a/templates/devshells/dotnet/flake.nix b/templates/devshells/dotnet/flake.nix
new file mode 100644
index 0000000..c9e7500
--- /dev/null
+++ b/templates/devshells/dotnet/flake.nix
@@ -0,0 +1,77 @@
+{
+  description = ".NET development environment";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in {
+        devShells.default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            # .NET SDK (choose version as needed)
+            dotnet-sdk_8
+            
+            # ASP.NET Core runtime (if needed separately)
+            # dotnet-aspnetcore_8
+            
+            # Development tools
+            omnisharp-roslyn  # C# language server
+            
+            # Database tools (uncomment as needed)
+            # postgresql
+            # sqlite
+            # sqlitebrowser
+            
+            # Additional utilities
+            unzip
+            curl
+            wget
+          ];
+          
+          shellHook = ''
+            echo "🔷 .NET Development Environment"
+            echo ".NET version: $(dotnet --version)"
+            echo ""
+            echo "Available commands:"
+            echo "  dotnet new              - Create new project from template"
+            echo "  dotnet build            - Build project"
+            echo "  dotnet run              - Run project"
+            echo "  dotnet test             - Run tests"
+            echo "  dotnet publish          - Publish application"
+            echo ""
+            echo "Common project templates:"
+            echo "  dotnet new console      - Console application"
+            echo "  dotnet new webapi       - ASP.NET Core Web API"
+            echo "  dotnet new mvc          - ASP.NET Core MVC"
+            echo "  dotnet new blazor       - Blazor app"
+            echo "  dotnet new classlib     - Class library"
+            echo "  dotnet new xunit        - xUnit test project"
+            echo ""
+            
+            # Set .NET environment variables
+            export DOTNET_ROOT="${pkgs.dotnet-sdk_8}"
+            export DOTNET_CLI_TELEMETRY_OPTOUT=1
+            export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+            
+            # Create local NuGet cache directory
+            export NUGET_PACKAGES="$PWD/.nuget/packages"
+            mkdir -p "$NUGET_PACKAGES"
+            
+            # Set up local tools path
+            export PATH="$PWD/.dotnet/tools:$PATH"
+            export DOTNET_TOOLS_PATH="$PWD/.dotnet/tools"
+            mkdir -p "$DOTNET_TOOLS_PATH"
+            
+            echo "NuGet packages: $NUGET_PACKAGES"
+            echo "Local tools: $DOTNET_TOOLS_PATH"
+            echo ""
+          '';
+        };
+      }
+    );
+}
diff --git a/templates/devshells/nodejs/flake.nix b/templates/devshells/nodejs/flake.nix
new file mode 100644
index 0000000..8f8871e
--- /dev/null
+++ b/templates/devshells/nodejs/flake.nix
@@ -0,0 +1,56 @@
+{
+  description = "Node.js development environment";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in {
+        devShells.default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            # Node.js and package managers
+            nodejs_24
+            nodePackages.npm
+            nodePackages.pnpm
+            nodePackages.yarn
+            
+            # Development tools
+            nodePackages.typescript
+            nodePackages.typescript-language-server
+            nodePackages.eslint
+            nodePackages.prettier
+            
+            # Build tools
+            nodePackages.vite
+            nodePackages.webpack-cli
+            
+            # Testing
+            nodePackages.jest
+            
+            # Utilities
+            nodePackages.npm-check-updates
+          ];
+          
+          shellHook = ''
+            echo "📦 Node.js Development Environment"
+            echo "Node version: $(node --version)"
+            echo "npm version: $(npm --version)"
+            echo ""
+            echo "Available commands:"
+            echo "  node, npm, pnpm, yarn"
+            echo "  tsc, eslint, prettier"
+            echo ""
+            
+            # Set npm prefix to local directory
+            export NPM_CONFIG_PREFIX="$PWD/.npm-global"
+            export PATH="$NPM_CONFIG_PREFIX/bin:$PATH"
+          '';
+        };
+      }
+    );
+}
diff --git a/templates/devshells/python/flake.nix b/templates/devshells/python/flake.nix
new file mode 100644
index 0000000..386ba15
--- /dev/null
+++ b/templates/devshells/python/flake.nix
@@ -0,0 +1,73 @@
+{
+  description = "Python development environment";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+        
+        # Python with packages
+        pythonEnv = pkgs.python3.withPackages (ps: with ps; [
+          # Core packages
+          pip
+          setuptools
+          wheel
+          
+          # Development tools
+          black
+          flake8
+          mypy
+          pytest
+          pytest-cov
+          ipython
+          
+          # Common libraries
+          requests
+          numpy
+          pandas
+          # Add your packages here
+        ]);
+        
+      in {
+        devShells.default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            pythonEnv
+            
+            # Additional tools
+            poetry
+            ruff  # Fast Python linter
+            
+            # System dependencies (if needed)
+            # postgresql
+            # redis
+          ];
+          
+          shellHook = ''
+            echo "🐍 Python Development Environment"
+            echo "Python version: $(python --version)"
+            echo ""
+            echo "Available commands:"
+            echo "  python, pip, pytest, black, flake8, mypy"
+            echo ""
+            
+            # Set up virtual environment if it doesn't exist
+            if [ ! -d .venv ]; then
+              echo "Creating virtual environment..."
+              python -m venv .venv
+            fi
+            
+            # Activate virtual environment
+            source .venv/bin/activate
+            
+            # Set environment variables
+            export PYTHONPATH="$PWD:$PYTHONPATH"
+          '';
+        };
+      }
+    );
+}
diff --git a/templates/devshells/rust/flake.nix b/templates/devshells/rust/flake.nix
new file mode 100644
index 0000000..168bdf1
--- /dev/null
+++ b/templates/devshells/rust/flake.nix
@@ -0,0 +1,62 @@
+{
+  description = "Rust development environment";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+    rust-overlay.url = "github:oxalica/rust-overlay";
+  };
+
+  outputs = { self, nixpkgs, flake-utils, rust-overlay }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        overlays = [ (import rust-overlay) ];
+        pkgs = import nixpkgs {
+          inherit system overlays;
+        };
+        
+        # Use stable rust or specify version
+        rustToolchain = pkgs.rust-bin.stable.latest.default.override {
+          extensions = [ "rust-src" "rust-analyzer" ];
+        };
+        
+      in {
+        devShells.default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            # Rust toolchain
+            rustToolchain
+            
+            # Build tools
+            cargo-watch
+            cargo-edit
+            cargo-outdated
+            cargo-audit
+            
+            # Additional tools
+            bacon  # Background rust code checker
+            
+            # System dependencies (common)
+            pkg-config
+            openssl
+            
+            # Optional: for cross-compilation
+            # cargo-cross
+          ];
+          
+          # Environment variables
+          RUST_BACKTRACE = "1";
+          
+          shellHook = ''
+            echo "🦀 Rust Development Environment"
+            echo "Rust version: $(rustc --version)"
+            echo "Cargo version: $(cargo --version)"
+            echo ""
+            echo "Available commands:"
+            echo "  cargo, rustc, rust-analyzer"
+            echo "  cargo-watch, cargo-edit, cargo-audit"
+            echo ""
+          '';
+        };
+      }
+    );
+}