refactor: merge into one file

This commit is contained in:
Daniel Langbein 2023-09-06 14:02:19 +02:00
parent 03ab7b610b
commit 00008ec704
4 changed files with 5 additions and 12 deletions

View File

@ -15,7 +15,6 @@
../../modules/base.nix ../../modules/base.nix
../../modules/programs.nix ../../modules/programs.nix
../../modules/git.nix ../../modules/git.nix
../../modules/zsh.nix
../../modules/print-and-scan.nix ../../modules/print-and-scan.nix
../../modules/fde-ssh-unlock.nix ../../modules/fde-ssh-unlock.nix
../../modules/nextcloud-integration.nix ../../modules/nextcloud-integration.nix

View File

@ -15,7 +15,6 @@
../../modules/base.nix ../../modules/base.nix
../../modules/programs.nix ../../modules/programs.nix
../../modules/git.nix ../../modules/git.nix
../../modules/zsh.nix
../../modules/print-and-scan.nix ../../modules/print-and-scan.nix
../../modules/fde-ssh-unlock.nix ../../modules/fde-ssh-unlock.nix
../../modules/nextcloud-integration.nix ../../modules/nextcloud-integration.nix

View File

@ -1,10 +1,14 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
# https://nixos.wiki/wiki/Command_Shell
# https://nixos.wiki/wiki/Zsh
programs.zsh.enable = true;
users.defaultUserShell = pkgs.zsh;
# Inside the following Home Manager configuration block, # Inside the following Home Manager configuration block,
# `config` refers to Home Manager configuration. # `config` refers to Home Manager configuration.
home-manager.users.yoda = { osConfig, config, pkgs, ... }: { home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
programs.zsh = { programs.zsh = {
enable = true; enable = true;
shellAliases = { shellAliases = {
@ -31,6 +35,5 @@
theme = "agnoster"; theme = "agnoster";
}; };
}; };
}; };
} }

View File

@ -1,8 +0,0 @@
{ config, pkgs, ... }:
{
# https://nixos.wiki/wiki/Command_Shell
# https://nixos.wiki/wiki/Zsh
programs.zsh.enable = true;
users.defaultUserShell = pkgs.zsh;
}