CHANGEME

4 files changed, 26 insertions, 22 deletions

diff --git a/configuration.nix b/configuration.nix
index 4643be5..b220420 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -44,14 +44,16 @@
   };
 
   boot = {
+    # CHANGEME delete this initrd entry
     initrd.luks.devices."luks-30d6b69f-1ec0-4111-b5d3-c0138d485a49".device = "/dev/disk/by-uuid/30d6b69f-1ec0-4111-b5d3-c0138d485a49";
-
+    # CHANGEME delete lanzaboote entry for now
     lanzaboote = {
       enable = true;
       pkiBundle = "/etc/secureboot";
     };
 
     loader = {
+      # CHANGEME to true
       systemd-boot.enable = lib.mkForce false;
       efi.canTouchEfiVariables = true;
     };
@@ -234,6 +236,7 @@
         options = "caps:escape";
       };
 
+      # CHANGEME if using nvidia
       videoDrivers = [];
       enable = true;
     };
@@ -378,6 +381,7 @@
 
   nix.settings.experimental-features = "nix-command flakes";
 
+  # CHANGEME timezone
   time.timeZone = "America/Vancouver";
   i18n.defaultLocale = "en_CA.UTF-8";
   system = {
diff --git a/flake.lock b/flake.lock
index d41bd99..045430f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -189,11 +189,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1735669367,
-        "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=",
+        "lastModified": 1735922141,
+        "narHash": "sha256-vk0xwGZSlvZ/596yxOtsk4gxsIx2VemzdjiU8zhjgWw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9",
+        "rev": "d29ab98cd4a70a387b8ceea3e930b3340d41ac5a",
         "type": "github"
       },
       "original": {
@@ -221,11 +221,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1735471104,
-        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
+        "lastModified": 1735834308,
+        "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
+        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
         "type": "github"
       },
       "original": {
@@ -258,11 +258,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1735845466,
-        "narHash": "sha256-DrcWJ8ixKFzl52H/C+XwT7mzygpMnbaxCJzUA3cEGmM=",
+        "lastModified": 1736022659,
+        "narHash": "sha256-UeUSw27RN8pRH/ZPpjzAS9oRAJJF7y4d5BlOax+JJ/g=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "9421fe22a9563f910858e3a0c946a82e589febae",
+        "rev": "0faee956ebfa57b5c438767a21b28b7fca432368",
         "type": "github"
       },
       "original": {
diff --git a/home.nix b/home.nix
index 5267913..814d42d 100644
--- a/home.nix
+++ b/home.nix
@@ -7,11 +7,12 @@
     stateVersion = "23.11";
     
     packages = with pkgs; [
+      # kicad
       acpilight
       alsa-utils
       autobuild
-      bitcoin
       bear
+      bitcoin
       bun
       cargo
       clang
@@ -32,25 +33,26 @@
       helvum
       imagemagick
       inkscape
-      # kicad
+      jq
       krita
       libnotify
       miniserve
-      monero-gui
       monero-cli
+      monero-gui
       mpc-cli
       mu
-      nixd
       nil
+      nixd
       nixfmt-rfc-style
+      nodejs
       noto-fonts
       noto-fonts-cjk-sans
       noto-fonts-emoji
       octaveFull
       openscad
       openscad-lsp
-      passExtensions.pass-otp
       pandoc
+      passExtensions.pass-otp
       pavucontrol
       pfetch
       pinentry
@@ -64,17 +66,15 @@
       sox
       swww
       texliveFull
-      typescript
       tor-browser
       torsocks
+      typescript
       vesktop
       vim
       vscode-langservers-extracted
       x11_ssh_askpass
       xdg-utils
-      nodejs
       yarn
-      jq
       (aspellWithDicts
         (dicts: with dicts; [ en en-computers en-science ]))
       (nerdfonts.override { fonts = [ "Iosevka" ]; })
diff --git a/initial-deploy.sh b/initial-deploy.sh
index fe31da2..0b97d85 100755
--- a/initial-deploy.sh
+++ b/initial-deploy.sh
@@ -4,10 +4,10 @@
 # You'll also need an ssh key to my server. You can change the
 # sources if you don't have access to my server.
 sudo mv /etc/nixos/configuration.nix /etc/nixos/configuration.nix.old
-sudo ln $HOME/src/hyprnixmacs/flake.nix /etc/nixos/
-sudo ln $HOME/src/hyprnixmacs/flake.lock /etc/nixos/
-sudo ln $HOME/src/hyprnixmacs/configuration.nix /etc/nixos/
-sudo ln $HOME/src/hyprnixmacs/home.nix /etc/nixos/
+sudo ln $HOME/src/toughnix/flake.nix /etc/nixos/
+sudo ln $HOME/src/toughnix/flake.lock /etc/nixos/
+sudo ln $HOME/src/toughnix/configuration.nix /etc/nixos/
+sudo ln $HOME/src/toughnix/home.nix /etc/nixos/
 
 mkdir -p ~/org
 git clone git@nullring.xyz:/var/git/ret2pop-website ~/org/website