git: use delta for diffing

ncdu2 builds are broken under darwin far too often

.gitignore

@@ -0,0 +1 @@
+.DS_Store

common/default.nix

@@ -1,272 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-let
-  inputs = config.inputInjection.flake-inputs;
-  unstable = inputs.nixos-unstable;
-in
-{
-  imports = [
-    ./packages.nix
-    ./nitrokey.nix
-    ./nix-settings.nix
-    ./upgrade-diff.nix
-    ./guest.nix
-  ];
-
-  services.davfs2.enable = true;
-
-  # exfat support
-  #boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
-
-  # make the boot look good
-  boot.plymouth.enable = true;
-
-  # configure console
-  console = {
-    font = "Lat2-Terminus16";
-    keyMap = "de";
-  };
-
-  # Select internationalisation properties.
-  i18n = {
-    defaultLocale = "de_DE.UTF-8";
-  };
-
-  # Set your time zone.
-  time.timeZone = "Europe/Berlin";
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  programs.bash.completion.enable = true;
-  programs.wireshark = {
-    enable = true;
-    package = pkgs.wireshark;
-  };
-
-  programs.adb.enable = true;
-
-  programs.mtr.enable = true;
-  # programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
-
-  programs.ausweisapp = {
-    enable = true;
-    openFirewall = true;
-  };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  programs.ssh.startAgent = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  networking.firewall.allowedTCPPortRanges = [
-    {
-      from = 1714;
-      to = 1764;
-    }
-  ];
-  networking.firewall.allowedUDPPortRanges = [
-    {
-      from = 1714;
-      to = 1764;
-    }
-  ]; # for KDE connect
-  # FIXME: kdeconnect module
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  networking.networkmanager = {
-    enable = true;
-    # FIXME: move into own file, use SOPS for secrets
-    ensureProfiles.profiles = {
-      "37C3" = {
-        connection = {
-          id = "37C3";
-          type = "wifi";
-          interface-name = "wlan0";
-        };
-        wifi = {
-          mode = "infrastructure";
-          ssid = "37C3";
-        };
-        wifi-security = {
-          auth-alg = "open";
-          key-mgmt = "wpa-eap";
-        };
-        "802-1x" = {
-          anonymous-identity = "37C3";
-          eap = "ttls;";
-          identity = "37C3";
-          password = "37C3";
-          phase2-auth = "pap";
-          altsubject-matches = "DNS:radius.c3noc.net";
-          ca-cert = "${builtins.fetchurl {
-            url = "https://letsencrypt.org/certs/isrgrootx1.pem";
-            sha256 = "sha256:1la36n2f31j9s03v847ig6ny9lr875q3g7smnq33dcsmf2i5gd92";
-          }}";
-        };
-        ipv4 = {
-          method = "auto";
-        };
-        ipv6 = {
-          addr-gen-mode = "default";
-          method = "auto";
-        };
-      };
-    };
-  };
-
-  services.avahi.enable = true;
-
-  # Enable CUPS to print documents.
-  services.printing = {
-    enable = true;
-    drivers = [ pkgs.hplip ];
-  };
-  # scanners
-  hardware.sane = {
-    enable = true;
-    extraBackends = [ pkgs.hplip ];
-  };
-
-  # Bluetooth
-  hardware.bluetooth = {
-    enable = true;
-    settings.General.Disable = "Headset"; # disable headset profile
-  };
-
-  # FIXME: at some point, hide GUI and sound (desktop vs. server) behind an option
-  # Enable the X11 windowing system.
-  services.xserver = {
-    enable = true;
-    xkb.layout = "de";
-    xkb.options = "eurosign:e";
-  };
-
-  # Enable touchpad support.
-  services.libinput.enable = true;
-
-  # while libinput also supports graphic tablets, enable more-specific wacom driver
-  services.xserver.wacom.enable = true;
-
-  # Enable the KDE Desktop Environment.
-  services.displayManager.sddm = {
-    enable = true;
-    wayland.enable = true;
-  };
-  services.desktopManager.plasma6.enable = true;
-  # TODO: move out into a plasma.nix module
-  programs.kde-pim = {
-    enable = true;
-    kmail = true;
-    kontact = true;
-    merkuro = true;
-  };
-  # enable wayland for Chromium and Electron
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
-
-  # dconf required for several Gnome applications
-  programs.dconf.enable = true;
-
-  programs.firefox.enable = true; # enables support for automatically setting additionsl nativeMessagingHosts
-
-  # Flatpak support
-  services.flatpak.enable = true;
-  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
-
-  # Define a user account. Don't forget to set a password with `passwd`.
-  users.users.spiollinux = {
-    isNormalUser = true;
-    uid = 1000;
-    extraGroups = [
-      "vboxusers"
-      "wheel"
-      "networkmanager"
-      "scanner"
-      "lp"
-      "wireshark"
-      "dialout"
-      "cdrom"
-      "input"
-      "adbusers"
-    ];
-    shell = pkgs.zsh;
-  };
-
-  # enable virtualbox support
-  virtualisation.virtualbox.host = {
-    enable = true;
-    #enableExtensionPack = true;
-  };
-  # allow PUEL license
-  nixpkgs.config.whitelistedLicenses = [ pkgs.lib.licenses.virtualbox-puel ];
-  users.extraGroups.vboxusers.members = [ "spiollinux" ];
-
-  programs.zsh = {
-    enable = true;
-    autosuggestions.enable = true;
-  };
-
-  # profile sync daemon
-  services.psd.enable = true;
-
-  fonts = {
-    fontDir.enable = true;
-    fontconfig.enable = true;
-    fontconfig.includeUserConf = true;
-  };
-
-  # Enable all sysrq functions (useful to recover from some issues):
-  boot.kernel.sysctl."kernel.sysrq" = 1; # NixOS default: 16 (only the sync command)
-
-  nix.package = pkgs.lix;
-
-  nix.settings.trusted-users = [ "spiollinux" ];
-  # override tmpdir for daemon
-  #systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp";
-
-  # remote builders
-  #nix.buildMachines = [
-  #  {
-  #    hostName = "build01.nix-community.org";
-  #    sshUser = "ssh-ng://schmittlauch";
-  #    sshKey = "/root/.ssh/remote_builder_key";
-  #    system = "x86_64-linux";
-  #    maxJobs = 64;
-  #    supportedFeatures = [
-  #      "big-parallel"
-  #      "kvm"
-  #      "nixos-test"
-  #    ];
-  #  }
-  #];
-  programs.ssh.knownHosts."build01.nix-community.org".publicKey =
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIElIQ54qAy7Dh63rBudYKdbzJHrrbrrMXLYl7Pkmk88H";
-
-  # package debugging
-  # programs.sysdig.enable = true;
-
-  # declarative containers
-  containers = {
-    #  hash2PubSim = import ./Hash2PubTestbed.nix
-    #    {
-    #      inherit pkgs config;
-    #      experimentUid = config.users.users.spiollinux.uid;
-    #      projectDir = "/home/spiollinux/Seafile/Studium/Semester11/INF-PM-FP-ANW";
-    #    };
-  };
-
-  # stop NetworkManager from managing virtual interfaces
-  networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
-
-  services.dbus.implementation = "broker";
-}

common/guest.nix

@@ -1,65 +0,0 @@
-{
-  config,
-  lib,
-  system,
-  ...
-}:
-let
-  inputs = config.inputInjection.flake-inputs;
-in
-{
-  # interesting: this causes an infinite recursion
-  #imports = [ config.inputInjection.flake-inputs.home-manager.nixosModules.home-manager ];
-
-  options.schmittlauch.guestUser.enable = lib.options.mkEnableOption "Provide a guest user account";
-
-  config = lib.mkIf config.schmittlauch.guestUser.enable {
-    users.extraUsers.gast = {
-      isNormalUser = true;
-      group = "gast";
-      hashedPassword = "$y$j9T$pPCjU8ZvVYo0aY4jtrHPj1$NxUWOP/YTcqJ1PYaP1Hy5MwTeDcNjg0k369R5rE5M48";
-    };
-    users.groups.gast = { };
-    # a basic home-manager configuration to share installed packages of other accounts
-    # reason: keeping a separate config checkout for guests and requiring them to run
-    # their own `home-manager` instance does not make sense.
-    home-manager =
-      let
-        gast = config.users.extraUsers.gast;
-      in
-      {
-        useGlobalPkgs = false; # to allow usage of home-level overlays
-        # FIXME: possibly expose home modules through flake outputs instead of brittle path traversals
-        users.gast = {
-          imports = [
-            ../home/modules/packages.nix
-          ];
-          home = {
-            username = gast.name;
-            homeDirectory = gast.home;
-            stateVersion = "24.05";
-          };
-          schmittlauch = {
-            packages = {
-              graphics = true;
-              multimedia = true;
-              nixHelpers = true;
-              devTools = true;
-              pythonTools = true;
-              games = true;
-              desktopLinux = true;
-              kde = true;
-            };
-          };
-
-        };
-        # Optionally use extraSpecialArgs
-        # to pass through arguments to home.nix
-        extraSpecialArgs = {
-          inherit inputs system;
-        };
-
-      };
-
-  };
-}

common/nitrokey.nix

@@ -1,13 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  hardware.nitrokey.enable = true;
-  environment.systemPackages = [ pkgs.pynitrokey ];
-  nixpkgs.config.allowUnfreePredicate =
-    pkg:
-    builtins.elem (lib.getName pkg) [
-      "nrfutil"
-      "pc-ble-driver-py"
-      "pc-ble-driver"
-      "pypemicro"
-    ];
-}

common/nix-settings.nix

@@ -1,38 +0,0 @@
-# needs to be kept compatible to both NixOS and nix-darwin
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-let
-  inputs = config.inputInjection.flake-inputs;
-  unstable = inputs.nixos-unstable;
-in
-{
-  nix = {
-    # expose all flake inputs through nix Path and registry
-    registry = (lib.mapAttrs (_: value: { flake = value; }) inputs) // {
-      nixpkgs.flake = inputs.nixpkgs;
-    };
-    nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
-  };
-  nix.settings = builtins.mapAttrs (_: lib.mkDefault) {
-    # keep around all inputs necessary for offline-rebuilding the system
-    keep-outputs = true;
-    keep-derivations = true;
-    trusted-users = [ "spiollinux" ];
-    experimental-features = [
-      "nix-command"
-      "flakes"
-    ];
-    # use all cores for building
-    cores = 0;
-  };
-  # TODO: manage access token with sops instead of manual deployment
-  # permissions: needs to be readable by the user invoking nix and root (for nix daemon)
-  nix.extraOptions = ''
-    !include /etc/nix/secrets.conf
-  '';
-}

common/packages.nix

@@ -1,59 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-
-{
-  # take overlays from flake
-  nixpkgs.overlays = lib.attrValues config.inputInjection.flake-inputs.self.overlays;
-  nixpkgs.config.permittedInsecurePackages = [
-    # (temporarily) permit the usage of libolm
-    "olm-3.2.16"
-  ];
-
-  # List packages installed in system profile.
-  environment.systemPackages = with pkgs; [
-    wget
-    vim
-    vimPlugins.vim-nix
-    vimPlugins.pathogen
-    tmux
-    htop
-    zsh
-    btrfs-progs
-    git
-    python3
-    man-pages
-    dnsutils
-    netcat-openbsd
-    ntfs3g
-    file
-    multipath-tools
-    strace
-    ltrace
-    valgrind
-    testdisk
-    rsync
-    pv
-    exfat
-    iotop
-    cifs-utils
-    dstat
-    lsof
-    macchanger
-    borgbackup
-
-    # for debugging WLAN failures:
-    ethtool
-    trace-cmd
-
-    # NetworkManager stuff
-    networkmanager-openconnect
-    networkmanager-vpnc
-    networkmanager-openvpn
-    # for some Flatpak packkages
-    accountsservice
-  ];
-}

common/pipewire.nix

