machines/sternenseemann/wolfgang: declarative fish config

4 files changed, 48 insertions, 6 deletions

diff --git a/machines/sternenseemann/base-laptop.nix b/machines/sternenseemann/base-laptop.nix
index 698b4302..62cbe2eb 100644
--- a/machines/sternenseemann/base-laptop.nix
+++ b/machines/sternenseemann/base-laptop.nix
@@ -39,7 +39,7 @@
       acpi
       zip unzip
       stow
-      neovim silver-searcher
+      silver-searcher
       mosh
       nmap
       ffmpeg graphicsmagick
diff --git a/machines/sternenseemann/base.nix b/machines/sternenseemann/base.nix
index d39a982d..31dd6000 100644
--- a/machines/sternenseemann/base.nix
+++ b/machines/sternenseemann/base.nix
@@ -1,6 +1,16 @@
 { config, lib, pkgs, ... }:
 
-{
+let
+
+  inherit (pkgs.vuizvui.profpatsch)
+    getBins
+    ;
+
+  bins = (getBins pkgs.neovim [ "nvim" ])
+      // (getBins pkgs.less [ "less" ])
+      ;
+
+in {
   config = {
     boot.cleanTmpDir = true;
 
@@ -18,8 +28,16 @@
       defaultLocale = "en_US.UTF-8";
     };
 
-    programs.fish.enable = true;
-    programs.fish.vendor.completions.enable = true;
+    programs.fish = {
+      enable = true;
+      vendor.completions.enable = true;
+      shellAliases = {
+        "sd" = "systemctl";
+      };
+      shellInit = ''
+        set -x fish_greeting ""
+      '';
+    };
 
     documentation = {
       enable = true;
@@ -32,6 +50,13 @@
       mandoc man-pages
       git
       file htop psmisc tmux
+      neovim
     ];
+
+    environment.variables = {
+      EDITOR = bins.nvim;
+      VISUAL = bins.nvim;
+      PAGER = "${bins.less} -R";
+    };
   };
 }
diff --git a/machines/sternenseemann/desktop-sway.nix b/machines/sternenseemann/desktop-sway.nix
index 57d9d7ee..5799177a 100644
--- a/machines/sternenseemann/desktop-sway.nix
+++ b/machines/sternenseemann/desktop-sway.nix
@@ -95,7 +95,7 @@ in
         };
 
         mouse = {
-          alternate-scroll-mode = "no";
+          alternate-scroll-mode = "yes";
         };
 
         scrollback = {
@@ -115,5 +115,12 @@ in
       grim slurp screenshot      # screenshots
       mako                       # notifications
     ];
+
+    programs.fish.shellAliases = {
+      "hdmi2-above" = ''
+        sway output HDMI-A-2 position 0 0 && sway output eDP-1 position 0 1440
+      '';
+      "workspace-move" = "sway move workspace output";
+    };
   };
 }
diff --git a/machines/sternenseemann/wolfgang.nix b/machines/sternenseemann/wolfgang.nix
index aeea9b44..77ffb68e 100644
--- a/machines/sternenseemann/wolfgang.nix
+++ b/machines/sternenseemann/wolfgang.nix
@@ -3,6 +3,12 @@
 let
   i686Games = false;
   avahi = false;
+
+  browser = rec {
+    pkg = pkgs.firefox-wayland;
+    bin = "${pkg}/bin/firefox";
+  };
+
 in {
   imports = [
     ./base-laptop.nix
@@ -107,11 +113,15 @@ in {
     networkmanagerapplet       # for nm-connection-ediotr
     imv zathura
     gnome3.nautilus
-    firefox-wayland
+    browser.pkg
     # TODO(sterni) depot.users.sterni.clhs-lookup
     hunspell
   ] ++ (with hunspellDicts; [ de-de en-gb-large en-us ]);
 
+  environment.variables = {
+    BROWSER = browser.bin;
+  };
+
   services.tor = {
     enable = true;