so long fish

This commit is contained in:
Danilo Reyes 2023-08-19 17:57:14 -06:00
parent 2aedb7039b
commit f6752a6d61
2 changed files with 703 additions and 894 deletions

View File

@ -7,27 +7,27 @@ let
25152 # ssh 25152 # ssh
49494 # gerbera 49494 # gerbera
]; ];
open_firewall_port_ranges = [ open_firewall_port_ranges = [{
{ from = 1714; to = 1764; } # kdeconnect from = 1714;
to = 1764;
} # kdeconnect
]; ];
VERSION = "23.05"; VERSION = "23.05";
# "https://github.com/nix-community/home-manager/archive/master.tar.gz"; # "https://github.com/nix-community/home-manager/archive/master.tar.gz";
unstable_tarball = builtins.fetchTarball unstable_tarball =
https://github.com/nixos/nixpkgs/tarball/master; builtins.fetchTarball "https://github.com/nixos/nixpkgs/tarball/master";
unstable = import unstable_tarball { unstable = import unstable_tarball { config = config.nixpkgs.config; };
config = config.nixpkgs.config; nix-gaming = import (builtins.fetchTarball
}; "https://github.com/fufexan/nix-gaming/archive/master.tar.gz");
nix-gaming = import (builtins.fetchTarball "https://github.com/fufexan/nix-gaming/archive/master.tar.gz"); nextcloud_scrapsync = pkgs.writeScriptBin "nextcloud_scrapsync"
nextcloud_scrapsync = pkgs.writeScriptBin (builtins.readFile ./scripts/nextcloud_scrapsync.sh);
"nextcloud_scrapsync" (builtins.readFile ./scripts/nextcloud_scrapsync.sh); manage_library = pkgs.writeScriptBin "manage_library"
manage_library = pkgs.writeScriptBin (builtins.readFile ./scripts/manage_library.sh);
"manage_library" (builtins.readFile ./scripts/manage_library.sh); ffmpeg4discord = pkgs.writeScriptBin "ffmpeg4discord"
ffmpeg4discord = pkgs.writeScriptBin (builtins.readFile ./scripts/ffmpeg4discord.py);
"ffmpeg4discord" (builtins.readFile ./scripts/ffmpeg4discord.py); chat-dl =
chat-dl = pkgs.writeScriptBin pkgs.writeScriptBin "chat-dl" (builtins.readFile ./scripts/chat-dl.sh);
"chat-dl" (builtins.readFile ./scripts/chat-dl.sh); in { # Remember to close this bracket at the end of the document
in
{ # Remember to close this bracket at the end of the document
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
@ -44,9 +44,7 @@ time.timeZone = "America/Mexico_City";
i18n = { i18n = {
defaultLocale = "en_CA.UTF-8"; defaultLocale = "en_CA.UTF-8";
extraLocaleSettings = { extraLocaleSettings = { LC_MONETARY = "es_MX.UTF-8"; };
LC_MONETARY = "es_MX.UTF-8";
};
}; };
console = { console = {
font = "Lat2-Terminus16"; font = "Lat2-Terminus16";
@ -72,8 +70,7 @@ environment.gnome.excludePackages = (with pkgs; [
gnome-connections gnome-connections
# gnome-shell-extensions # gnome-shell-extensions
baobab baobab
]) ]) ++ (with pkgs.gnome; [
++ (with pkgs.gnome; [
# totem # totem
gedit gedit
gnome-music gnome-music
@ -120,16 +117,16 @@ security.sudo = {
# noPass = true; # noPass = true;
# }]; # }];
nixpkgs.config = { nixpkgs.config = { allowUnfree = true; };
allowUnfree = true;
};
users.users.jawz = { users.users.jawz = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "networkmanager" "docker" "scanner" "lp" ]; extraGroups = [ "wheel" "networkmanager" "docker" "scanner" "lp" ];
initialPassword = "password"; initialPassword = "password";
openssh = { openssh = {
authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB5GaQM4N+yGAByibOFQOBVMV/6TjOfaGIP+NunMiK76 gpodeacero\cdreyes@100CDREYES" ]; authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB5GaQM4N+yGAByibOFQOBVMV/6TjOfaGIP+NunMiK76 gpodeacerocdreyes@100CDREYES"
];
}; };
packages = (with pkgs; [ packages = (with pkgs; [
@ -282,12 +279,17 @@ gnome.gnome-tweaks # tweaks for the gnome desktop environment
# Fonts # Fonts
(nerdfonts.override { (nerdfonts.override {
fonts = [ "Agave" "CascadiaCode" "SourceCodePro" "Ubuntu" "FiraCode" "Iosevka" ]; fonts = [
"Agave"
"CascadiaCode"
"SourceCodePro"
"Ubuntu"
"FiraCode"
"Iosevka"
];
}) })
symbola symbola
(papirus-icon-theme.override { (papirus-icon-theme.override { color = "adwaita"; })
color = "adwaita";
})
]) ++ (with pkgs.python3Packages; [ ]) ++ (with pkgs.python3Packages; [
flake8 # wraper for pyflakes, pycodestyle and mccabe flake8 # wraper for pyflakes, pycodestyle and mccabe
@ -305,8 +307,7 @@ symbola
src = ./scripts/download/.; src = ./scripts/download/.;
doCheck = false; doCheck = false;
buildInputs = [ setuptools ]; buildInputs = [ setuptools ];
propagatedBuildInputs = propagatedBuildInputs = [ pyyaml types-pyyaml ];
[ pyyaml types-pyyaml ];
}) })
(buildPythonApplication rec { (buildPythonApplication rec {
pname = "classifier"; pname = "classifier";
@ -317,8 +318,7 @@ symbola
}; };
doCheck = false; doCheck = false;
buildInputs = [ setuptools ]; buildInputs = [ setuptools ];
propagatedBuildInputs = propagatedBuildInputs = [ arrow ];
[ arrow ];
}) })
(buildPythonApplication rec { (buildPythonApplication rec {
pname = "ffpb"; pname = "ffpb";
@ -329,8 +329,7 @@ symbola
}; };
doCheck = false; doCheck = false;
buildInputs = [ setuptools ]; buildInputs = [ setuptools ];
propagatedBuildInputs = propagatedBuildInputs = [ tqdm ];
[ tqdm ];
}) })
]) ++ (with pkgs.bat-extras; [ ]) ++ (with pkgs.bat-extras; [
@ -341,13 +340,6 @@ symbola
batwatch # probably my next best friend batwatch # probably my next best friend
prettybat # trans your sourcecode! prettybat # trans your sourcecode!
]) ++ (with pkgs.fishPlugins; [
sponge # keep history clean from typos
fzf-fish # fish command line with fzf keybindings
colored-man-pages # self explanatory
autopair-fish # who has time for a closing bracket?
bass # integrate bash utilities on fish
]) ++ (with pkgs.gnomeExtensions; [ ]) ++ (with pkgs.gnomeExtensions; [
appindicator # applets for open applications appindicator # applets for open applications
gsconnect # sync data and notifications from your phone gsconnect # sync data and notifications from your phone
@ -368,7 +360,8 @@ symbola
markdownlint-cli # Linter markdownlint-cli # Linter
prettier # Linter prettier # Linter
pnpm # Package manager pnpm # Package manager
]); }; # <--- end of package list ]);
}; # <--- end of package list
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
@ -384,16 +377,19 @@ programs.bash = {
historyFile = "\${XDG_STATE_HOME}/bash/history"; historyFile = "\${XDG_STATE_HOME}/bash/history";
historyControl = [ "erasedups" ]; historyControl = [ "erasedups" ];
shellAliases = { shellAliases = {
ls = "exa --icons --group-directories-first --no-permissions --no-user --no-time"; ls =
"exa --icons --group-directories-first --no-permissions --no-user --no-time";
edit = "emacsclient -t"; edit = "emacsclient -t";
comic = "download -u jawz -i $(cat $lc | fzf --multi --exact -i)"; comic = "download -u jawz -i $(cat $lc | fzf --multi --exact -i)";
gallery = "download -u jawz -i $(cat $lw | fzf --multi --exact -i)"; gallery = "download -u jawz -i $(cat $lw | fzf --multi --exact -i)";
open_gallery = "cd /mnt/disk2/scrapping/JawZ/gallery-dl && nautilus \ open_gallery = ''
\"$(fd . ./ Husbands -tdirectory -d 1 | fzf -i)\""; cd /mnt/disk2/scrapping/JawZ/gallery-dl && nautilus
unique_extensions = "fd -tf | rev | cut -d. -f1 | rev | tr '[:upper:]' '[:lower:]' | sort | uniq --count | sort -rn"; "$(fd . ./ Husbands -tdirectory -d 1 | fzf -i)"'';
unique_extensions =
"fd -tf | rev | cut -d. -f1 | rev | tr '[:upper:]' '[:lower:]' | sort | uniq --count | sort -rn";
cp = "cp -i"; cp = "cp -i";
mv = "mv -i"; mv = "mv -i";
mkcd = "mkdir -pv \"$1\" && cd \"$1\" || exit"; mkcd = ''mkdir -pv "$1" && cd "$1" || exit'';
mkdir = "mkdir -p"; mkdir = "mkdir -p";
rm = "trash"; rm = "trash";
".." = "cd .."; ".." = "cd ..";
@ -437,76 +433,6 @@ nixos-magic () {
''; '';
}; };
programs.fish = {
enable = true;
# useBabelfish = true; This setting doens't work from inside home-manager
shellAliases = {
ls = "exa --icons --group-directories-first --no-permissions --no-user --no-time";
edit = "emacsclient -t";
comic = "download -u jawz -i (cat $lc | fzf --multi --exact -i)";
gallery = "download -u jawz -i (cat $lw | fzf --multi --exact -i)";
open_gallery = "open (cd /mnt/disk2/scrapping/JawZ/gallery-dl && fd . ./ Husbands kemonoparty -tdirectory -d 1 | fzf)";
unique_extensions = "find . -type f | string match -r '([^.\/]+)\$' | sort -u";
cp = "cp -i";
mv = "mv -i";
mkdir = "mkdir -p";
rm = "trash";
".." = "cd ..";
"..." = "cd ../..";
".3" = "cd ../../..";
".4" = "cd ../../../..";
".5" = "cd ../../../../..";
};
shellAbbrs = {
dl = "download -u jawz -i";
ex = "ls";
e = "edit";
c = "cat";
f = "fzf --multi --exact -i";
sc = "systemctl --user";
jc = "journalctl --user -xeu";
};
interactiveShellInit = ''
function fish_greeting
~/.local/bin/pokemon-colorscripts -r --no-title
end
# Lists
set -l list_root ${config.home.homeDirectory}/.config/jawz/lists/jawz
set lw $list_root/watch.txt
set li $list_root/instant.txt
set lc $list_root/comic.txt
set command_timeout = 30
set GPG_TTY (tty)
# Set EMACS/VI mode
function fish_user_key_bindings
# fish_default_key_bindings
fish_vi_key_bindings
end
'';
functions = {
nixos-magic = ''
set -l nix_file "$HOME/Development/NixOS/configuration.nix"
set -l hardware_file "$HOME/Development/NixOS/hardware-configuration.nix"
nixfmt $nix_file
nixfmt $hardware_file
sudo nixos-rebuild switch -I nixos-config=$nix_file
'';
mkcd = ''
mkdir -pv $argv
cd $argv
'';
};
};
programs = { programs = {
starship.enable = true; starship.enable = true;
direnv = { direnv = {
@ -518,7 +444,8 @@ programs = {
enable = true; enable = true;
config = { config = {
pager = "less -FR"; pager = "less -FR";
theme = "base16"; }; theme = "base16";
};
}; };
git = { git = {
enable = true; enable = true;
@ -547,7 +474,8 @@ xdg = {
}; };
configFile = { configFile = {
"wgetrc".source = ./dotfiles/wget/wgetrc; "wgetrc".source = ./dotfiles/wget/wgetrc;
"configstore/update-notifier-npm-check.json".source = ./dotfiles/npm/update-notifier-npm-check.json; "configstore/update-notifier-npm-check.json".source =
./dotfiles/npm/update-notifier-npm-check.json;
"npm/npmrc".source = ./dotfiles/npm/npmrc; "npm/npmrc".source = ./dotfiles/npm/npmrc;
"gallery-dl/config.json".source = ./dotfiles/gallery-dl/config.json; "gallery-dl/config.json".source = ./dotfiles/gallery-dl/config.json;
"htop/htoprc".source = ./dotfiles/htop/htoprc; "htop/htoprc".source = ./dotfiles/htop/htoprc;
@ -636,9 +564,7 @@ snapraid = {
olderThan = 10; olderThan = 10;
interval = "4:00"; interval = "4:00";
}; };
parityFiles = [ parityFiles = [ "/mnt/parity/snapraid.parity" ];
"/mnt/parity/snapraid.parity"
];
extraConfig = '' extraConfig = ''
autosave 50 autosave 50
''; '';
@ -662,7 +588,6 @@ snapraid = {
}; };
programs = { programs = {
fish.enable = true;
fzf.fuzzyCompletion = true; fzf.fuzzyCompletion = true;
mtr.enable = true; mtr.enable = true;
neovim = { neovim = {
@ -673,9 +598,7 @@ programs = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;
}; };
geary = { geary = { enable = true; };
enable = true;
};
steam = { steam = {
enable = true; enable = true;
remotePlay.openFirewall = true; remotePlay.openFirewall = true;
@ -693,11 +616,7 @@ services = {
fstrim.enable = true; fstrim.enable = true;
btrfs.autoScrub = { btrfs.autoScrub = {
enable = true; enable = true;
fileSystems = [ fileSystems = [ "/" "/mnt/disk1" "/mnt/disk2" ];
"/"
"/mnt/disk1"
"/mnt/disk2"
];
}; };
openssh = { openssh = {
enable = true; enable = true;
@ -707,12 +626,10 @@ services = {
KbdInteractiveAuthentication = false; KbdInteractiveAuthentication = false;
}; };
startWhenNeeded = true; startWhenNeeded = true;
listenAddresses = [ listenAddresses = [{
{
addr = "0.0.0.0"; addr = "0.0.0.0";
port = 25152; port = 25152;
} }];
];
}; };
emacs = { emacs = {
enable = true; enable = true;
@ -740,23 +657,19 @@ systemd.services = {
environment = { environment = {
FILE = "/home/jawz/Development/Docker/docker-compose.yml"; FILE = "/home/jawz/Development/Docker/docker-compose.yml";
}; };
path = [ path = [ pkgs.docker-compose ];
pkgs.docker-compose
];
serviceConfig = { serviceConfig = {
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 30; RestartSec = 30;
ExecStart = "${pkgs.docker-compose}/bin/docker-compose -f \${FILE} up --remove-orphans"; ExecStart =
"${pkgs.docker-compose}/bin/docker-compose -f \${FILE} up --remove-orphans";
ExecStop = "${pkgs.docker-compose}/bin/docker-compose -f \${FILE} down"; ExecStop = "${pkgs.docker-compose}/bin/docker-compose -f \${FILE} down";
}; };
}; };
"nextcloud_scrapsync" = { "nextcloud_scrapsync" = {
description = "Sync scrapped files with nextcloud"; description = "Sync scrapped files with nextcloud";
wantedBy = [ "default.target" ]; wantedBy = [ "default.target" ];
path = [ path = [ pkgs.bash nextcloud_scrapsync ];
pkgs.bash
nextcloud_scrapsync
];
serviceConfig = { serviceConfig = {
RestartSec = 30; RestartSec = 30;
ExecStart = "${nextcloud_scrapsync}/bin/nextcloud_scrapsync"; ExecStart = "${nextcloud_scrapsync}/bin/nextcloud_scrapsync";
@ -786,9 +699,7 @@ systemd.user.services = {
restartIfChanged = true; restartIfChanged = true;
description = "Run hentai@home server"; description = "Run hentai@home server";
wantedBy = [ "default.target" ]; wantedBy = [ "default.target" ];
path = [ path = [ pkgs.HentaiAtHome ];
pkgs.HentaiAtHome
];
serviceConfig = { serviceConfig = {
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 30; RestartSec = 30;
@ -799,12 +710,9 @@ systemd.user.services = {
"manage_library" = { "manage_library" = {
enable = true; enable = true;
restartIfChanged = true; restartIfChanged = true;
description = "Run the manage library fish script"; description = "Run the manage library bash script";
wantedBy = [ "default.target" ]; wantedBy = [ "default.target" ];
path = [ path = [ pkgs.bash manage_library ];
pkgs.fish
manage_library
];
serviceConfig = { serviceConfig = {
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 30; RestartSec = 30;

View File

@ -531,17 +531,6 @@ symbola
prettybat # trans your sourcecode! prettybat # trans your sourcecode!
#+end_src #+end_src
** FISH PLUGINS
#+begin_src nix
]) ++ (with pkgs.fishPlugins; [
sponge # keep history clean from typos
fzf-fish # fish command line with fzf keybindings
colored-man-pages # self explanatory
autopair-fish # who has time for a closing bracket?
bass # integrate bash utilities on fish
#+end_src
** GNOME EXTENSIONS ** GNOME EXTENSIONS
#+begin_src nix #+begin_src nix
@ -669,93 +658,6 @@ nixos-magic () {
}; };
#+end_src #+end_src
*** FISH
#+begin_src nix
programs.fish = {
enable = true;
# useBabelfish = true; This setting doens't work from inside home-manager
shellAliases = {
ls = "exa --icons --group-directories-first --no-permissions --no-user --no-time";
edit = "emacsclient -t";
comic = "download -u jawz -i (cat $lc | fzf --multi --exact -i)";
gallery = "download -u jawz -i (cat $lw | fzf --multi --exact -i)";
open_gallery = "open (cd /mnt/disk2/scrapping/JawZ/gallery-dl && fd . ./ Husbands kemonoparty -tdirectory -d 1 | fzf)";
unique_extensions = "find . -type f | string match -r '([^.\/]+)\$' | sort -u";
cp = "cp -i";
mv = "mv -i";
mkdir = "mkdir -p";
rm = "trash";
".." = "cd ..";
"..." = "cd ../..";
".3" = "cd ../../..";
".4" = "cd ../../../..";
".5" = "cd ../../../../..";
};
shellAbbrs = {
dl = "download -u jawz -i";
ex = "ls";
e = "edit";
c = "cat";
f = "fzf --multi --exact -i";
sc = "systemctl --user";
jc = "journalctl --user -xeu";
};
interactiveShellInit = ''
#+end_src
#+begin_src fish
function fish_greeting
~/.local/bin/pokemon-colorscripts -r --no-title
end
# Lists
set -l list_root ${config.home.homeDirectory}/.config/jawz/lists/jawz
set lw $list_root/watch.txt
set li $list_root/instant.txt
set lc $list_root/comic.txt
set command_timeout = 30
set GPG_TTY (tty)
# Set EMACS/VI mode
function fish_user_key_bindings
# fish_default_key_bindings
fish_vi_key_bindings
end
#+end_src
#+begin_src nix
'';
#+end_src
#+begin_src nix
functions = {
nixos-magic = ''
#+end_src
#+begin_src fish
set -l nix_file "$HOME/Development/NixOS/configuration.nix"
set -l hardware_file "$HOME/Development/NixOS/hardware-configuration.nix"
nixfmt $nix_file
nixfmt $hardware_file
sudo nixos-rebuild switch -I nixos-config=$nix_file
#+end_src
#+begin_src nix
'';
mkcd = ''
#+end_src
#+begin_src fish
mkdir -pv $argv
cd $argv
#+end_src
#+begin_src nix
'';
};
};
#+end_src
*** OTHER *** OTHER
#+begin_src nix #+begin_src nix
@ -957,7 +859,6 @@ of some services.
#+begin_src nix #+begin_src nix
programs = { programs = {
fish.enable = true;
fzf.fuzzyCompletion = true; fzf.fuzzyCompletion = true;
mtr.enable = true; mtr.enable = true;
neovim = { neovim = {
@ -1100,10 +1001,10 @@ systemd.user.services = {
"manage_library" = { "manage_library" = {
enable = true; enable = true;
restartIfChanged = true; restartIfChanged = true;
description = "Run the manage library fish script"; description = "Run the manage library bash script";
wantedBy = [ "default.target" ]; wantedBy = [ "default.target" ];
path = [ path = [
pkgs.fish pkgs.bash
manage_library manage_library
]; ];
serviceConfig = { serviceConfig = {