aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPreston Pan <ret2pop@gmail.com>2025-01-10 14:20:20 -0800
committerPreston Pan <ret2pop@gmail.com>2025-01-10 14:20:20 -0800
commit82f3b7b522edd220fc6819fb7c36496a7bfff407 (patch)
tree1c134562fc6443ff1c45dd0a093b4b54d7ba699a
parent570901512da178449d7cef2755574e9e786457b3 (diff)
alter config to work on first install
-rw-r--r--README.org11
-rw-r--r--desktop/configuration.nix22
-rw-r--r--desktop/home.nix7
3 files changed, 14 insertions, 26 deletions
diff --git a/README.org b/README.org
index d0e9a9e..f239cd3 100644
--- a/README.org
+++ b/README.org
@@ -14,8 +14,15 @@ You will have to interact with the installer three times. Two of those times wil
for which you should read the files and make the intuitive changes based on the comments_{}^{}_{} in those
files, and once will be to confirm that you want to wipe the disk.
-After this process, reboot and log into your user. You will immediately be taken into Hyprland,
-and Emacs and Firefox will autostart.
+After this process, reboot and log into your user with your username and the password being the
+username. You will immediately be taken into Hyprland, and Emacs and Firefox will autostart.
+Use Windows + Enter in order to spawn a terminal, and then run:
+#+begin_src shell
+ # connect to internet again
+ nmtui
+ post-install
+#+end_src
+use the same disko and variable settings you used when installing the first time.
** Troubleshooting
If you encounter an error in home-manager after building (can't start the home-manager process
because it can't resolve so-and-so hostname), run ~doas nixos-rebuild switch~, and possibly
diff --git a/desktop/configuration.nix b/desktop/configuration.nix
index 79bc5fa..aa5290e 100644
--- a/desktop/configuration.nix
+++ b/desktop/configuration.nix
@@ -5,9 +5,7 @@ in
{
imports = [];
- hardware = {
- enableRedistributableFirmware = true;
- };
+ hardware.enableAllFirmware = true;
documentation = {
enable = true;
@@ -23,14 +21,6 @@ in
'';
};
};
- # environment = {
- # memoryAllocator.provider = "scudo";
- # variables.SCUDO_OPTIONS = "ZeroContents=1";
- # };
-
- # environment = {
- # memoryAllocator.provider = "graphene-hardened-light";
- # };
systemd = {
coredump.enable = false;
@@ -359,15 +349,7 @@ in
auditd.enable = true;
audit.enable = true;
chromiumSuidSandbox.enable = true;
- sudo.enable = false;
- doas = {
- enable = true;
- extraRules = [{
- users = [ vars.userName ];
- keepEnv = true;
- persist = true;
- }];
- };
+ sudo.enable = true;
};
xdg.portal = {
diff --git a/desktop/home.nix b/desktop/home.nix
index ed21c97..0143c00 100644
--- a/desktop/home.nix
+++ b/desktop/home.nix
@@ -13,9 +13,8 @@ in
if [ ! -d "${config.home.homeDirectory}/src/publish-org-roam-ui" ]; then
mkdir -p ${config.home.homeDirectory}/src
${pkgs.git}/bin/git clone https://git.nullring.xyz/publish-org-roam-ui.git ${config.home.homeDirectory}/src/publish-org-roam-ui
- ${pkgs.git}/bin/git clone https://git.nullring.xyz/toughnix.git ${config.home.homeDirectory}/src/toughnix
fi
-
+
if [ ! -d "${config.home.homeDirectory}/.password-store" ]; then
${pkgs.git}/bin/git clone ${vars.passwordRepo} ${config.home.homeDirectory}/.password-store
fi
@@ -1021,8 +1020,8 @@ on-notify=exec mpv /home/${vars.userName}/sounds/notification.wav --no-config --
g = "git";
v = "vim";
py = "python3";
- rb = "doas nixos-rebuild switch --flake .#continuity-dell";
- nfu = "cd ~/src/toughnix && git add . && git commit -m \"new flake lock\" && cd /etc/nixos/ && doas nix flake update";
+ rb = "sudo nixos-rebuild switch --flake .#continuity";
+ nfu = "cd ~/src/toughnix && git add . && git commit -m \"new flake lock\" && nix flake update";
usite
= "cd ~/src/publish-org-roam-ui && bash local.sh && rm -rf ~/website_html/graph_view; cp -r ~/src/publish-org-roam-ui/out ~/website_html/graph_view && rsync -azvP --chmod=\"Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r\" ~/website_html/ ${vars.websiteLocation}";
sai = "eval \"$(ssh-agent -s)\" && ssh-add ~/.ssh/id_ed25519 && ssh-add -l";