config sync

7 files changed, 32 insertions, 28 deletions

diff --git a/config/lf/lfrc b/config/lf/lfrc
index 98c495e..671afbc 100644
--- a/config/lf/lfrc
+++ b/config/lf/lfrc
@@ -54,11 +54,11 @@ cmd unzip_zip ${{
 }}
 
 cmd unzip_7z ${{
-  nix-zsh -p p7zip --run '7z x $f';
+  nix-shell -p p7zip --run '7z x $f';
 }}
 
 cmd unzip_rar ${{
-  NIXPKGS_ALLOW_UNFREE=1 nix-zsh -p unrar --run 'unrar x $f';
+  NIXPKGS_ALLOW_UNFREE=1 nix-shell -p unrar --run 'unrar x $f';
 }}
 
 # }}}
@@ -99,4 +99,5 @@ map gdv   cd ~/dev
 map gdp   cd ~/dump
 map gp    cd ~/Pictures
 map gmnt  cd /run/media/imsohexy
+map gdc   cd ~/Documents
 
diff --git a/config/lf/previewer.sh b/config/lf/previewer.sh
index 05a1f34..981ef55 100755
--- a/config/lf/previewer.sh
+++ b/config/lf/previewer.sh
@@ -29,7 +29,10 @@ case "$1" in
 	*.[1-8]) man "$1" | col -b ;;
 
 	# Images
-	*.bmp|*.jpg|*.jpeg|*.png|*.xpm|*.webp) mediainfo "$1"; ;;
+	*.bmp|*.jpg|*.jpeg|*.png|*.xpm|*.webp)
+		catimg -w "$((width * 2 * 3))" "$1";
+		echo "done"
+	;;
 
 	#*.bmp|*.jpg|*.jpeg|*.png|*.xpm|*.webp)
     #~/scripts/image.sh draw "$1" "$x" "$y" "$width" "$height";
diff --git a/config/qutebrowser/config.py b/config/qutebrowser/config.py
index 97c7147..bb424a7 100644
--- a/config/qutebrowser/config.py
+++ b/config/qutebrowser/config.py
@@ -156,12 +156,11 @@ nmap(localleader + 'td', ':toggle-darkmode')
 # }}}
 
 #### Sessions {{{
-c.aliases['load'] = 'session-load -t';
+# c.aliases['load'] = 'session-load -t';
 
 # Sessions
-nmap(leader + 'sv', ':load video');
-nmap(leader + 'sc', ':load work');
-nmap(leader + 'si', ':load interview');
+nmap(leader + 'sl', ':set-cmd-text :session-load ');
+nmap(leader + 'sw', ':set-cmd-text :session-save ');
 # }}}
 
 #### Navigation {{{
@@ -296,6 +295,8 @@ c.url.searchengines = {
     'hg': 'http://www.haskell.org/hoogle/?hoogle={}',
     'cname': 'https://www.whatsmydns.net/#CNAME/{}',
     'nx': 'https://search.nixos.org/packages?channel=unstable&query={}',
+    'pio': 'https://registry.platformio.org/search?q={}',
+    'pub': 'https://pub.dev/packages?q={}',
 
     # Media
     'r': 'http://www.reddit.com/r/{}/',
diff --git a/config/zsh/aliases/dev.zsh b/config/zsh/aliases/dev.zsh
index 793d823..4283a2d 100644
--- a/config/zsh/aliases/dev.zsh
+++ b/config/zsh/aliases/dev.zsh
@@ -88,5 +88,7 @@ p__enter_nixshell() {
 zle -N p__enter_nixshell;
 bindkey '^X' p__enter_nixshell;
 
-alias fix-interpreter="nix-shell -p patchelf --run 'patchelf --set-interpreter \$(patchelf --print-interpreter \$(which mkdir))'"
+fix-interpreter() {
+  nix-shell -p patchelf --run "patchelf --set-interpreter \$(patchelf --print-interpreter \$(which mkdir)) $@"
+}
 
diff --git a/configuration.nix b/configuration.nix
index 40796f0..e8033df 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -137,14 +137,17 @@ in
       };
     };
   };
-  fonts.fonts = with pkgs; [
+  fonts.packages = with pkgs; [
     # jetbrains-mono
     (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
     cozette
     noto-fonts-emoji
   ];
 
-  nix.settings.auto-optimise-store = true;
+  nix.settings = {
+    experimental-features = [ "nix-command" "flakes" ];
+    auto-optimise-store = true;
+  };
   nix.gc = {
     automatic = true;
     dates = "weekly";
diff --git a/packages.nix b/packages.nix
index 811cbc2..b701fa7 100644
--- a/packages.nix
+++ b/packages.nix
@@ -43,7 +43,7 @@ let
     nodePackages.typescript-language-server
     nodePackages.vscode-json-languageserver
     nodePackages.vscode-langservers-extracted
-    nodePackages.tsun
+    # nodePackages.tsun
     # nodePackage.bash-language-server
   ];
 
@@ -61,7 +61,6 @@ let
 
     # Media
     spotify
-    # mpv
     sxiv
     youtube-dl
     imagemagick
@@ -70,32 +69,26 @@ let
     obs-studio
     inkscape
     krita
-    # blender
+    zathura
+    blender
 
-    # Gaming
-    # chiaki
+    # chiaki # PS remote play
 
-    # Scheduling
     remind
-    wyrd
+    dunst
 
+    # Audio
     # qjackctl
     # ardour
     pavucontrol
     easyeffects
 
+    # TUI stuff
     lf
-    dunst
     gotop
     tremc
-    zathura
-    # (emojipick.override {
-    #   dmenu = localPkgs.dmenu;
-    #   python3 = python3;
-    #   emojipick-print-emoji = false;
-    #   emojipick-font-family = "JetBrainsMono Nerd Font";
-    #   emojipick-font-size = "12";
-    # })
+    wyrd
+    dua
   ];
 
   utils = with pkgs; [
@@ -111,11 +104,13 @@ let
     at
     bc
     bat
+    catimg
     fd
     sad
     mediainfo
     poppler_utils
     glow
+    figlet
     wineWowPackages.stable
     # appimage-run
 
diff --git a/packages/sidekick-dashboard/pkg.nix b/packages/sidekick-dashboard/pkg.nix
index 7721a00..ee63050 100644
--- a/packages/sidekick-dashboard/pkg.nix
+++ b/packages/sidekick-dashboard/pkg.nix
@@ -7,8 +7,7 @@ let
   sidekickSrc = pkgs.fetchFromGitHub {
     owner = "phenax";
     repo = "sidekick-dashboard";
-    rev = "main";
-    # sha256 = lib.fakeSha256;
+    rev = "25709ed8eed6a13ff4bd5fdd5ccec50c13433895";
     sha256 = "sha256-1EJv0N1Ebp5vHN2+xETx4qhPQTS4YI6r3ysCkn0GozY=";
   };