fix spotify
This commit is contained in:
zackartz
parent
769d4b0df5
commit
85521a1666
14 changed files with 223 additions and 262 deletions
|
|
@ -1,75 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
# imports = [./zsh ./zsh/tools.nix ./starship.nix];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
gnumake
|
||||
# Runs programs without installing them
|
||||
comma
|
||||
|
||||
# grep replacement
|
||||
ripgrep
|
||||
|
||||
# ping, but with cool graph
|
||||
gping
|
||||
|
||||
# dns client
|
||||
dogdns
|
||||
|
||||
# neofetch but for git repos
|
||||
onefetch
|
||||
|
||||
# neofetch but for cpu's
|
||||
cpufetch
|
||||
|
||||
# download from yt and other websites
|
||||
yt-dlp
|
||||
|
||||
zsh-history
|
||||
|
||||
# man pages for tiktok attention span mfs
|
||||
tealdeer
|
||||
|
||||
# markdown previewer
|
||||
glow
|
||||
|
||||
# profiling tool
|
||||
hyperfine
|
||||
|
||||
imagemagick
|
||||
ffmpeg-full
|
||||
|
||||
# preview images in terminal
|
||||
catimg
|
||||
|
||||
# networking stuff
|
||||
nmap
|
||||
wget
|
||||
|
||||
# faster find
|
||||
fd
|
||||
|
||||
# http request thingy
|
||||
xh
|
||||
|
||||
# generate regex
|
||||
grex
|
||||
|
||||
# json thingy
|
||||
jq
|
||||
|
||||
# syncthnig for acoustic people
|
||||
rsync
|
||||
|
||||
figlet
|
||||
# Generate qr codes
|
||||
qrencode
|
||||
|
||||
# script kidde stuff
|
||||
hcxdumptool
|
||||
hashcat
|
||||
|
||||
unzip
|
||||
# tshark
|
||||
# termshark
|
||||
];
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
{config, ...}: {
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
enableZshIntegration = config.programs.zsh.enable;
|
||||
settings = {
|
||||
add_newline = false;
|
||||
command_timeout = 1000;
|
||||
scan_timeout = 3;
|
||||
character = {
|
||||
error_symbol = "[](bold red)";
|
||||
success_symbol = "[](bold green)";
|
||||
vicmd_symbol = "[](bold yellow)";
|
||||
format = "$symbol [|](bold bright-black) ";
|
||||
};
|
||||
git_commit = {commit_hash_length = 7;};
|
||||
line_break.disabled = false;
|
||||
lua.symbol = "[](blue) ";
|
||||
python.symbol = "[](blue) ";
|
||||
hostname = {
|
||||
ssh_only = true;
|
||||
format = "[$hostname](bold blue) ";
|
||||
disabled = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (builtins) concatStringsSep;
|
||||
in {
|
||||
home.sessionVariables.STARSHIP_CACHE = "${config.xdg.cacheHome}/starship";
|
||||
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
sessionVariables = {
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
ZSH_AUTOSUGGEST_USE_ASYNC = "true";
|
||||
SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh";
|
||||
};
|
||||
enableAutosuggestions = true;
|
||||
history = {
|
||||
save = 2137;
|
||||
size = 2137;
|
||||
expireDuplicatesFirst = true;
|
||||
ignoreDups = true;
|
||||
ignoreSpace = true;
|
||||
};
|
||||
|
||||
initExtra = let
|
||||
sources = with pkgs; [
|
||||
"${zsh-nix-shell}/share/zsh-nix-shell/nix-shell.plugin.zsh"
|
||||
"${zsh-history}/share/zsh/init.zsh"
|
||||
"${zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh"
|
||||
"${zsh-f-sy-h}/share/zsh/site-functions/F-Sy-H.plugin.zsh"
|
||||
"${zsh-autocomplete}/share/zsh-autocomplete/zsh-autocomplete.plugin.zsh"
|
||||
"${zsh-you-should-use}/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh"
|
||||
"${zsh-navigation-tools}/share/zsh/site-functions/zsh-navigation-tools.plugin.zsh"
|
||||
];
|
||||
|
||||
source = map (source: "source ${source}") sources;
|
||||
|
||||
plugins = concatStringsSep "\n" ([
|
||||
"${pkgs.any-nix-shell}/bin/any-nix-shell zsh --info-right | source /dev/stdin"
|
||||
]
|
||||
++ source);
|
||||
in ''
|
||||
${plugins}
|
||||
|
||||
bindkey "^[[1;5C" forward-word
|
||||
bindkey "^[[1;5D" backward-word
|
||||
'';
|
||||
|
||||
plugins = [
|
||||
{
|
||||
name = "zsh-tmux";
|
||||
file = "zsh-tmux.plugin.zsh";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "laggardkernel";
|
||||
repo = "zsh-tmux";
|
||||
rev = "v1.1.0";
|
||||
sha256 = "sha256-BB9L84HjUnV1OUIp2U2lHYHEg5q4p/TgqLcsCvInkC8=";
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
dirHashes = {
|
||||
music = "$HOME/Music";
|
||||
media = "/run/media/$USER";
|
||||
};
|
||||
|
||||
shellAliases = import ./aliases.nix {inherit pkgs lib config;};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
programs = {
|
||||
gpg.enable = true;
|
||||
man.enable = true;
|
||||
eza.enable = true;
|
||||
dircolors = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
};
|
||||
|
||||
skim = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
defaultCommand = "rg --files --hidden";
|
||||
changeDirWidgetOptions = [
|
||||
"--preview 'eza --icons --git --color always -T -L 3 {} | head -200'"
|
||||
"--exact"
|
||||
];
|
||||
};
|
||||
direnv = {
|
||||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
tealdeer = {
|
||||
enable = true;
|
||||
settings = {
|
||||
display = {
|
||||
compact = false;
|
||||
use_pager = true;
|
||||
};
|
||||
updates = {
|
||||
auto_update = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
# bat = {
|
||||
# enable = true;
|
||||
# config = {
|
||||
# pager = "less -FR";
|
||||
# theme = "catppuccin-frappe";
|
||||
# };
|
||||
# themes = {
|
||||
# catppuccin-frappe = {
|
||||
# src = pkgs.fetchFromGitHub {
|
||||
# owner = "catppuccin";
|
||||
# repo = "bat";
|
||||
# rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
|
||||
# sha256 = "6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
|
||||
# };
|
||||
# file = "Catppuccin-frappe.tmTheme";
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
};
|
||||
}
|
||||
|
|
@ -2,17 +2,83 @@
|
|||
options,
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.custom; let
|
||||
cfg = config.shells.zsh;
|
||||
|
||||
inherit (builtins) concatStringsSep;
|
||||
in {
|
||||
options.shells.zsh = with types; {
|
||||
enable = mkBoolOpt false "Enable Zsh Configuration";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.sessionVariables.STARSHIP_CACHE = "${config.xdg.cacheHome}/starship";
|
||||
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
sessionVariables = {
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
ZSH_AUTOSUGGEST_USE_ASYNC = "true";
|
||||
SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh";
|
||||
};
|
||||
enableAutosuggestions = true;
|
||||
history = {
|
||||
save = 2137;
|
||||
size = 2137;
|
||||
expireDuplicatesFirst = true;
|
||||
ignoreDups = true;
|
||||
ignoreSpace = true;
|
||||
};
|
||||
|
||||
initExtra = let
|
||||
sources = with pkgs; [
|
||||
"${zsh-nix-shell}/share/zsh-nix-shell/nix-shell.plugin.zsh"
|
||||
"${zsh-history}/share/zsh/init.zsh"
|
||||
"${zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh"
|
||||
"${zsh-f-sy-h}/share/zsh/site-functions/F-Sy-H.plugin.zsh"
|
||||
"${zsh-autocomplete}/share/zsh-autocomplete/zsh-autocomplete.plugin.zsh"
|
||||
"${zsh-you-should-use}/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh"
|
||||
"${zsh-navigation-tools}/share/zsh/site-functions/zsh-navigation-tools.plugin.zsh"
|
||||
];
|
||||
|
||||
source = map (source: "source ${source}") sources;
|
||||
|
||||
plugins = concatStringsSep "\n" ([
|
||||
"${pkgs.any-nix-shell}/bin/any-nix-shell zsh --info-right | source /dev/stdin"
|
||||
]
|
||||
++ source);
|
||||
in ''
|
||||
${plugins}
|
||||
|
||||
bindkey "^[[1;5C" forward-word
|
||||
bindkey "^[[1;5D" backward-word
|
||||
'';
|
||||
|
||||
plugins = [
|
||||
{
|
||||
name = "zsh-tmux";
|
||||
file = "zsh-tmux.plugin.zsh";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "laggardkernel";
|
||||
repo = "zsh-tmux";
|
||||
rev = "v1.1.0";
|
||||
sha256 = "sha256-BB9L84HjUnV1OUIp2U2lHYHEg5q4p/TgqLcsCvInkC8=";
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
dirHashes = {
|
||||
music = "$HOME/Music";
|
||||
media = "/run/media/$USER";
|
||||
};
|
||||
|
||||
shellAliases = import ./aliases.nix {inherit pkgs lib config;};
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
gnumake
|
||||
# Runs programs without installing them
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue