lytedev/nix
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Merge remote-tracking branch 'origin/modules2' into modules2
Some checks failed
/ check (push) Failing after 47s
Details

Browse source
This commit is contained in:
Daniel Flanagan 2025-02-16 22:11:14 -06:00
commit 259208cef9
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/modules/home/default.nix
View file

@ -45,7 +45,8 @@ in
}; };
}; };
config = { config = lib.mkIf config.lyte.shell.enable {
programs.fish.enable = true;
programs.helix.enable = true; programs.helix.enable = true;
programs.zellij.enable = true; programs.zellij.enable = true;
programs.eza.enable = true; programs.eza.enable = true;
@ -1289,9 +1290,9 @@ in
# zellij does not support modern terminal keyboard input: # zellij does not support modern terminal keyboard input:
# https://github.com/zellij-org/zellij/issues/735 # https://github.com/zellij-org/zellij/issues/735
programs.zellij = { programs.zellij = {
# enable = true;
# This causes fish to start zellij immediately # do not start immediately
# enableFishIntegration = true; enableFishIntegration = false;
# uses home manager's toKDL generator # uses home manager's toKDL generator
settings = { settings = {

3
lib/modules/nixos/default-module.nix
View file

@ -10,6 +10,7 @@
modulesPath, modulesPath,
lib, lib,
config, config,
pkgs,
... ...
}: }:
{ {
@ -92,6 +93,7 @@
users.users.root = { users.users.root = {
openssh.authorizedKeys.keys = lib.mkDefault [ self.outputs.pubkey ]; openssh.authorizedKeys.keys = lib.mkDefault [ self.outputs.pubkey ];
shell = lib.mkIf config.lyte.shell.enable pkgs.fish;
}; };
services = { services = {
@ -177,6 +179,7 @@
createHome = true; createHome = true;
openssh.authorizedKeys.keys = [ self.outputs.pubkey ]; openssh.authorizedKeys.keys = [ self.outputs.pubkey ];
group = "daniel"; group = "daniel";
shell = lib.mkIf config.lyte.shell.enable pkgs.fish;
extraGroups = [ extraGroups = [
"users" "users"
"wheel" "wheel"