From b3d49dcb70a67c7fc60bfff9914bf0434e2b6390 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Fri, 8 Apr 2022 17:02:16 -0700 Subject: delete all CLI modules Everything is under home/ now --- users/fcuny/cli/backups.nix | 23 ----------------- users/fcuny/cli/default.nix | 8 ------ users/fcuny/cli/git.nix | 47 ---------------------------------- users/fcuny/cli/media.nix | 53 --------------------------------------- users/fcuny/cli/shell.nix | 10 -------- users/fcuny/cli/ssh.nix | 17 ------------- users/fcuny/cli/tmux.nix | 13 ---------- users/fcuny/configs/yt-dlp/config | 26 ------------------- 8 files changed, 197 deletions(-) delete mode 100644 users/fcuny/cli/backups.nix delete mode 100644 users/fcuny/cli/default.nix delete mode 100644 users/fcuny/cli/git.nix delete mode 100644 users/fcuny/cli/media.nix delete mode 100644 users/fcuny/cli/shell.nix delete mode 100644 users/fcuny/cli/ssh.nix delete mode 100644 users/fcuny/cli/tmux.nix delete mode 100644 users/fcuny/configs/yt-dlp/config diff --git a/users/fcuny/cli/backups.nix b/users/fcuny/cli/backups.nix deleted file mode 100644 index 57bd8b7..0000000 --- a/users/fcuny/cli/backups.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ pkgs, ... }: - -{ - home.packages = with pkgs; [ restic ]; - - systemd.user.services.backup = { - Unit = { - Description = "backup my home directory"; - Documentation = "man:resitc(1)"; - }; - Service = { - Type = "oneshot"; - Environment = [ - "RESTIC_REPOSITORY=sftp:fcuny@192.168.0.107:/data/slow/backups/users/fcuny" - ''RESTIC_PASSWORD_COMMAND="pass backup/restic@%H"'' - ]; - ExecStartPre = - "${pkgs.systemd}/lib/systemd/systemd-networkd-wait-online --interface=wg0"; - ExecStart = - "${pkgs.restic}/bin/restic --tag=home-nixos --exclude=%h/media --exclude=%C --exclude=%E backup %h"; - }; - }; -} diff --git a/users/fcuny/cli/default.nix b/users/fcuny/cli/default.nix deleted file mode 100644 index 77d236e..0000000 --- a/users/fcuny/cli/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = - [ ./backups.nix ./git.nix ./media.nix ./shell.nix ./ssh.nix ./tmux.nix ]; - - home.packages = [ pkgs.gcc pkgs.gnumake pkgs.jq pkgs.ripgrep ]; -} diff --git a/users/fcuny/cli/git.nix b/users/fcuny/cli/git.nix deleted file mode 100644 index 8afb7ec..0000000 --- a/users/fcuny/cli/git.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, config, ... }: - -let inherit (lib) mkIf; -in { - programs.git = { - enable = true; - aliases = { - s = "status --short --branch"; - amend = "commit --amend --no-edit"; - }; - extraConfig = { - core.whitespace = "trailing-space,space-before-tab"; - color.ui = "true"; - push.default = "simple"; - init.defaultBranch = "main"; - branch.autosetuprebase = "remote"; - branch.sort = "authordate"; - }; - userName = "Franck Cuny"; - userEmail = "franck@fcuny.net"; - extraConfig = { - "credential \"https://github.com\"" = { username = "fcuny"; }; - "credential \"https://git.fcuny.net\"" = { username = "fcuny"; }; - }; - ignores = [ - "*.elc" - "*.iml" - "*.o" - "*.pyc" - "*.pyo" - "*pyc" - "*~" - ".DS_Store" - ".\\#" - ".dir-locals.el" - ".direnv/*" - ".idea" - ".projectile" - ".pytest_cache/" - "/env/*" - "Icon" - "TAGS" - "\\#*\\#" - "tags" - ]; - }; -} diff --git a/users/fcuny/cli/media.nix b/users/fcuny/cli/media.nix deleted file mode 100644 index 9e965e5..0000000 --- a/users/fcuny/cli/media.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ config, lib, pkgs, hostname, ... }: -let - musicDirectory = if (hostname == "tahoe") then - "/data/fast/music" - else - "/home/fcuny/media/music"; -in { - xdg.configFile."yt-dlp/config".source = ../configs/yt-dlp/config; - - home.packages = with pkgs; [ - yt-dlp - flac - abcde - (pkgs.writers.writeDashBin "rip-flac" '' - ${pkgs.abcde}/bin/abcde -Vx -G -a "cddb,read,encode,tag,move,clean" -o flac - '') - ]; - - # inspired from https://blog.yossarian.net/2022/02/21/Enjoying-music-curation-again - programs.beets = { - enable = true; - settings = { - directory = musicDirectory; - plugins = - "fromfilename discogs duplicates fetchart embedart badfiles lastgenre scrub"; - paths = { - default = "$albumartist/$album%aunique{}/$track $title"; - singleton = "Singles/$artist/$title"; - comp = "Compilations/$album%aunique{}/$track - $title"; - "albumtype:soundtrack" = "Soundtracks/$album ($year)/$track $title"; - }; - import = { - copy = true; - move = true; - }; - va_name = "Various Artists"; - embedart = { ifempty = true; }; - - lastgenre = { - auto = false; - canonical = true; - fallback = "unknown"; - force = true; - prefer_specific = true; - }; - - fetchart = { - cautious = true; - sources = "filesystem coverart itunes amazon lastfm wikipedia"; - }; - }; - }; -} diff --git a/users/fcuny/cli/shell.nix b/users/fcuny/cli/shell.nix deleted file mode 100644 index 0e6a790..0000000 --- a/users/fcuny/cli/shell.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - programs.fish = { - enable = true; - interactiveShellInit = '' - set fish_greeting - ''; - }; -} diff --git a/users/fcuny/cli/ssh.nix b/users/fcuny/cli/ssh.nix deleted file mode 100644 index 9708660..0000000 --- a/users/fcuny/cli/ssh.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - programs.ssh = { - enable = true; - forwardAgent = true; - serverAliveInterval = 60; - controlMaster = "auto"; - controlPersist = "30m"; - matchBlocks = { - "github.com" = { - hostname = "github.com"; - user = "git"; - forwardAgent = false; - extraOptions = { preferredAuthentications = "publickey"; }; - }; - }; - }; -} diff --git a/users/fcuny/cli/tmux.nix b/users/fcuny/cli/tmux.nix deleted file mode 100644 index 1a9a2d4..0000000 --- a/users/fcuny/cli/tmux.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - programs.tmux = { - enable = true; - terminal = "xterm-256color"; - escapeTime = 0; - aggressiveResize = true; - shortcut = "z"; - - extraConfig = '' - setw -g mouse on - ''; - }; -} diff --git a/users/fcuny/configs/yt-dlp/config b/users/fcuny/configs/yt-dlp/config deleted file mode 100644 index 4710c9f..0000000 --- a/users/fcuny/configs/yt-dlp/config +++ /dev/null @@ -1,26 +0,0 @@ -# Preferred formats: -# 1. 1080p, combined, mp4 (for some non-youtube sites). -# 2. 1080p, combined, any format (in case mp4 is not available). -# 3. 1080p, best video + best audio (only available with separate video and audio on youtube). -# 4. >30fps (any resolution), best video + best audio (only available with separate video and audio on youtube). -# 5. 720p, pre-joined, because it is available on youtube. -# 6. <720p, best video + best audio (480p and some other lower resolutions are only available with separate video and audio on youtube). -# 7. When all else fails, take whatever youtube-dl thinks is the best (mainly for non-YT websites). ---format="best[height=1080][ext=mp4]/best[height=1080]/bestvideo[height=1080][ext=mp4]+bestaudio[ext=m4a]/bestvideo[fps>30][ext=mp4]+bestaudio[ext=m4a]/best[height=720][ext=mp4]/bestvideo[ext=mp4]+bestaudio[ext=m4a]/best" - ---sub-langs all ---write-subs - ---convert-subs=srt - ---restrict-filenames ---output="$HOME/media/videos/%(title)s.%(ext)s" ---merge-output-format mkv - ---embed-metadata ---embed-chapters ---embed-info-json -# create chapter entries to mark sponsor segments ---sponsorblock-mark all - ---yes-playlist -- cgit 1.4.1