diff --git a/main.nix b/main.nix index b20c565..de3c650 100644 --- a/main.nix +++ b/main.nix @@ -1,5 +1,5 @@ { - systemStateVersion ? "23.05", + systemStateVersion ? "23.11", hostName, user, }: diff --git a/modules/os/core.nix b/modules/os/core.nix index ab44eab..3416720 100644 --- a/modules/os/core.nix +++ b/modules/os/core.nix @@ -1,5 +1,5 @@ { hostName }: -{ ... }: +{ pkgs, ... }: { # Bootloader. boot.loader.systemd-boot.enable = true; @@ -16,4 +16,19 @@ # Select internationalisation properties. i18n.defaultLocale = "en_CA.UTF-8"; + # Fonts + # fonts = { + # packages = with pkgs; [ + # (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; }) + # ]; + + # fontconfig = { + # enable = true; + # defaultFonts = { + # serif = [ "FiraCode" "DroidSansMono" ]; + # sansSerif = [ "FiraCode" "DroidSansMono" ]; + # monospace = [ "FiraCode" ]; + # }; + # }; + # }; } \ No newline at end of file diff --git a/modules/rootUser.nix b/modules/rootUser.nix index 283b4ef..2a0fce2 100644 --- a/modules/rootUser.nix +++ b/modules/rootUser.nix @@ -8,5 +8,10 @@ userName = "root"; userEmail = "root@${hostName}"; }; + programs.zsh = { + enable = true; + enableAutosuggestions = true; + }; + programs.zsh.oh-my-zsh.enable = true; }; } \ No newline at end of file diff --git a/modules/user.nix b/modules/user.nix index b33656e..4b5a659 100644 --- a/modules/user.nix +++ b/modules/user.nix @@ -2,6 +2,7 @@ { pkgs, ... }: { users.users.${user.name} = { + # shell = pkgs.zsh; isNormalUser = true; description = user.name; extraGroups = [ @@ -14,11 +15,38 @@ ]; }; home-manager.users.${user.name} = { - home.stateVersion = systemStateVersion; - programs.git = { - enable = true; - userName = user.fullName; - userEmail = user.email; + home = { + stateVersion = systemStateVersion; + shellAliases = { + cat = "bat"; + }; + packages = [ + (pkgs.nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; }) + ]; + }; + programs = { + bat.enable = true; + lsd = { + enable = true; + enableAliases = true; + }; + git = { + enable = true; + userName = user.fullName; + userEmail = user.email; + }; + zsh = { + enable = true; + enableAutosuggestions = true; + }; + zsh.oh-my-zsh = { + enable = true; + plugins = [ + "git" + "sudo" + ]; + theme = "robbyrussell"; + }; }; }; } \ No newline at end of file