flake.lock

@@ -561,24 +561,6 @@
         "type": "github"
       }
     },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_5"
-      },
-      "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"
-      }
-    },
     "flatpak": {
       "locked": {
         "lastModified": 1739444422,
@@ -761,21 +743,6 @@
         "type": "github"
       }
     },
-    "import-tree": {
-      "locked": {
-        "lastModified": 1771045967,
-        "narHash": "sha256-oYO4poyw0Sb/db2PigqugMlDwsvwLg6CSpFrMUWxA3Q=",
-        "owner": "vic",
-        "repo": "import-tree",
-        "rev": "c968d3b54d12cf5d9c13f16f7c545a06c9d1fde6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "vic",
-        "repo": "import-tree",
-        "type": "github"
-      }
-    },
     "master": {
       "locked": {
         "lastModified": 1767143992,
@@ -912,26 +879,6 @@
         "type": "github"
       }
     },
-    "nixmate": {
-      "inputs": {
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_6",
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1770757353,
-        "narHash": "sha256-u8lSQe2z961yTbzm9K/nHV5AvjUps8Y8k+ZYvJ6qaWg=",
-        "owner": "daskladas",
-        "repo": "nixmate",
-        "rev": "7bb722d3a4d198d3b9403dea2ed7e953b5b82663",
-        "type": "github"
-      },
-      "original": {
-        "owner": "daskladas",
-        "repo": "nixmate",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1767051569,
@@ -1074,22 +1021,6 @@
       }
     },
     "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1770562336,
-        "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d6c71932130818840fc8fe9509cf50be8c64634f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_7": {
       "locked": {
         "lastModified": 1764983851,
         "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=",
@@ -1276,13 +1207,11 @@
         "flatpak": "flatpak",
         "git-global-log": "git-global-log",
         "home-manager": "home-manager_2",
-        "import-tree": "import-tree",
         "master": "master",
         "musnix": "musnix",
         "ngipkgs": "ngipkgs",
         "niri": "niri",
-        "nixmate": "nixmate",
+        "nixpkgs": "nixpkgs_6",
-        "nixpkgs": "nixpkgs_7",
         "noctalia": "noctalia",
         "nur": "nur",
         "stylix": "stylix",
@@ -1290,27 +1219,6 @@
         "waka-victoriametrics": "waka-victoriametrics"
       }
     },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "nixmate",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1770606655,
-        "narHash": "sha256-rpJf+kxvLWv32ivcgu8d+JeJooog3boJCT8J3joJvvM=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "11a396520bf911e4ed01e78e11633d3fc63b350e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
     "sbt-derivation": {
       "inputs": {
         "flake-utils": [
@@ -1393,7 +1301,7 @@
           "nixpkgs"
         ],
         "nur": "nur_2",
-        "systems": "systems_6",
+        "systems": "systems_5",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
@@ -1489,21 +1397,6 @@
         "type": "github"
       }
     },
-    "systems_6": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "tinted-foot": {
       "flake": false,
       "locked": {
@@ -1629,11 +1522,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1770562336,
+        "lastModified": 1770197578,
-        "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
+        "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d6c71932130818840fc8fe9509cf50be8c64634f",
+        "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
         "type": "github"
       },
       "original": {

flake.nix

@@ -9,7 +9,6 @@
 
     # Flake framework
     flake-parts.url = "github:hercules-ci/flake-parts";
-    import-tree.url = "github:vic/import-tree";
     easy-hosts.url = "github:tgirlcloud/easy-hosts";
     deploy-rs.url = "github:serokell/deploy-rs";
 
@@ -52,7 +51,6 @@
     musnix.url = "github:musnix/musnix";
     flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0";
     git-global-log.url = "github:tophcodes/git-global-log";
-    nixmate.url = "github:daskladas/nixmate";
     nur = {
       url = "github:nix-community/NUR";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -89,7 +87,7 @@
     }: {
       imports = [
         inputs.agenix-rekey.flakeModules.default
-        (inputs.import-tree ./modules/flake)
+        ./modules/flake
       ];
     });
 }

home/by-host/endurance/config/dev.nix

