From 4ddc81f0babf956f22c5d70acd578eca143651a2 Mon Sep 17 00:00:00 2001 From: Preston Pan Date: Fri, 3 Jan 2025 20:20:16 -0800 Subject: update README link; update to 24.11; initial-deploy script --- README.org | 4 ++-- configuration.nix | 2 +- flake.lock | 28 ++++++++++++++-------------- home.nix | 6 ++---- initial-deploy.sh | 24 ++++++++++++++++++++++-- 5 files changed, 41 insertions(+), 23 deletions(-) mode change 100644 => 100755 initial-deploy.sh diff --git a/README.org b/README.org index ac6cffe..9a3a9ba 100644 --- a/README.org +++ b/README.org @@ -12,7 +12,7 @@ much less cruft. Simply clone the contents of this repository to ~/etc/nixos/~ and run ~sudo nixos-rebuild switch~. Note that afterwards you will need a ~$HOME/.password-store~ in user ~preston~ which has an entry named ~Mail~, as well as a ~~/org/website/~ directory made by cloning my -[[https://github.com/ret2pop/ret2pop-website][ret2pop website]] repository to that location. Here are all the commands: +[[https://git.nullring.xyz/ret2pop-website.git/about/][ret2pop website]] repository to that location. Here are all the commands: #+begin_src shell # run as root # create backup of hardware-configuration.nix and put it back there after @@ -21,7 +21,7 @@ an entry named ~Mail~, as well as a ~~/org/website/~ directory made by cloning m nixos-rebuild switch su preston # copy over gpg and ssh keys - git clone root@nullring.xyz:/var/git/password-store.git ~/.password-store/ + git clone root@nullring.xyz:/var/git/passwords.git ~/.password-store/ mkdir ~/org git clone https://github.com/ret2pop/ret2pop-website ~/org/website/ # get music and put it in ~/music diff --git a/configuration.nix b/configuration.nix index 0ad9399..4643be5 100644 --- a/configuration.nix +++ b/configuration.nix @@ -172,7 +172,7 @@ powerOnBoot = true; }; - opengl = { + graphics = { enable = true; }; diff --git a/flake.lock b/flake.lock index 4ff3256..d41bd99 100644 --- a/flake.lock +++ b/flake.lock @@ -146,16 +146,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1735344290, + "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "613691f285dad87694c2ba1c9e6298d04736292d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -189,16 +189,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", + "lastModified": 1735669367, + "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", + "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -258,11 +258,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735705238, - "narHash": "sha256-b7iPAqFGwY1rRv0xdT/vsZjo8UnbJFPf9U9PC2OuU4U=", + "lastModified": 1735845466, + "narHash": "sha256-DrcWJ8ixKFzl52H/C+XwT7mzygpMnbaxCJzUA3cEGmM=", "owner": "nix-community", "repo": "NUR", - "rev": "21096db6c9ba41cd300a22ee42b86851366bd94f", + "rev": "9421fe22a9563f910858e3a0c946a82e589febae", "type": "github" }, "original": { @@ -355,11 +355,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1735468296, - "narHash": "sha256-ZjUjbvS06jf4fElOF4ve8EHjbpbRVHHypStoY8HGzk8=", + "lastModified": 1735844895, + "narHash": "sha256-CIRlqX9tBK2awJkmVu2cKuap/0QziDXStQZ/u/+e8Z4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "bcb8b65aa596866eb7e5c3e1a6cccbf5d1560b27", + "rev": "24d89184adf76d7ccc99e659dc5f3838efb5ee32", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index 6268007..04893cf 100644 --- a/home.nix +++ b/home.nix @@ -44,7 +44,7 @@ nil nixfmt-rfc-style noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji octaveFull openscad @@ -1094,7 +1094,7 @@ on-notify=exec mpv /home/preston/sounds/notification.wav --no-config --no-video User ret2pop@gmail.com PassCmd "pass Mail" Port 993 - SSLType IMAPS + TLSType IMAPS AuthMechs * CertificateFile /etc/ssl/certs/ca-certificates.crt @@ -1279,8 +1279,6 @@ on-notify=exec mpv /home/preston/sounds/notification.wav --no-config --no-video passes = 2; }; rounding = 5; - shadow_offset = "0 5"; - "col.shadow" = "rgba(00000099)"; }; input = { kb_options = "caps:swapescape"; diff --git a/initial-deploy.sh b/initial-deploy.sh old mode 100644 new mode 100755 index 63f1f90..fe31da2 --- a/initial-deploy.sh +++ b/initial-deploy.sh @@ -1,6 +1,26 @@ #!/bin/sh -# install git first. + +# Install git first, and you'd probably want vim to make changes. +# 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/ + mkdir -p ~/org -git clone git@github.com:ret2pop/ret2pop-website ~/org/website +git clone git@nullring.xyz:/var/git/ret2pop-website ~/org/website +# git clone https://git.nullring.xyz/ret2pop-website.git ~/org/website mkdir -p ~/src git clone git@nullring.xyz:/var/git/publish-org-roam-ui ~/src +# git clone https://git.nullring.xyz/publish-org-roam-ui.git ~/org/website + +cd /etc/nixos +sudo nix --extra-experimental-features nix-command --extra-experimental-features flakes flake update +read -p "press enter to continue with installing after making changes with vim:" +sudo nixos-rebuild switch + +echo "Installlation done! Rebooting..." +sleep 3 +reboot -- cgit