diff --git a/flake.nix b/flake.nix index 19b3971..7a408e5 100644 --- a/flake.nix +++ b/flake.nix @@ -19,12 +19,6 @@ allowUnfree = true; }; }; - configs = builtins.fetchTarball { - url = "https://github.com/itme-brain/nixos/raw/yolo-allin/terminal/configs.tar.gz"; - sha256 = "1q6qcwp06hgia0wiz11jynxjh8l527ckfjpgz1cylczdfbv60vk1"; - }; - - myTerminal = pkgs.callPackage ./terminal/shell.nix { inherit configs; }; in { @@ -40,7 +34,5 @@ } ]; }; - - defaultPackage.x86_64-linux = myTerminal; }; } diff --git a/homeConfig/modules/neovim/config/servers.nix b/homeConfig/modules/neovim/config/servers.nix index 9a1d4c2..3488b60 100644 --- a/homeConfig/modules/neovim/config/servers.nix +++ b/homeConfig/modules/neovim/config/servers.nix @@ -20,4 +20,4 @@ let ]; in - lsp ++ lsp' ++ pkgs.lazygit + lsp ++ lsp' diff --git a/homeConfig/modules/neovim/default.nix b/homeConfig/modules/neovim/default.nix index a8aeaf3..4e34e28 100644 --- a/homeConfig/modules/neovim/default.nix +++ b/homeConfig/modules/neovim/default.nix @@ -25,5 +25,8 @@ in source = ./config/lazyvim; recursive = true; }; + home.packages = with pkgs; [ + lazygit + ]; }; } diff --git a/terminal/configs.tar.gz b/terminal/configs.tar.gz deleted file mode 100644 index 378e668..0000000 Binary files a/terminal/configs.tar.gz and /dev/null differ diff --git a/terminal/shell.nix b/terminal/shell.nix deleted file mode 100644 index fb74760..0000000 --- a/terminal/shell.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ pkgs, configs, ... }: - - -with pkgs; -mkShell { - buildInputs = [ - bash neovim alacritty - terminus-nerdfont noto-fonts-emoji - direnv nix-direnv - lsd git gnupg lazygit - ]; - - shellHook = '' - echo "Preparing your environment, Bryan..." - - tar -xzvf ${configs} -C . - - if [ -f ~/.bashrc ] || [ -f ~/.config/alacritty/alacritty.yml ] || [ -d ~/.config/nvim ] || [ -f ~/.gitconfig ]; then - echo "Backing up existing config files..." - echo "You can find them at ~/your_configs.bak" - mkdir -p ~/your_configs.bak - fi - - [ -f ~/.bashrc ] && mv ~/.bashrc ~/your_configs.bak/bashrc.bak - mv configs/bashrc ~/.bashrc - - [ -f ~/.config/alacritty/alacritty.yml ] && mv ~/.config/alacritty ~/your_configs.bak/alacritty.bak - mv configs/alacritty ~/.config/alacritty - - [ -d ~/.config/nvim ] && mv ~/.config/nvim ~/your_configs.bak/nvim.bak - mv configs/nvim ~/.config/nvim - - [ -f ~/.gitconfig ] && mv ~/.gitconfig ~/your_configs.bak/gitconfig.bak - mv configs/gitconfig ~/.gitconfig - - gpg --import configs/pub.key - - rm configs - find . -type d -empty -delete - - if [ -d ~/your_configs.bak ]; then - echo "Restore script has been created..." - cat > ~/your_configs.bak/restore.sh << EOF - #!/bin/sh - # To restore the original config, run the script using './restore.sh' - [ -f bashrc.bak ] && mv bashrc.bak ~/.bashrc - [ -d alacritty.bak ] && mv alacritty.bak ~/.config/alacritty - [ -d nvim.bak ] && mv nvim.bak ~/.config/nvim - [ -f gitconfig.bak ] && mv gitconfig.bak ~/.gitconfig - EOF - chmod +x ~/your_configs.bak/restore.sh - fi - - echo "Terminal ready." - echo "Run `ldv` to get some existing environments." - ''; -}