From 1abb54693d4473cd59c0eb52eb1fc1b7f6802762 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Mon, 1 Aug 2022 12:24:30 +0200 Subject: [PATCH] sail: fish shell --- flake.lock | 24 ++++++++++++------------ home/hosts/Styx.nix | 4 +--- home/hosts/sail.nix | 7 +++---- home/programs/nvim/plugins.nix | 12 ++++++------ home/programs/streamlink.nix | 8 ++++++++ home/programs/yt-dlp.nix | 6 +++++- system/hosts/sail.nix | 3 +++ 7 files changed, 38 insertions(+), 26 deletions(-) create mode 100644 home/programs/streamlink.nix diff --git a/flake.lock b/flake.lock index 0d0c6c9..4c1df61 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1659244399, - "narHash": "sha256-6AlHM5YGKjIoYPeZq06/KSNnKGcfKIt7O3bTrWtFbFc=", + "lastModified": 1659309744, + "narHash": "sha256-HMPYMhcqJ8W/RwJmpmIenSMwyQXZTdJHTBlZYiohPNI=", "owner": "neovim", "repo": "neovim", - "rev": "c1652bdcb5b5ca95b5ae328cec582f23816b70dd", + "rev": "8952def50afa8308e044c0100e6d4fa367d0a9c2", "type": "github" }, "original": { @@ -140,11 +140,11 @@ ] }, "locked": { - "lastModified": 1659255315, - "narHash": "sha256-nWw0xTWc9CqvoLstBdxgwxYPIuBuXnEXe1WmVtx22js=", + "lastModified": 1659341861, + "narHash": "sha256-bSjp4/Z3ujV8ABqMKbMGJ35b2OwG3mpmsdgPoLWh6Bc=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "e1ae0a56d37bcb8394f9b9d8ad92119d87cfd19d", + "rev": "0e17ee068e94dd888b41791a910ff1d96dfa6296", "type": "github" }, "original": { @@ -175,11 +175,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1659190188, - "narHash": "sha256-LudYrDFPFaQMW0l68TYkPWRPKmqpxIFU1nWfylIp9AQ=", + "lastModified": 1659254610, + "narHash": "sha256-ee5W5MLWZ3kdx5hwOUs6trOJit+GeTDfG+Lg3rANKoc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3fddd46a7f3418d7e3940ded94701aba569161d", + "rev": "67f49b2a3854e8b5e3f9df4422225daa0985f451", "type": "github" }, "original": { @@ -223,11 +223,11 @@ ] }, "locked": { - "lastModified": 1659228580, - "narHash": "sha256-mOgXbbjl6k+jinEeUByuN74gSX74+NVSZCWvuSTElGs=", + "lastModified": 1659315496, + "narHash": "sha256-d2UFb31bF2hJrJ4Rp0JCDK1hCuw0Em08OR1cbLbmkNA=", "owner": "arqv", "repo": "zig-overlay", - "rev": "7608ad89206b52a025fc22d64cfb81b4133ef8c4", + "rev": "b991fe45280c45695c81b0cc6824e3c532a2ec56", "type": "github" }, "original": { diff --git a/home/hosts/Styx.nix b/home/hosts/Styx.nix index dce668b..5a4dd95 100644 --- a/home/hosts/Styx.nix +++ b/home/hosts/Styx.nix @@ -26,6 +26,7 @@ ../programs/ssh.nix + ../programs/streamlink.nix ../programs/yt-dlp.nix ]; @@ -36,7 +37,6 @@ agilebits-op aria2 arp-scan - atomicparsley cachix cliclick curlFull @@ -55,8 +55,6 @@ parallel q ripgrep - rtmpdump - streamlink socat tokei viddy diff --git a/home/hosts/sail.nix b/home/hosts/sail.nix index eb43616..6c34e0b 100644 --- a/home/hosts/sail.nix +++ b/home/hosts/sail.nix @@ -2,6 +2,9 @@ { imports = [ + ../programs/fish.nix + ../programs/starship.nix + ../programs/nvim ../programs/git.nix @@ -25,8 +28,4 @@ ripgrep ]; }; - - programs = { - zoxide.enable = true; - }; } diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index 8320ba2..842d638 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -241,12 +241,12 @@ }; comment-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-07-26"; + version = "2022-08-01"; src = pkgs.fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "78ab4e9785b6da9b7a539df3bd6f70300dc9482b"; - sha256 = "1dgbhf8l3212rvhs424cdb2qh07k95biazyc0qy5xa7asrdwj1m7"; + rev = "006724e38c244c3128b2840ea40bd61dd6c419f0"; + sha256 = "1aq8k68hfvqiawgk7pgvqh7c4f86c86zw7z634wmsrjvl1cckv22"; fetchSubmodules = false; }; }; @@ -263,12 +263,12 @@ }; friendly-snippets = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-07-30"; + version = "2022-08-01"; src = pkgs.fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "1db69684a27eec0b9f520a5d7d95d414fc30ba91"; - sha256 = "1qsb92sl6nyihy63h0dyif8fnb39gpggf8s7xv4yf1wrlzxx30al"; + rev = "8880d7257e6f25e177a8192ef35d4ba8874b004d"; + sha256 = "1mh44wjnm2q0424gkasav3cv5344ky6nwsvcdb8gbw5268ijjz7a"; fetchSubmodules = false; }; }; diff --git a/home/programs/streamlink.nix b/home/programs/streamlink.nix new file mode 100644 index 0000000..45fbace --- /dev/null +++ b/home/programs/streamlink.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: + +{ + home.packages = with pkgs; [ + rtmpdump + streamlink + ]; +} diff --git a/home/programs/yt-dlp.nix b/home/programs/yt-dlp.nix index ea166bf..4e82792 100644 --- a/home/programs/yt-dlp.nix +++ b/home/programs/yt-dlp.nix @@ -1,7 +1,11 @@ { pkgs, ... }: { - home.packages = [ pkgs.yt-dlp ]; + home.packages = with pkgs; [ + atomicparsley + rtmpdump + yt-dlp + ]; xdg.configFile.yt-dlp = { source = ../config/yt-dlp; diff --git a/system/hosts/sail.nix b/system/hosts/sail.nix index 5ce2848..28379d9 100644 --- a/system/hosts/sail.nix +++ b/system/hosts/sail.nix @@ -55,6 +55,8 @@ in ]; }; + programs.fish.enable = true; + users.users = { root = { openssh.authorizedKeys.keys = [ ssh-keys.Hetzner ]; @@ -66,6 +68,7 @@ in home = "/home/daniel"; description = "Daniel"; extraGroups = [ "wheel" ]; + shell = pkgs.fish; openssh.authorizedKeys.keys = [ ssh-keys.Hetzner ]; }; };