@@ -1,25 +0,0 @@
-{ pkgs, ... }:
-{
-  # rtkit is optional but recommended
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-
-    wireplumber.configPackages = [
-      (pkgs.writeTextDir "share/wireplumber/bluetooth.lua.d/51-bluez-config.lua" ''
-        bluez_monitor.properties = {
-            ["bluez5.enable-sbc-xq"] = true,
-            ["bluez5.enable-msbc"] = true,
-            ["bluez5.enable-hw-volume"] = true,
-            ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
-        }
-      '')
-    ];
-  };
-  environment.systemPackages = [ pkgs.easyeffects ];
-}

common/pulseaudio.nix

@@ -1,16 +0,0 @@
-{ pkgs, ... }:
-{
-  # Enable sound.
-  hardware.pulseaudio = {
-    enable = true;
-    package = pkgs.pulseaudioFull;
-    # decouple pulseaudio application and sink volumes
-    daemon.config = {
-      flat-volumes = "no";
-    };
-    # C3D2 hq music
-    zeroconf.discovery.enable = true;
-    zeroconf.publish.enable = true;
-  };
-  services.pipewire.enable = false; # conflicts otherwise
-}

common/upgrade-diff.nix

@@ -1,9 +0,0 @@
-# MIT Jörg Thalheim - https://github.com/Mic92/dotfiles/blob/c6cad4e57016945c4816c8ec6f0a94daaa0c3203/nixos/modules/upgrade-diff.nix
-{ pkgs, ... }:
-{
-  system.activationScripts.diff = ''
-    if [[ -e /run/current-system ]]; then
-      ${pkgs.nix}/bin/nix store diff-closures /run/current-system "$systemConfig"
-    fi
-  '';
-}

darwin/configuration.nix

@@ -1,55 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [ ../common/nix-settings.nix ];
-  nix = {
-    enable = true;
-    package = pkgs.nixVersions.nix_2_25;
-    settings = {
-      trusted-users = [
-        "os"
-        "@admin"
-      ]; # @admin for linux-builder
-      substituters = [
-        "https://s3.whq.fcio.net/hydra"
-        "https://hydra.flyingcircus.io"
-      ];
-      trusted-public-keys = [
-        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-        "flyingcircus.io-1:Rr9CwiPv8cdVf3EQu633IOTb6iJKnWbVfCC8x8gVz2o="
-      ];
-    };
-  };
-
-  # Auto upgrade nix package and the daemon service.
-  services.nix-daemon.enable = true;
-
-  # List packages installed in system profile. To search by name, run:
-  # $ nix-env -qaP | grep wget
-  environment.systemPackages = [ pkgs.vim ];
-
-  # Use a custom configuration.nix location.
-  # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
-  # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";
-
-  # Create /etc/bashrc that loads the nix-darwin environment.
-  programs.zsh.enable = true; # default shell on catalina
-
-  # system-wide SSH configuration, used by nix-daemon for remote builders
-
-  # show hidden files
-  system.defaults.NSGlobalDomain.AppleShowAllFiles = true;
-
-  # Used for backwards compatibility, please read the changelog before changing.
-  # $ darwin-rebuild changelog
-  system.stateVersion = 4;
-  nixpkgs.hostPlatform = "aarch64-darwin";
-
-  # local vm-backed linux builder as background service
-  nix.linux-builder = {
-    enable = true;
-    ephemeral = true;
-    maxJobs = 3;
-  };
-
-}

darwin/darwin-configuration.nix

@@ -0,0 +1,29 @@
+{ config, pkgs, ... }:
+
+{
+  # List packages installed in system profile. To search by name, run:
+  # $ nix-env -qaP | grep wget
+  environment.systemPackages =
+    [ pkgs.vim
+    ];
+
+  # Use a custom configuration.nix location.
+  # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
+  # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";
+
+  # Auto upgrade nix package and the daemon service.
+  services.nix-daemon.enable = true;
+  # nix.package = pkgs.nix;
+
+  # Create /etc/bashrc that loads the nix-darwin environment.
+  programs.zsh.enable = true;  # default shell on catalina
+
+  # system-wide SSH configuration, used by nix-daemon for remote builders
+
+  # show hidden files
+  system.defaults.NSGlobalDomain.AppleShowAllFiles = true;
+
+  # Used for backwards compatibility, please read the changelog before changing.
+  # $ darwin-rebuild changelog
+  system.stateVersion = 4;
+}

flake.lock

