diff --git a/.gitmodules b/.gitmodules index b2ea95d..3990cfe 100644 --- a/.gitmodules +++ b/.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 diff --git a/lappy/configuration.nix b/boxes/aristotle/default.nix similarity index 88% rename from lappy/configuration.nix rename to boxes/aristotle/default.nix index a9d5080..bd3a576 100644 --- a/lappy/configuration.nix +++ b/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 diff --git a/lappy/hardware-configuration.nix b/boxes/aristotle/hardware-configuration.nix similarity index 100% rename from lappy/hardware-configuration.nix rename to boxes/aristotle/hardware-configuration.nix diff --git a/lappy/paperless.nix b/boxes/aristotle/paperless.nix similarity index 100% rename from lappy/paperless.nix rename to boxes/aristotle/paperless.nix diff --git a/lappy/builds/dwm b/builds/dwm similarity index 100% rename from lappy/builds/dwm rename to builds/dwm diff --git a/lappy/builds/dwm.nix b/builds/dwm.nix similarity index 100% rename from lappy/builds/dwm.nix rename to builds/dwm.nix diff --git a/lappy/builds/st/clipboard.patch b/builds/lappy-st/clipboard.patch similarity index 100% rename from lappy/builds/st/clipboard.patch rename to builds/lappy-st/clipboard.patch diff --git a/lappy/builds/st/config.h b/builds/lappy-st/config.h similarity index 100% rename from lappy/builds/st/config.h rename to builds/lappy-st/config.h diff --git a/lappy/builds/st/scrollback.patch b/builds/lappy-st/scrollback.patch similarity index 100% rename from lappy/builds/st/scrollback.patch rename to builds/lappy-st/scrollback.patch diff --git a/lappy/builds/utils.nix b/builds/lappy-utils.nix similarity index 89% rename from lappy/builds/utils.nix rename to builds/lappy-utils.nix index 5a20976..a8e6d4b 100644 --- a/lappy/builds/utils.nix +++ b/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 ]; diff --git a/lappy/builds/utils/blackhole b/builds/lappy-utils/blackhole similarity index 100% rename from lappy/builds/utils/blackhole rename to builds/lappy-utils/blackhole diff --git a/lappy/builds/utils/cmus-status-update b/builds/lappy-utils/cmus-status-update similarity index 100% rename from lappy/builds/utils/cmus-status-update rename to builds/lappy-utils/cmus-status-update diff --git a/lappy/builds/utils/git-rbw-wrap b/builds/lappy-utils/git-rbw-wrap similarity index 100% rename from lappy/builds/utils/git-rbw-wrap rename to builds/lappy-utils/git-rbw-wrap diff --git a/lappy/builds/utils/khalmacs b/builds/lappy-utils/khalmacs similarity index 100% rename from lappy/builds/utils/khalmacs rename to builds/lappy-utils/khalmacs diff --git a/lappy/builds/utils/paperless b/builds/lappy-utils/paperless similarity index 100% rename from lappy/builds/utils/paperless rename to builds/lappy-utils/paperless diff --git a/lappy/builds/utils/passmenu b/builds/lappy-utils/passmenu similarity index 100% rename from lappy/builds/utils/passmenu rename to builds/lappy-utils/passmenu diff --git a/lappy/builds/utils/pimsync b/builds/lappy-utils/pimsync similarity index 100% rename from lappy/builds/utils/pimsync rename to builds/lappy-utils/pimsync diff --git a/lappy/builds/utils/rebuild b/builds/lappy-utils/rebuild similarity index 100% rename from lappy/builds/utils/rebuild rename to builds/lappy-utils/rebuild diff --git a/lappy/builds/utils/status b/builds/lappy-utils/status similarity index 100% rename from lappy/builds/utils/status rename to builds/lappy-utils/status diff --git a/flake.nix b/flake.nix index 3fef63f..8353937 100644 --- a/flake.nix +++ b/flake.nix @@ -32,8 +32,6 @@ }) configurations ); in { - nixosConfigurations = generateNixosConfigurations [ "netbox" "copernicus" ] // { - aristotle = mkSystem [ ./lappy/configuration.nix ]; - }; + nixosConfigurations = generateNixosConfigurations [ "netbox" "copernicus" "aristotle" ]; }; } diff --git a/lappy/config/bash/bashrc b/lappy-config/bash/bashrc similarity index 100% rename from lappy/config/bash/bashrc rename to lappy-config/bash/bashrc diff --git a/lappy/config/bash/profile b/lappy-config/bash/profile similarity index 100% rename from lappy/config/bash/profile rename to lappy-config/bash/profile diff --git a/lappy/config/cmus/rc b/lappy-config/cmus/rc similarity index 100% rename from lappy/config/cmus/rc rename to lappy-config/cmus/rc diff --git a/lappy/config/default.nix b/lappy-config/default.nix similarity index 62% rename from lappy/config/default.nix rename to lappy-config/default.nix index 68395ae..16f888a 100644 --- a/lappy/config/default.nix +++ b/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 = []; }; diff --git a/lappy/config/git/config b/lappy-config/git/config similarity index 100% rename from lappy/config/git/config rename to lappy-config/git/config diff --git a/lappy/config/isync/config b/lappy-config/isync/config similarity index 100% rename from lappy/config/isync/config rename to lappy-config/isync/config diff --git a/lappy/config/khal/config b/lappy-config/khal/config similarity index 100% rename from lappy/config/khal/config rename to lappy-config/khal/config diff --git a/lappy/config/khard/khard.conf b/lappy-config/khard/khard.conf similarity index 100% rename from lappy/config/khard/khard.conf rename to lappy-config/khard/khard.conf diff --git a/lappy/config/lynx/lynx.cfg b/lappy-config/lynx/lynx.cfg similarity index 100% rename from lappy/config/lynx/lynx.cfg rename to lappy-config/lynx/lynx.cfg diff --git a/lappy/config/msmtp/config b/lappy-config/msmtp/config similarity index 100% rename from lappy/config/msmtp/config rename to lappy-config/msmtp/config diff --git a/lappy/config/neomutt/neomuttrc b/lappy-config/neomutt/neomuttrc similarity index 100% rename from lappy/config/neomutt/neomuttrc rename to lappy-config/neomutt/neomuttrc diff --git a/lappy/config/nvim/init.lua b/lappy-config/nvim/init.lua similarity index 100% rename from lappy/config/nvim/init.lua rename to lappy-config/nvim/init.lua diff --git a/lappy/config/python/pythonrc.py b/lappy-config/python/pythonrc.py similarity index 100% rename from lappy/config/python/pythonrc.py rename to lappy-config/python/pythonrc.py diff --git a/lappy/config/rbw/config.json b/lappy-config/rbw/config.json similarity index 100% rename from lappy/config/rbw/config.json rename to lappy-config/rbw/config.json diff --git a/lappy/config/ssh/config b/lappy-config/ssh/config similarity index 100% rename from lappy/config/ssh/config rename to lappy-config/ssh/config diff --git a/lappy/config/sx/default.nix b/lappy-config/sx/default.nix similarity index 100% rename from lappy/config/sx/default.nix rename to lappy-config/sx/default.nix diff --git a/lappy/config/sx/sxrc b/lappy-config/sx/sxrc similarity index 100% rename from lappy/config/sx/sxrc rename to lappy-config/sx/sxrc diff --git a/lappy/config/sx/thinclient b/lappy-config/sx/thinclient similarity index 100% rename from lappy/config/sx/thinclient rename to lappy-config/sx/thinclient diff --git a/lappy/config/tmux/tmux.conf b/lappy-config/tmux/tmux.conf similarity index 100% rename from lappy/config/tmux/tmux.conf rename to lappy-config/tmux/tmux.conf diff --git a/lappy/config/todoman/config.py b/lappy-config/todoman/config.py similarity index 100% rename from lappy/config/todoman/config.py rename to lappy-config/todoman/config.py diff --git a/lappy/config/vdirsyncer/config b/lappy-config/vdirsyncer/config similarity index 100% rename from lappy/config/vdirsyncer/config rename to lappy-config/vdirsyncer/config diff --git a/lappy/README.md b/lappy/README.md deleted file mode 100644 index 5072990..0000000 --- a/lappy/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# lappy - -within this directory are some experimental configurations for a laptop. -that is all. diff --git a/lappy/background.jpg b/lappy/background.jpg deleted file mode 100644 index c22784c..0000000 Binary files a/lappy/background.jpg and /dev/null differ diff --git a/lappy/builds/default.nix b/lappy/builds/default.nix deleted file mode 100644 index 61fd71e..0000000 --- a/lappy/builds/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, pkgs, ... }: - -{ - environment.systemPackages = with pkgs; [ - (callPackage ./utils.nix {}) - (callPackage ./dwm.nix {}) - (callPackage ./sssg.nix {}) - ]; -} diff --git a/lappy/builds/sssg.nix b/lappy/builds/sssg.nix deleted file mode 100644 index c9ac3f6..0000000 --- a/lappy/builds/sssg.nix +++ /dev/null @@ -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 ]} - ''; -}