move aristotle (mostly) into the tree

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "lappy/builds/dwm"]
-	path = lappy/builds/dwm
+[submodule "builds/dwm"]
+	path = builds/dwm
 	url = https://git.beepboop.systems/stupidcomputer/dwm

boxes/aristotle/default.nix

@@ -2,8 +2,7 @@
 
 {
   imports = [
-    ./builds
-    ./config
+    ../../lappy-config
     ./paperless.nix
     ./hardware-configuration.nix
   ];
@@ -50,11 +49,14 @@
     brave
     (pkgs.st.overrideAttrs (oldAttrs: rec {
         patches = [
-          ./builds/st/scrollback.patch
-          ./builds/st/clipboard.patch
+          ../../builds/lappy-st/scrollback.patch
+          ../../builds/lappy-st/clipboard.patch
         ];
-        conf = builtins.readFile ./builds/st/config.h;
+        conf = builtins.readFile ../../builds/lappy-st/config.h;
     }))
+    (callPackage ../../builds/lappy-utils.nix {})
+    (callPackage ../../builds/dwm.nix {})
+    (callPackage ../../builds/sssg.nix {})
     dmenu
     pinentry-qt
 

builds/lappy-utils.nix

@@ -9,10 +9,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "utils";
+  pname = "lappy-utils";
   version = "1.01";
 
-  src = ./utils;
+  src = ./lappy-utils;
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ xclip kbd rbw ];

flake.nix

@@ -32,8 +32,6 @@
           }) configurations
         );
     in {
-      nixosConfigurations = generateNixosConfigurations [ "netbox" "copernicus" ] // {
-        aristotle = mkSystem [ ./lappy/configuration.nix ];
-      };
+      nixosConfigurations = generateNixosConfigurations [ "netbox" "copernicus" "aristotle" ];
     };
 }

lappy-config/default.nix

@@ -19,58 +19,58 @@
     copyEssentialConfiguration = {
       text = ''
         mkdir -p /home/usr/.config/bash
-        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy/config/bash/bashrc /home/usr/.config/bash/bashrc
-        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy/config/bash/profile /home/usr/.config/bash/profile
+        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy-config/bash/bashrc /home/usr/.config/bash/bashrc
+        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy-config/bash/profile /home/usr/.config/bash/profile
 
         mkdir -p /home/usr/.config/cmus
-        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy/config/cmus/rc /home/usr/.config/cmus/rc
+        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy-config/cmus/rc /home/usr/.config/cmus/rc
 
         mkdir -p /home/usr/.config/git
-        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy/config/git/config /home/usr/.config/git/config
+        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy-config/git/config /home/usr/.config/git/config
 
         mkdir -p /home/usr/.config/isync
-        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy/config/isync/config /home/usr/.config/isync/config
+        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy-config/isync/config /home/usr/.config/isync/config
 
         mkdir -p /home/usr/.config/khal
-        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy/config/khal/config /home/usr/.config/khal/config
+        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy-config/khal/config /home/usr/.config/khal/config
 
         mkdir -p /home/usr/.config/khard
-        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy/config/khard/khard.conf /home/usr/.config/khard/khard.conf
+        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy-config/khard/khard.conf /home/usr/.config/khard/khard.conf
 
         mkdir -p /home/usr/.config/lynx
-        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy/config/lynx/lynx.cfg /home/usr/.config/lynx/lynx.cfg
+        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy-config/lynx/lynx.cfg /home/usr/.config/lynx/lynx.cfg
 
         mkdir -p /home/usr/.config/msmtp
-        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy/config/msmtp/config /home/usr/.config/msmtp/config
+        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy-config/msmtp/config /home/usr/.config/msmtp/config
 
         mkdir -p /home/usr/.config/neomutt
-        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy/config/neomutt/neomuttrc /home/usr/.config/neomutt/neomuttrc
+        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy-config/neomutt/neomuttrc /home/usr/.config/neomutt/neomuttrc
 
         mkdir -p /home/usr/.config/nvim
-        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy/config/nvim/init.lua /home/usr/.config/nvim/init.lua
+        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy-config/nvim/init.lua /home/usr/.config/nvim/init.lua
 
         mkdir -p /home/usr/.config/python
-        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy/config/python/pythonrc.py /home/usr/.config/python/pythonrc.py
+        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy-config/python/pythonrc.py /home/usr/.config/python/pythonrc.py
 
         mkdir -p /home/usr/.config/rbw
-        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy/config/rbw/config.json /home/usr/.config/rbw/config.json
+        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy-config/rbw/config.json /home/usr/.config/rbw/config.json
 
         mkdir -p /home/usr/.config/ssh
         mkdir -p /home/usr/.ssh
-        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy/config/ssh/config /home/usr/.config/ssh/config
-        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy/config/ssh/config /home/usr/.ssh/config
+        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy-config/ssh/config /home/usr/.config/ssh/config
+        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy-config/ssh/config /home/usr/.ssh/config
 
         mkdir -p /home/usr/.config/sx
-        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy/config/sx/sxrc /home/usr/.config/sx/sxrc
+        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy-config/sx/sxrc /home/usr/.config/sx/sxrc
 
         mkdir -p /home/usr/.config/tmux
-        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy/config/tmux/tmux.conf /home/usr/.config/tmux/tmux.conf
+        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy-config/tmux/tmux.conf /home/usr/.config/tmux/tmux.conf
 
         mkdir -p /home/usr/.config/todoman
-        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy/config/todoman/config.py /home/usr/.config/todoman/config.py
+        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy-config/todoman/config.py /home/usr/.config/todoman/config.py
 
         mkdir -p /home/usr/.config/vdirsyncer
-        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy/config/vdirsyncer/config /home/usr/.config/vdirsyncer/config
+        ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/lappy-config/vdirsyncer/config /home/usr/.config/vdirsyncer/config
       '';
       deps = [];
     };

lappy/README.md

@@ -1,4 +0,0 @@
-# lappy
-
-within this directory are some experimental configurations for a laptop.
-that is all.

lappy/builds/default.nix

@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    (callPackage ./utils.nix {})
-    (callPackage ./dwm.nix {})
-    (callPackage ./sssg.nix {})
-  ];
-}

lappy/builds/sssg.nix

@@ -1,28 +0,0 @@
-{ stdenv
-, lib
-, pkgs
-, fetchgit
-, makeWrapper
-, bash
-, pandoc
-}:
-
-stdenv.mkDerivation rec {
-  pname = "sssg";
-  version = "1.00";
-
-  src = fetchgit {
-    url = "https://git.beepboop.systems/stupidcomputer/sssg";
-    hash = "sha256-b0lbHsu628CKPNC6HDLApZQ4HsinTrXCoFqr1KdVIYE=";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ bash pandoc ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-
-    cp $src/sssg.sh $out/bin/sssg
-    wrapProgram $out/bin/sssg --prefix PATH : ${lib.makeBinPath [ bash pandoc ]}
-  '';
-}