[feat] Remove .gitmodules
This commit is contained in:
37
.gitmodules
vendored
37
.gitmodules
vendored
@@ -1,37 +0,0 @@
|
|||||||
[submodule "config/neomutt/dracula"]
|
|
||||||
path = config/neomutt/dracula
|
|
||||||
url = https://github.com/dracula/mutt
|
|
||||||
|
|
||||||
[submodule "tpm"]
|
|
||||||
path = config/tmux/plugins/tpm
|
|
||||||
url = https://github.com/tmux-plugins/tpm
|
|
||||||
|
|
||||||
[submodule "zsh-abbr"]
|
|
||||||
path = config/zsh/plugins/zsh-abbr
|
|
||||||
url = https://github.com/olets/zsh-abbr
|
|
||||||
|
|
||||||
[submodule "zsh-autocomplete"]
|
|
||||||
path = config/zsh/plugins/zsh-autocomplete
|
|
||||||
url = https://github.com/marlonrichert/zsh-autocomplete
|
|
||||||
|
|
||||||
[submodule "zsh-vim-mode"]
|
|
||||||
path = config/zsh/plugins/zsh-vim-mode
|
|
||||||
url = https://github.com/softmoth/zsh-vim-mode
|
|
||||||
|
|
||||||
[submodule "tmux-battery"]
|
|
||||||
path = config/tmux/plugins/tmux-battery
|
|
||||||
url = https://github.com/tmux-plugins/tmux-battery
|
|
||||||
|
|
||||||
[submodule "tmux-fzf-url"]
|
|
||||||
path = config/tmux/plugins/tmux-fzf-url
|
|
||||||
url = https://github.com/wfxr/tmux-fzf-url
|
|
||||||
|
|
||||||
[submodule "tmux"]
|
|
||||||
path = config/tmux/plugins/tmux
|
|
||||||
url = https://github.com/dracula/tmux
|
|
||||||
[submodule "mozilla/firefox-csshacks"]
|
|
||||||
path = mozilla/firefox-csshacks
|
|
||||||
url = https://github.com/MrOtherGuy/firefox-csshacks/
|
|
||||||
[submodule "config/tmux/plugins/tmux-nightowl"]
|
|
||||||
path = config/tmux/plugins/tmux-nightowl
|
|
||||||
url = ssh://git@github.com/kylepeeler/tmux-nightowl
|
|
||||||
69
README.md
69
README.md
@@ -3,28 +3,35 @@
|
|||||||
These are dotfiles for my Linux, MacOS and Windows machines
|
These are dotfiles for my Linux, MacOS and Windows machines
|
||||||
|
|
||||||
### Linux
|
### Linux
|
||||||
- OS: Arch Linux
|
- OS: NixOS
|
||||||
- Shell: fish
|
- Shell: fish / nushell
|
||||||
- Editor: nvim
|
- Editor: nvim / neovide
|
||||||
- WM / DE: [hyprland](https://hyprland.org)
|
- WM / DE: [hyprland](https://hyprland.org)
|
||||||
- Terminal: foot / wezterm
|
- Terminal: foot / wezterm
|
||||||
|
|
||||||
### MacOS
|
### MacOS
|
||||||
- OS: MacOS Ventura
|
- OS: MacOS Ventura
|
||||||
- Shell: fish
|
- Shell: fish / nushell
|
||||||
- Editor: nvim
|
- Editor: nvim / neovide
|
||||||
- WM: [yabai](https://github.com/koekeishiya/yabai)
|
- WM: [yabai](https://github.com/koekeishiya/yabai)
|
||||||
- Terminal: wezterm
|
- Terminal: wezterm
|
||||||
|
|
||||||
### Windows
|
### Windows
|
||||||
- OS: Windows 11
|
- OS: Windows 11
|
||||||
- Shell: nushell
|
- Shell: nushell
|
||||||
- Editor: nvim / helix
|
- Editor: nvim / neovide / helix
|
||||||
- WM: Vanilla
|
- WM: Vanilla /
|
||||||
- Terminal: Vanilla / wezterm
|
- Terminal: Vanilla / wezterm
|
||||||
|
|
||||||
|
|
||||||
|
### For nix
|
||||||
|
|
||||||
|
I'm a recent convert to NixOS from ArchLinux and have been usin it as primary os as well as a package manager on macos so the flake.nix contains configuration for both nix-darwin as well as nixos. It also contains a native home-manager module configuration for non-nixos devices ( like a SteamDeck ).
|
||||||
|
The
|
||||||
|
|
||||||
|
|
||||||
#### Tools
|
#### Tools
|
||||||
Some useful tools I use everyday
|
Some useful tools I regularly use.
|
||||||
| Name | Repo
|
| Name | Repo
|
||||||
| --- | ---
|
| --- | ---
|
||||||
| `bat` | [sharkdp/bat](https://github.com/sharkdp/fd)
|
| `bat` | [sharkdp/bat](https://github.com/sharkdp/fd)
|
||||||
@@ -39,6 +46,8 @@ Some useful tools I use everyday
|
|||||||
| `rg/ripgrep` | [BurntSushi/ripgrep](https://github.com/BurntSushi/ripgrep)
|
| `rg/ripgrep` | [BurntSushi/ripgrep](https://github.com/BurntSushi/ripgrep)
|
||||||
| `starship` | [starship/starship](https://github.com/starship/starship)
|
| `starship` | [starship/starship](https://github.com/starship/starship)
|
||||||
| `z/zoxide` | [ajeetdsouza/zoxide](https://github.com/ajeetdsouza/zoxide)
|
| `z/zoxide` | [ajeetdsouza/zoxide](https://github.com/ajeetdsouza/zoxide)
|
||||||
|
| `anyrun` | [Kirottu/anyrun](https://github.com/Kirottu/anyrun)
|
||||||
|
|
||||||
|
|
||||||
#### Others
|
#### Others
|
||||||
`zig` zig toolchain can be used to compile tree-sitter definitions without having to go through all the hassle of setting up llvm / MSVC on windows
|
`zig` zig toolchain can be used to compile tree-sitter definitions without having to go through all the hassle of setting up llvm / MSVC on windows
|
||||||
@@ -66,47 +75,3 @@ Includes the dotfiles for
|
|||||||
- [tmux](#tmux)
|
- [tmux](#tmux)
|
||||||
- [fish](#fish)
|
- [fish](#fish)
|
||||||
- [zsh](#zsh)
|
- [zsh](#zsh)
|
||||||
|
|
||||||
### alacritty
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
### bspwm
|
|
||||||
|
|
||||||
[bspwm](https://github.com/baskerville/bspwm)
|
|
||||||
|
|
||||||
### conky
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
### neovim
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
### neomutt
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
### picom
|
|
||||||
|
|
||||||
[picom](https://github.com/yshui/picom)
|
|
||||||
|
|
||||||
### rofi
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
### sxhkd
|
|
||||||
|
|
||||||
[sxhkd](https://github.com/baskerville/sxhkd)
|
|
||||||
|
|
||||||
### tmux
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
### fish
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
### zsh
|
|
||||||
|
|
||||||

|
|
||||||
|
|||||||
@@ -1,20 +1,18 @@
|
|||||||
{ inputs, config, pkgs, lib, device, ... }:
|
{ inputs, config, pkgs, lib, device, ... }:
|
||||||
let
|
let
|
||||||
# https://mipmip.github.io/home-manager-option-search/
|
|
||||||
start-tmux = (import ../scripts/start-tmux.nix) pkgs;
|
start-tmux = (import ../scripts/start-tmux.nix) pkgs;
|
||||||
lazy = false;
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
inputs.nix-index-database.hmModules.nix-index
|
inputs.nix-index-database.hmModules.nix-index
|
||||||
# Include the results of the hardware scan.
|
|
||||||
./tmux.nix
|
./tmux.nix
|
||||||
./wezterm.nix
|
./wezterm.nix
|
||||||
] ++ lib.optionals device.isLinux [ ../linux ]
|
./nvim.nix
|
||||||
++ lib.optionals (!lazy) [ ./nvim.nix ];
|
] ++ lib.optionals device.isLinux [ ../linux ];
|
||||||
|
|
||||||
home.packages = with pkgs;
|
home.packages = with pkgs;
|
||||||
[
|
[
|
||||||
|
pandoc
|
||||||
gnupg
|
gnupg
|
||||||
gpg-tui
|
gpg-tui
|
||||||
ngrok
|
ngrok
|
||||||
@@ -47,9 +45,10 @@ in
|
|||||||
nil
|
nil
|
||||||
pkg-config
|
pkg-config
|
||||||
lua-language-server
|
lua-language-server
|
||||||
# mpv
|
|
||||||
(nerdfonts.override { fonts = [ "Hasklig" ]; })
|
(nerdfonts.override { fonts = [ "Hasklig" ]; })
|
||||||
|
pfetch-rs
|
||||||
] ++ lib.optionals device.isLinux [
|
] ++ lib.optionals device.isLinux [
|
||||||
|
mpv
|
||||||
psst
|
psst
|
||||||
gnome.seahorse
|
gnome.seahorse
|
||||||
gnome.nautilus
|
gnome.nautilus
|
||||||
@@ -87,7 +86,7 @@ in
|
|||||||
})
|
})
|
||||||
] ++ lib.optionals device.isMac [ ];
|
] ++ lib.optionals device.isMac [ ];
|
||||||
|
|
||||||
# xdg.enable = true;
|
xdg.enable = true;
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
nix-index-database.comma.enable = true;
|
nix-index-database.comma.enable = true;
|
||||||
@@ -233,15 +232,11 @@ in
|
|||||||
stateVersion = "23.11";
|
stateVersion = "23.11";
|
||||||
|
|
||||||
file = {
|
file = {
|
||||||
".config/tmux/sessions".source = ../../tmux/sessions;
|
# ".config/tmux/sessions".source = ../../tmux/sessions;
|
||||||
".config/macchina".source = ../../macchina;
|
# ".config/macchina".source = ../../macchina;
|
||||||
".config/fish/themes".source = pkgs.catppuccinThemes.fish + "/themes";
|
".config/fish/themes".source = pkgs.catppuccinThemes.fish + "/themes";
|
||||||
# ".cache/nix-index".source = pkgs.nix-index-database;
|
# ".cache/nix-index".source = pkgs.nix-index-database;
|
||||||
} // (if lazy then {
|
};
|
||||||
".config/nvim/lua".source = ../../nvim/lua;
|
|
||||||
".config/nvim/init.lua".source = ../../nvim/init.lua;
|
|
||||||
} else
|
|
||||||
{ });
|
|
||||||
|
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
EDITOR = "nvim";
|
EDITOR = "nvim";
|
||||||
|
|||||||
Reference in New Issue
Block a user