Added lots of things

This commit is contained in:
FredzyW 2024-05-02 10:37:04 +02:00
parent 176a36e120
commit 0c40e0f66d
9 changed files with 103 additions and 32 deletions

View file

@ -16,8 +16,18 @@
};
nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs);
nix.nixPath = ["/etc/nix/path"];
programs.fish.enable = true;
programs.bash = {
interactiveShellInit = ''
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
then
shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
fi
'';
};
users.defaultUserShell = pkgs.bash;
environment.etc =
lib.mapAttrs'
(name: value: {
@ -78,7 +88,7 @@
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
console.keyMap = "sv-latin1";
programs.zsh.enable = true;
# programs.zsh.enable = true;
services = {
openssh = {

View file

@ -13,7 +13,9 @@
../moduler/common/dmenu.nix
../moduler/common/kitty.nix
../moduler/common/tmux.nix
../moduler/common/zsh.nix
# ../moduler/common/zsh.nix
../moduler/common/fish.nix
../moduler/common/starship.nix
../moduler/common/git.nix
../moduler/common/nixpkgs.nix
../moduler/common/firefox.nix
@ -69,6 +71,7 @@
bluez-tools
sops
age
grc
#Terminal
git
@ -90,6 +93,8 @@
poppler_utils
pandoc
ncspot
starship
any-nix-shell
#Desktop
aerc
@ -163,6 +168,7 @@
dotnetPackages.Nuget
];
programs.home-manager.enable = true;
programs.fish.enable = true;
xsession.enable = true;
xsession.windowManager.command = "exec dwm";

View file

@ -4,7 +4,7 @@
}: {
# TODO: Configure your system-wide user settings (groups, etc), add more users as needed.
users = {
defaultUserShell = pkgs.zsh;
defaultUserShell = pkgs.bash;
users = {
fw = {
initialPassword = "password";