@@ -1,7 +1,6 @@
 {
   pkgs,
   config,
-  inputs,
   ...
 }: {
   home.packages = with pkgs; [
@@ -37,7 +36,6 @@
     devenv
     gitui
     tea
-    harbor.agent-deck # Terminal session manager for AI coding agents
     harbor.oryx # TUI for sniffing network traffic using eBPF
 
     # BMAD
@@ -59,8 +57,6 @@
     bun
 
     nomad
-    damon
-    inputs.nixmate.packages.${pkgs.stdenv.hostPlatform.system}.default
   ];
 
   bosun.secrets.npmrc = {

home/by-host/endurance/config/shell.nix

@@ -1,14 +0,0 @@
-{pkgs, ...}: {
-  programs.fish = {
-    enable = true;
-
-    interactiveShellInit = ''
-      # Kitty shell integration - enables command markers and sticky command display
-      if set -q KITTY_INSTALLATION_DIR
-        set --global KITTY_SHELL_INTEGRATION enabled
-        source "$KITTY_INSTALLATION_DIR/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish"
-        set --prepend fish_complete_path "$KITTY_INSTALLATION_DIR/shell-integration/fish/vendor_completions.d"
-      end
-    '';
-  };
-}

home/by-host/endurance/default.nix

@@ -12,7 +12,6 @@
       ./gaming.nix
       ./ssh.nix
       ./communication.nix
-      ./wakatime.nix
       ./gpg
       ./niri
       ./stylix.nix

home/by-host/endurance/misc/creativity.nix

@@ -15,8 +15,6 @@
     # gimpPlugins.bimp # batch image manipulation, broken atm
     # rawtherapee
 
-    jugglinglab
-
     # CAD
     freecad
     openscad

home/by-host/endurance/misc/everything.nix

@@ -15,9 +15,6 @@
     bottom # System resource monitor
     grim # Screenshots
     slurp # Region selection
-    portfolio
-    pytr
-    tabiew # csv viewer
 
     # Productivity
     obsidian # Note taking

hosts/endurance/default.nix

@@ -186,6 +186,9 @@
 
       nix-tree
       nix-output-monitor
+
+      xdg-desktop-portal
+      xdg-desktop-portal-gtk
     ];
 
     # Quirky workaround for this not being set in portals for some reason

modules/flake/args.nix

@@ -20,7 +20,7 @@
 
       overlays = [
         (final: prev: {
-          writeNushellApplication = import ./lib/_writeNushellApplication.nix {
+          writeNushellApplication = import ./lib/writeNushellApplication.nix {
             inherit lib;
             pkgs = prev;
           };

modules/flake/default.nix

@@ -0,0 +1,10 @@
+{...}: {
+  imports = [
+    ./hosts.nix
+    ./homes.nix
+    ./args.nix
+    ./formatter.nix
+    ./packages.nix
+    ./lib
+  ];
+}

modules/generic/nix.nix

@@ -43,7 +43,6 @@
         ];
 
       permittedInsecurePackages = [
-        "python3.13-ecdsa-0.19.1" # pytr
         # "nixos-config"
         # "electron-36.9.5"
         # "dotnet-sdk-6.0.428"

overlays/default.nix

@@ -33,5 +33,4 @@ in [
   (withChannels (import ./packages.nix))
   (withChannels (import ./unstable.nix))
   (withChannels (import ./spacedrive.nix))
-  (withChannels (import ./pytr.nix))
 ]

overlays/pytr.nix

@@ -1,11 +0,0 @@
-{...}: final: prev: {
-  pytr = prev.pytr.overrideAttrs (old: {
-    version = "0.4.5";
-    src = prev.fetchFromGitHub {
-      owner = "pytr-org";
-      repo = "pytr";
-      rev = "3cd0bb3b1301d89ff9c39de3cb34dc82c0c9af6d";
-      hash = "sha256-UStDQaZecrpbL9+IApyV49gVQZrGI7eDURtgHZJazrk=";
-    };
-  });
-}

packages/agent-deck/package.nix

@@ -1,38 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-  git,
-  tmux,
-  makeWrapper,
-}:
-buildGoModule rec {
-  pname = "agent-deck";
-  version = "0.15.0";
-
-  src = fetchFromGitHub {
-    owner = "asheshgoplani";
-    repo = "agent-deck";
-    rev = "v${version}";
-    hash = "sha256-R/hDPhb+CtGXreHaKlSH2E6QEpfigj41Sq3BDVxLtaw=";
-  };
-
-  vendorHash = "sha256-k0jRlsFmBJNbfX3u2UQlnx/Z25KII8fYegU+Z77/EO0=";
-
-  subPackages = ["cmd/agent-deck"];
-
-  nativeBuildInputs = [makeWrapper];
-  nativeCheckInputs = [git];
-
-  postInstall = ''
-    wrapProgram $out/bin/agent-deck \
-      --prefix PATH : ${lib.makeBinPath [tmux]}
-  '';
-
-  meta = {
-    description = "Terminal-based session manager for AI coding agents";
-    homepage = "https://github.com/asheshgoplani/agent-deck";
-    license = lib.licenses.mit;
-    mainProgram = "agent-deck";
-  };
-}