diff --git a/deploy b/deploy index adec8b2..9e2f02e 100755 --- a/deploy +++ b/deploy @@ -20,6 +20,7 @@ rebuild_flake () { git add . --verbose if [ "$1" = "reinstall-bootloader" ]; then sudo nixos-rebuild switch --flake . --install-bootloader + # STC_DISPLAY_ALL_UNITS=1 (verbose, show output of all units) else sudo nixos-rebuild switch --flake . #nixos-rebuild build --flake .# --cores 8 -j 1 diff --git a/docs/nixos_notes.md b/docs/nixos_notes.md new file mode 100644 index 0000000..e396b10 --- /dev/null +++ b/docs/nixos_notes.md @@ -0,0 +1,2 @@ +Building specific parts of a NixOS system +https://nixos.org/manual/nixos/stable/#sec-building-parts diff --git a/homes/me/default.nix b/homes/me/default.nix index 2636693..f35678d 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -11,7 +11,6 @@ }; imports = [ - #inputs.hyprpanel.packages.homeManagerModules.hyprpanel ../modules/git.nix ../modules/bat.nix ../modules/fish.nix @@ -23,7 +22,7 @@ ../modules/nixcord.nix #../modules/hypr/hypridle.nix - #../modules/hypr/hyprlock.nix + ../modules/hypr/hyprlock.nix ../modules/kanshi.nix ../modules/ags ]; @@ -93,7 +92,7 @@ # DEBUG: testing if my xdg-desktop-portal-hyprland is working or not obs-studio = { - enable = true; + enable = false; plugins = with pkgs.obs-studio-plugins; [ wlrobs obs-backgroundremoval @@ -126,6 +125,15 @@ port = 22; identityFile = "~/.ssh/id_subspace"; }; + dead = { + hostname = "deadlyserver.com"; + user = "emile"; + port = 29843; + identityFile = "~/.ssh/id_deadlyserver"; + setEnv = { + TERM = "xterm-256color"; + }; + }; youcue = { hostname = "moss.labs.eait.uq.edu.au"; user = "s4740056"; @@ -135,15 +143,6 @@ TERM = "xterm-256color"; }; }; - deadlyserver = { - hostname = "deadlyserver.com"; - user = "emile"; - port = 29843; - identityFile = "~/.ssh/id_deadlyserver"; - setEnv = { - TERM = "xterm-256color"; - }; - }; }; }; diff --git a/homes/subspace/default.nix b/homes/subspace/default.nix index 6b1c0fa..c827022 100644 --- a/homes/subspace/default.nix +++ b/homes/subspace/default.nix @@ -41,12 +41,27 @@ user = "ae"; port = 22; identityFile = "~/.ssh/id_hyrule"; + setEnv = { + TERM = "linux"; + }; }; - YearnForTheMines = { + dead = { hostname = "deadlyserver.com"; user = "emile"; port = 29843; identityFile = "~/.ssh/id_deadlyserver"; + setEnv = { + TERM = "xterm-256color"; + }; + }; + youcue = { + hostname = "moss.labs.eait.uq.edu.au"; + user = "s4740056"; + port = 22; + identityFile = "~/.ssh/id_youcue"; + setEnv = { + TERM = "xterm-256color"; + }; }; }; }; diff --git a/hosts/hyrule/default.nix b/hosts/hyrule/default.nix index 11048b6..c2c0461 100755 --- a/hosts/hyrule/default.nix +++ b/hosts/hyrule/default.nix @@ -450,10 +450,9 @@ in { }; environment.systemPackages = with pkgs; [ + git vim helix - - #wishlist ]; programs = { diff --git a/hosts/imbored/default.nix b/hosts/imbored/default.nix index df99d85..0e0e268 100755 --- a/hosts/imbored/default.nix +++ b/hosts/imbored/default.nix @@ -76,6 +76,7 @@ in { #}; environment.SystemPackages = with pkgs; [ + btop ]; programs = { diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index c06299d..2dcf179 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -117,7 +117,7 @@ in { # literally me fr (personal account) me = { isNormalUser = true; - extraGroups = ["wheel"]; + extraGroups = ["wheel" "docker"]; shell = pkgs.bash; #pkgs.fish packages = let # TODO: can I just do this: https://nix.dev/manual/nix/2.18/command-ref/new-cli/nix3-flake#url-like-syntax @@ -229,6 +229,7 @@ in { acpi vim powertop + gcc # Unix Commands wget @@ -308,6 +309,8 @@ in { "flakes" ]; + virtualisation.docker.enable = true; + # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 117cfee..7e8c5ce 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -213,6 +213,7 @@ in { acpi vim nix-prefetch-git + gcc # Unix Commands wget