From f87aa20bd274ef4d4eff05efe2362c55586c7be6 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Sun, 5 Mar 2023 00:23:27 -0500 Subject: [PATCH] updated passwords added ssh pub keys --- modules/shell.nix | 22 ++++++++++++---------- systems/game-laptop/default.nix | 7 ++++++- systems/gerg-desktop/default.nix | 19 +++++++++++++++---- systems/mom-laptop/default.nix | 9 +++++++-- systems/mom-laptop/printing.nix | 1 + systems/notbuntu/default.nix | 2 ++ 6 files changed, 43 insertions(+), 17 deletions(-) diff --git a/modules/shell.nix b/modules/shell.nix index 8a9a789..6b95ec2 100644 --- a/modules/shell.nix +++ b/modules/shell.nix @@ -1,4 +1,8 @@ -{fetch-rs, ...}: {pkgs, ...}: rec { +{fetch-rs, ...}: { + pkgs, + config, + ... +}: rec { #put: #source /run/current-system/sw/share/nix-direnv/direnvrc #in ~/.direnvrc @@ -28,9 +32,9 @@ #paste link trick pastebin = "curl -F 'clbin=<-' https://clbin.com"; #nix stuff - nix-update = "nix flake update /etc/nixos/# "; - nix-switch = "nixos-rebuild switch --use-remote-sudo"; - nix-boot = "nixos-rebuild boot --use-remote-sudo"; + nix-update = "nix flake update /etc/nixos/"; + nix-switch = "nixos-rebuild switch --flake /etc/nixos/#${config.networking.hostName} --use-remote-sudo"; + nix-boot = "nixos-rebuild boot --flake /etc/nixos/#${config.networking.hostName} --use-remote-sudo"; nix-clean = "nix-collect-garbage -d"; nix-gc-force = "rm /nix/var/nix/gcroots/auto/*"; nix-gc-check = "nix-store --gc --print-roots | egrep -v \"^(/nix/var|/run/\w+-system|\{memory|/proc)\""; @@ -67,12 +71,10 @@ programs = { zsh = { enable = true; - autosuggestions = { - enable = true; - }; - syntaxHighlighting = { - enable = true; - }; + autosuggestions.enable = true; + syntaxHighlighting.enable = true; + histSize = 1000; + histFile = "$HOME/.cache/zsh_history"; shellInit = '' eval "$(direnv hook zsh)" ''; diff --git a/systems/game-laptop/default.nix b/systems/game-laptop/default.nix index b5e9c81..6ce6f37 100644 --- a/systems/game-laptop/default.nix +++ b/systems/game-laptop/default.nix @@ -51,7 +51,12 @@ inputs: { "root" = { uid = 0; home = "/root"; - initialHashedPassword = "$6$KV00qSRKyx1hpZjX$kwzWN4UuQxHSFwA4vYtRTcYecQyR.Qelvvcr90ZfZ4y.LISUcx2PDHH9/7REwsoAHD./KlAnwlsm1hxeLoGpl/"; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAuO/3IF+AjH8QjW4DAUV7mjlp2Mryd+1UnpAUofS2yA gerg@gerg-phone" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILpYY2uw0OH1Re+3BkYFlxn0O/D8ryqByJB/ljefooNc gerg@gerg-windows" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJWbwkFJmRBgyWyWU+w3ksZ+KuFw9uXJN3PwqqE7Z/i8 gerg@gerg-desktop" + ]; + initialHashedPassword = "$6$hgiDFHEMVEA39Snj$Huxf2a/yd/gSO2ZwntxI5Z65c1kCf35lvbkA61knP5i5NLPuIy4cybBBv9lnd24LVR9sfi9Tss96VQdsGCQhq1"; }; }; }; diff --git a/systems/gerg-desktop/default.nix b/systems/gerg-desktop/default.nix index a5ebf3c..670e0db 100644 --- a/systems/gerg-desktop/default.nix +++ b/systems/gerg-desktop/default.nix @@ -46,7 +46,9 @@ inputs: { inputs.suckless.packages.${pkgs.system}.st ]; #set webcord theme - systemd.tmpfiles.rules = ["L+ /home/gerg/.config/WebCord/Themes/black - - - - ${self}/misc/black.theme.css"]; + systemd.tmpfiles.rules = let + theme = pkgs.writeText "black" (builtins.readFile "${self}/misc/black.theme.css"); + in ["L+ /home/gerg/.config/WebCord/Themes/black - - - - ${theme}"]; networking = { hostName = "gerg-desktop"; @@ -67,9 +69,10 @@ inputs: { } ]; ipv6.addresses = [ - # { - # prefixLength = 64; - # } + { + address = "2605:59c8:252e:500:da5e:d3ff:fee5:4790"; + prefixLength = 64; + } ]; }; }; @@ -85,11 +88,19 @@ inputs: { uid = 1000; isNormalUser = true; extraGroups = ["wheel" "audio"]; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAuO/3IF+AjH8QjW4DAUV7mjlp2Mryd+1UnpAUofS2yA gerg@gerg-phone" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILpYY2uw0OH1Re+3BkYFlxn0O/D8ryqByJB/ljefooNc gerg@gerg-windows" + ]; initialHashedPassword = "$6$hgiDFHEMVEA39Snj$Huxf2a/yd/gSO2ZwntxI5Z65c1kCf35lvbkA61knP5i5NLPuIy4cybBBv9lnd24LVR9sfi9Tss96VQdsGCQhq1"; }; "root" = { uid = 0; home = "/root"; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAuO/3IF+AjH8QjW4DAUV7mjlp2Mryd+1UnpAUofS2yA gerg@gerg-phone" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILpYY2uw0OH1Re+3BkYFlxn0O/D8ryqByJB/ljefooNc gerg@gerg-windows" + ]; initialHashedPassword = "$6$KV00qSRKyx1hpZjX$kwzWN4UuQxHSFwA4vYtRTcYecQyR.Qelvvcr90ZfZ4y.LISUcx2PDHH9/7REwsoAHD./KlAnwlsm1hxeLoGpl/"; }; }; diff --git a/systems/mom-laptop/default.nix b/systems/mom-laptop/default.nix index 114f567..5cb363a 100644 --- a/systems/mom-laptop/default.nix +++ b/systems/mom-laptop/default.nix @@ -18,7 +18,7 @@ inputs: { }; }; - system.stateVersion = "22.11"; + system.stateVersion = "23.05"; environment.systemPackages = [ pkgs.vlc pkgs.nomacs @@ -47,7 +47,12 @@ inputs: { "root" = { uid = 0; home = "/root"; - initialHashedPassword = "$6$KV00qSRKyx1hpZjX$kwzWN4UuQxHSFwA4vYtRTcYecQyR.Qelvvcr90ZfZ4y.LISUcx2PDHH9/7REwsoAHD./KlAnwlsm1hxeLoGpl/"; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAuO/3IF+AjH8QjW4DAUV7mjlp2Mryd+1UnpAUofS2yA gerg@gerg-phone" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILpYY2uw0OH1Re+3BkYFlxn0O/D8ryqByJB/ljefooNc gerg@gerg-windows" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJWbwkFJmRBgyWyWU+w3ksZ+KuFw9uXJN3PwqqE7Z/i8 gerg@gerg-desktop" + ]; + initialHashedPassword = "$6$hgiDFHEMVEA39Snj$Huxf2a/yd/gSO2ZwntxI5Z65c1kCf35lvbkA61knP5i5NLPuIy4cybBBv9lnd24LVR9sfi9Tss96VQdsGCQhq1"; }; }; }; diff --git a/systems/mom-laptop/printing.nix b/systems/mom-laptop/printing.nix index b1dafce..ae97db5 100644 --- a/systems/mom-laptop/printing.nix +++ b/systems/mom-laptop/printing.nix @@ -15,6 +15,7 @@ _: { extraBackends = [pkgs.hplipWithPlugin]; #run this to setup gimp plugin #ln -s /run/current-system/sw/bin/xsane ~/.config/GIMP/2.10/plug-ins/xsane + systemd.tmpfiles.rules = ["L /home/jo/.config/GIMP/2.10/plug-ins/xsane - - - - /run/current-system/sw/bin/xsane"]; }; services = { printing = { diff --git a/systems/notbuntu/default.nix b/systems/notbuntu/default.nix index 15ae4e3..9e31a07 100644 --- a/systems/notbuntu/default.nix +++ b/systems/notbuntu/default.nix @@ -38,6 +38,8 @@ _: {pkgs, ...}: { gitMinimal ]; users.users.root.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAuO/3IF+AjH8QjW4DAUV7mjlp2Mryd+1UnpAUofS2yA gerg@gerg-phone" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILpYY2uw0OH1Re+3BkYFlxn0O/D8ryqByJB/ljefooNc gerg@gerg-windows" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJWbwkFJmRBgyWyWU+w3ksZ+KuFw9uXJN3PwqqE7Z/i8 gerg@gerg-desktop" ]; system.stateVersion = "23.05";