From 00008ec70425958e9bbe6058a05b10d37ef4c7cd Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Wed, 6 Sep 2023 14:02:19 +0200 Subject: [PATCH] refactor: merge into one file --- hosts/yodaTab/configuration.nix | 1 - hosts/yodaTux/configuration.nix | 1 - modules/zsh.home.nix | 7 +++++-- modules/zsh.nix | 8 -------- 4 files changed, 5 insertions(+), 12 deletions(-) delete mode 100644 modules/zsh.nix diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix index 85ff5d7..4347fbb 100644 --- a/hosts/yodaTab/configuration.nix +++ b/hosts/yodaTab/configuration.nix @@ -15,7 +15,6 @@ ../../modules/base.nix ../../modules/programs.nix ../../modules/git.nix - ../../modules/zsh.nix ../../modules/print-and-scan.nix ../../modules/fde-ssh-unlock.nix ../../modules/nextcloud-integration.nix diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix index 69fda4c..7977889 100644 --- a/hosts/yodaTux/configuration.nix +++ b/hosts/yodaTux/configuration.nix @@ -15,7 +15,6 @@ ../../modules/base.nix ../../modules/programs.nix ../../modules/git.nix - ../../modules/zsh.nix ../../modules/print-and-scan.nix ../../modules/fde-ssh-unlock.nix ../../modules/nextcloud-integration.nix diff --git a/modules/zsh.home.nix b/modules/zsh.home.nix index 1859ac1..2fba842 100644 --- a/modules/zsh.home.nix +++ b/modules/zsh.home.nix @@ -1,10 +1,14 @@ { 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, # `config` refers to Home Manager configuration. home-manager.users.yoda = { osConfig, config, pkgs, ... }: { - programs.zsh = { enable = true; shellAliases = { @@ -31,6 +35,5 @@ theme = "agnoster"; }; }; - }; } diff --git a/modules/zsh.nix b/modules/zsh.nix deleted file mode 100644 index 8866d59..0000000 --- a/modules/zsh.nix +++ /dev/null @@ -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; -}