@@ -1,435 +0,0 @@
-{
-  "nodes": {
-    "crane": {
-      "locked": {
-        "lastModified": 1731098351,
-        "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "lanzaboote",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1730504689,
-        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "lanzaboote",
-          "pre-commit-hooks-nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1746171682,
-        "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "50eee705bbdbac942074a8c120e8194185633675",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-24.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "lanzaboote": {
-      "inputs": {
-        "crane": "crane",
-        "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs",
-        "pre-commit-hooks-nix": "pre-commit-hooks-nix",
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1737639419,
-        "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=",
-        "owner": "nix-community",
-        "repo": "lanzaboote",
-        "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "v0.4.2",
-        "repo": "lanzaboote",
-        "type": "github"
-      }
-    },
-    "mysecrets": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1722419972,
-        "narHash": "sha256-7gKcSKTu7Z6sswIK4QuMHtDbpKMs09b6w7uFjJJyAIA=",
-        "ref": "refs/heads/master",
-        "rev": "c725f810bb9a43c213fcf964f036dd0c64b6ba04",
-        "revCount": 5,
-        "type": "git",
-        "url": "ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git"
-      }
-    },
-    "nix-darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1743127615,
-        "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=",
-        "owner": "LnL7",
-        "repo": "nix-darwin",
-        "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "LnL7",
-        "ref": "nix-darwin-24.11",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
-    "nixos-hardware": {
-      "locked": {
-        "lastModified": 1746621361,
-        "narHash": "sha256-T9vOxEqI1j1RYugV0b9dgy0AreiZ9yBDKZJYyclF0og=",
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "rev": "2ea3ad8a1f26a76f8a8e23fc4f7757c46ef30ee5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "master",
-        "repo": "nixos-hardware",
-        "type": "github"
-      }
-    },
-    "nixos-unstable": {
-      "locked": {
-        "lastModified": 1746461020,
-        "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1731919951,
-        "narHash": "sha256-vOM6ETpl1yu9KLi/icTmLJIPbbdJCdAVYUXZceO/Ce4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "04386ac325a813047fc314d4b4d838a5b1e3c7fe",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1730741070,
-        "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1746557022,
-        "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1746461020,
-        "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nur": {
-      "inputs": {
-        "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_3",
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1746740791,
-        "narHash": "sha256-4o0Aj9BXpybfAkcxY3h9+y0AuC5TtIVztuTdVXYubrI=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "228d29ab7ffa3f89d0088917883b179c7bce05f2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
-        "type": "github"
-      }
-    },
-    "pre-commit-hooks-nix": {
-      "inputs": {
-        "flake-compat": [
-          "lanzaboote",
-          "flake-compat"
-        ],
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "lanzaboote",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable"
-      },
-      "locked": {
-        "lastModified": 1731363552,
-        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "home-manager": "home-manager",
-        "lanzaboote": "lanzaboote",
-        "mysecrets": "mysecrets",
-        "nix-darwin": "nix-darwin",
-        "nixos-hardware": "nixos-hardware",
-        "nixos-unstable": "nixos-unstable",
-        "nixpkgs": "nixpkgs_2",
-        "nur": "nur",
-        "treefmt-nix": "treefmt-nix_2",
-        "utils": "utils"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "lanzaboote",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1731897198,
-        "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733222881,
-        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "treefmt-nix_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1746216483,
-        "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,198 +0,0 @@
-{
-  description = "NixOS system flake";
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
-    nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
-    home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    lanzaboote = {
-      url = "github:nix-community/lanzaboote/v0.4.2";
-      # deliberately do _not_ follow the nixpkgs input here, because paranoia and test coverage
-    };
-    utils.url = "github:numtide/flake-utils";
-    treefmt-nix = {
-      url = "github:numtide/treefmt-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nix-darwin = {
-      url = "github:LnL7/nix-darwin/nix-darwin-24.11";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    nur.url = "github:nix-community/NUR";
-    # TODO: possible make this a flake as well
-    mysecrets = {
-      flake = false;
-      url = "git+ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git";
-    };
-  };
-
-  outputs =
-    {
-      self,
-      nixpkgs,
-      nur,
-      lanzaboote,
-      utils,
-      home-manager,
-      treefmt-nix,
-      nix-darwin,
-      ...
-    }@inputs:
-    let
-      # FIXME: allow different systems
-      systems = utils.lib.system;
-      # necessary to make the top-level inputs available to system configuration
-      # inspired by https://jade.fyi/blog/flakes-arent-real/
-      inputInjection =
-        { pkgs, lib, ... }:
-        {
-          options.inputInjection = lib.mkOption {
-            type = with lib.types; attrsOf unspecified;
-            default = { };
-          };
-          config.inputInjection = {
-            flake-inputs = inputs;
-          };
-        };
-      defaultModules = system: [
-        inputInjection
-
-        # for some reason, `imports`-ing the home-manager module via inputInjection
-        # from a sub-module causes infinite recursion, so importing it here instead
-        home-manager.nixosModules.home-manager
-      ];
-      mkSystem =
-        system: extraModules:
-        nixpkgs.lib.nixosSystem rec {
-          modules = (defaultModules system) ++ extraModules;
-          inherit system;
-          specialArgs = {
-            inherit system;
-          };
-        };
-      mkHomeManager =
-        confName: user: system: # unfortunately, home-manager configs are still system-specific
-        home-manager.lib.homeManagerConfiguration {
-          pkgs = nixpkgs.legacyPackages.${system};
-          modules = [
-            {
-              imports = [
-                ./home/common.nix
-                ./home/${confName}.nix
-              ];
-              # extends the home config
-              home.username = user;
-            }
-          ];
-          # Optionally use extraSpecialArgs
-          # to pass through arguments to home.nix
-          extraSpecialArgs = {
-            inherit inputs system;
-          };
-        };
-      treefmtConf =
-        { pkgs, ... }:
-        {
-          projectRootFile = "flake.nix";
-          programs.nixfmt.enable = true;
-        };
-    in
-    {
-      overlays.default = import ./packages;
-      nixosConfigurations = {
-        thinknix = mkSystem systems.x86_64-linux [
-          ./hosts/thinknix
-          inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t440s
-          lanzaboote.nixosModules.lanzaboote
-        ];
-        framenix = mkSystem systems.x86_64-linux [
-          ./hosts/framenix
-          inputs.nixos-hardware.nixosModules.framework-13-7040-amd
-          lanzaboote.nixosModules.lanzaboote
-        ];
-      };
-      darwinConfigurations."OS-MacBook-Pro" = nix-darwin.lib.darwinSystem {
-        modules = [
-          ./darwin/configuration.nix
-          inputInjection
-
-        ];
-      };
-      homeConfigurations = {
-        spiollinux-desktop = mkHomeManager "desktop" "spiollinux" systems.x86_64-linux;
-        os-workmac = mkHomeManager "workmac" "os" systems.aarch64-darwin;
-      };
-      lib = {
-        inherit mkHomeManager;
-      };
-    }
-    // utils.lib.eachDefaultSystem (
-      system:
-      let
-        nixpkgs = import inputs.nixpkgs {
-          inherit system;
-          overlays = nixpkgs.lib.attrValues self.overlays;
-        };
-        nixpkgs_unstable = import inputs.nixos-unstable {
-          inherit system;
-          overlays = nixpkgs.lib.attrValues self.overlays;
-        };
-        pkgs = inputs.nixpkgs.legacyPackages.${system};
-        pkgs_unstable = inputs.nixos-unstable.legacyPackages.${system};
-        treefmtEval = treefmt-nix.lib.evalModule pkgs_unstable treefmtConf;
-      in
-      {
-        devShells.default = pkgs.mkShell { buildInputs = [ ]; };
-        formatter = treefmtEval.config.build.wrapper;
-        checks.formatting = treefmtEval.config.build.check self;
-        # expose nixpkgs with overlay; TODO: figure out role of config
-        #legacyPackages = nixpkgs;
-
-        # inspired by https://github.com/Mic92/dotfiles/blob/main/home-manager/flake-module.nix
-        # run like: `nix run .#hm -- <action>`
-        apps.hm = {
-          type = "app";
-          program = "${pkgs.writeShellScriptBin "hm" ''
-                set -x
-                export PATH=${
-                  pkgs.lib.makeBinPath [
-                    pkgs.git
-                    pkgs.coreutils
-                    pkgs.findutils
-                    pkgs.lix
-                    pkgs.jq
-                    pkgs.unixtools.hostname
-                  ]
-                }
-            declare -A profiles=(
-              ["framenix"]="spiollinux-desktop"
-              ["thinknix"]="spiollinux-desktop"
-              ["OS MacBook Pro"]="os-workmac"
-            )
-            user=$(id -un)
-            host=$(hostname)
-            if [[ -n ''${profiles["$host-$user"]} ]]; then
-              profile=''${profiles["$host-$user"]};
-            elif [[ -n ''${profiles[$host]:-} ]]; then
-              profile=''${profiles[$host]}
-            else
-                echo "No suitable profile found." >2
-                exit 2
-            fi
-            if [[ "''${1:-}" == profile ]]; then
-              echo $profile
-              exit 0
-            fi
-            ${
-              inputs.home-manager.packages.${pkgs.system}.home-manager
-            }/bin/home-manager --flake "${self}#$profile" "$@"
-          ''}/bin/hm";
-        };
-      }
-    );
-}

home/common.nix

@@ -1,178 +0,0 @@
-{
-  pkgs,
-  inputs,
-  config,
-  system,
-  lib,
-  ...
-}:
-{
-  imports = [
-    ./modules/packages.nix
-    ./modules/vscodium.nix
-    ./modules/fonts.nix
-  ];
-  home.homeDirectory =
-    if pkgs.stdenv.isDarwin then "/Users/${config.home.username}" else "/home/${config.home.username}";
-  programs.home-manager.enable = true;
-
-  programs.bat.enable = true;
-  programs.direnv = {
-    enable = true;
-    nix-direnv.enable = true;
-    enableZshIntegration = true;
-  };
-
-  programs.tmux = {
-    enable = true;
-    keyMode = "vi";
-    extraConfig =
-      # for direnv not messing up the environment
-      ''
-        set-option -g update-environment "DIRENV_DIFF DIRENV_DIR DIRENV_WATCHES"
-                  set-environment -gu DIRENV_DIFF
-                  set-environment -gu DIRENV_DIR
-                  set-environment -gu DIRENV_WATCHES
-                  set-environment -gu DIRENV_LAYOUT
-                
-                  bind-key -T copy-mode-vi 'v' send -X begin-selection
-                  bind-key -T copy-mode-vi 'y' send -X copy-selection-and-cancel'';
-    terminal = "screen-256color";
-  };
-
-  programs.git = {
-    enable = true;
-    extraConfig = {
-      credential.helper = "cache";
-      push.default = "simple";
-      push.forceIfIncludes = true; # avoid accidental force overrides when remote is autofetched in background
-      init.defaultBranch = "mainline";
-      diff.tool = "vimdiff";
-      merge.tool = "vimdiff";
-      # provide `git mergetool -t nixfmt`
-      mergetool.nixfmt = {
-        cmd = "${
-          lib.getExe inputs.nixos-unstable.legacyPackages.${system}.nixfmt-rfc-style
-        } --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
-        trustExitCode = true;
-      };
-      core.excludesfile = toString (
-        pkgs.writeText ".gitignore_global" ''
-          # Direnv stuff #
-          ################
-          .direnv
-          .envrc
-          # Editor files #
-          ################
-          *~
-          *.swp
-          *.swo
-          # macOS foo #
-          #############
-          .DS_Store
-        ''
-      );
-      core.whitespace = "-blank-at-eol,blank-at-eof,space-before-tab";
-    };
-    lfs.enable = true;
-    delta = {
-      enable = true;
-      options = {
-        line-numbers = true;
-        side-by-side = true;
-        #dark = true;
-      };
-    };
-  };
-  programs.lazygit = {
-    enable = true;
-    settings = {
-      git = {
-        autoFetch = false;
-        mainBranches = [
-          "main"
-          "master"
-          "mainline"
-        ];
-      };
-      update.method = "never";
-    };
-  };
-
-  # shell config
-  programs.zsh = {
-    enable = true;
-    syntaxHighlighting.enable = true;
-    history.ignoreSpace = true;
-    initExtra = ''
-      # Uncomment following line if you want red dots to be displayed while waiting for completion
-      COMPLETION_WAITING_DOTS="true"
-      ### Fix slowness of pastes with zsh-syntax-highlighting.zsh
-      pasteinit() {
-        OLD_SELF_INSERT=''${''${(s.:.)widgets[self-insert]}[2,3]}
-        zle -N self-insert url-quote-magic # I wonder if you'd need `.url-quote-magic`?
-      }
-
-      pastefinish() {
-        zle -N self-insert $OLD_SELF_INSERT
-      }
-      zstyle :bracketed-paste-magic paste-init pasteinit
-      zstyle :bracketed-paste-magic paste-finish pastefinish
-
-      # automatic rehash of path completion
-      zstyle ':completion:*' rehash true
-
-      eval "$(${pkgs.thefuck}/bin/thefuck --alias)"
-
-      ##  helper functions
-      nixify() {
-        if [ ! -e ./.envrc ]; then
-          echo "eval \"$(lorri direnv)\"" > .envrc
-          direnv allow
-        fi
-        if [ ! -e shell.nix ]; then
-          cat > shell.nix <<'EOF'
-      with import <nixpkgs> {};
-      mkShell {
-        buildInputs = [
-          bashInteractive
-        ];
-      }
-      EOF
-          ${"EDITOR:-vim"} default.nix
-        fi
-      }
-
-      binpath() {
-        realpath $(${pkgs.which}/bin/which $1)
-      }
-    '';
-
-    oh-my-zsh = {
-      enable = true;
-      theme = "bira";
-      plugins = [
-        "git"
-        "python"
-        "systemd"
-        "gpg-agent"
-      ];
-    };
-  };
-  home.shellAliases = {
-    ip = "ip --color";
-    ipb = "ip --color --brief";
-    ll = "ls -l";
-    wavesynth = "nix-shell -p sox --run 'play -n synth brownnoise synth pinknoise mix synth 0 0 0 15 40 80 trapezium amod 0.2 20'";
-    vim = "nvim";
-  };
-  home.sessionVariables = {
-    EDITOR = "nvim";
-  };
-
-  home.activation.reportChanges = config.lib.dag.entryAnywhere ''
-    if [[ -v oldGenPath ]]; then
-      run nix store diff-closures $oldGenPath $newGenPath
-    fi
-  '';
-}

home/config.nix

@@ -0,0 +1,15 @@
+let 
+  lib = (import <nixpkgs> {}).lib;
+
+in
+  {
+
+    firefox.enablePlasmaBrowserIntegration = true;
+    firefox-bin.enablePlasmaBrowserIntegration = true;
+    clementine.spotify = false;
+    vim =
+      { gui = "gtk3";
+      python = true;
+      multibyteSupport = true;
+    };
+  }

home/desktop.nix

@@ -1,86 +0,0 @@
-{
-  pkgs,
-  inputs,
-  config,
-  system,
-  lib,
-  ...
-}:
-{
-  imports = [ ./modules/latex.nix ];
-  home.stateVersion = "23.11";
-
-  schmittlauch = {
-    packages = {
-      graphics = true;
-      multimedia = true;
-      nixHelpers = true;
-      devTools = true;
-      pythonTools = true;
-      games = true;
-      desktopLinux = true;
-      kde = true;
-    };
-    latex.guiTools = true;
-  };
-
-  # for backwards compatibility
-  services.lorri.enable = true;
-
-  programs.git =
-    let
-      # TODO profile specific
-      contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; };
-    in
-    {
-      includes =
-        [
-          {
-            condition = "gitdir:~/Seafile/Studium/";
-            contents = {
-              user.name = contacts.personal.name;
-              user.email = contacts.uni.email;
-            };
-          }
-          {
-            condition = "gitdir:~/src/nixpkgs/";
-            contents = {
-              user.name = "Trolli Schmittlauch";
-              user.email = contacts.nixOs.email;
-            };
-          }
-        ]
-        # set default name for several other common locations
-        ++
-          map
-            (dir: {
-              condition = "gitdir:${dir}";
-              contents = {
-                user = {
-                  inherit (contacts.schmittlauch) email name;
-                };
-              };
-            })
-            [
-              "~/src/"
-              "~/bin/"
-              "~/tmp/"
-              "~/nixconfigs/"
-            ];
-    };
-
-  services.gpg-agent = {
-    enable = true;
-    #enableSshSupport = true;
-    pinentryPackage = pkgs.pinentry-qt;
-  };
-
-  programs.ssh = {
-    enable = true;
-    # ssh host config
-    matchBlocks = (import "${inputs.mysecrets}/ssh_hosts.nix").privateHosts;
-  };
-
-  # media button control support from Bluetooth devices
-  services.mpris-proxy.enable = true;
-}

home/home.nix

@@ -0,0 +1,608 @@
+{ pkgs, lib, config, ... }:
+
+with pkgs;
+let
+  # nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable
+  #unstable = import <nixos-unstable> { };
+  # nix-channel --add https://github.com/nix-community/NUR/archive/master.tar.gz NUR
+  nur = import <NUR> { inherit pkgs; };
+  myNur = nur.repos.schmittlauch;
+
+  desktopApps = [
+    # use pre-built Mozilla binary until nixpkgs build has similar performance (build profiling information)
+    firefox-bin
+    chromium
+    falkon
+    thunderbird
+    calibre
+    dino
+    zotero
+    keepassxc
+    ding
+    aspell
+    aspellDicts.de
+    aspellDicts.en
+    # for kate/KDE applications
+    hunspellDicts.de-de
+    hunspellDicts.en-us
+    hunspellDicts.en-gb-ise
+    seafile-client
+    alacritty
+    libreoffice-qt # fresh with KDE integration
+    backintime-common
+    anki-bin
+    signal-desktop
+    (tor-browser-bundle-bin.override {
+      mediaSupport = true;
+      pulseaudioSupport = true;
+      # prevent segfault on Intel graphics systems
+      useHardenedMalloc = false;
+    })
+    pdfpc
+    quaternion
+    nheko
+    gpx-viewer
+    gpxsee
+    cawbird
+    subsurface
+    yate
+    # split and merge PDFs in a GUI
+    pdfarranger
+    qbittorrent
+    #(pkgs.pidgin-with-plugins.override {
+    #    plugins = [ pkgs.pidginotr ];})
+
+
+    # for Hibiscus banking software
+    jameica
+    #ToDo: which of these drivers is actually used?
+    geckodriver
+    chromedriver
+  ];
+
+  graphicsApps = [
+    inkscape
+    darktable
+    #hugin
+    #luminanceHDR
+    exiftool
+    gimp
+    #xournal  # FIXME: broken on darwin-aarch64
+  ]
+  ++ (
+    with gimpPlugins; [
+      fourier
+      lqrPlugin
+    ]
+  );
+
+  multimediaApps = [
+    mpv
+    #vlc
+    #amarok
+    #clementine
+    #elisa
+    yt-dlp
+    #sonic-pi
+    #musescore
+    #audacity
+    #avidemux
+    #linphone
+    #soundkonverter
+  ];
+
+  cliApps = [
+    myVim
+    htop
+    tmux
+    httpie
+    ponysay
+    gti
+    tree
+    lsof
+    mosh
+    openssh
+    sshfs-fuse
+    cryfs
+    #smbnetfs # for FUSE smb mounting
+    openssh
+    sshuttle
+    thefuck
+    gnupg
+    unar
+    lzop
+    p7zip
+    pwgen
+    pandoc
+    #agrep    # FIXME: broken on darwin-aarch64
+    pdfgrep
+    #torsocks # FIXME: broken on darwin-aarch64
+    # zig dependency breaks occasionally, stay on C version for now
+    ncdu_1
+    #psmisc # for killall
+    dos2unix
+    #reptyr # re-bind running program to other tty
+    xclip
+    unzip
+    fswatch
+    #myNur.lolcommits # from NUR
+    jq
+    age
+    _1password
+    lnav
+  ];
+
+  nixHelpers = [
+    nixpkgs-review
+    nixfmt
+    nix-top
+    statix
+  ];
+
+  kdeTools = with plasma5Packages; with kdeGear; [
+    okular
+    gwenview
+    yakuake
+    kmail
+    kontact
+    korganizer
+    akonadi-mime #for KOrganizer
+    kaddressbook
+    kdeconnect
+    dolphin
+    spectacle
+    kate
+    kleopatra
+    qdirstat
+    ark
+    kwalletmanager
+    ktouch
+    kcharselect
+    konversation
+    okteta
+    krdc
+    skanlite
+    akonadiconsole
+    plasma-browser-integration
+  ]
+  ++ (
+    with kdeFrameworks; [
+      networkmanager-qt
+      kcrash
+      breeze-gtk
+      phonon-backend-vlc
+      #(phonon-backend-vlc.override {qtbase=qt5.qtbase; qtx11extras=qt5.qtx11extras;})
+    ]
+  );
+
+  devTools = [
+    curl
+    httpie
+    #gdb
+    #strace
+    #ltrace
+    #valgrind
+    #zeal
+    gcc
+    shellcheck
+    mtr
+    ripgrep
+    gitui
+    lazygit
+    pre-commit
+    scriv
+
+    # Haskell
+    ghc
+    cabal2nix
+  ];
+
+
+  latexApps = [
+    texmaker
+    kile
+    biber
+    # customize texlive installation
+    (
+      texlive.combine {
+        inherit (texlive)
+          scheme-medium
+
+          xetex
+          luatex
+          unicode-math
+          fontspec
+          collection-binextra
+          collection-fontsrecommended
+          collection-latex
+          collection-latexextra
+          collection-latexrecommended
+          collection-langgerman
+          IEEEtran
+          moderncv
+          fontawesome5
+          academicons
+          acronym
+          ccicons
+          fontawesome
+          biblatex
+          logreq
+          koma-script
+          ;
+      }
+    )
+  ];
+
+  pythonApps = with python3Packages; [
+    notebook
+    ipython
+    pip
+    numpy
+    matplotlib
+    jedi
+    jedi-language-server
+    black
+    flake8
+    mypy
+  ];
+
+
+  fonts = [
+    comic-neue
+    source-sans-pro
+    source-code-pro
+    source-serif-pro
+    ubuntu_font_family
+    twemoji-color-font
+    open-sans
+    (iosevka-bin.override {
+      variant = "curly-slab";
+    })
+    myNur.vollkorn
+    # TODO: humor-sans
+
+    # fcio corporate design, TODO module
+    fira-code
+    fira-mono
+    # TODO fira-sans + condensed
+    # TODO museo 500
+    # also TODO: color schemes nix-darwin
+  ];
+
+  games = [
+    superTuxKart
+    #hedgewars
+  ];
+
+  macosTools = [
+    wireshark   # on NixOS systems enabled via system config
+  ];
+
+in
+{
+
+  home.packages =
+    cliApps
+    #++ desktopApps
+    #++ latexApps
+    ++ pythonApps
+    ++ graphicsApps
+    ++ multimediaApps
+    ++ devTools
+    #++ kdeTools
+    ++ fonts
+    ++ nixHelpers
+    #++ games
+    ++ macosTools
+  ;
+  
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+             "1password-cli"
+  ];
+
+  programs.home-manager.enable = true;
+  #programs.home-manager.path = "$HOME/.nix-defexpr/channels/home-manager";
+  home.stateVersion = "22.05";
+
+  # Home Manager needs a bit of information about you and the
+  # paths it should manage.
+  home.username = "os";
+  home.homeDirectory = "/Users/os";
+
+  programs.direnv =
+    {
+      enable = true;
+      nix-direnv.enable = true;
+      enableZshIntegration = true;
+    };
+
+  #  programs.vim =
+  #    { enable = true;
+  #    };
+
+  programs.vscode = {
+    enable = true;
+    package = pkgs.vscodium;
+    extensions = with pkgs.vscode-extensions; [
+      ms-python.python
+      vscodevim.vim
+      yzhang.markdown-all-in-one
+      bungcip.better-toml
+      eamodio.gitlens
+      jnoortheen.nix-ide
+      mkhl.direnv
+    ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+      {
+        name = "Sync-Rsync";
+        publisher = "vscode-ext";
+        version = "0.36.0";
+        sha256 = "sha256-0b/OHLZfXo0NAVAVkzZSqMGDzF0uvPRoiqsZtW1iOdA";
+      }
+      # TODO: probably available in nixpkgs soonish?
+      {
+        name = "mypy-type-checker";
+        publisher = "ms-python";
+        version = "2023.3.12681020";
+        sha256 = "sha256-rhed7CQlvxksVCGc9nPU2oYQWtXcAV5TzuG63e8Y3zM=";
+      }
+      {
+        name = "black-formatter";
+        publisher = "ms-python";
+        version = "2023.5.12771008";
+        sha256 = "sha256-lJG0RRUUMhQGs2a6oBtoqt+uY1kSJ0+cbmaP07hNh2o=";
+      }
+      {
+        name = "vscode-pets";
+        publisher = "tonybaloney";
+        version = "1.25.1";
+        sha256 = "sha256-as3e2LzKBSsiGs/UGIZ06XqbLh37irDUaCzslqITEJQ=";
+      }
+    ];
+    userSettings = let
+      defaultPython = pkgs.python3.withPackages (ps: [
+        ps.jedi ps.jedi-language-server
+        ps.pip ps.setuptools # for pkg_resources
+        ps.black ps.mypy
+      ]);
+      in {
+      "editor.fontLigatures" = true;
+      "window.autoDetectColorScheme" = true;
+      "workbench.preferredDarkColorTheme" = "Default Dark Modern";
+      "workbench.preferredLightColorTheme" = "Default Light Modern";
+      "[nix]" = {
+        "editor.insertSpaces" = true;
+        "editor.tabSize" = 2;
+        # for now, disable automatic formatting to prevent disruption of existing code bases
+        "editor.formatOnPaste" = false;
+        "editor.formatOnSave" = false;
+        "editor.formatOnType" = false;
+      };
+      "nix.formatterPath" = "${pkgs.nixfmt}/bin/nixfmt";
+      "editor.fontSize" = 13;
+      "editor.fontWeight" = "normal";
+      "git.detectSubmodulesLimit" = 30;
+      "[python]" = {
+        "breadcrumbs.showClasses" = true;
+        "breadcrumbs.showFunctions" = true;
+        "gitlens.codeLens.symbolScopes" = [
+        "!Module"
+        ];
+        "editor.defaultFormatter" = "ms-python.black-formatter";
+        "editor.formatOnSave" = true;
+      };
+      "python.languageServer" = "Jedi";  # don't use proprietary pylance server
+      "python.defaultInterpreterPath" = "${defaultPython}/bin/python";
+      "black-formatter.path" = ["${pkgs.python3Packages.black}/bin/black"];
+      "black-formatter.importStrategy" = "fromEnvironment";
+      "mypy-type-checker.path" = ["${pkgs.python3Packages.mypy}/bin/mypy"];
+      "mypy-type-checker.importStrategy" = "fromEnvironment";
+      "mypy-type-checker.args" =  [
+        "--ignore-missing-imports"
+      ];
+      "gitlens.telemetry.enabled" = false;
+      "vim.highlightedyank.enable" = true;
+      "vim.history" = 500;
+      "vim.neovimUseConfigFile" = true;
+      "vim.enableNeovim" = true;
+      "git.suggestSmartCommit" = false;
+      "editor.rulers" = [ 79 ];
+      "vim.useSystemClipboard" = true;
+      "vim.smartRelativeLine" = true;
+      "diffEditor.ignoreTrimWhitespace" = false;
+      "files.associations" = {
+        "*.py" = "python";
+      };
+      "editor.renderWhitespace" = "all";
+      "editor.fontFamily" = "Iosevka Curly Slab, Menlo, Monaco, 'Courier New', monospace";
+      "vim.neovimPath" = "/Users/os/.nix-profile/bin/nvim";
+      "sync-rsync.options" = [];
+    };
+  };
+
+programs.bat = {
+    enable = true;
+    # pinning theme is necessary until iTerm 3.5, because despite the dark terminal background, bat detects light mode and adapts theme
+    config.theme = "Visual Studio Dark+";
+  };
+
+#  services.gpg-agent =
+#    {
+#      enable = true;
+#      enableSshSupport = true;
+#      pinentryFlavor = "qt";
+#    };
+
+  programs.ssh =
+    {
+      enable = true;
+      # ssh host config
+      matchBlocks = {
+        "hydra01" = {
+          hostname = "hydra01.fe.whq.fcio.net";
+          user = "os";
+        };
+        "fcio-whq-jump" = {
+          hostname = "vpn-whq.services.fcio.net";
+          extraOptions.LogLevel = "Verbose";
+        };
+        "fcio-rzob-jump" = {
+          hostname = "vpn-rzob.services.fcio.net";
+        };
+      };
+    };
+
+  programs.tmux = {
+    enable = true;
+    keyMode = "vi";
+    extraConfig =
+      # for direnv not messing up the environment
+      ''set-option -g update-environment "DIRENV_DIFF DIRENV_DIR DIRENV_WATCHES"
+          set-environment -gu DIRENV_DIFF
+          set-environment -gu DIRENV_DIR
+          set-environment -gu DIRENV_WATCHES
+          set-environment -gu DIRENV_LAYOUT
+        
+          bind-key -T copy-mode-vi 'v' send -X begin-selection
+          bind-key -T copy-mode-vi 'y' send -X copy-selection-and-cancel'';
+    terminal = "screen-256color";
+  };
+
+  #systemd.user.startServices = true;
+
+  #services.lorri.enable = true;
+
+  # media button control support from Bluetooth devices
+  #services.mpris-proxy.enable = true;
+
+  fonts.fontconfig.enable = true;
+
+  programs.git =
+    let contacts = import ./secrets/contacts.nix;
+    in
+    {
+      enable = true;
+      includes = [
+        {
+          condition = "gitdir:~/Seafile/Studium/";
+          contents = {
+            user.name = contacts.realName;
+            user.email = contacts.uniMail;
+          };
+        }
+        {
+          condition = "gitdir:~/src/nixpkgs/";
+          contents = {
+            user.name = "Trolli Schmittlauch";
+            user.email = contacts.nixosMail;
+          };
+        }
+      ]
+      # set default name for several other common locations
+      ++ map
+        (dir: {
+          condition = "gitdir:${dir}";
+          contents = {
+            user.name = "Trolli Schmittlauch";
+            user.email = contacts.mainMail;
+          };
+        }) [ "~/src/" "~/bin/" "~/tmp/" "~/nixconfigs/" ];
+      extraConfig = {
+        credential.helper = "cache";
+        push.default = "simple";
+        init.defaultBranch = "mainline";
+        diff.tool = "vimdiff";
+        merge.tool = "vimdiff";
+        core.excludesfile = toString (pkgs.writeText ".gitignore_global" ''
+          # Direnv stuff
+          .direnv
+          .envrc
+          # Editor files #
+          ################
+          *~
+          *.swp
+          *.swo
+        '');
+        core.whitespace = "-blank-at-eol,blank-at-eof,space-before-tab";
+        rerere.enabled = true;
+      };
+      lfs.enable = true;
+      delta = {
+        enable = true;
+        options = {
+          line-numbers = true;
+          side-by-side = true;
+          #dark = true;
+        };
+      };
+    };
+
+    # shell config
+    programs.zsh = {
+      enable = true;
+      syntaxHighlighting.enable = true;
+      history.ignoreSpace = true;
+      initExtra = ''
+        # Uncomment following line if you want red dots to be displayed while waiting for completion
+        COMPLETION_WAITING_DOTS="true"
+        ### Fix slowness of pastes with zsh-syntax-highlighting.zsh
+        pasteinit() {
+          OLD_SELF_INSERT=''${''${(s.:.)widgets[self-insert]}[2,3]}
+          zle -N self-insert url-quote-magic # I wonder if you'd need `.url-quote-magic`?
+        }
+
+        pastefinish() {
+          zle -N self-insert $OLD_SELF_INSERT
+        }
+        zstyle :bracketed-paste-magic paste-init pasteinit
+        zstyle :bracketed-paste-magic paste-finish pastefinish
+
+        # automatic rehash of path completion
+        zstyle ':completion:*' rehash true
+
+        eval "$(${pkgs.thefuck}/bin/thefuck --alias)"
+
+        ##  helper functions
+        nixify() {
+          if [ ! -e ./.envrc ]; then
+            echo "eval \"$(lorri direnv)\"" > .envrc
+            direnv allow
+          fi
+          if [ ! -e shell.nix ]; then
+            cat > shell.nix <<'EOF'
+        with import <nixpkgs> {};
+        mkShell {
+          buildInputs = [
+            bashInteractive
+          ];
+        }
+        EOF
+            ${EDITOR:-vim} default.nix
+          fi
+        }
+
+        binpath() {
+          realpath $(${pkgs.which}/bin/which $1)
+        }
+        ''
+        + (import ./scripts/reporsync.nix {inherit pkgs;})
+        + (import ./scripts/ssh-loop-fc.nix {inherit pkgs;});
+
+
+      oh-my-zsh = {
+        enable = true;
+        theme = "bira";
+        plugins = [ "git" "python" "systemd" "gpg-agent"];
+      };
+    };
+    home.shellAliases = {
+      ip = "ip --color";
+      ipb = "ip --color --brief";
+      ll = "ls -l";
+      wavesynth = "nix-shell -p sox --run 'play -n synth brownnoise synth pinknoise mix synth 0 0 0 15 40 80 trapezium amod 0.2 20'";
+      vim = "nvim";
+    };
+    home.sessionVariables = {
+      EDITOR = "nvim";
+      BATOU_AGE_IDENTITY_PASSPHRASE="op://Private/SSH key/password";
+    };
+}

