files/emacs/init.el

@@ -877,7 +877,6 @@ create a new one."
 (add-to-list 'org-structure-template-alist '("el" . "src emacs-lisp"))
 (add-to-list 'org-structure-template-alist '("py" . "src python :results output"))
 (add-to-list 'org-structure-template-alist '("nix" . "src nix-ts :tangle"))
-(add-to-list 'org-structure-template-alist '("ne" . "bash :exports both"))
 
 (use-package auctex)
 (setq TeX-auto-save t)

files/scripts/swarselzellij.sh

@@ -1,8 +1,7 @@
-# KITTIES=$(($(pgrep -P 1 kitty | wc -l) - 1))
+KITTIES=$(($(pgrep -P 1 kitty | wc -l) - 1))
 
-# if ((KITTIES < 1)); then
-#     exec kitty -o confirm_os_window_close=0 zellij attach --create main
-# else
-#     exec kitty -o confirm_os_window_close=0 zellij attach --create "temp $KITTIES"
-# fi
-exec kitty -o confirm_os_window_close=0 zellij
+if ((KITTIES < 1)); then
+    exec kitty -o confirm_os_window_close=0 zellij attach --create main
+else
+    exec kitty -o confirm_os_window_close=0 zellij attach --create "temp $KITTIES"
+fi

files/zellij/config.kdl.nix

@@ -5,7 +5,6 @@
   default_shell "zsh"
   copy_on_select true
   on_force_close "detach"
-  show_startup_tips false
 
   default_layout "default"
   layout_dir "${config.home.homeDirectory}/.config/zellij/layouts"

flake.nix

@@ -23,7 +23,6 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    swarsel.url = "github:Swarsel/.dotfiles";
     emacs-overlay = {
       url = "github:nix-community/emacs-overlay";
       inputs.nixpkgs.follows = "nixpkgs";

hosts/nixos/pyramid/hardware-configuration.nix

@@ -32,7 +32,6 @@
         # improve performance on ssds
         bypassWorkqueues = true;
         preLVM = true;
-        # crypttabExtraOpts = ["fido2-device=auto"];
       };
     };
 

modules/home/common/custom-packages.nix

@@ -25,7 +25,6 @@
       swarsel-bootstrap
       swarsel-displaypower
       swarsel-deploy
-      swarsel-instantiate
       swarselzellij
       sshrm
 

modules/nixos/common/default.nix

@@ -1,10 +1,11 @@
 { self, lib, ... }:
 let
   importNames = lib.swarselsystems.readNix "modules/nixos/common";
+  modulesPath = "${self}/modules";
 in
 {
   imports = lib.swarselsystems.mkImports importNames "modules/nixos/common" ++ [
-    "${self}/modules/shared/sharedsetup.nix"
+    "${modulesPath}/home/common/sharedsetup.nix"
   ];
 
 

modules/nixos/common/settings.nix

@@ -36,9 +36,7 @@ let
         channel.enable = false;
         registry = rec {
           nixpkgs.flake = inputs.nixpkgs;
-          swarsel.flake = inputs.swarsel;
-          n = nixpkgs;
-          s = swarsel;
+          p = nixpkgs;
         };
         nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
       };

nix/lib.nix

@@ -47,6 +47,20 @@ let
       readHosts = type: lib.attrNames (builtins.readDir "${self}/hosts/${type}");
       readNix = type: lib.filter (name: name != "default.nix") (lib.attrNames (builtins.readDir "${self}/${type}"));
 
+      mkModules = names: type: builtins.listToAttrs (map
+        (name: {
+          inherit name;
+          value = import "${self}/modules/${type}/${name}";
+        })
+        names);
+
+      mkProfiles = names: type: builtins.listToAttrs (map
+        (name: {
+          inherit name;
+          value = import "${self}/profiles/${type}/${name}";
+        })
+        names);
+
       mkImports = names: baseDir: lib.map (name: "${self}/${baseDir}/${name}") names;
     };
 in

pkgs/swarsel-instantiate/default.nix

@@ -1,8 +0,0 @@
-{ name, writeShellApplication, ... }:
-writeShellApplication {
-  inherit name;
-  text = ''
-    set -euo pipefail
-    nix-instantiate --strict --eval --expr "let lib = import <nixpkgs/lib>; in $*"
-  '';
-}