diff --git a/home-manager/users/nathan/packages/default.nix b/home-manager/users/nathan/packages/default.nix index 3938444..888b980 100644 --- a/home-manager/users/nathan/packages/default.nix +++ b/home-manager/users/nathan/packages/default.nix @@ -23,6 +23,10 @@ }; home.packages = with pkgs; ([ + + inputs.disko.packages.${pkgs.system}.disko + inputs.disko.packages.${pkgs.system}.disko-install + kjv openssh sops diff --git a/system-config/configuration/iso/default.nix b/system-config/configuration/iso/default.nix index 2fa206e..5c8a1d9 100644 --- a/system-config/configuration/iso/default.nix +++ b/system-config/configuration/iso/default.nix @@ -24,8 +24,6 @@ packages = with pkgs; [ git nerd-fonts.fira-code - inputs.disko.packages.${pkgs.system}.disko - inputs.disko.packages.${pkgs.system}.disko-install ]; }; @@ -77,7 +75,7 @@ services = { sddm.enable = true; - #openssh.enable = false; + openssh.enable = true; pipewire.enable = true; #kdePlasma6.enable = true; netbird.enable = true; diff --git a/system-config/configuration/live/default.nix b/system-config/configuration/live/default.nix index ebfbfdf..f6ef520 100644 --- a/system-config/configuration/live/default.nix +++ b/system-config/configuration/live/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, inputs, modulesPath, ... }: { +{ config, lib, pkgs, inputs, modulesPath, ... }: { imports = with inputs; [ @@ -15,6 +15,22 @@ ]; config = { + + fonts.fontconfig.enable = lib.mkForce true; + environment.systemPackages = with pkgs; [ nerd-fonts.fira-code ]; + + users.users.nixos.enable = lib.mkForce false; + + services.getty.autologinUser = lib.mkForce null; + + programs.zsh.enable = true; + + environment.shells = with pkgs; [ zsh bashInteractive ]; + + networking = { + nameservers = [ "1.1.1.1" "1.0.0.1" ]; + networkmanager.enable = true; + }; nixpkgs.hostPlatform = "x86_64-linux"; @@ -25,6 +41,14 @@ }; }; + users.users."nathan" = { + hashedPassword = "$y$j9T$F0pn6l4C45lz4a0FTZLqE0$Fc48Ptbmz/3MJCk/Jsaqop4ff.bY3J3GcjhmJx5R7k6"; + packages = with pkgs; [ + git + nerd-fonts.fira-code + ]; + }; + sysconfig = { remoteBuildClient = true; host = "live"; @@ -32,8 +56,11 @@ users = { nathan = { extraGroups = [ "wheel" "networkmanager" ]; - hashedPasswordFile = config.sops.secrets."nathan/pass".path; + #hashedPasswordFile = config.sops.secrets."nathan/pass".path; shell = pkgs.zsh; + sshKeys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsU69CxfQk58CvItPN426h5Alnpb60SH37wet97Vb57 nathan@laptop" + ]; home-manager = { enable = true; standalone = false; @@ -49,7 +76,7 @@ calcurse.enable = true; rofi.enable = true; firefox.enable = true; - git.enable = true; + #git.enable = true; nh.enable = true; }; } @@ -60,7 +87,7 @@ services = { sddm.enable = true; - #openssh.enable = false; + openssh.enable = true; pipewire.enable = true; #kdePlasma6.enable = true; netbird.enable = true;