home/modules/fonts.nix

@@ -1,29 +0,0 @@
-{
-  pkgs,
-  inputs,
-  config,
-  system,
-  ...
-}:
-{
-  home.packages = with pkgs; [
-    comic-neue
-    source-sans-pro
-    source-code-pro
-    source-serif-pro
-    ubuntu_font_family
-    twemoji-color-font
-    open-sans
-    (iosevka-bin.override { variant = "CurlySlab"; })
-    inputs.nur.legacyPackages.${system}.repos.schmittlauch.vollkorn
-    # TODO: humor-sans
-
-    # fcio corporate design, TODO module
-    fira-code
-    fira-mono
-    # TODO fira-sans + condensed
-    # TODO museo 500
-  ];
-
-  fonts.fontconfig.enable = true;
-}

home/modules/latex.nix

@@ -1,47 +0,0 @@
-{
-  pkgs,
-  inputs,
-  config,
-  system,
-  lib,
-  ...
-}:
-with pkgs;
-let
-  latexGuiTools = [
-    texmaker
-    kile
-    biber
-  ];
-in
-{
-  options.schmittlauch.latex.guiTools = lib.mkEnableOption "Install GUI LaTeX tools like editors";
-
-  config.home.packages = [
-    (texlive.combine {
-      inherit (texlive)
-        scheme-medium
-
-        xetex
-        luatex
-        unicode-math
-        fontspec
-        collection-binextra
-        collection-fontsrecommended
-        collection-latex
-        collection-latexextra
-        collection-latexrecommended
-        collection-langgerman
-        moderncv
-        fontawesome5
-        academicons
-        acronym
-        ccicons
-        fontawesome
-        biblatex
-        logreq
-        koma-script
-        ;
-    })
-  ] ++ lib.optionals config.schmittlauch.latex.guiTools latexGuiTools;
-}

