Switch to using nushell as default again

Keep zsh as defaultUserShell (so same for root user), ensure emacs
also uses zsh instead of nu for POSIX compliance

Switch nu tables back to rounded configuration
This commit is contained in:
Evie Litherland-Smith 2024-02-26 08:34:45 +00:00
parent 4bdd2313e5
commit 513a2df379
4 changed files with 8 additions and 5 deletions

View file

@ -28,7 +28,7 @@
systemModules ? [],
homeModules ? [],
}: let
shell = "zsh";
defaultUserShell = "zsh";
specialArgs = {
inherit hostName user;
accentColour = "base0E"; # magenta
@ -72,7 +72,7 @@
};
nixpkgs.config.allowUnfree = true;
networking = {inherit hostName;};
programs.${shell}.enable = true;
programs.${defaultUserShell}.enable = true;
system = {
inherit stateVersion;
autoUpgrade = {
@ -88,7 +88,7 @@
};
};
users = {
defaultUserShell = pkgs.${shell};
defaultUserShell = pkgs.${defaultUserShell};
users = let
authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINI1dWlS16Keil0MGPWmMsBzx8F9ylfz+fRwxUr8/tZ/ ion"
@ -100,6 +100,7 @@
root.openssh = {inherit authorizedKeys;};
${user} = {
group = "users";
shell = pkgs.nushell;
isNormalUser = true;
description = "Evie Litherland-Smith";
extraGroups = ["networkmanager" "wheel" "video" "input" "uinput"];

View file

@ -30,7 +30,7 @@
enable = true;
git = true;
icons = true;
enableAliases = true;
enableAliases = false;
extraOptions = ["--octal-permissions"];
};
readline = {

View file

@ -11,9 +11,11 @@
package = pkgs.emacs29-pgtk;
extraConfig = with builtins;
with config; let
shell = "${pkgs.zsh}/bin/zsh";
font = "${stylix.fonts.monospace.name}-${toString stylix.fonts.sizes.applications}";
alpha = "${toString (floor (mul stylix.opacity.applications 100))}";
in ''
(customize-set-variable 'shell-file-name "${shell}")
(add-to-list 'initial-frame-alist '(font . "${font}"))
(add-to-list 'default-frame-alist '(font . "${font}"))
(add-to-list 'initial-frame-alist '(alpha-background . ${alpha}))

View file

@ -2,6 +2,6 @@ $env.config = {
show_banner: false,
edit_mode: emacs,
table: {
mode: compact,
mode: rounded,
},
}