From 45f668be7234b5d715ec439e50bc8cbcab59ad6c Mon Sep 17 00:00:00 2001 From: Tyrel Souza Date: Tue, 14 May 2024 17:02:21 -0400 Subject: [PATCH] remove nix, cleanup justfiles --- Makefile | 6 +- arch_setup.sh | 27 -------- debian_setup.sh | 33 ---------- hosts/_common/fonts.nix | 10 --- hosts/_common/home.nix | 4 -- hosts/_common/programs.nix | 4 -- hosts/_common/xdg.nix | 6 -- hosts/blackbox-jr/default.nix | 4 -- hosts/blackbox-jr/flake.lock | 64 ------------------- hosts/blackbox-jr/flake.nix | 36 ----------- hosts/blackbox-jr/home-manager.nix | 15 ----- hosts/blackbox-jr/home.nix | 14 ----- hosts/ts-tl-mbp/brew.nix | 29 --------- hosts/ts-tl-mbp/default.nix | 6 -- hosts/ts-tl-mbp/flake.lock | 85 ------------------------- hosts/ts-tl-mbp/flake.nix | 29 --------- hosts/ts-tl-mbp/home-manager.nix | 24 ------- hosts/ts-tl-mbp/home.nix | 12 ---- hosts/tyrel-MicroPC/default.nix | 4 -- hosts/tyrel-MicroPC/flake.lock | 64 ------------------- hosts/tyrel-MicroPC/flake.nix | 36 ----------- hosts/tyrel-MicroPC/home-manager.nix | 15 ----- hosts/tyrel-MicroPC/home.nix | 12 ---- hosts/x1carbon-ubuntu/default.nix | 4 -- hosts/x1carbon-ubuntu/flake.lock | 64 ------------------- hosts/x1carbon-ubuntu/flake.nix | 36 ----------- hosts/x1carbon-ubuntu/home-manager.nix | 15 ----- hosts/x1carbon-ubuntu/home.nix | 12 ---- justfile | 87 +++++++++----------------- 29 files changed, 30 insertions(+), 727 deletions(-) delete mode 100755 arch_setup.sh delete mode 100755 debian_setup.sh delete mode 100644 hosts/_common/fonts.nix delete mode 100644 hosts/_common/home.nix delete mode 100644 hosts/_common/programs.nix delete mode 100644 hosts/_common/xdg.nix delete mode 100644 hosts/blackbox-jr/default.nix delete mode 100644 hosts/blackbox-jr/flake.lock delete mode 100644 hosts/blackbox-jr/flake.nix delete mode 100644 hosts/blackbox-jr/home-manager.nix delete mode 100644 hosts/blackbox-jr/home.nix delete mode 100644 hosts/ts-tl-mbp/brew.nix delete mode 100644 hosts/ts-tl-mbp/default.nix delete mode 100644 hosts/ts-tl-mbp/flake.lock delete mode 100644 hosts/ts-tl-mbp/flake.nix delete mode 100644 hosts/ts-tl-mbp/home-manager.nix delete mode 100644 hosts/ts-tl-mbp/home.nix delete mode 100644 hosts/tyrel-MicroPC/default.nix delete mode 100644 hosts/tyrel-MicroPC/flake.lock delete mode 100644 hosts/tyrel-MicroPC/flake.nix delete mode 100644 hosts/tyrel-MicroPC/home-manager.nix delete mode 100644 hosts/tyrel-MicroPC/home.nix delete mode 100644 hosts/x1carbon-ubuntu/default.nix delete mode 100644 hosts/x1carbon-ubuntu/flake.lock delete mode 100644 hosts/x1carbon-ubuntu/flake.nix delete mode 100644 hosts/x1carbon-ubuntu/home-manager.nix delete mode 100644 hosts/x1carbon-ubuntu/home.nix diff --git a/Makefile b/Makefile index 64a87f8..6481cb8 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,7 @@ ## Setup -.PHONY: install-just install-nix +.PHONY: install-just ## Management install-just: curl --proto '=https' --tlsv1.3 -sSf https://just.systems/install.sh | bash -s -- --to ~/ sudo cp ~/just /usr/local/bin - -install-nix: - sh <(curl -L https://nixos.org/nix/install) --daemon - diff --git a/arch_setup.sh b/arch_setup.sh deleted file mode 100755 index c175f9f..0000000 --- a/arch_setup.sh +++ /dev/null @@ -1,27 +0,0 @@ - -#!/bin/bash - -USER=tyrel -HOME=/home/tyrel - -curl https://sh.rustup.rs -sSf | sh - -sudo curl https://pyenv.run | bash - -ln -s $(pwd)/home/config/nvim /home/$USER/.config/nvim -ln -s $(pwd)/home/gitconfig /home/$USER/.gitconfig -ln -s $(pwd)/home/shell_aliases /home/$USER/.shell_aliases -ln -s $(pwd)/home/shell_funcs /home/$USER/.shell_funcs -ln -s $(pwd)/home/zshrc /home/$USER/.zshrc - -echo 'export PYENV_ROOT="/home/$USER/.pyenv"' >> /home/$USER/.bashrc -echo '[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"' >> /home/$USER/.bashrc -echo 'eval "$(pyenv init -)"' >> /home/$USER/.bashrc - -export PYENV_ROOT="$HOME/.pyenv" -[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH" -eval "$(pyenv init -)" - -pyenv install 3.12.3 -pyenv global 3.12.3 -pip install neovim diff --git a/debian_setup.sh b/debian_setup.sh deleted file mode 100755 index ceaa838..0000000 --- a/debian_setup.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -USER=tyrel -HOME=/home/tyrel - -sudo apt-get install software-properties-common -sudo add-apt-repository -y ppa:neovim-ppa/unstable -sudo apt update -sudo apt-get install -y libncurses5-dev neovim -sudo apt-get install -y build-essential zlib1g-dev libffi-dev libssl-dev libbz2-dev libreadline-dev libsqlite3-dev liblzma-dev -sudo apt-get install -y git-lfs - -curl https://sh.rustup.rs -sSf | sh - -sudo curl https://pyenv.run | bash - -ln -s $(pwd)/home/config/nvim /home/$USER/.config/nvim -ln -s $(pwd)/home/bin /home/$USER/bin -ln -s $(pwd)/home/gitconfig /home/$USER/.gitconfig -ln -s $(pwd)/home/shell_aliases /home/$USER/.shell_aliases -ln -s $(pwd)/home/shell_funcs /home/$USER/.shell_funcs - -echo 'export PYENV_ROOT="/home/$USER/.pyenv"' >> /home/$USER/.bashrc -echo '[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"' >> /home/$USER/.bashrc -echo 'eval "$(pyenv init -)"' >> /home/$USER/.bashrc - -export PYENV_ROOT="$HOME/.pyenv" -[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH" -eval "$(pyenv init -)" - -pyenv install 3.10.13 -pyenv global 3.10.13 -pip install neovim diff --git a/hosts/_common/fonts.nix b/hosts/_common/fonts.nix deleted file mode 100644 index ba2694e..0000000 --- a/hosts/_common/fonts.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs, config, lib, ... }: -{ - fonts.fonts = with pkgs; [ - noto-fonts - dejavu_fonts - nerdfonts # Includes font-awesome, material-icons, powerline-fonts - iosevka - ]; - -} diff --git a/hosts/_common/home.nix b/hosts/_common/home.nix deleted file mode 100644 index be8d3dc..0000000 --- a/hosts/_common/home.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.stateVersion = "22.05"; -} diff --git a/hosts/_common/programs.nix b/hosts/_common/programs.nix deleted file mode 100644 index a812c0e..0000000 --- a/hosts/_common/programs.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - programs.home-manager.enable = true; -} diff --git a/hosts/_common/xdg.nix b/hosts/_common/xdg.nix deleted file mode 100644 index 2b4de67..0000000 --- a/hosts/_common/xdg.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, config, ... }: -{ - xdg.configFile = { - }; - -} diff --git a/hosts/blackbox-jr/default.nix b/hosts/blackbox-jr/default.nix deleted file mode 100644 index 3a2e20a..0000000 --- a/hosts/blackbox-jr/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, config, lib, ... }: -{ - #programs.zsh.enable = true; -} diff --git a/hosts/blackbox-jr/flake.lock b/hosts/blackbox-jr/flake.lock deleted file mode 100644 index 7e2d60f..0000000 --- a/hosts/blackbox-jr/flake.lock +++ /dev/null @@ -1,64 +0,0 @@ -{ - "nodes": { - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1672688183, - "narHash": "sha256-3sNEWKTg3XXVDnvzVatdyetiUQWL+ibJ1YkvxSk3PuM=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "c1a830c8fabb13f95f51ecf48552f0a794d8718a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1672525397, - "narHash": "sha256-WASDnyxHKWVrEe0dIzkpH+jzKlCKAk0husv0f/9pyxg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8ba56d7c0d7490680f2d51ba46a141eca7c46afa", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "home-manager": "home-manager", - "nixpkgs": "nixpkgs" - } - }, - "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/hosts/blackbox-jr/flake.nix b/hosts/blackbox-jr/flake.nix deleted file mode 100644 index 01e3aa3..0000000 --- a/hosts/blackbox-jr/flake.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - description = "Tyrel Nix"; - - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; - }; - outputs = { self, nixpkgs, home-manager } : - let - system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; - in { - defaultPackage.x86_64-linux = home-manager.defaultPackage.x86_64-linux; - homeConfigurations = { - "tyrel" = home-manager.lib.homeManagerConfiguration { - inherit pkgs; - - modules = [ - ./default.nix - ./home-manager.nix - { - home = { - homeDirectory = "/home/tyrel"; - username = "tyrel"; - stateVersion = "22.05"; - }; - } - ]; - - - }; - }; - }; -} - diff --git a/hosts/blackbox-jr/home-manager.nix b/hosts/blackbox-jr/home-manager.nix deleted file mode 100644 index e0af78a..0000000 --- a/hosts/blackbox-jr/home-manager.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: -{ - # Common Imports - imports = [ - ./home.nix - ../_common/home.nix - ../_common/programs.nix - ../_common/xdg.nix - ]; - home.sessionVariables = { - XDG_CONFIG_HOME = "/home/tyrel/.config"; - }; - - -} diff --git a/hosts/blackbox-jr/home.nix b/hosts/blackbox-jr/home.nix deleted file mode 100644 index 681fed7..0000000 --- a/hosts/blackbox-jr/home.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ pkgs, ... }: -{ - home.stateVersion = "22.05"; - home.sessionVariables = { - }; - home.packages = with pkgs; [ - maestral - maestral-gui - ]; - - home.file = { - }; - -} diff --git a/hosts/ts-tl-mbp/brew.nix b/hosts/ts-tl-mbp/brew.nix deleted file mode 100644 index c3b0912..0000000 --- a/hosts/ts-tl-mbp/brew.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ pkgs, config, lib, ... }: -{ - homebrew = { - enable = true; - casks = [ - "alfred" - "affinity-photo" - "affinity-designer" - "affinity-publisher" - "commander-one" - "discord" - "divvy" - "firefox" - "gpg-suite" - "jetbrains-toolbox" - "karabiner-elements" - "meetingbar" - "qsyncthingtray" - "scrivener" - "slack" - "spotify" - "steam" - "syncthing" - "tailscale" - "telegram-desktop" - "thunderbird" - ]; - }; -} diff --git a/hosts/ts-tl-mbp/default.nix b/hosts/ts-tl-mbp/default.nix deleted file mode 100644 index 715c3cb..0000000 --- a/hosts/ts-tl-mbp/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, config, lib, ... }: -{ - services.nix-daemon.enable = true; - programs.zsh.enable = true; - system.defaults.dock.autohide = true; - } diff --git a/hosts/ts-tl-mbp/flake.lock b/hosts/ts-tl-mbp/flake.lock deleted file mode 100644 index 1542cfd..0000000 --- a/hosts/ts-tl-mbp/flake.lock +++ /dev/null @@ -1,85 +0,0 @@ -{ - "nodes": { - "darwin": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1671891118, - "narHash": "sha256-+GJYiT7QbfA306ex4sGMlFB8Ts297pn3OdQ9kTd4aDw=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "267040e7a2b8644f1fdfcf57b7e808c286dbdc7b", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1672688183, - "narHash": "sha256-3sNEWKTg3XXVDnvzVatdyetiUQWL+ibJ1YkvxSk3PuM=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "c1a830c8fabb13f95f51ecf48552f0a794d8718a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1672600835, - "narHash": "sha256-PCrIP7joW/SaDYbKlZGV44bBcLOXI/woLVnVHwcJlWc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fe1c6a5547c10a5f6b6debb22d548017f7e14263", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-22.11-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "darwin": "darwin", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs" - } - }, - "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/hosts/ts-tl-mbp/flake.nix b/hosts/ts-tl-mbp/flake.nix deleted file mode 100644 index d207e75..0000000 --- a/hosts/ts-tl-mbp/flake.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - description = "Tyrel Nix"; - - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-22.11-darwin"; - home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; - darwin.url = "github:lnl7/nix-darwin"; - darwin.inputs.nixpkgs.follows = "nixpkgs"; - }; - outputs = { self, nixpkgs, home-manager, darwin }: { - defaultPackage.x86_64-darwin = home-manager.defaultPackage.x86_64-darwin; - - darwinConfigurations."ts-tl-mbp" = darwin.lib.darwinSystem { - system = "x86_64-darwin"; - modules = [ - home-manager.darwinModules.home-manager - ./default.nix - ./home-manager.nix - ./brew.nix - ../_common/fonts.nix - ]; - }; - nixpkgs.config = { - allowUnfree = true; - }; - }; - -} diff --git a/hosts/ts-tl-mbp/home-manager.nix b/hosts/ts-tl-mbp/home-manager.nix deleted file mode 100644 index 8066883..0000000 --- a/hosts/ts-tl-mbp/home-manager.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ pkgs, ... }: -{ - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.tyrel = { pkgs, ... }: { - # Common Imports - imports = [ - ./home.nix - ../_common/home.nix - ../_common/programs.nix - ../_common/xdg.nix - ]; - home.sessionVariables = { - XDG_CONFIG_HOME = "/Users/tyrel/.config"; - }; - - # XDG CONFIGS - xdg.configFile."karabiner" = { - source = ../../home/config/karabiner; - recursive = true; - }; - }; # -- HomeManager - -} diff --git a/hosts/ts-tl-mbp/home.nix b/hosts/ts-tl-mbp/home.nix deleted file mode 100644 index a57c409..0000000 --- a/hosts/ts-tl-mbp/home.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: -{ - home.stateVersion = "22.05"; - home.sessionVariables = { - }; - home.packages = with pkgs; [ - ]; - - home.file = { - }; - -} diff --git a/hosts/tyrel-MicroPC/default.nix b/hosts/tyrel-MicroPC/default.nix deleted file mode 100644 index 8c55841..0000000 --- a/hosts/tyrel-MicroPC/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, config, lib, ... }: -{ - programs.zsh.enable = true; -} diff --git a/hosts/tyrel-MicroPC/flake.lock b/hosts/tyrel-MicroPC/flake.lock deleted file mode 100644 index 7e2d60f..0000000 --- a/hosts/tyrel-MicroPC/flake.lock +++ /dev/null @@ -1,64 +0,0 @@ -{ - "nodes": { - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1672688183, - "narHash": "sha256-3sNEWKTg3XXVDnvzVatdyetiUQWL+ibJ1YkvxSk3PuM=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "c1a830c8fabb13f95f51ecf48552f0a794d8718a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1672525397, - "narHash": "sha256-WASDnyxHKWVrEe0dIzkpH+jzKlCKAk0husv0f/9pyxg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8ba56d7c0d7490680f2d51ba46a141eca7c46afa", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "home-manager": "home-manager", - "nixpkgs": "nixpkgs" - } - }, - "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/hosts/tyrel-MicroPC/flake.nix b/hosts/tyrel-MicroPC/flake.nix deleted file mode 100644 index 01e3aa3..0000000 --- a/hosts/tyrel-MicroPC/flake.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - description = "Tyrel Nix"; - - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; - }; - outputs = { self, nixpkgs, home-manager } : - let - system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; - in { - defaultPackage.x86_64-linux = home-manager.defaultPackage.x86_64-linux; - homeConfigurations = { - "tyrel" = home-manager.lib.homeManagerConfiguration { - inherit pkgs; - - modules = [ - ./default.nix - ./home-manager.nix - { - home = { - homeDirectory = "/home/tyrel"; - username = "tyrel"; - stateVersion = "22.05"; - }; - } - ]; - - - }; - }; - }; -} - diff --git a/hosts/tyrel-MicroPC/home-manager.nix b/hosts/tyrel-MicroPC/home-manager.nix deleted file mode 100644 index e0af78a..0000000 --- a/hosts/tyrel-MicroPC/home-manager.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: -{ - # Common Imports - imports = [ - ./home.nix - ../_common/home.nix - ../_common/programs.nix - ../_common/xdg.nix - ]; - home.sessionVariables = { - XDG_CONFIG_HOME = "/home/tyrel/.config"; - }; - - -} diff --git a/hosts/tyrel-MicroPC/home.nix b/hosts/tyrel-MicroPC/home.nix deleted file mode 100644 index a57c409..0000000 --- a/hosts/tyrel-MicroPC/home.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: -{ - home.stateVersion = "22.05"; - home.sessionVariables = { - }; - home.packages = with pkgs; [ - ]; - - home.file = { - }; - -} diff --git a/hosts/x1carbon-ubuntu/default.nix b/hosts/x1carbon-ubuntu/default.nix deleted file mode 100644 index 3a2e20a..0000000 --- a/hosts/x1carbon-ubuntu/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, config, lib, ... }: -{ - #programs.zsh.enable = true; -} diff --git a/hosts/x1carbon-ubuntu/flake.lock b/hosts/x1carbon-ubuntu/flake.lock deleted file mode 100644 index 7e2d60f..0000000 --- a/hosts/x1carbon-ubuntu/flake.lock +++ /dev/null @@ -1,64 +0,0 @@ -{ - "nodes": { - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1672688183, - "narHash": "sha256-3sNEWKTg3XXVDnvzVatdyetiUQWL+ibJ1YkvxSk3PuM=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "c1a830c8fabb13f95f51ecf48552f0a794d8718a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1672525397, - "narHash": "sha256-WASDnyxHKWVrEe0dIzkpH+jzKlCKAk0husv0f/9pyxg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8ba56d7c0d7490680f2d51ba46a141eca7c46afa", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "home-manager": "home-manager", - "nixpkgs": "nixpkgs" - } - }, - "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/hosts/x1carbon-ubuntu/flake.nix b/hosts/x1carbon-ubuntu/flake.nix deleted file mode 100644 index 01e3aa3..0000000 --- a/hosts/x1carbon-ubuntu/flake.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - description = "Tyrel Nix"; - - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; - }; - outputs = { self, nixpkgs, home-manager } : - let - system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; - in { - defaultPackage.x86_64-linux = home-manager.defaultPackage.x86_64-linux; - homeConfigurations = { - "tyrel" = home-manager.lib.homeManagerConfiguration { - inherit pkgs; - - modules = [ - ./default.nix - ./home-manager.nix - { - home = { - homeDirectory = "/home/tyrel"; - username = "tyrel"; - stateVersion = "22.05"; - }; - } - ]; - - - }; - }; - }; -} - diff --git a/hosts/x1carbon-ubuntu/home-manager.nix b/hosts/x1carbon-ubuntu/home-manager.nix deleted file mode 100644 index e0af78a..0000000 --- a/hosts/x1carbon-ubuntu/home-manager.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: -{ - # Common Imports - imports = [ - ./home.nix - ../_common/home.nix - ../_common/programs.nix - ../_common/xdg.nix - ]; - home.sessionVariables = { - XDG_CONFIG_HOME = "/home/tyrel/.config"; - }; - - -} diff --git a/hosts/x1carbon-ubuntu/home.nix b/hosts/x1carbon-ubuntu/home.nix deleted file mode 100644 index a57c409..0000000 --- a/hosts/x1carbon-ubuntu/home.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: -{ - home.stateVersion = "22.05"; - home.sessionVariables = { - }; - home.packages = with pkgs; [ - ]; - - home.file = { - }; - -} diff --git a/justfile b/justfile index 5640654..f88d6fe 100644 --- a/justfile +++ b/justfile @@ -6,70 +6,41 @@ OS := if "${HOME}" =~ '/U.*' { } else { if `cat /etc/issue 2>/dev/null || true` =~ "Deb.*" { "debian" } else { "ubuntu" } } -HOSTNAME := `hostname| sed 's/.local//'` -NIXPATH := "nixpkgs=/nix/var/nix/profiles/per-user/tyrel/channels/nixpkgs:/nix/var/nix/profiles/per-user/tyrel/channels" +PWD := `pwd` +USER := "tyrel" +HOME := "/home/tyrel" -setup: - just setup-{{OS}} - -setup-ubuntu: - NIX_PATH={{NIXPATH}} nix-channel --add https://nixos.org/channels/nixos-22.11 nixos - NIX_PATH={{NIXPATH}} nix-channel --add https://github.com/nix-community/home-manager/archive/release-22.11.tar.gz home-manager - NIX_PATH={{NIXPATH}} nix-channel --add https://channels.nixos.org/nixos-22.11 nixpkgs - NIX_PATH={{NIXPATH}} nix-channel --update - NIX_PATH={{NIXPATH}} nix-shell '' -A install - -update-hm: - NIX_PATH={{NIXPATH}} nix-shell '' -A update - -setup-debian: - NIX_PATH={{NIXPATH}} nix-channel --add https://nixos.org/channels/nixos-22.11 nixos - NIX_PATH={{NIXPATH}} nix-channel --add https://github.com/nix-community/home-manager/archive/release-22.11.tar.gz home-manager - NIX_PATH={{NIXPATH}} nix-channel --add https://channels.nixos.org/nixos-22.11 nixpkgs - NIX_PATH={{NIXPATH}} nix-channel --update - NIX_PATH={{NIXPATH}} nix-shell '' -A install - -experimental: - mkdir -p ~/.config/nix - echo "extra-experimental-features = flakes nix-command" ~/.config/nix/nix.conf +pwd: + echo "{{PWD}}" git-add: git add . -update: update-neovim +rust: + curl https://sh.rustup.rs -sSf | sh -update-os: - sudo nixos-rebuild switch +pyenv: + sudo curl https://pyenv.run | bash + echo 'export PYENV_ROOT="/home/$USER/.pyenv"' >> /home/$USER/.bashrc + echo '[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"' >> /home/$USER/.bashrc + echo 'eval "$(pyenv init -)"' >> /home/$USER/.bashrc + pyenv install 3.12.3 + pyenv global 3.12.3 -update-neovim: - nvim --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync' +symlinks: + ln -s {{PWD}}/home/config/nvim /home/{{USER}}/.config/nvim + ln -s {{PWD}}/home/bin /home/{{USER}}/bin + ln -s {{PWD}}/home/gitconfig /home/{{USER}}/.gitconfig + ln -s {{PWD}}/home/shell_aliases /home/{{USER}}/.shell_aliases + ln -s {{PWD}}/home/shell_funcs /home/{{USER}}/.shell_funcs -pi: - nvim --headless -c 'autocmd User PackerComplete quitall' -c 'PackerInstall' +debian: + sudo apt-get install software-properties-common + sudo add-apt-repository -y ppa:neovim-ppa/unstable + sudo apt update + sudo apt-get install -y libncurses5-dev neovim + sudo apt-get install -y build-essential zlib1g-dev libffi-dev libssl-dev libbz2-dev libreadline-dev libsqlite3-dev liblzma-dev + sudo apt-get install -y git-lfs -sync: - sudo nix-channel --update - nix-channel --update - -clean: - nix-collect-garbage --delete-older-than 7d - home-manager expire-generations "-7 days" - -vimpacker: - git clone --depth 1 https://github.com/wbthomason/packer.nvim ~/.local/share/nvim/site/pack/packer/start/packer.nvim - -rebuild: git-add - just rebuild-{{OS}} - -rebuild-macos: - ./result/sw/bin/darwin-rebuild switch --flake ./hosts/{{HOSTNAME}} - -rebuild-ubuntu: - NIX_PATH={{NIXPATH}} nix run ./hosts/{{HOSTNAME}} switch -vv - NIX_PATH={{NIXPATH}} home-manager switch --flake ./hosts/{{HOSTNAME}} - just clean - -rebuild-debian: - NIX_PATH={{NIXPATH}} nix run ./hosts/{{HOSTNAME}} switch -vv - NIX_PATH={{NIXPATH}} home-manager switch --flake ./hosts/{{HOSTNAME}} - just clean +arch: + sudo pacman -S git git-lfs ctags rofi terminator tint2 tree-sitter unzip cpan base-devel