home/modules/packages.nix

@@ -1,273 +0,0 @@
-{
-  pkgs,
-  inputs,
-  config,
-  system,
-  ...
-}:
-
-with pkgs;
-let
-  cfg = config.schmittlauch.packages;
-  unstable = inputs.nixos-unstable.legacyPackages.${system};
-  nur = inputs.nur.legacyPackages.${system};
-
-  graphicsApps =
-    [
-      inkscape
-      darktable
-      exiftool
-      gimp
-    ]
-    ++ (with gimpPlugins; [
-      fourier
-      lqrPlugin
-    ])
-    ++ lib.optionals pkgs.stdenv.isLinux [
-      hugin
-      luminanceHDR
-      xournal
-    ];
-
-  multimediaApps =
-    [
-      mpv
-      yt-dlp
-    ]
-    ++ lib.optionals pkgs.stdenv.isLinux [
-      vlc
-      amarok
-      clementine
-      elisa
-      musescore
-      tenacity
-      soundkonverter
-      #nur.repos.fooker.studio-link
-    ];
-
-  cliApps =
-    [
-      coreutils
-      myVim
-      htop
-      tmux
-      httpie
-      ponysay
-      gti
-      tree
-      lsof
-      mosh
-      openssh
-      sshfs-fuse
-      sshuttle
-      cryfs
-      thefuck
-      gnupg
-      unar
-      lzop
-      p7zip
-      pwgen
-      pandoc
-      pdfgrep
-      # zig dependency breaks occasionally, stay on C version for now
-      ncdu_1
-      dos2unix
-      unzip
-      fswatch
-      jq
-      age
-      lnav
-      spacer
-
-      nix-output-monitor # putting this here as a plain `nix` alternative
-    ]
-    ++ lib.optionals pkgs.stdenv.isLinux [
-      xclip
-      smbnetfs # for FUSE smb mounting
-      psmisc # for killall
-      torsocks
-      agrep
-      reptyr # re-bind running program to other tty
-    ];
-
-  nixHelpers = [
-    nixpkgs-review
-    nixfmt-rfc-style
-    nix-top
-    statix
-  ];
-  devTools =
-    [
-      curl
-      httpie
-      gcc
-      shellcheck
-      mtr
-      ripgrep
-      fd
-      gitui
-      pre-commit
-      scriv
-
-      # Haskell
-      ghc
-      cabal2nix
-    ]
-    ++ lib.optionals pkgs.stdenv.isLinux [
-      gdb
-      strace
-      ltrace
-      valgrind
-      zeal
-    ];
-
-  pythonTools = with python3Packages; [
-    python3 # to shadow old macOS python
-    ipython
-    uv
-    pip
-    numpy
-    matplotlib
-    jedi
-    jedi-language-server
-    black
-    flake8
-    mypy
-  ];
-
-  games = [
-    superTuxKart
-    #hedgewars
-  ];
-
-  desktopCommon = [
-    keepassxc
-    tigervnc
-  ];
-
-  desktopLinux = [
-    firefox
-    chromium
-    falkon
-    thunderbird
-    calibre
-    dino
-    zotero
-    ding
-    aspell
-    aspellDicts.de
-    aspellDicts.en
-    # for kate/KDE applications
-    hunspellDicts.de-de
-    hunspellDicts.en-us
-    hunspellDicts.en-gb-ise
-    seafile-client
-    alacritty
-    libreoffice-qt6 # still with KDE integration
-    backintime-common
-    anki
-    signal-desktop
-    (tor-browser-bundle-bin.override {
-      mediaSupport = true;
-      pulseaudioSupport = pkgs.stdenv.isLinux;
-    })
-    pdfpc
-    quaternion
-    nheko
-    gpxsee
-    subsurface
-    yate
-    # split and merge PDFs in a GUI
-    pdfarranger
-    qbittorrent
-    #(pkgs.pidgin-with-plugins.override {
-    #    plugins = [ pkgs.pidginotr ];})
-
-    unstable.logseq
-
-    # for Hibiscus banking software
-    jameica
-    #ToDo: which of these drivers is actually used?
-    geckodriver
-    chromedriver
-  ];
-
-  kdeTools =
-    [
-      okteta
-      plasma5Packages.kdeconnect-kde
-    ]
-    ++ (with kdePackages; [
-      okular
-      gwenview
-      yakuake
-      dolphin
-      spectacle
-      kate
-      kleopatra
-      qdirstat
-      ark
-      kwalletmanager
-      #ktouch  # TODO: unbreak
-      kcharselect
-      konversation
-      krdc
-      skanlite
-      akonadiconsole
-      tokodon # mastodon client
-      networkmanager-qt
-      kcrash
-      breeze-gtk
-    ]);
-in
-{
-  options.schmittlauch.packages = {
-    graphics = lib.mkEnableOption "Enable a common set of graphics apps";
-    multimedia = lib.mkEnableOption "Enable a common set of multimedia apps";
-    cli = lib.mkOption {
-      description = "Enable a common set of CLI tools";
-      type = lib.types.bool;
-      default = true;
-    };
-    nixHelpers = lib.mkEnableOption "Enable a common set of Nix helper tools";
-    devTools = lib.mkEnableOption "Enable a common set of dev tools";
-    pythonTools = lib.mkEnableOption "Enable a common set of python tools";
-    games = lib.mkEnableOption "Enable some games";
-    desktopCommon = lib.mkOption {
-      description = "GUI desktop applications that work cross-platform and cross-desktop";
-      type = lib.types.bool;
-      default = true;
-    };
-    desktopLinux = lib.mkEnableOption "Enable a common set of desktop applications";
-    kde = lib.mkEnableOption "Enable a common set of KDE applications";
-  };
-  config = {
-    home.packages = lib.flatten (
-      (lib.optional cfg.graphics graphicsApps)
-      ++ (lib.optional cfg.multimedia multimediaApps)
-      ++ (lib.optional cfg.cli cliApps)
-      ++ (lib.optional cfg.nixHelpers nixHelpers)
-      ++ (lib.optional cfg.devTools devTools)
-      ++ (lib.optional cfg.pythonTools pythonTools)
-      ++ (lib.optional cfg.games games)
-      ++ (lib.optional cfg.desktopCommon desktopCommon)
-      ++ (lib.optional cfg.desktopLinux desktopLinux)
-      ++ (lib.optional cfg.kde kdeTools)
-    );
-
-    nixpkgs.overlays = import ../overlays.nix;
-    nixpkgs.config = {
-
-      permittedInsecurePackages = [
-        # (temporarily) permit the usage of libolm
-        "olm-3.2.16"
-      ];
-      clementine.spotify = false;
-      vim = {
-        gui = "gtk3";
-        python = true;
-        multibyteSupport = true;
-      };
-    };
-  };
-}

home/modules/vscodium.nix

