WIP: home/{hyprland,waybar}: init

flake.nix

@@ -95,19 +95,10 @@
         nonrecursive-unstable-pkgs = import nixpkgs-unstable {
           inherit system;
           config.allowUnfree = true;
-          config.segger-jlink.acceptLicense = true;
-          config.permittedInsecurePackages = [
-            "segger-jlink-qt4-794s"
-          ];
         };
       in [
         (self: super: {
-          inherit (nonrecursive-unstable-pkgs)
+          inherit (nonrecursive-unstable-pkgs) atuin wstunnel;
-            atuin
-            wstunnel
-            nrf-udev
-            nrfutil
-            ;
         })
 
         (import ./overlays/wayland-ime-integration.nix)

home/config/xdg/mimetypes.nix

@@ -95,7 +95,7 @@ let
   vscode = "code.desktop";
   mpv = "mpv.desktop";
   zathura = "org.pwmt.zathura.desktop";
-  nsxiv = "nsxiv.desktop";
+  sxiv = "sxiv.desktop";
   font-viewer = "org.gnome.font-viewer.desktop";
 in {
   xdg.configFile."mimeapps.list".force = true;
@@ -104,7 +104,7 @@ in {
     # associations.added = {};
     # associations.removed = {};
     defaultApplications =
-      (lib.mapAttrs' (_: v: lib.nameValuePair v nsxiv) mime.image)
+      (lib.mapAttrs' (_: v: lib.nameValuePair v sxiv) mime.image)
     // (lib.mapAttrs' (_: v: lib.nameValuePair v mpv) mime.audio)
     // (lib.mapAttrs' (_: v: lib.nameValuePair v mpv) mime.video)
     // (lib.mapAttrs' (_: v: lib.nameValuePair v font-viewer) mime.font)

home/home.nix

@@ -10,21 +10,17 @@ in {
 
     ./programs/aria2.nix
     ./programs/atuin.nix
-    ./programs/beets.nix
     ./programs/comma.nix
     ./programs/direnv
     ./programs/gdb.nix
     ./programs/gh.nix
-    ./programs/gh-dash.nix
     ./programs/git
     ./programs/gpg
-    ./programs/jq.nix
     ./programs/less.nix
     ./programs/neovim
     ./programs/nix-index
     ./programs/ssh
     ./programs/tealdeer
-    ./programs/thunderbird.nix
     ./programs/tmux.nix
     ./programs/zsh
 
@@ -107,13 +103,6 @@ in {
     };
   };
 
-  xsession = {
-    enable = true;
-    # TODO: declare using xdg config home
-    scriptPath = ".config/X11/xsession";
-    profilePath = ".config/X11/xprofile";
-  };
-
   xdg.configFile = {
     "ghc/ghci.conf".text = ''
       :set prompt "${extendedLib.termColors.front.magenta "[GHCi]λ"} "
@@ -187,7 +176,10 @@ in {
 
   qt = mkIf graphics {
     enable = true;
-    platformTheme.name = "adwaita";
+    platformTheme.name = "gtk";
-    style.name = "adwaita-dark";
+    style = {
+      name = "adwaita-dark";
+      package = pkgs.adwaita-qt;
+    };
   };
 }

home/packages.nix

@@ -1,6 +1,7 @@
 { pkgs, config, machineVars, ... }:
 {
   home.packages = with pkgs; [
+    beets
     binutils
     cloc
     cyme
@@ -11,6 +12,7 @@
     duff
     ffmpeg
     file
+    gh-dash
     glances
     gpg-tui
     gping
@@ -18,6 +20,7 @@
     hexyl
     httpie
     imagemagick
+    jq
     kepubify
     # keybase
     keymapviz
@@ -32,6 +35,7 @@
     mtr
     neofetch
     nix-diff
+    nix-index
     nix-output-monitor
     nix-tree
     nix-update
@@ -81,6 +85,7 @@
       alsa-utils
       anki
       ark
+      birdtray
       calibre
       cool-retro-term
       darktable
@@ -109,7 +114,6 @@
       mopidy-youtube
       mpc_cli
       naps2
-      nsxiv
       nyxt
       obsidian
       # pcloud
@@ -120,9 +124,11 @@
       slack
       # sublime3
       # swiPrologWithGui
+      sxiv
       tagainijisho
 
       tenacity
+      thunderbird
       # transcribe
       wireshark
       xcalib

home/programs/beets.nix

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

home/programs/browser/bookmarks.nix

@@ -9,7 +9,7 @@ in [
   (link "GitHub" "http://github.com")
   (short "/u/" "danger/u/" "https://dangeru.us/")
   (link "PVV" "https://www.pvv.ntnu.no/")
-  (short "PVVM" "PVV Mail" "https://webmail.pvv.ntnu.no/roundcube/")
+  (short "PVVM" "PVV Mail" "https://webmail2.pvv.ntnu.no/roundcube/")
   (short "ΩV" "Omega Verksted" "https://omegav.no/")
 
   (dir "Nix" [
@@ -31,34 +31,21 @@ in [
   ])
 
   (dir "CTF" [
-    (link "Revshells" "https://revshells.com/")
+    (link "HackTheBox" "https://www.hackthebox.eu/")
+    (link "TryHackMe" "https://tryhackme.com/dashboard")
+    (link "OverTheWire" "https://overthewire.org/wargames/")
+    (link "NetGarage" "https://io.netgarage.org/")
     (link "Exploit Education" "http://exploit.education/")
-    (link "Webhook" "https://webhook.site")
-    (link "CyberChef" "https://gchq.github.io/CyberChef/")
-    (link "Aperisolve" "https://www.aperisolve.com/")
-    (link "how2heap" "https://github.com/shellphish/how2heap")
-    (link "Heap Search" "https://kissprogramming.com/heap/heap-search")
-    (link "CrackStation" "https://crackstation.net/")
-    (link "FactorDB" "http://factordb.com/")
-    (link "Syscalls" "https://syscalls.w3challs.com/")
-    (link "DogBolt" "https://dogbolt.org/")
-    (link "HackTricks" "https://book.hacktricks.xyz/")
-    (dir "Practise" [
-      (link "S2G" "https://s2gctf.ncr.ntnu.no")
-      (link "Pico CTF" "https://play.picoctf.org/practice")
-      (link "Pwn college" "https://pwn.college/")
-      (link "HackTheBox" "https://www.hackthebox.eu")
-      (link "Crackmes" "https://crackmes.one")
-      (link "Nightmare" "https://guyinatuxedo.github.io/")
-    ])
   ])
 
   (dir "Misc & Tools" [
     (link "ASCIIFlow" "https://asciiflow.com/#/")
     (link "CopyChar" "https://copychar.cc/")
+    (link "CyberChef" "https://gchq.github.io/CyberChef/")
     (link "Device Info" "https://www.deviceinfo.me/")
     (link "Diagrams" "https://app.diagrams.net/")
     (link "FakeMail" "http://www.fakemailgenerator.com/")
+    (link "FilePizza" "https://file.pizza/")
     (link "IPLeak" "https://ipleak.net/")
     (link "LaTeX" "https://www.codecogs.com/latex/eqneditor.php")
     (link "ManualsLib" "https://www.manualslib.com/")

home/programs/gh-dash.nix

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

home/programs/git/default.nix

@@ -53,7 +53,6 @@ in
         forcepush = "push --force-with-lease --force-if-includes";
         authors = "shortlog --summary --numbered --email";
         si = "switch-interactive";
-        subs = "submodule update --init --recursive";
         rebase-author = "rebase -i -x \"git commit --amend --reset-author -CHEAD\"";
         git = "!git";
       };
@@ -129,8 +128,6 @@ in
           submodule = "log";
         };
 
-        pager.show = lib.getExe pkgs.bat;
-
         status = {
           showUntrackedFiles = "all";
           relativePaths = true;
@@ -262,14 +259,6 @@ in
       runtimeInputs = with pkgs; [ cfg.package coreutils ];
       text = lib.fileContents ./scripts/git-tcommit.sh;
     })
-    (pkgs.writeShellApplication {
-      name = "git-tmcommit";
-      runtimeInputs = with pkgs; [ cfg.package coreutils ];
-      text = lib.pipe ./scripts/git-tcommit.sh [
-        lib.fileContents
-        (builtins.replaceStrings ["hours" "tcommit"] ["minutes" "tmcommit"])
-      ];
-    })
     (pkgs.writeShellApplication {
       name = "git-switch-interactive";
       runtimeInputs = with pkgs; [ cfg.package fzf gnused coreutils ];

home/programs/git/scripts/git-tcommit.sh

@@ -1,10 +1,5 @@
 set -euo pipefail
 
-if [[ $# -lt 1 ]]; then
-  echo "Usage: git tcommit [-]<hours>"
-  exit 1
-fi
-
 HOUR_SHIFT="$1"
 shift
 

home/programs/jq.nix

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

home/programs/newsboat/sources.nix

@@ -3,45 +3,40 @@ let
   mkSource = tags: url: { inherit tags url; };
 in {
   programs.newsboat.urls = [
-    (mkSource [ "tech" "linux" ] "https://archlinux.org/feeds/news/")
+    (mkSource [ "tech" "linux" ] "https://lukesmith.xyz/rss.xml")
-    (mkSource [ "tech" "linux" "nixos" ] "https://nixos.org/blog/announcements-rss.xml")
+    (mkSource [ "tech" "vim" "old" ] "https://castel.dev/rss.xml")
-    (mkSource [ "tech" "ntnu" ] "https://omegav.no/newsrss")
+    (mkSource [ "tech" "linux" "nixos" ] "https://christine.website/blog.rss")
-    (mkSource [ "ntnu" ] "https://varsel.it.ntnu.no/subscribe/rss/")
+    (mkSource [ "japanese" "language" "old" ] "http://feeds.feedburner.com/LocalizingJapan")
-    (mkSource [ "tech" ] "https://blog.hackeriet.no/feed.xml")
-    (mkSource [ "tech" ] "https://fribyte.no/rss.xml")
-    (mkSource [ "tech" ] "https://existentialtype.wordpress.com/feed/")
-    (mkSource [ "tech" "linux" "ntnu" ] "https://wiki.pvv.ntnu.no/w/api.php?hidebots=1&urlversion=1&days=90&limit=50&action=feedrecentchanges&format=xml")
-    (mkSource [ "tech" "linux" "nixos" ] "https://dandellion.xyz/atom.xml")
     (mkSource [ "tech" "linux" ] "http://xahlee.info/comp/blog.xml")
-    (mkSource [ "tech" ] "https://branchfree.org/feed/")
+    (mkSource [ "japanese" "language" ] "https://www.outlier-linguistics.com/blogs/japanese.atom")
-    (mkSource [ "tech" ] "https://search.marginalia.nu/news.xml")
+    (mkSource [ "tech" "linux" ] "https://archlinux.org/feeds/news/")
     (mkSource [ "tech" "linux" ] "https://bartoszmilewski.com/feed/")
-    (mkSource [ "tech" "linux" "nixos" ] "https://myme.no/atom-feed.xml")
+    (mkSource [ "tech" "linux" "nixos" ] "https://nixos.org//blog/announcements-rss.xml")
+    (mkSource [ "tech" "linux" ] "https://www.digitalneanderthal.com/index.xml")
+    (mkSource [ "tech" "ntnu" ] "https://omegav.no/newsrss")
+    (mkSource [ "tech" ] "https://code.visualstudio.com/feed.xml")
     (mkSource [ "tech" "linux" "nixos" ] "https://blog.ysndr.de/atom.xml")
     (mkSource [ "tech" "linux" "nixos" ] "https://kaushikc.org/atom.xml")
     (mkSource [ "tech" "linux" "nixos" ] "https://ianthehenry.com/feed.xml")
+    (mkSource [ "tech" "linux" "ntnu" ] "https://www.pvv.ntnu.no/w/api.php?hidebots=1&urlversion=1&days=7&limit=50&action=feedrecentchanges&feedformat=atom")
+    (mkSource [ "ntnu" ] "https://varsel.it.ntnu.no/subscribe/rss/")
     (mkSource [ "tech" "linux" "japanese" ] "https://www.ncaq.net/feed.atom")
-    (mkSource [ "tech" "linux" "nixos" "emacs" "japanese" ] "https://apribase.net/program/feed")
+    (mkSource [ "tech" "linux" "haskell" "nixos" "functional-programming" ] "https://www.haskellforall.com/feeds/posts/default")
-    (mkSource [ "tech" "linux" "nixos" "functional-programming" ] "https://www.haskellforall.com/feeds/posts/default")
+    (mkSource [ "tech" "haskell" "functional-programming" ] "https://williamyaoh.com/feed.atom")
-    (mkSource [ "tech" "linux" "nixos" ] "https://christine.website/blog.rss")
+    (mkSource [ "tech" "haskell" "functional-programming" ] "https://www.parsonsmatt.org/feed.xml")
-    (mkSource [ "tech" "functional-programming" "nixos" ] "https://markkarpov.com/feed.atom")
+    (mkSource [ "tech" "haskell" "functional-programming" "python" ] "http://blog.ezyang.com/feed/")
-    (mkSource [ "tech" "functional-programming" ] "https://williamyaoh.com/feed.atom")
+    (mkSource [ "tech" "haskell" "functional-programming" ] "https://lexi-lambda.github.io/feeds/all.rss.xml")
-    (mkSource [ "tech" "functional-programming" ] "https://www.parsonsmatt.org/feed.xml")
+    (mkSource [ "tech" "haskell" "functional-programming" ] "https://www.stephendiehl.com/feed.rss")
-    (mkSource [ "tech" "functional-programming" "python" ] "http://blog.ezyang.com/feed/")
+    (mkSource [ "tech" "haskell" "functional-programming" "emacs" ] "https://chrisdone.com/rss.xml")
-    (mkSource [ "tech" "functional-programming" ] "https://lexi-lambda.github.io/feeds/all.rss.xml")
+    (mkSource [ "tech" "haskell" "functional-programming" "nixos" ] "https://markkarpov.com/feed.atom")
-    (mkSource [ "tech" "functional-programming" ] "https://www.stephendiehl.com/feed.rss")
+    (mkSource [ "tech" "flutter" ] "https://resocoder.com/feed/")
-    (mkSource [ "tech" "functional-programming" "emacs" ] "https://chrisdone.com/rss.xml")
+    (mkSource [ "tech" "compilers" ] "https://existentialtype.wordpress.com/feed/")
-    (mkSource [ "tech" ] "https://go.dev/blog/feed.atom")
+    (mkSource [ "tech" "compilers" "haskell" "functional-programming" "old" ] "https://skilpat.tumblr.com/rss")
-    (mkSource [ "tech" "linux" ] "https://jfx.ac/blog/index.xml")
-    (mkSource [ "tech" "linux" ] "https://lukesmith.xyz/rss.xml")
-    (mkSource [ "japanese" "language" ] "https://www.outlier-linguistics.com/blogs/japanese.atom")
     (mkSource [ "language" ] "https://feeds.feedburner.com/blogspot/Ckyi")
-    (mkSource [ "japanese" "language" "old" ] "http://feeds.feedburner.com/LocalizingJapan")
+    (mkSource [ "tech" "compilers" ] "https://go.dev/blog/feed.atom")
-    (mkSource [ "tech" "vim" "old" ] "https://castel.dev/rss.xml")
+    (mkSource [ "tech" "linux" "nixos" ] "https://myme.no/feed.xml")
-    (mkSource [ "tech" "functional-programming" "old" ] "https://skilpat.tumblr.com/rss")
+    (mkSource [ "tech" "linux" "nixos" "compilers" ] "https://flyx.org/feed.xml")
-    (mkSource [ "tech" ] "https://resocoder.com/feed/")
+    (mkSource [ "tech" "linux" ] "https://blog.jfx.ac/feed.xml")
-
+    (mkSource [ "tech" "linux" "nixos" ] "https://dandellion.xyz/atom.xml")
-    # Broken?
-    (mkSource [ "tech" "linux" "nixos" ] "https://flyx.org/feed.xml")
   ];
 }

home/programs/ssh/pvv.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, extendedLib, ... }:
 let
   adminUser = "root";
   normalUser = "oysteikt";
@@ -88,17 +88,16 @@ let
     machines: pipe machines pipeline;
 in
   {
-    programs.ssh.matchBlocks = lib.mergeAttrsList [
+    programs.ssh.matchBlocks = (extendedLib.attrsets.concatAttrs [
       (convertMachinesWith convertNormalMachine normalMachines)
       (convertMachinesWith convertAdminMachine rootMachines)
-      {
+    ]) // {
-        "pvv-git git.pvv.ntnu.no" = {
+      "pvv-git git.pvv.ntnu.no" = {
-          hostname = "git.pvv.ntnu.no";
+        hostname = "git.pvv.ntnu.no";
-          user = "gitea";
+        user = "gitea";
-          addressFamily = "inet";
+        addressFamily = "inet";
-          port = 2222;
+        port = 2222;
-          proxyJump = "pvv";
+        proxyJump = "pvv";
-        };
+      };
-      }
+    };
-    ];
   }

home/programs/thunderbird.nix

@@ -1,18 +0,0 @@
-{ config, pkgs, lib, machineVars, ... }:
-let
-  cfg = config.programs.thunderbird;
-in
-{
-  programs.thunderbird = {
-    enable = !machineVars.headless;
-    profiles.h7x4 = {
-      isDefault = true;
-      withExternalGnupg = true;
-    };
-  };
-
-
-  home.packages = lib.mkIf cfg.enable (with pkgs; [
-    birdtray
-  ]);
-}

home/programs/xmonad/xmonad.hs

@@ -89,7 +89,7 @@ myScratchpads = [ NS "ncmpcpp"     spawnNC findNC layoutA
     -- spawnMX = "element"
     spawnFB = "thunar --class=floatingThunar"
     spawnEX = "emacs --name=floatingEmacs"
-    spawnSC = "nsxiv -N floatingSchedule ~/uni/schedule.png"
+    spawnSC = "sxiv -N floatingSchedule ~/uni/schedule.png"
     spawnHP = "echo \"" ++ help ++ "\" | xmessage -file -"
 
     findNC = title =? "ncmpcppScratchpad"

hosts/common/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, extendedLib, ... }:
+{ pkgs, unstable-pkgs, lib, extendedLib, config, inputs, secrets, ... }:
 let
   inherit (config) machineVars;
 in {

hosts/dosei/configuration.nix

@@ -3,8 +3,6 @@
   imports = [
     ./hardware-configuration.nix
 
-    ./programs/nrfutil.nix
-
     ./services/avahi.nix
     ./services/docker.nix
     ./services/jenkins.nix

hosts/dosei/programs/nrfutil.nix

@@ -1,13 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    nrfutil
-    nrfconnect
-    nrf-command-line-tools
-  ];
-
-  services.udev.packages = with pkgs; [
-    nrf-udev
-    segger-jlink
-  ];
-}

hosts/kasei/configuration.nix

@@ -11,9 +11,6 @@
     ./services/tailscale.nix
     ./services/keybase.nix
 
-    ./nspawn-containers/arch.nix
-  ];
-
   system.stateVersion = "22.05";
 
   security.pam.services.hyprlock = {};
@@ -22,7 +19,6 @@
     "x86_64-windows"
     "aarch64-linux"
     "armv7l-linux"
-    "i686-linux"
   ];
 
   nix.settings.system-features = [

hosts/kasei/nspawn-containers/arch.nix

@@ -1,28 +0,0 @@
-{ ... }:
-{
-  systemd.targets.machines.enable = true;
-
-  systemd.nspawn."arch" = {
-    enable = true;
-    execConfig.Boot = true;
-
-    filesConfig = {
-      BindReadOnly = [
-        "/nix/store"
-        # "/etc/resolv.conf:/etc/resolv.conf"
-      ];
-      Bind = [
-        "/home/h7x4/git"
-        "/home/h7x4/pico"
-        "/home/h7x4/Downloads"
-      ];
-    };
-    networkConfig.Private = false;
-  };
-
-  systemd.services."systemd-nspawn@arch" = {
-    enable = true;
-    requiredBy = [ "machines.target" ];
-    overrideStrategy = "asDropin";
-  };
-}

lib/attrsets.nix

@@ -7,6 +7,9 @@ in rec {
   mapToAttrsWithConst = constant: items:
     listToAttrs (map (name: nameValuePair name constant) items);
 
+  # [AttrSet] -> AttrSet
+  concatAttrs = foldr (a: b: a // b) {};
+
   # (Int -> String -> a -> a) -> AttrSet -> AttrSet
   imap0Attrs = f: set:
     listToAttrs (imap0 (i: attr: nameValuePair attr (f i attr set.${attr})) (attrNames set));