tyrel/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove nix, cleanup justfiles

Browse Source
This commit is contained in:
Tyrel Souza 2024-05-14 17:02:21 -04:00
parent 54283732c1
commit 45f668be72
No known key found for this signature in database
GPG Key ID: F3614B02ACBE438E
29 changed files with 30 additions and 727 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -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

27
arch_setup.sh
View File

@ -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

33
debian_setup.sh
View File

@ -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

10
hosts/_common/fonts.nix
View File

@ -1,10 +0,0 @@
{ pkgs, config, lib, ... }:
{
fonts.fonts = with pkgs; [
noto-fonts
dejavu_fonts
nerdfonts # Includes font-awesome, material-icons, powerline-fonts
iosevka
];
}

4
hosts/_common/home.nix
View File

@ -1,4 +0,0 @@
{ pkgs, ... }:
{
home.stateVersion = "22.05";
}

4
hosts/_common/programs.nix
View File

@ -1,4 +0,0 @@
{ pkgs, ... }:
{
programs.home-manager.enable = true;
}

6
hosts/_common/xdg.nix
View File

@ -1,6 +0,0 @@
{ pkgs, config, ... }:
{
xdg.configFile = {
};
}

4
hosts/blackbox-jr/default.nix
View File

@ -1,4 +0,0 @@
{ pkgs, config, lib, ... }:
{
#programs.zsh.enable = true;
}

64
hosts/blackbox-jr/flake.lock
View File

@ -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
}

36
hosts/blackbox-jr/flake.nix
View File

@ -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";
};
}
];
};
};
};
}

15
hosts/blackbox-jr/home-manager.nix
View File

@ -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";
};
}

14
hosts/blackbox-jr/home.nix
View File

@ -1,14 +0,0 @@
{ pkgs, ... }:
{
home.stateVersion = "22.05";
home.sessionVariables = {
};
home.packages = with pkgs; [
maestral
maestral-gui
];
home.file = {
};
}

29
hosts/ts-tl-mbp/brew.nix
View File

@ -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"
];
};
}

6
hosts/ts-tl-mbp/default.nix
View File

@ -1,6 +0,0 @@
{ pkgs, config, lib, ... }:
{
services.nix-daemon.enable = true;
programs.zsh.enable = true;
system.defaults.dock.autohide = true;
}

85
hosts/ts-tl-mbp/flake.lock
View File

@ -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
}

29
hosts/ts-tl-mbp/flake.nix
View File

@ -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;
};
};
}

24
hosts/ts-tl-mbp/home-manager.nix
View File

@ -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
}

12
hosts/ts-tl-mbp/home.nix
View File

@ -1,12 +0,0 @@
{ pkgs, ... }:
{
home.stateVersion = "22.05";
home.sessionVariables = {
};
home.packages = with pkgs; [
];
home.file = {
};
}

4
hosts/tyrel-MicroPC/default.nix
View File

@ -1,4 +0,0 @@
{ pkgs, config, lib, ... }:
{
programs.zsh.enable = true;
}

64
hosts/tyrel-MicroPC/flake.lock
View File

@ -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
}

36
hosts/tyrel-MicroPC/flake.nix
View File

@ -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";
};
}
];
};
};
};
}

15
hosts/tyrel-MicroPC/home-manager.nix
View File

@ -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";
};
}

12
hosts/tyrel-MicroPC/home.nix
View File

@ -1,12 +0,0 @@
{ pkgs, ... }:
{
home.stateVersion = "22.05";
home.sessionVariables = {
};
home.packages = with pkgs; [
];
home.file = {
};
}

4
hosts/x1carbon-ubuntu/default.nix
View File

@ -1,4 +0,0 @@
{ pkgs, config, lib, ... }:
{
#programs.zsh.enable = true;
}

64
hosts/x1carbon-ubuntu/flake.lock
View File

@ -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
}

36
hosts/x1carbon-ubuntu/flake.nix
View File

@ -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";
};
}
];
};
};
};
}

15
hosts/x1carbon-ubuntu/home-manager.nix
View File

@ -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";
};
}

12
hosts/x1carbon-ubuntu/home.nix
View File

@ -1,12 +0,0 @@
{ pkgs, ... }:
{
home.stateVersion = "22.05";
home.sessionVariables = {
};
home.packages = with pkgs; [
];
home.file = {
};
}

87
justfile
View File

@ -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 '<home-manager>' -A install
update-hm:
NIX_PATH={{NIXPATH}} nix-shell '<home-manager>' -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 '<home-manager>' -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