@@ -1,122 +0,0 @@
-{
-  pkgs,
-  lib,
-  inputs,
-  config,
-  system,
-  ...
-}:
-{
-  programs.vscode = {
-    enable = true;
-    package = pkgs.vscodium;
-    mutableExtensionsDir = true;
-    extensions =
-      with pkgs.vscode-extensions;
-      [
-        ms-python.python
-        vscodevim.vim
-        yzhang.markdown-all-in-one
-        bungcip.better-toml
-        eamodio.gitlens
-        jnoortheen.nix-ide
-        mkhl.direnv
-        editorconfig.editorconfig
-      ]
-      ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-        {
-          name = "Sync-Rsync";
-          publisher = "vscode-ext";
-          version = "0.36.0";
-          sha256 = "sha256-0b/OHLZfXo0NAVAVkzZSqMGDzF0uvPRoiqsZtW1iOdA";
-        }
-        # TODO: probably available in nixpkgs soonish?
-        {
-          name = "mypy-type-checker";
-          publisher = "ms-python";
-          version = "2023.3.12681020";
-          sha256 = "sha256-rhed7CQlvxksVCGc9nPU2oYQWtXcAV5TzuG63e8Y3zM=";
-        }
-        {
-          name = "black-formatter";
-          publisher = "ms-python";
-          version = "2023.5.12771008";
-          sha256 = "sha256-lJG0RRUUMhQGs2a6oBtoqt+uY1kSJ0+cbmaP07hNh2o=";
-        }
-        {
-          name = "vscode-pets";
-          publisher = "tonybaloney";
-          version = "1.25.1";
-          sha256 = "sha256-as3e2LzKBSsiGs/UGIZ06XqbLh37irDUaCzslqITEJQ=";
-        }
-      ];
-    userSettings =
-      let
-        defaultPython = pkgs.python3.withPackages (ps: [
-          ps.jedi
-          ps.jedi-language-server
-          ps.pip
-          ps.setuptools # for pkg_resources
-          ps.black
-          ps.mypy
-        ]);
-      in
-      {
-        "editor.fontLigatures" = true;
-        "editor.accessibilitySupport" = false; # prevent asking
-        "editor.cursorBlinking" = "phase";
-        "editor.stickyScroll.enabled" = true;
-        "workbench.editor.highlightModifiedTabs" = true;
-        "window.autoDetectColorScheme" = true;
-        "workbench.preferredDarkColorTheme" = "Default Dark Modern";
-        "workbench.preferredLightColorTheme" = "Default Light Modern";
-        "[nix]" = {
-          "editor.insertSpaces" = true;
-          "editor.tabSize" = 2;
-          # for now, disable automatic formatting to prevent disruption of existing code bases
-          "editor.formatOnPaste" = false;
-          "editor.formatOnSave" = false;
-          "editor.formatOnType" = false;
-        };
-        "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style;
-        "nix.enableLanguageServer" = true;
-        "nix.serverPath" = lib.getExe pkgs.nixd;
-        "nix.serverSettings" = { };
-        "editor.fontSize" = 13;
-        "editor.fontWeight" = "normal";
-        "git.detectSubmodulesLimit" = 30;
-        "[python]" = {
-          "breadcrumbs.showClasses" = true;
-          "breadcrumbs.showFunctions" = true;
-          "gitlens.codeLens.symbolScopes" = [ "!Module" ];
-          "editor.defaultFormatter" = "ms-python.black-formatter";
-          "editor.formatOnSave" = true;
-        };
-        "python.languageServer" = "Jedi"; # don't use proprietary pylance server
-        "python.defaultInterpreterPath" = "${defaultPython}/bin/python";
-        "black-formatter.path" = [ "${pkgs.python3Packages.black}/bin/black" ];
-        "black-formatter.importStrategy" = "fromEnvironment";
-        "mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/mypy" ];
-        "mypy-type-checker.importStrategy" = "fromEnvironment";
-        "mypy-type-checker.args" = [ "--ignore-missing-imports" ];
-        "gitlens.telemetry.enabled" = false;
-        "vim.highlightedyank.enable" = true;
-        "vim.history" = 500;
-        "vim.neovimUseConfigFile" = true;
-        "vim.enableNeovim" = true;
-        "git.suggestSmartCommit" = false;
-        "editor.rulers" = [ 79 ];
-        "vim.useSystemClipboard" = true;
-        "vim.smartRelativeLine" = true;
-        "diffEditor.ignoreTrimWhitespace" = false;
-        "files.associations" = {
-          "*.py" = "python";
-        };
-        "editor.renderWhitespace" = "all";
-        "editor.fontFamily" = "Iosevka Curly Slab, Menlo, Monaco, 'Courier New', monospace";
-        "vim.neovimPath" = lib.getExe pkgs.myVim;
-        "sync-rsync.options" = [ ];
-        "direnv.path.executable" = lib.getExe pkgs.direnv;
-      };
-  };
-}

home/overlays.nix

@@ -1,9 +1,9 @@
+
 [
-  (self: super: rec {
+  (
-    myVim =
+    self: super:
-      with super;
+      rec {
-      neovim.override {
+        myVim = with super; neovim.override { configure = {
-        configure = {
           packages.myVimPackage = with pkgs.vimPlugins; {
             # loaded on start
             start = [
@@ -25,7 +25,11 @@
             ];
           };
           customRC = builtins.readFile ./vimrc;
-        };
+        };};
-      };
+        # pyopenssl is broken upstream for py3.9
-  })
+        # inspired by https://github.com/montchr/dotfield/commit/9ec0f1d7cf4f6e3c0079c4656bf76e0daf55c5ea
+        httpie = self.python310Packages.httpie;
+      }
+  )
+
 ]

home/scripts/reporsync.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{pkgs, ...}:
 ''
 # rsync -rlptzv --progress --delete --exclude=.git --exclude=.vscode --exclude=result --exclude=channels/ /Users/os/src/fc.qemu os@hydra01:
 # rsync -rlptzv --progress --rsh="ssh -J fcio-whq-jump" --delete --exclude=.git --exclude=.vscode --exclude=result --exclude=channels/ /Users/os/src/fc-nixos/ os@patty:fc-nixos/
@@ -29,7 +29,7 @@
 				JUMPHOST="$DEFAULT_JUMPHOST"
 				;;
 			?)
-  				echo "rsyncrepo [-J] [-j <jumphost>] <directory> <hostname> [target dir name]"
+				echo "rsyncrepo [-J] [-j <jumphost>] <directory> <hostname>"
 				return 1
 				;;
 		esac
@@ -40,7 +40,6 @@
 
 	RR_FROM="$1"
 	RR_TO="$2"
-    RR_TARGET="$3"
 }
 
 _do_rsync() {
@@ -51,35 +50,30 @@
 	fi
 
 	if [ -n "$JUMPHOST" ]; then
-  		RSYNC_OPTS+=("--rsh=${lib.getExe pkgs.openssh} -J ''${JUMPHOST}")
+		RSYNC_OPTS+=("--rsh=/Users/os/.nix-profile/bin/ssh -J ''${JUMPHOST}")
 	fi
 
 	for OPTI in "''${RSYNC_OPTS[@]}"; do
 		echo "$OPTI"
 	done
 
-  	# If no $3 is specified, we sync /path/to/dir/ to hostname:dir
+	# we always sync /path/to/dir/ to hostname:dir
-    if [ -z "$3" ]; then
 	RR_DEST="''${2}:$(basename $(realpath "''${1}"))"
-    else
-      RR_DEST="''${2}:''${3}"
-    fi
 
 	echo "Syncing ''${1} to ''${RR_DEST}…"
 
 	# ensure trailing slash for src to avoid recreating directory
-  	${lib.getExe pkgs.rsync} "''${RSYNC_OPTS[@]}"  "''${1}/" "''${RR_DEST}"
+	${pkgs.rsync}/bin/rsync "''${RSYNC_OPTS[@]}"  "''${1}/" "''${RR_DEST}"
 }
 
 rsyncrepo() {
 	_parse_rsync_args "$@"
 	# inherits parsed arguments through variables
-  	_do_rsync "$RR_FROM" "$RR_TO" "$RR_TARGET"
+	_do_rsync "$RR_FROM" "$RR_TO"
 }
 
 rsynchydra() {
 	_parse_rsync_args "$@"
-    # the name of RR_TO is a bit misleading, it just describes the 2nd positional arg here
+	_do_rsync "$RR_FROM" "hydra01"
-  	_do_rsync "$RR_FROM" "hydra01" "$RR_TO"
 }
 ''

home/secrets

@@ -1 +1 @@
-Subproject commit c725f810bb9a43c213fcf964f036dd0c64b6ba04
+Subproject commit 068a4759e72948284c3de85d20a780723278f8b8

home/vimrc

@@ -24,11 +24,7 @@ filetype plugin indent on
  
 syntax on
 
-" use relative numbering…
-set relativenumber
-" except for current line
 set number
-
 set mouse=a
 set mousehide
 
@@ -46,29 +42,24 @@ set history=1000
 " representing system clipboard (not X11 clipboard)
 set clipboard=unnamedplus
 
-set expandtab
+" set expandtab
 set shiftwidth=4
 set tabstop=4
 set softtabstop=4
 
 " enable truecolor support
-let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
+"let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
-let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
+"let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
-set termguicolors
+"set termguicolors
+"
+"let base16colorspace=256
 
-let base16colorspace=256
+"colorscheme base16-tomorrow-night
-
-colorscheme base16-tomorrow-night
 "colorscheme Tomorrow-Night
 "colorscheme base16-default-dark
 
 set background=dark
 
-" use default terminal background to retain transparency
-highlight Normal guibg=NONE
-highlight NonText guibg=NONE
-highlight SignColumn guibg=NONE
-
 " Use the same symbols as TextMate for tabstops and EOLs
 set listchars=tab:▸\ ,eol:¬
 
@@ -106,7 +97,6 @@ let g:haskell_enable_typeroles = 1        " to enable highlighting of type roles
 let g:haskell_enable_static_pointers = 1  " to enable highlighting of `static`
 let g:haskell_backpack = 1                " to enable highlighting of backpack keywords
 au FileType markdown setlocal tabstop=4 expandtab shiftwidth=4 softtabstop=4
-au FileType pandoc setlocal tabstop=4 expandtab shiftwidth=4 softtabstop=4
 au FileType nix setlocal tabstop=2 expandtab shiftwidth=2 softtabstop=2
 set ofu=syntaxcomplete#Complete
 " nmap <C-V> "+gP

home/workmac.nix

@@ -1,119 +0,0 @@
-{
-  pkgs,
-  inputs,
-  config,
-  system,
-  lib,
-  ...
-}:
-
-with pkgs;
-let
-  unstable = inputs.nixos-unstable.legacyPackages.${system};
-in
-{
-
-  schmittlauch.packages = {
-    graphics = true;
-    multimedia = true;
-    nixHelpers = true;
-    devTools = true;
-    pythonTools = true;
-  };
-
-  home.packages = [
-    wireshark # on NixOS systems enabled via system config
-    _1password-cli
-    # also TODO: color schemes nix-darwin
-  ];
-
-  # pinning theme is necessary until iTerm 3.5, because despite the dark terminal background, bat detects light mode and adapts theme
-  programs.bat.config.theme = "Visual Studio Dark+";
-
-  programs.ssh = {
-    enable = true;
-    # defaults in bottom match block "*"
-    # TODO: common config for desktop as well
-    # multiplexer, e.g. to avoid rate limiting on jumphost usage
-    serverAliveInterval = 60;
-    controlMaster = "auto";
-    controlPersist = "4h";
-    # ssh host config
-    matchBlocks = {
-
-      # early catchall to enforce agent socket usage. **NOT** the place for fallback defaults.
-      "*" = {
-        extraOptions = {
-          IdentityAgent = "\"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\"";
-          #ControlPath = "/tmp/ssh_mux_%h_%p_%r";
-        };
-      };
-
-      "hydra01" = lib.hm.dag.entryAfter [ "*" ] {
-        hostname = "hydra01.access.whq.gocept.net";
-        user = "os";
-      };
-      "fcio-whq-jump" = lib.hm.dag.entryAfter [ "*" ] {
-        hostname = "vpn-whq.services.fcio.net";
-        extraOptions.LogLevel = "Verbose";
-      };
-      "fcio-rzob-jump" = lib.hm.dag.entryAfter [ "*" ] { hostname = "vpn-rzob.services.fcio.net"; };
-    };
-  };
-
-  programs.git =
-    let
-      contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; };
-    in
-    {
-      includes =
-        [
-          {
-            condition = "gitdir:~/src/schmittlauch/";
-            contents = {
-              user = {
-                inherit (contacts.schmittlauch) name email;
-              };
-            };
-          }
-        ]
-        # set default name for several other common locations
-        ++ map (dir: {
-          condition = "gitdir:${dir}";
-          contents = {
-            user = {
-              inherit (contacts.work) name email;
-            };
-          };
-        }) [ "~/" ];
-    };
-
-  # some extra shell scripts
-  programs.zsh.initExtra = lib.mkAfter (
-    import ./scripts/reporsync.nix { inherit pkgs lib; }
-    + import ./scripts/ssh-loop-fc.nix { inherit pkgs lib; }
-  );
-
-  launchd.agents.hydra_proxy = {
-    enable = true;
-    config = {
-      ProgramArguments = [
-        "${lib.getExe pkgs.autossh}"
-        "-M"
-        "0"
-        "-D"
-        "1080"
-        "-oServerAliveInterval=60"
-        "-oControlMaster=no"
-        "-N"
-        "vpn-whq.services.fcio.net"
-      ];
-      # TODO: consider socket activation instead
-      KeepAlive = true;
-      ThrottleInterval = 60;
-    };
-  };
-  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "1password-cli" ];
-
-  home.stateVersion = "22.05";
-}

hosts/framenix/default.nix

