diff --git a/configs/ssh.nix b/configs/ssh.nix index b2b06f4..777c34b 100644 --- a/configs/ssh.nix +++ b/configs/ssh.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, config, ... }: let sshPort = 22022; sshKey = { @@ -17,6 +17,8 @@ in { passwordAuthentication = false; }; + users.motd = "Welcome to ${config.networking.hostName}!"; + users.users.root.openssh.authorizedKeys.keys = [ sshKey.homeros sshKey.scardanelli diff --git a/configs/xautolock.nix b/configs/xautolock.nix index 3457409..6395317 100644 --- a/configs/xautolock.nix +++ b/configs/xautolock.nix @@ -1,15 +1,14 @@ { config, pkgs, lib, ... }: let xlockModes = lib.concatStringsSep "\\n" [ - "braid" + # "braid" "galaxy" "lightning" - "matrix" + # "matrix" "pyro2" "space" - "star" ]; - my-xlock = pkgs.unstable.writers.writeDash "xlock" '' + my-xlock = pkgs.unstable.writers.writeDashBin "xlock" '' MODE=$(printf "${xlockModes}" | shuf -n 1) ${pkgs.xlockmore}/bin/xlock \ diff --git a/configs/zsh.nix b/configs/zsh.nix index 2c823b4..d1f7517 100644 --- a/configs/zsh.nix +++ b/configs/zsh.nix @@ -62,7 +62,7 @@ bindkey -M vicmd 'k' history-substring-search-up bindkey -M vicmd 'j' history-substring-search-down ''; - promptInit = '' + promptInit = with config.niveum; '' autoload -Uz vcs_info zstyle ':vcs_info:*' enable git zstyle ':vcs_info:*' check-for-changes true @@ -76,9 +76,9 @@ vcs_info RPROMPT="$vcs_info_msg_0_" if [[ -n $IN_NIX_SHELL ]]; then - PROMPT='%B%~%b %(?.%F{green}.%F{red})λ%f ' + PROMPT='%B%~%b %(?.%F{${promptColours.success}}.%F{${promptColours.failure}})λ%f ' else - PROMPT='%B%~%b %(?.%F{green}.%F{red})%#%f ' + PROMPT='%B%~%b %(?.%F{${promptColours.success}}.%F{${promptColours.failure}})%#%f ' fi } diff --git a/modules/constants.nix b/modules/constants.nix index a7c05d3..669a487 100644 --- a/modules/constants.nix +++ b/modules/constants.nix @@ -70,6 +70,15 @@ in { ]; }; + networkInterfaces.wireless = mkOption { type = types.str; }; + + promptColours = + let colours16 = types.enum [ "black" "red" "green" "yellow" "blue" "magenta" "cyan" "white" ]; + in { + success = mkOption { type = colours16; default = "green"; }; + failure = mkOption { type = colours16; default = "red"; }; + }; + fonts = { terminal = mkOption { type = my-types.font; }; ui = mkOption { type = my-types.font; };