WIP: home/{hyprland,waybar}: init

home/config/ssh/pvv.nix

@@ -8,7 +8,6 @@ let
     {
       names = [ "hildring" "pvv-login" "pvv" ];
       proxyJump = lib.mkDefault null;
-      addressFamily = "inet";
     }
     "dagali"
     "drolsum"
@@ -86,7 +85,6 @@ in
       "pvv-git git.pvv.ntnu.no" = {
         hostname = "git.pvv.ntnu.no";
         user = "gitea";
-        addressFamily = "inet";
         port = 2222;
         proxyJump = "pvv";
       };

home/config/xdg/directory-spec-overrides.nix

@@ -18,12 +18,8 @@
 
     GHCUP_USE_XDG_DIRS = "true";
 
-    __GL_SHADER_DISK_CACHE_PATH = "${cacheHome}/nv";
     ANDROID_USER_HOME = "${dataHome}/android";
     AZURE_CONFIG_DIR = "${dataHome}/azure";
-    BZRPATH = "${configHome}/bazaar";
-    BZR_PLUGIN_PATH = "${dataHome}/bazaar";
-    BZR_HOME = "${cacheHome}/bazaar";
     CARGO_HOME = "${dataHome}/cargo";
     CUDA_CACHE_PATH = "${cacheHome}/nv";
     DOCKER_CONFIG = "${configHome}/docker";

home/config/xdg/mimetypes.nix

@@ -1,121 +1,143 @@
 { lib, ... }:
+
 let
-  mime = {
-    image = {
-      apng = "image/apng";
-      avif = "image/avif";
-      bmp = "image/bmp";
-      gif = "image/gif";
-      ico = "image/vnd.microsoft.icon";
-      icox = "image/x-icon";
-      jpg = "image/jpeg";
-      jxl = "image/jxl";
-      pic = "image/x-pict";
-      png = "image/png";
-      psd = "image/vnd.adobe.photoshop";
-      svg = "image/svg+xml";
-      tif = "image/tif";
-      tiff = "image/tiff";
-      webp = "image/webp";
-      xbm = "image/x-xbitmap";
-      xpm = "image/x-xpixmap";
-    };
-
-    audio = {
-      "3g2-audio" = "audio/3gpp";
-      "3gp-audio" = "audio/3gpp";
-      aac = "audio/aac";
-      aiff = "audio/aiff";
-      flac = "audio/flac";
-      mkv = "audio/x-matroska";
-      mpeg = "audio/mpeg"; # NOTE: this is the real mp3, but the other one also exists
-      mpeg3 = "audio/mpeg3";
-      mp3 = "audio/mp3";
-      mp4 = "audio/mp4";
-      ogg = "audio/ogg";
-      opus = "audio/opus";
-      wav = "audio/wav";
-      wavx = "audio/x-wav";
-      webm-audio = "audio/webm";
-    };
-
-    video = {
-      "3g2-video" = "video/3gpp";
-      "3gp-video" = "video/3gpp";
-      avi = "video/x-msvideo";
-      flv = "video/x-flv";
-      m4v = "video/x-m4v";
-      mkv = "video/x-matroska";
-      mov = "video/quicktime";
-      mp4 = "video/mp4";
-      mpeg = "video/mpeg";
-      ogv = "video/ogg";
-      webm-video = "video/webm";
-      wmv = "video/x-ms-wmv";
-    };
-
-    font = {
-      otf = "font/otf";
-      ttf = "font/ttf";
-      woff = "font/woff";
-      woff2 = "font/woff2";
-    };
-
-    documents = {
-      azv = "application/vnd.amazon.ebook";
-      cbr = "application/vnd.comicbook+rar";
-      cbrx = "application/x-cbr";
-      cbz = "application/vnd.comicbook+zip";
-      cbzx = "application/x-cbz";
-      djvu = "image/vnd.djvu";
-      epub = "application/epub+zip";
-      pdf = "application/pdf";
-    };
-
-    code = {
-      css = "text/css";
-      csv = "text/csv";
-      html = "text/html";
-      txt = "text/plain";
-      xhtml = "application/xhtml+xml";
-      xml = "text/xml";
-    };
-
-    misc = {
-      http = "x-scheme-handler/http";
-      https = "x-scheme-handler/https";
-      wine-ini = "application/x-wine-extension-ini";
-      ics = "text/calendar";
-      url = "application/x-mswinurl";
-    };
-  };
 
   # Applications
+  google-chrome = "google-chrome.desktop";
   firefox = "firefox.desktop";
+  gimp = "gimp.desktop";
+  inkscape = "org.inkscape.Inkscape.desktop";
   vscode = "code.desktop";
   mpv = "mpv.desktop";
   zathura = "org.pwmt.zathura.desktop";
   sxiv = "sxiv.desktop";
   font-viewer = "org.gnome.font-viewer.desktop";