@@ -1,82 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  system,
-  ...
-}:
-let
-  unstable = config.inputInjection.flake-inputs.nixos-unstable.legacyPackages.${system};
-in
-{
-  imports = [
-    ../../common
-    ../../common/pipewire.nix
-
-    ./hardware-configuration.nix
-    ./storage.nix
-    ./swap.nix
-  ];
-
-  networking.hostName = "framenix"; # Define your hostname.
-
-  # override tmpdir for daemon
-  systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp";
-
-  # try newer kernels
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  boot.kernelParams = [
-    # powersave
-    "amd_pstate=active"
-    "amdgpu.abmlevel=1" # adaptive backlight management
-  ];
-
-  boot.initrd.systemd.enable = true;
-
-  # at boot by default, limit charging capacity to protect battery.
-  # Hopefully there's gonna be a standard interface to control this from the desktop at some point.
-  systemd.services.battery-charge-limit = {
-    wantedBy = [ "basic.target" ];
-    serviceConfig = {
-      Type = "oneshot";
-      ExecStart = "${lib.getExe pkgs.framework-tool} --driver portio --charge-limit 85";
-      RemainAfterExit = true;
-    };
-  };
-
-  boot.loader = {
-    systemd-boot.enable = true;
-    efi.canTouchEfiVariables = true;
-  };
-
-  # This option defines the first version of NixOS you have installed on this particular machine,
-  # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
-  #
-  # Most users should NEVER change this value after the initial install, for any reason,
-  # even if you've upgraded your system to a new NixOS release.
-  #
-  # This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
-  # so changing it will NOT upgrade your system.
-  #
-  # This value being lower than the current NixOS release does NOT mean your system is
-  # out of date, out of support, or vulnerable.
-  #
-  # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
-  # and migrated your data accordingly.
-  #
-  # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
-  system.stateVersion = "23.11"; # Did you read the comment?
-
-  hardware.enableRedistributableFirmware = true;
-
-  services.fwupd.enable = true;
-
-  # I do not need fingerprint reading
-  services.fprintd.enable = false;
-
-  environment.systemPackages = [
-    pkgs.radeontop
-    pkgs.framework-tool
-  ];
-}

hosts/framenix/hardware-configuration.nix

@@ -1,35 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
-  boot.initrd.availableKernelModules = [
-    "nvme"
-    "xhci_pci"
-    "thunderbolt"
-    "usb_storage"
-    "sd_mod"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp193s0f3u1c2.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

hosts/framenix/storage.nix

@@ -1,54 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  fsOptions = [
-    "noatime"
-    "ssd"
-    "compress=zstd"
-  ];
-in
-{
-  boot.initrd.luks = {
-    devices =
-      # allow discards on all devices
-      builtins.mapAttrs (name: val: val // { allowDiscards = true; }) {
-        "system".device = "/dev/disk/by-uuid/1838cdc5-9b0b-4c46-9f23-9465549eeb92";
-        "cryptswap".device = "/dev/disk/by-uuid/ded7d649-ab3a-42ee-ae4a-f8c4ba029e9c";
-      };
-  };
-
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-uuid/22388786-4285-403b-9994-e9aae1f11172";
-      fsType = "btrfs";
-      options = fsOptions ++ [ "subvol=nixos_root" ];
-    };
-
-    "/home" = {
-      device = "/dev/disk/by-uuid/22388786-4285-403b-9994-e9aae1f11172";
-      fsType = "btrfs";
-      options = fsOptions ++ [ "subvol=home" ];
-    };
-
-    "/boot" = {
-      device = "/dev/disk/by-uuid/AF8E-E9E6";
-      fsType = "vfat";
-      options = [ "discard" ];
-    };
-  };
-
-  services.fstrim.enable = true;
-  services.btrfs.autoScrub = {
-    enable = true;
-    fileSystems = [
-      "/"
-      "/home"
-    ];
-  };
-
-  boot.tmp.useTmpfs = true;
-}

hosts/framenix/swap.nix

@@ -1,10 +0,0 @@
-{
-  swapDevices = [ { device = "/dev/disk/by-uuid/24c47f3d-0d3e-4575-92a2-174b5a6b6086"; } ];
-
-  zramSwap = {
-    enable = true;
-    memoryPercent = 20;
-  };
-
-  boot.kernel.sysctl."vm.swappiness" = 9;
-}

hosts/thinknix/default.nix

@@ -1,36 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  imports = [
-    ../../common
-    ../../common/pulseaudio.nix
-
-    ./hardware-configuration.nix
-    ./storage.nix
-    ./swap.nix
-    # FIXME: move this to common, conditional enabling
-    ./secureboot.nix
-  ];
-
-  hardware.trackpoint = {
-    enable = true;
-    sensitivity = 180;
-    speed = 180;
-  };
-
-  boot.extraModprobeConfig = "options thinkpad_acpi fan_control=1"; # enable fan control via echo to /proc/acpi/ibm/fan
-
-  schmittlauch.guestUser.enable = true;
-
-  networking.hostName = "thinknix";
-
-  # This value determines the NixOS release with which your system is to be
-  # compatible, in order to avoid breaking some software such as database
-  # servers. You should change this only after NixOS release notes say you
-  # should.
-  system.stateVersion = "18.09"; # Did you read the comment?
-}

hosts/thinknix/hardware-configuration.nix

@@ -1,28 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "ehci_pci"
-    "ahci"
-    "usb_storage"
-    "sd_mod"
-    "rtsx_pci_sdmmc"
-  ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  nix.settings.max-jobs = lib.mkDefault 4;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-
-  # modesetting is always better than intel (legacy)
-  services.xserver.videoDrivers = [ "modesetting" ];
-}

hosts/thinknix/secureboot.nix

@@ -1,22 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  # UEFI secure boot
-  environment.systemPackages = [ pkgs.sbctl ];
-  # Lanzaboote currently replaces the systemd-boot module.
-  # This setting is usually set to true in configuration.nix
-  # generated at installation time. So we force it to false
-  # for now.
-  boot.loader.systemd-boot.enable = lib.mkForce false;
-
-  boot.lanzaboote = {
-    enable = true;
-    pkiBundle = "/etc/secureboot";
-  };
-}

hosts/thinknix/storage.nix

@@ -1,85 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  fsOptions = [
-    "noatime"
-    "ssd"
-    "space_cache"
-    "compress=zstd"
-  ];
-in
-{
-  # encrypted partitions
-  boot.initrd.luks = {
-    devices =
-      # allow discards on all devices
-      builtins.mapAttrs (name: val: val // { allowDiscards = true; }) {
-        "system".device = "/dev/disk/by-uuid/85154131-b2a8-4ef5-9d74-47429cb267ef";
-        "cryptswap".device = "/dev/disk/by-uuid/ac586df6-6332-4809-beb1-f51906a2adaa";
-        "ssd2".device = "/dev/disk/by-uuid/cadd4e1f-3642-4faa-8d4e-37dd85465df1";
-      };
-    reusePassphrases = true;
-  };
-
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-uuid/cb5998ae-cfc9-447f-8756-1ceaec6ca4c4";
-      fsType = "btrfs";
-      options = fsOptions ++ [ "subvol=nixos_root" ];
-    };
-
-    "/boot" = {
-      device = "/dev/disk/by-uuid/DED9-661B";
-      fsType = "vfat";
-      options = [ "discard" ];
-    };
-
-    "/home" = {
-      device = "/dev/disk/by-uuid/cb5998ae-cfc9-447f-8756-1ceaec6ca4c4";
-      fsType = "btrfs";
-      options = fsOptions ++ [ "subvol=home" ];
-    };
-
-    "/var/tmp" = {
-      device = "/dev/disk/by-uuid/cd6b8f25-c029-49a6-b326-656faec3ce15";
-      fsType = "btrfs";
-      options = fsOptions ++ [ "subvol=vartmp" ];
-    };
-
-    "/var/log" = {
-      device = "/dev/disk/by-uuid/cd6b8f25-c029-49a6-b326-656faec3ce15";
-      fsType = "btrfs";
-      options = fsOptions ++ [ "subvol=varlog" ];
-    };
-
-    "/var/cache" = {
-      device = "/dev/disk/by-uuid/cd6b8f25-c029-49a6-b326-656faec3ce15";
-      fsType = "btrfs";
-      options = fsOptions ++ [ "subvol=varcache" ];
-    };
-  };
-
-  services.fstrim.enable = true;
-  services.btrfs.autoScrub = {
-    enable = true;
-    fileSystems = [
-      "/"
-      "/home"
-    ];
-  };
-
-  boot.tmp.useTmpfs = true;
-  fileSystems."/tmp".fsType = "tmpfs";
-
-  services.smartd = {
-    enable = true;
-    devices = [
-      { device = "/dev/sda"; }
-      { device = "/dev/sdb"; }
-    ];
-  };
-}

hosts/thinknix/swap.nix

@@ -1,10 +0,0 @@
-{
-  swapDevices = [ { device = "/dev/disk/by-uuid/bf928178-4e92-4e7e-8df2-18fbd658eecf"; } ];
-
-  zramSwap = {
-    enable = true;
-    memoryPercent = 20;
-  };
-
-  boot.kernel.sysctl."vm.swappiness" = 9;
-}

nixos/Hash2PubTestbed.nix

@@ -1,9 +1,4 @@
-{
+{ config, pkgs, experimentUid ? 1000, ... }:
-  config,
-  pkgs,
-  experimentUid ? 1000,
-  ...
-}:
 
 let
   projectDir = "/home/spiollinux/Seafile/Studium/Semester11/INF-PM-FP-ANW";
@@ -18,29 +13,24 @@ let
     # run simulation script within the shell
     ${pkgs.nix}/bin/nix-shell ${shell.drvPath} --command "cd ${projectMount} && bash ./build/simulationrunner.sh 2>&1"
     '';
