pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Switch to using nushell as default again

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

7
flake.nix
View file

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

2
home/default.nix
View file

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

2
home/emacs/default.nix
View file

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

2
home/nushell/config.nu
View file

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