diff --git a/boxes/aristotle/agenix.nix b/boxes/aristotle/agenix.nix index c8eeb2b..182e6d9 100644 --- a/boxes/aristotle/agenix.nix +++ b/boxes/aristotle/agenix.nix @@ -1,4 +1,3 @@ -{ machines, ... }: { age = { secrets = { diff --git a/boxes/aristotle/default.nix b/boxes/aristotle/default.nix index b9f267f..fb3f29f 100644 --- a/boxes/aristotle/default.nix +++ b/boxes/aristotle/default.nix @@ -1,5 +1,4 @@ { pkgs, lib, machines, ... }: - { imports = [ ../../config/aristotle.nix diff --git a/boxes/aristotle/hardware-configuration.nix b/boxes/aristotle/hardware-configuration.nix index 80d56fe..207ecc1 100644 --- a/boxes/aristotle/hardware-configuration.nix +++ b/boxes/aristotle/hardware-configuration.nix @@ -1,5 +1,4 @@ -{ config, lib, pkgs, modulesPath, ... }: - +{ config, lib, modulesPath, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") diff --git a/boxes/aristotle/paperless.nix b/boxes/aristotle/paperless.nix index a536bfa..2e03966 100644 --- a/boxes/aristotle/paperless.nix +++ b/boxes/aristotle/paperless.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ lib, ... }: { services.paperless = { enable = true; diff --git a/boxes/copernicus/default.nix b/boxes/copernicus/default.nix index 579f8ef..2f9a038 100644 --- a/boxes/copernicus/default.nix +++ b/boxes/copernicus/default.nix @@ -1,5 +1,4 @@ { pkgs, lib, machines, ...}: - { imports = [ ./hardware-configuration.nix @@ -35,7 +34,6 @@ dmenu - (pkgs.callPackage ../../builds/archutils.nix {}) (pkgs.callPackage ../../builds/sssg.nix {}) ]; diff --git a/boxes/copernicus/hardware-configuration.nix b/boxes/copernicus/hardware-configuration.nix index 3af2e40..6e3ee5d 100644 --- a/boxes/copernicus/hardware-configuration.nix +++ b/boxes/copernicus/hardware-configuration.nix @@ -1,8 +1,4 @@ -# 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, ... }: - +{ config, lib, modulesPath, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") diff --git a/boxes/copernicus/nvidia.nix b/boxes/copernicus/nvidia.nix index 29a5542..63372be 100644 --- a/boxes/copernicus/nvidia.nix +++ b/boxes/copernicus/nvidia.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, ... }: { # Make sure opengl is enabled hardware.graphics = { diff --git a/boxes/copernicus/services/default.nix b/boxes/copernicus/services/default.nix index 4d02af4..4f1e3b4 100644 --- a/boxes/copernicus/services/default.nix +++ b/boxes/copernicus/services/default.nix @@ -1,5 +1,3 @@ -{ lib, config, pkgs, ...}: - { imports = [ ./wireguard.nix diff --git a/boxes/copernicus/services/nextcloud.nix b/boxes/copernicus/services/nextcloud.nix deleted file mode 100644 index 467ac52..0000000 --- a/boxes/copernicus/services/nextcloud.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, config, pkgs, ...}: - -{ - services.nextcloud = { - enable = true; - package = pkgs.nextcloud30; - hostName = "nextcloud.beepboop.systems"; - config.adminpassFile = "/etc/nextcloud-admin"; - settings.overwriteprotocol = "https"; - extraApps = { - phonetrack = pkgs.fetchNextcloudApp { - sha256 = "sha256-V92f+FiS5vZEkq15A51pHoDpUOBfUOEVIcsXdP/rSMQ="; - license = "agpl3Only"; - url = "https://github.com/julien-nc/phonetrack/releases/download/v0.8.1/phonetrack-0.8.1.tar.gz"; - }; - }; - extraAppsEnable = true; - }; - - services.nginx.virtualHosts."${config.services.nextcloud.hostName}".listen = [ { - addr = "10.100.0.2"; - port = 5028; - } ]; -} diff --git a/boxes/copernicus/services/wireguard.nix b/boxes/copernicus/services/wireguard.nix index 60a5c99..cdbf52f 100644 --- a/boxes/copernicus/services/wireguard.nix +++ b/boxes/copernicus/services/wireguard.nix @@ -1,5 +1,4 @@ { config, machines, ... }: - { networking = { firewall.allowedUDPPorts = [ 50000 ]; diff --git a/boxes/netbox/default.nix b/boxes/netbox/default.nix index acc8443..e2ea028 100644 --- a/boxes/netbox/default.nix +++ b/boxes/netbox/default.nix @@ -1,5 +1,4 @@ { pkgs, lib, machines, ... }: - { imports = [ ./hardware-configuration.nix diff --git a/boxes/netbox/franklincce.nix b/boxes/netbox/franklincce.nix index 51f935d..60105c7 100644 --- a/boxes/netbox/franklincce.nix +++ b/boxes/netbox/franklincce.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, ... }: +{ pkgs, ... }: { virtualisation.docker.enable = true; diff --git a/boxes/netbox/hardware-configuration.nix b/boxes/netbox/hardware-configuration.nix index 89e88a0..1b14e94 100644 --- a/boxes/netbox/hardware-configuration.nix +++ b/boxes/netbox/hardware-configuration.nix @@ -1,8 +1,4 @@ -# 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, ... }: - +{ lib, ... }: { imports = [ ]; @@ -25,10 +21,6 @@ [ { device = "/dev/disk/by-uuid/57fbd850-1ced-4e21-9e52-4f3b529c61b0"; } ]; - # 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..useDHCP`. networking.useDHCP = lib.mkDefault true; # networking.interfaces.ens3.useDHCP = lib.mkDefault true; diff --git a/boxes/netbox/nginx.nix b/boxes/netbox/nginx.nix index 917bdc2..44457c7 100644 --- a/boxes/netbox/nginx.nix +++ b/boxes/netbox/nginx.nix @@ -1,4 +1,3 @@ -{ lib, config, pkgs, ... }: { services.nginx.enable = true; services.nginx.clientMaxBodySize = "100m"; diff --git a/boxes/netbox/radicale.nix b/boxes/netbox/radicale.nix index 26e09ad..f21eee0 100644 --- a/boxes/netbox/radicale.nix +++ b/boxes/netbox/radicale.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, ... }: +{ config, ... }: { services.radicale = { enable = true; diff --git a/boxes/netbox/ssh.nix b/boxes/netbox/ssh.nix index 300b572..3ed48ba 100644 --- a/boxes/netbox/ssh.nix +++ b/boxes/netbox/ssh.nix @@ -1,5 +1,4 @@ { pkgs, machines, ... }: - { services.openssh = { enable = true; diff --git a/boxes/netbox/sslh.nix b/boxes/netbox/sslh.nix index 40d3662..db2a3e1 100644 --- a/boxes/netbox/sslh.nix +++ b/boxes/netbox/sslh.nix @@ -1,4 +1,3 @@ -{ lib, config, pkgs, ... }: { services.sslh = { enable = true; diff --git a/boxes/netbox/vaultwarden.nix b/boxes/netbox/vaultwarden.nix index 255e485..5ef30e6 100644 --- a/boxes/netbox/vaultwarden.nix +++ b/boxes/netbox/vaultwarden.nix @@ -1,4 +1,3 @@ -{ lib, config, pkgs, ... }: { services.vaultwarden.enable = true; services.vaultwarden.config = { diff --git a/boxes/netbox/wireguard.nix b/boxes/netbox/wireguard.nix index 19df201..48b60aa 100644 --- a/boxes/netbox/wireguard.nix +++ b/boxes/netbox/wireguard.nix @@ -1,5 +1,4 @@ { config, machines, pkgs, ... }: - { networking = { nat = { diff --git a/builds/archutils.nix b/builds/archutils.nix deleted file mode 100644 index 988bcf0..0000000 --- a/builds/archutils.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv -, lib -, pkgs -, makeWrapper -, sxhkd -, bash -, feh -, jq -, fzy -, curl -, texliveFull -}: - -stdenv.mkDerivation rec { - pname = "archutils"; - version = "1.01"; - - src = ./archutils; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - bash - feh - jq - curl - fzy - texliveFull - ]; - - installPhase = '' - mkdir -p $out/bin - - for i in $(ls $src/); do - cp $src/$i $out/bin - ln -sf $out/bin/tmenu_run $out/bin/regenerate - wrapProgram $out/bin/$i --prefix PATH : ${lib.makeBinPath [ bash feh jq curl fzy texliveFull ]} - done - ''; -} diff --git a/builds/archutils/generate_daily_brief b/builds/archutils/generate_daily_brief deleted file mode 100755 index b8e3b90..0000000 --- a/builds/archutils/generate_daily_brief +++ /dev/null @@ -1,118 +0,0 @@ -#!/bin/sh - -working_directory=$(date +%Y-%m-%d) -human_readable=$(date "+%d %b %Y") - -cd ~/annex/briefs/ -mkdir "$working_directory" -cd "$working_directory" - -cat > main.tex <> main.tex -done - -cat >> main.tex <> main.tex -done - -cat >> main.tex < notices.tex - -if [ -f notices.tex ]; then - cat >> main.tex <> main.tex <pimsync" - -set use_threads = yes -set sort_aux = reverse-last-date-received - -set imap_keepalive = 300 -set query_command = "khard email --parsable --search-in-source-files '%s'" diff --git a/lappy-config/nvim/init.lua b/lappy-config/nvim/init.lua deleted file mode 100644 index d71b31c..0000000 --- a/lappy-config/nvim/init.lua +++ /dev/null @@ -1,113 +0,0 @@ --- helper functions {{{ -local keymapper = vim.keymap -local globals = vim.g -local opt = vim.o -local cmd = vim.cmd -function nnoremap(l, r) - keymapper.set('n', l, r) -- noremap is implied -end - -function inoremap(l, r) - keymapper.set('i', l, r) -end - -function tnoremap(l, r) - keymapper.set('t', l, r) -end --- }}} - --- custom mappings {{{ -globals.mapleader = ' ' -nnoremap(';', ':') -nnoremap(':', ';') -nnoremap('', ':') - --- source init.vim --- requires rebuilding the configuration first -nnoremap('rr', function() - cmd.source('~/.config/nvim/init.lua') -end) --- edit init.vim -nnoremap('re', function() - cmd.edit('~/.config/nvim/init.lua') -end) --- openup netrw -nnoremap('fs', function() - cmd.Lexplore() -end) - -inoremap('qp', 'u[s1z=`]au') -inoremap("", "mZ0i`ZlA") -inoremap('jk', '') -inoremap('zz', ':w!a') - -tnoremap('', '') --- }}} - --- vim options {{{ -opt.compatible = false -opt.number = true -opt.foldmethod = 'marker' -opt.encoding = 'utf8' -opt.list = true -opt.lcs = 'tab:->,trail:_,eol:^' -opt.clipboard = 'unnamedplus' -opt.spell = true -opt.spelllang = "en_us" -opt.title = true -opt.ts = 2 -opt.sw = 2 -opt.hlsearch = true -opt.incsearch = true -opt.ignorecase = true -opt.smartcase = true -opt.inccommand = 'nosplit' -opt.hidden = true -opt.linebreak = true -opt.path = '.,/usr/include,**' -opt.statusline="%f %r%m%q%h%=%y 0x%02B %04l:%03c:%03p" -vim.api.nvim_exec("let &titlestring='%{expand(\"%:p\")}'", true) - -globals.vimtex_view_method = 'zathura' --- }}} - --- autocommands {{{ -function setTabbing(lang, width) - vim.api.nvim_create_autocmd({"Filetype"}, { - pattern = {lang}, - callback = function() - vim.bo.expandtab = true - vim.bo.tabstop = width - vim.bo.shiftwidth = width - end - }) -end - -setTabbing("python", 4) -setTabbing("htmldjango", 4) -setTabbing("javascript", 4) -setTabbing("css", 4) -setTabbing("html", 4) -setTabbing("nix", 2) - -vim.api.nvim_create_autocmd({"TermOpen"}, { - pattern = {"*"}, - callback = function() - vim.wo.number = false - end -}) - -vim.api.nvim_create_autocmd({"TermOpen"}, { - pattern = {"*"}, - command = "setlocal nospell", -}) --- }}} - --- netrw options {{{ -globals.netrw_winsize = -28 -globals.netrw_banner = 0 --- for tree view -globals.netrw_liststyle = 3 --- use previous window to open files -globals.netrw_browser_split = 4 --- }}} diff --git a/lappy-config/python/pythonrc.py b/lappy-config/python/pythonrc.py deleted file mode 100644 index 71743f1..0000000 --- a/lappy-config/python/pythonrc.py +++ /dev/null @@ -1,17 +0,0 @@ -import os -import atexit -import readline - -history = os.path.join(os.path.expanduser('~'), '.cache/python_history') -try: - readline.read_history_file(history) -except OSError: - pass - -def write_history(): - try: - readline.write_history_file(history) - except OSError: - pass - -atexit.register(write_history) diff --git a/lappy-config/rbw/config.json b/lappy-config/rbw/config.json deleted file mode 100644 index 8f18c83..0000000 --- a/lappy-config/rbw/config.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "base_url": "https://bitwarden.beepboop.systems", - "email": "bit@beepboop.systems", - "identity_url": null, - "lock_timeout": 3600 -} diff --git a/lappy-config/ssh/config b/lappy-config/ssh/config deleted file mode 100644 index f640d81..0000000 --- a/lappy-config/ssh/config +++ /dev/null @@ -1,18 +0,0 @@ -Host netbox - HostName beepboop.systems - User ryan - Port 443 - -Host copernicus-proxy - HostName 10.100.0.2 - User usr - Port 2222 - ProxyJump netbox - -Host copernicus - User usr - Port 2222 - -Host aristotle - User usr - Port 2222 diff --git a/lappy-config/sx/default.nix b/lappy-config/sx/default.nix deleted file mode 100644 index 55dbcbe..0000000 --- a/lappy-config/sx/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ lib, config, pkgs, ...}: - -{ - services.xserver = { - enable = true; - xkb.layout = "us"; - - displayManager.sx.enable = true; - }; - - environment.systemPackages = with pkgs; [ - xorg.xset - xorg.setxkbmap - xcape - ]; -} diff --git a/lappy-config/sx/sxrc b/lappy-config/sx/sxrc deleted file mode 100755 index 6c80c80..0000000 --- a/lappy-config/sx/sxrc +++ /dev/null @@ -1,8 +0,0 @@ -status & - -xset r rate 200 80 -setxkbmap -option caps:super -pkill xcape -xcape -e 'Super_L=Escape' - -dwm diff --git a/lappy-config/sx/thinclient b/lappy-config/sx/thinclient deleted file mode 100644 index e69de29..0000000 diff --git a/lappy-config/todoman/config.py b/lappy-config/todoman/config.py deleted file mode 100644 index a7d0bb4..0000000 --- a/lappy-config/todoman/config.py +++ /dev/null @@ -1,5 +0,0 @@ -path = "~/pim/calendar/personal/*" -date_format = "%m-%d-%Y" -time_format = "%H:%M" -default_due = 0 -default_list = "edfbeaf1-e9f3-4d94-a512-40cdafdbc7a0" diff --git a/lappy-config/vdirsyncer/config b/lappy-config/vdirsyncer/config deleted file mode 100644 index 574506f..0000000 --- a/lappy-config/vdirsyncer/config +++ /dev/null @@ -1,79 +0,0 @@ -[general] -status_path = "~/pim/status" - -[pair contacts] -a = "contacts_local" -b = "contacts_remote" -collections = ["from a", "from b"] - -[pair calendar] -a = "calendar_local" -b = "calendar_remote" -collections = ["from a", "from b"] - -[pair band_calendar] -a = "band_calendar_local" -b = "band_calendar_remote" -collections = null - -[pair pco_calendar] -a = "pco_local" -b = "pco_remote" -collections = null - -[pair school_calendar] -a = "school_local" -b = "school_remote" -collections = null - -[storage contacts_local] -type = "filesystem" -path = "~/pim/people/main" -fileext = ".vcf" - -[storage calendar_local] -type = "filesystem" -path = "~/pim/calendar/personal" -fileext = ".ics" - -[storage band_calendar_local] -type = "filesystem" -path = "~/pim/calendar/band" -fileext = ".ics" - -[storage pco_local] -type = "filesystem" -path = "~/pim/calendar/pco" -fileext = ".ics" - -[storage school_local] -type = "filesystem" -path = "~/pim/calendar/school" -fileext = ".ics" - -[storage contacts_remote] -type = "carddav" - -url = "https://radicale.beepboop.systems/ryan/20cda0dd-5922-4905-8956-859c989a6519/" -username = "ryan" -password.fetch = ["command", "rbw", "get", "radicale"] - -[storage band_calendar_remote] -type = "http" -url = "https://calendar.google.com/calendar/ical/i6bong6iferbcuf1u25jg47t7k%40group.calendar.google.com/public/basic.ics" - -[storage pco_remote] -type = "http" - -url.fetch = ["command", "rbw", "get", "pco-ical-sync"] - -[storage school_remote] -type = "http" - -url.fetch = ["command", "rbw", "get", "school-ical-sync"] -[storage calendar_remote] -type = "caldav" - -url = "https://radicale.beepboop.systems/ryan/edfbeaf1-e9f3-4d94-a512-40cdafdbc7a0/" -username = "ryan" -password.fetch = ["command", "rbw", "get", "radicale"] diff --git a/lib/bootstrap.nix b/lib/bootstrap.nix index e7ae8f0..cc96381 100644 --- a/lib/bootstrap.nix +++ b/lib/bootstrap.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: - +{ pkgs, ... }: { environment.systemPackages = with pkgs; [ git