-  instanceData = builtins.fromJSON (
+  instanceData = builtins.fromJSON (builtins.readFile "${projectDir}/simulationData/inputs/generated/instances_sample.json");
-    builtins.readFile "${projectDir}/simulationData/inputs/generated/instances_sample.json"
+
-  );
 in
 
 {
   privateNetwork = true;
   ephemeral = true;
   bindMounts = {
-    "${projectMount}" = {
+    "${projectMount}" = { hostPath = projectDir; isReadOnly = false; };
-      hostPath = projectDir;
-      isReadOnly = false;
-    };
   };
 
   config = {
     networking = {
       firewall.enable = false;
-      interfaces.lo.ipv6.addresses = builtins.map (inst: {
+      interfaces.lo.ipv6.addresses =
-        address = inst.ip;
+        builtins.map (inst: {address = inst.ip; prefixLength = 0;}) instanceData;
-        prefixLength = 0;
+        extraHosts = 
-      }) instanceData;
+          pkgs.lib.concatMapStringsSep "\n" (inst: "${inst.ip} ${inst.hostname}") instanceData;
-      extraHosts = pkgs.lib.concatMapStringsSep "\n" (inst: "${inst.ip} ${inst.hostname}") instanceData;
     };
     # avoid permission problems with project builds
     users.users.experimentor = {
@@ -49,14 +39,12 @@ in
     };
 
     # adjust open file limits
-    security.pam.loginLimits = [
+    security.pam.loginLimits = [{
-      {
+        domain = "*"
-        domain = "*";
+      ; type = "-"
-        type = "-";
+      ; item = "nofile"
-        item = "nofile";
+      ; value = "50000"
-        value = "50000";
+      ;}];
-      }
-    ];
 
     environment.systemPackages = [
       pkgs.netcat

nixos/configuration.nix

@@ -0,0 +1,280 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, ... }:
+
+let
+  unstable = import <nixos-unstable> { };
+  localfork = import /home/spiollinux/src/nixpkgs { };
+
+in
+{
+  imports =
+    [
+      # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+      ./packages.nix
+    ];
+
+  services.davfs2.enable = true;
+
+  # try newer kernels
+  #boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  # use old kernel because 5.4 and 5.5 might be buggy with intel graphics
+  #boot.kernelPackages = pkgs.linuxPackages_4_19;
+
+  services.fstrim.enable = true;
+  services.btrfs.autoScrub =
+    {
+      enable = true;
+      fileSystems = [ "/" "/home" ];
+    };
+
+  # exfat support
+  #boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
+
+  zramSwap =
+    {
+      enable = true;
+      memoryPercent = 20;
+    };
+  boot.kernel.sysctl."vm.swappiness" = 9;
+
+  # powermanagement
+  services.tlp =
+    {
+      enable = true;
+      settings = {
+        "SATA_LINKPWR_ON_BAT" = "medium_power";
+        "SATA_LINKPWR_ON_AC" = "max_performance";
+      };
+    };
+
+  # Use the systemd-boot EFI boot loader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  # make the boot look good
+  boot.plymouth.enable = true;
+
+  networking.hostName = "thinknix";
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  # configure console
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "de";
+  };
+
+  # Select internationalisation properties.
+  i18n = {
+    defaultLocale = "de_DE.UTF-8";
+  };
+
+  # Set your time zone.
+  time.timeZone = "Europe/Berlin";
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  programs.bash.enableCompletion = true;
+  programs.wireshark =
+    {
+      enable = true;
+      package = pkgs.wireshark;
+    };
+
+  programs.adb.enable = true;
+
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  # services.openssh.enable = true;
+
+  #programs.ssh.startAgent = true;
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  networking.firewall.allowedTCPPortRanges = [{ from = 1714; to = 1764; }];
+  networking.firewall.allowedUDPPortRanges = [{ from = 1714; to = 1764; }]; # for KDE connect
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  networking.networkmanager.enable = true;
+
+  services.avahi.enable = true;
+
+  # Enable CUPS to print documents.
+  services.printing =
+    {
+      enable = true;
+      drivers = [ pkgs.hplip ];
+    };
+  # scanners
+  hardware.sane =
+    {
+      enable = true;
+      extraBackends = [ pkgs.hplip ];
+    };
+
+  # Enable sound.
+  sound.enable = true;
+  hardware.pulseaudio = {
+    enable = true;
+    # decouple pulseaudio application and sink volumes
+    daemon.config = { flat-volumes = "no"; };
+    # C3D2 hq music
+    zeroconf.discovery.enable = true;
+    zeroconf.publish.enable = true;
+  };
+
+
+  # Bluetooth
+  hardware.bluetooth = {
+    enable = true;
+    settings.General.Disable = "Headset"; # disable headset profile
+  };
+  hardware.pulseaudio = {
+    package = pkgs.pulseaudioFull;
+  };
+
+  # Nitrokey support
+  services.udev.packages = [ pkgs.nitrokey-udev-rules ];
+
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+  services.xserver.layout = "de";
+  services.xserver.xkbOptions = "eurosign:e";
+
+  # Enable touchpad support.
+  services.xserver.libinput.enable = true;
+
+  # while libinput also supports graphic tablets, enable more-specific wacom driver
+  services.xserver.wacom.enable = true;
+
+  # Enable the KDE Desktop Environment.
+  services.xserver.displayManager.sddm.enable = true;
+  services.xserver.desktopManager.plasma5.enable = true;
+
+  # dconf required for several Gnome applications like Cawbird
+  programs.dconf.enable = true;
+
+  # Flatpak support
+  services.flatpak.enable = true;
+  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.spiollinux = {
+    isNormalUser = true;
+    uid = 1000;
+    extraGroups = [ "vboxusers" "wheel" "networkmanager" "scanner" "lp" "wireshark" "dialout" "cdrom" "input" "adbusers" ];
+    shell = pkgs.zsh;
+  };
+
+  # enable virtualbox support
+  virtualisation.virtualbox.host = {
+    enable = true;
+    #enableExtensionPack = true;
+  };
+  # allow PUEL license
+  nixpkgs.config.whitelistedLicenses = [ pkgs.lib.licenses.virtualbox-puel ];
+  users.extraGroups.vboxusers.members = [ "spiollinux" ];
+
+  programs.zsh =
+    {
+      enable = true;
+      autosuggestions.enable = true;
+    };
+
+  # profile sync daemon
+  services.psd.enable = true;
+
+  services.smartd =
+    {
+      enable = true;
+      devices = [{ device = "/dev/sda"; } { device = "/dev/sdb"; }];
+    };
+
+  # block certain sites to prevent procrastination
+  systemd.services.procrastinationstop = {
+    serviceConfig.Type = "oneshot";
+    wantedBy = [ ];
+    script = ''
+      ln -sf ${pkgs.writeText "blockedHosts" ''
+        127.0.0.1 localhost
+        ::1 localhost
+        127.0.0.2 ${config.networking.hostName}
+        ::1 ${config.networking.hostName}
+
+        ::1   twitter.com
+        127.0.0.1   twitter.com
+        ::1   api.twitter.com
+        127.0.0.1   api.twitter.com
+        ::1   toot.matereal.eu
+        127.0.0.1   toot.matereal.eu
+        ::1   tagesschau.de
+        127.0.0.1   tagesschau.de
+        ::1   dnn.de
+        127.0.0.1   www.dnn.de
+        ::1   www.dnn.de
+        127.0.0.1   dnn.de
+        ''} /etc/hosts
+    '';
+  };
+
+  systemd.services.procrastinationstart = {
+    serviceConfig.Type = "oneshot";
+    wantedBy = [ ];
+    script = ''
+      ln -sf /etc/static/hosts /etc/hosts
+    '';
+  };
+
+  fonts = {
+    fontDir.enable = true;
+    fontconfig.enable = true;
+    fontconfig.includeUserConf = true;
+  };
+
+  # Enable all sysrq functions (useful to recover from some issues):
+  boot.kernel.sysctl."kernel.sysrq" = 1; # NixOS default: 16 (only the sync command)
+
+  # keep build-time deps around for offline-rebuilding
+  nix.extraOptions = ''
+    gc-keep-outputs = true
+    gc-keep-derivations = true
+    trusted-users = spiollinux
+  '';
+  # use all cores for building
+  nix.buildCores = 0;
+  # override tmpdir for daemon
+  #systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp";
+
+  # package debugging
+  # programs.sysdig.enable = true;
+
+  # declarative containers
+  containers = {
+    #  hash2PubSim = import ./Hash2PubTestbed.nix
+    #    {
+    #      inherit pkgs config;
+    #      experimentUid = config.users.users.spiollinux.uid;
+    #      projectDir = "/home/spiollinux/Seafile/Studium/Semester11/INF-PM-FP-ANW";
+    #    };
+  };
+
+  # stop NetworkManager from managing virtual interfaces
+  networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
+
+  # This value determines the NixOS release with which your system is to be
+  # compatible, in order to avoid breaking some software such as database
+  # servers. You should change this only after NixOS release notes say you
+  # should.
+  system.stateVersion = "18.09"; # Did you read the comment?
+
+}

nixos/hardware-configuration.nix

@@ -0,0 +1,100 @@
+{ config, lib, pkgs, ... }:
+
+
+let
+  fsOptions = [ "noatime" "ssd" "space_cache" "compress=zstd" ];
+in
+{
+  imports =
+    [
+      <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
+      (
+        builtins.fetchGit {
+          url = "https://github.com/NixOS/nixos-hardware";
+          rev = "d38958a6aa5bdbf3239f26a04689f3d9ae7da0c0";
+        } + "/lenovo/thinkpad/t440s"
+      )
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [];
+
+  # encrypted partitions
+  boot.initrd.luks =
+    {
+      devices =
+        # allow discards on all devices
+        builtins.mapAttrs (name: val: val // {allowDiscards = true;})
+        {
+          "system".device = "/dev/disk/by-uuid/85154131-b2a8-4ef5-9d74-47429cb267ef";
+          "cryptswap".device = "/dev/disk/by-uuid/ac586df6-6332-4809-beb1-f51906a2adaa";
+          "ssd2".device = "/dev/disk/by-uuid/cadd4e1f-3642-4faa-8d4e-37dd85465df1";
+        };
+      reusePassphrases = true;
+    };
+
+  fileSystems."/" =
+    {
+      device = "/dev/disk/by-uuid/cb5998ae-cfc9-447f-8756-1ceaec6ca4c4";
+      fsType = "btrfs";
+      options = fsOptions ++ [ "subvol=nixos_root" ];
+    };
+
+  fileSystems."/boot" =
+    {
+      device = "/dev/disk/by-uuid/DED9-661B";
+      fsType = "vfat";
+      options = [ "discard" ];
+    };
+
+  fileSystems."/home" =
+    {
+      device = "/dev/disk/by-uuid/cb5998ae-cfc9-447f-8756-1ceaec6ca4c4";
+      fsType = "btrfs";
+      options = fsOptions ++ [ "subvol=home" ];
+    };
+
+    fileSystems."/var/tmp" =
+      {
+        device = "/dev/disk/by-uuid/cd6b8f25-c029-49a6-b326-656faec3ce15";
+        fsType = "btrfs";
+        options = fsOptions ++ [ "subvol=vartmp" ];
+      };
+
+    fileSystems."/var/log" =
+      {
+        device = "/dev/disk/by-uuid/cd6b8f25-c029-49a6-b326-656faec3ce15";
+        fsType = "btrfs";
+        options = fsOptions ++ [ "subvol=varlog" ];
+      };
+
+    fileSystems."/var/cache" =
+      {
+        device = "/dev/disk/by-uuid/cd6b8f25-c029-49a6-b326-656faec3ce15";
+        fsType = "btrfs";
+        options = fsOptions ++ [ "subvol=varcache" ];
+      };
+
+    boot.tmpOnTmpfs = true;
+    fileSystems."/tmp".fsType = "tmpfs";
+
+  swapDevices =
+    [
+      { device = "/dev/disk/by-uuid/bf928178-4e92-4e7e-8df2-18fbd658eecf"; }
+    ];
+
+  nix.maxJobs = lib.mkDefault 4;
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+
+  hardware.trackpoint = {
+    enable = true;
+    sensitivity = 180;
+    speed = 180;
+  };
+
+
+  # modesetting is always better than intel (legacy)
+  services.xserver.videoDrivers = [ "modesetting" ];
+
+}

nixos/packages.nix

@@ -0,0 +1,86 @@
+{ pkgs, config, ... }:
+
+{ 
+  # List packages installed in system profile.
+  environment.systemPackages = with pkgs; [
+    wget
+    vim
+    vimPlugins.vim-nix
+    vimPlugins.pathogen
+    tmux
+    htop
+    zsh
+    btrfs-progs
+    git
+    python3
+    manpages
+    dnsutils
+    netcat
+    ntfs3g
+    file
+    strace
+    ltrace
+    valgrind
+    testdisk
+    rsync
+    pv
+    #exfat
+    exfat-utils
+    iotop
+    cifs-utils
+    dstat
+    lsof
+    macchanger
+
+    # for debugging WLAN failures:
+    ethtool
+    trace-cmd
+    
+    # NetworkManager stuff
+    networkmanager-openconnect
+    networkmanager-vpnc
+    networkmanager-openvpn
+    plasma5Packages.kdeGear.akonadi-mime # for KOrganizer
+    ]
+  ++ (with plasma5Packages; with kdeGear; [
+    #akonadi
+    #akonadi-calendar
+    #akonadi-contacts
+    #akonadi-import-wizard
+    #akonadi-mime
+    #akonadi-notes
+    #akonadi-search
+    #akonadiconsole
+    #akregator
+    #kaddressbook
+    #kalarm
+    #kalarmcal
+    #kcalutils
+    #kcontacts
+    #kdav
+    #kdepim-addons
+
+    #kdepim-runtime
+    #kidentitymanagement
+    #kldap
+    #kmail
+    #kmailtransport
+    #kmbox
+    #kmime
+    #kontact
+    #kontactinterface
+    #korganizer
+    #kpimtextedit
+    #libkdepim
+    #libksieve
+    #mailcommon
+    #messagelib
+    #pimcommon
+    #pim-sieve-editor
+
+    # for some Flatpak packkages
+    accountsservice
+  ]);
+}
+
+

packages/default.nix

@@ -1,8 +0,0 @@
-final: prev: {
-  python3 = prev.python3.override {
-    packageOverrides = python-final: python-prev: {
-      # spsdk tests fail with timeout on old laptop thinknix
-      spsdk = python-prev.spsdk.overridePythonAttrs { doCheck = false; };
-    };
-  };
-}