diff --git a/README.md b/README.md index 8eab318..c8c1110 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,25 @@ +# Dependencies + +- kitty +- emacs-gtk + +# Resources Some of the resources I referenced to write this home-manager config -# Manuals +## Manuals - [Home Manager Manual](https://nix-community.github.io/home-manager/) - [Nix Tour](https://nixcloud.io/tour/?id=introduction/nix) - [NixOS & Flakes Book](https://nixos-and-flakes.thiscute.world/introduction/) -# Git Repos +## Git Repos - [Gerg - nix-templates](https://github.com/Gerg-L/nix-templates) - [fufexan](https://github.com/fufexan/dotfiles/tree/main) mainly used for my helix config - [nix-starter-config](https://m7.rs/git/nix-starter-config/) -# Videos +## Videos - [vimjoyer - youtube](https://www.youtube.com/@vimjoyer) diff --git a/emacs/default.nix b/emacs/default.nix new file mode 100644 index 0000000..0dc6f3b --- /dev/null +++ b/emacs/default.nix @@ -0,0 +1,7 @@ +{ + programs.emacs = { + enable = true; + # set the package to a dummy package, install with system package manager + # specifically use the emacs gtk package + }; +} diff --git a/flake.nix b/flake.nix index b26a817..983d5aa 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,7 @@ ./shell ./programs ./helix + ./emacs ]; extraSpecialArgs = {inherit inputs system;}; diff --git a/home.nix b/home.nix index e2e1787..6598de9 100644 --- a/home.nix +++ b/home.nix @@ -6,12 +6,24 @@ sessionVariables = { EDITOR = "hx"; BAT_THEME = "ansi"; + DOTNET_ROOT = "$HOME/.dotnet"; + }; + sessionPath = [ + "$HOME/.local/bin" + "$HOME/.dotnet" + ]; + shellAliases = { + ls = "eza"; + la = "eza -la"; + l = "eza -l"; + gaa = "git add ."; + gcm = "git commit -m"; + gpom = "git push -u origin main"; }; packages = with pkgs; [ wineWowPackages.unstable eza bat - pandoc ]; }; diff --git a/shell/bash.nix b/shell/bash.nix index 6bb4e0e..3acf61d 100644 --- a/shell/bash.nix +++ b/shell/bash.nix @@ -4,15 +4,9 @@ enableCompletion = true; bashrcExtra = '' - if [ -d "$HOME/.local/bin" ] ; then - PATH="$HOME/.local/bin:$PATH" - fi + PS1='[\u@\h \W]\$ ' - # DotNet - PATH=$PATH:~/.dotnet - export DOTNET_ROOT=~/.dotnet - - ''; # this should be changed to use home.sessionVariables + ''; profileExtra = '' diff --git a/shell/zsh.nix b/shell/zsh.nix index e2ab43e..ea8eb36 100644 --- a/shell/zsh.nix +++ b/shell/zsh.nix @@ -10,7 +10,7 @@ syntaxHighlighting.enable = true; autocd = true; defaultKeymap = null; - dotDir = ".config/zsh"; + dotDir = "~/.config/zsh"; history = { ignoreSpace = true; path = "${config.xdg.dataHome}/zsh/zsh_history"; @@ -49,13 +49,8 @@ }; } ]; - shellAliases = { - ls = "eza"; - la = "eza -la"; - l = "eza -l"; - }; initExtra = '' - source ~/.config/zsh/.p10k.zsh + source $HOME/.config/zsh/.p10k.zsh ''; localVariables = { POWERLEVEL9K_DISABLE_CONFIGURATION_WIZARD = true;