+
+  # Formats
+  "3g2-audio" = "audio/3gpp";
+  "3g2-video" = "video/3gpp";
+  "3gp-audio" = "audio/3gpp";
+  "3gp-video" = "video/3gpp";
+  aac = "audio/aac";
+  avi = "video/x-msvideo";
+  bmp = "image/bmp";
+  cbr = "application/vnd.comicbook+rar";
+  cbrx = "application/x-cbr";
+  cbz = "application/vnd.comicbook+zip";
+  cbzx = "application/x-cbz";
+  djvu = "image/vnd.djvu";
+  epub = "application/epub+zip";
+  flv = "video/x-flv";
+  gif = "image/gif";
+  html = "text/html";
+  http = "x-scheme-handler/http";
+  https = "x-scheme-handler/https";
+  ico = "image/vnd.microsoft.icon";
+  icox = "image/x-icon";
+  ini = "application/x-wine-extension-ini";
+  jpg = "image/jpeg";
+  m4v = "video/x-m4v";
+  mkv = "video/x-matroska";
+  mov = "video/quicktime";
+  mp3 = "audio/mpeg";
+  mp4 = "video/mp4";
+  mpeg = "video/mpeg";
+  ogg = "audio/ogg";
+  ogv = "video/ogg";
+  opus = "audio/opus";
+  otf = "font/otf";
+  pdf = "application/pdf";
+  pic = "image/x-pict";
+  png = "image/png";
+  psd = "image/vnd.adobe.photoshop";
+  svg = "image/svg+xml";
+  tiff = "image/tiff";
+  ttf = "font/ttf";
+  txt = "text/plain";
+  url = "application/x-mswinurl";
+  wav = "audio/wav";
+  wavx = "audio/x-wav";
+  webm-audio = "audio/webm";
+  webm-video = "video/webm";
+  webp = "image/webp";
+  wmv = "video/x-ms-wmv";
+  woff = "font/woff";
+  woff2 = "font/woff2";
+  xbm = "image/x-xbitmap";
+  xcf = "image/x-xcf";
+  xhtml = "application/xhtml+xml";
+  xml = "text/xml";
+  xpm = "image/x-xpixmap";
+
+
+  # Generalizations
+  audio-player = mpv;
+  gui-text-editor = vscode;
+  image-viewer = sxiv;
+  pdf-viewer = zathura;
+  video-player = mpv;
+  web-browser = firefox;
+
 in {
+
   xdg.configFile."mimeapps.list".force = true;
   xdg.mimeApps = {
     enable = true;
     # associations.added = {};
     # associations.removed = {};
-    defaultApplications =
+    defaultApplications = {
-      (lib.mapAttrs' (_: v: lib.nameValuePair v sxiv) mime.image)
+      ${"3g2-audio"} = audio-player;
-    // (lib.mapAttrs' (_: v: lib.nameValuePair v mpv) mime.audio)
+      ${"3g2-video"} = video-player;
-    // (lib.mapAttrs' (_: v: lib.nameValuePair v mpv) mime.video)
+      ${"3gp-audio"} = audio-player;
-    // (lib.mapAttrs' (_: v: lib.nameValuePair v font-viewer) mime.font)
+      ${"3gp-video"} = video-player;
-    // (lib.mapAttrs' (_: v: lib.nameValuePair v zathura) mime.documents)
+      ${aac} = audio-player;
-    // (lib.mapAttrs' (_: v: lib.nameValuePair v vscode) mime.code)
+      ${avi} = video-player;
-    // {
+      ${bmp} = image-viewer;
-      ${mime.misc.http} = firefox;
+      ${cbrx} = zathura;
-      ${mime.misc.https} = firefox;
+      ${cbr} = zathura;
-      ${mime.misc.wine-ini} = vscode;
+      ${cbzx} = zathura;
-      ${mime.misc.ics} = vscode;
+      ${cbz} = zathura;
-      ${mime.misc.url} = firefox;
+      ${djvu} = pdf-viewer;
+      ${epub} = zathura;
+      ${flv} = video-player;
+      ${gif} = image-viewer;
+      ${html} = web-browser;
+      ${https} = web-browser;
+      ${http} = web-browser;
+      ${icox} = image-viewer;
+      ${ico} = image-viewer;
+      ${jpg} = image-viewer;
+      ${m4v} = video-player;
+      ${mkv} = video-player;
+      ${mov} = video-player;
+      ${mp3} = audio-player;
+      ${mp4} = video-player;
+      ${mpeg} = video-player;
+      ${ogg} = audio-player;
+      ${ogv} = video-player;
+      ${opus} = audio-player;
+      ${otf} = font-viewer;
+      ${pdf} = pdf-viewer;
+      ${pic} = image-viewer;
+      ${png} = image-viewer;
+      ${psd} = gimp;
+      ${svg} = image-viewer;
+      ${tiff} = image-viewer;
+      ${ttf} = font-viewer;
+      ${txt} = gui-text-editor;
+      ${url} = web-browser;
+      ${wav} = audio-player;
+      ${webm-audio} = audio-player;
+      ${webm-video} = video-player;
+      ${webp} = image-viewer;
+      ${wmv} = video-player;
+      ${woff2} = font-viewer;
+      ${woff} = font-viewer;
+      ${xbm} = image-viewer;
+      ${xcf} = gimp;
+      ${xhtml} = web-browser;
+      ${xml} = gui-text-editor;
+      ${xpm} = image-viewer;
     };
   };
 }

home/home.nix

@@ -6,9 +6,9 @@ in {
     ./shell.nix
     ./packages.nix
 
+    ./config/ssh
     ./config/xdg
 
-    ./programs/aria2.nix
     ./programs/atuin.nix
     ./programs/comma.nix
     ./programs/direnv
@@ -19,7 +19,6 @@ in {
     ./programs/less.nix
     ./programs/neovim
     ./programs/nix-index
-    ./programs/ssh
     ./programs/tealdeer
     ./programs/tmux.nix
     ./programs/zsh

home/programs/aria2.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  programs.aria2.enable = true;
-}

home/programs/vscode/default.nix

@@ -296,7 +296,7 @@ in
       # jock.svg
       # ms-azuretools.vscode-docker
       # ms-toolsai.jupyter
-      # ms-vscode-remote.remote-ssh
+      ms-vscode-remote.remote-ssh
       # ms-vsliveshare.vsliveshare
       bbenoist.nix
       christian-kohler.path-intellisense
@@ -318,12 +318,8 @@ in
       rust-lang.rust-analyzer
       mkhl.direnv
       waderyan.gitblame
+      # vs-liveshare
       vscodevim.vim
-      hbenl.vscode-test-explorer
-      # vitaliymaz.vscode-svg-previewer
-      ms-vscode.test-adapter-converter
-      visualstudioexptteam.vscodeintellicode
-      tamasfe.even-better-toml
     ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
       {
         name = "monokai-st3";
@@ -331,17 +327,47 @@ in
         version = "0.2.0";
         sha256 = "1rvz5hlrfshy9laybxzvrdklx328s13j0lb8ljbda9zkadi3wcad";
       }
+      {
+        name = "vscode-svgviewer";
+        publisher = "cssho";
+        version = "2.0.0";
+        sha256 = "06swlqiv3gc7plcbmzz795y6zwpxsdhg79k1n3jj6qngfwnv2p6z";
+      }
       {
         name = "comment-anchors";
         publisher = "ExodiusStudios";
-        version = "1.10.4";
+        version = "1.10.3";
-        sha256 = "sha256-FvfjPpQsgCsnY1BylhLCM/qDQChf9/iTr3cKkCGfMVI=";
+        sha256 = "sha256-IyiiS4jpcghwKI0j8s69uGNZlKnZ0o78ZCT0oZeJER0=";
+      }
+      {
+        name = "vscode-test-explorer";
+        publisher = "hbenl";
+        version = "2.21.1";
+        sha256 = "022lnkq278ic0h9ggpqcwb3x3ivpcqjimhgirixznq0zvwyrwz3w";
       }
       {
         name = "vscode-gutter-preview";
         publisher = "kisstkondoros";
-        version = "0.31.2";
+        version = "0.29.0";
-        sha256 = "sha256-2/RvDSsVL06UmNG9HchXaJMJ4FYtnpuJ2Bn53JVv1t8=";
+        sha256 = "00vibv9xmhwaqiqzp0y2c246pqiqfjsw4bqx4vcdd67pz1wnqhg1";
+      }
+      {
+        name = "test-adapter-converter";
+        publisher = "ms-vscode";
+        version = "0.1.9";
+        sha256 = "sha256-M53jhAVawk2yCeSrLkWrUit3xbDc0zgCK2snbK+BaSs=";
+      }
+      # {
+      #   name = "indent-rainbow";
+      #   publisher = "oderwat";
+      #   version = "8.2.2";
+      #   sha256 = "1xxljwh66f21fzmhw8icrmxxmfww1s67kf5ja65a8qb1x1rhjjgf";
+      # }
+      {
+        name = "vscodeintellicode";
+        publisher = "VisualStudioExptTeam";
+        version = "1.2.30";
+        sha256 = "sha256-f2Gn+W0QHN8jD5aCG+P93Y+JDr/vs2ldGL7uQwBK4lE=";
       }
       {
         name = "keyboard-quickfix";

hosts/common/default.nix

@@ -128,8 +128,6 @@ in {
       enable = !config.machineVars.headless;
       touchpad.disableWhileTyping = true;
     };
-
-    irqbalance.enable = true;
   };
 
   programs = {

hosts/kasei/configuration.nix

@@ -2,7 +2,6 @@
 {
   imports = [
     ./services/avahi.nix
-    ./services/btrfs.nix
     ./services/docker.nix
     ./services/libvirtd.nix
     ./services/logiops.nix

hosts/kasei/services/btrfs.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  services.btrfs.autoScrub.enable = true;
-}

package-overrides/fcitx5-mozc.nix

@@ -1,5 +1,3 @@
-# Dogfooding of https://github.com/NixOS/nixpkgs/pull/251706
-
 { bazel
 , buildBazelPackage
 , fcitx5

package-overrides/mozc.nix

@@ -1,5 +1,3 @@
-# Dogfooding of https://github.com/NixOS/nixpkgs/pull/251706
-
 { bazel
 , buildBazelPackage
 , fetchFromGitHub