boxes/inspiron.nix

@@ -0,0 +1,12 @@
+{ lib, config, pkgs, ...}:
+
+{
+  imports = [
+    ../common/desktop.nix
+  ];
+
+  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "/dev/sda";
+
+  networking.hostName = "mainsail";
+}

boxes/mainsail.nix

@@ -1,68 +0,0 @@
-{ lib, config, pkgs, ...}:
-
-{
-  imports = [
-    ../common/steam.nix
-    ../common/desktop.nix
-  ];
-
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/sda";
-
-  networking.hostName = "mainsail";
-
-  services.paperless = {
-    enable = true;
-    passwordFile = "/etc/paperless-password";
-    port = 3004;
-    address = "localhost";
-    extraConfig = {
-      PAPERLESS_URL = "https://paperless.beepboop.systems";
-    };
-  };
-  programs.adb.enable = true;
-  users.users.usr.extraGroups = ["adbusers"];
-
-  environment.etc."nextcloud-admin-pass".text = "aslkfjaslkdfjsalkdfjlKJFLKJDLFKJLSKDJFLSKDJFLSKDJFLSKDFJ";
-  services.nextcloud = {
-    enable = true;
-    hostName = "beepboop.systems";
-    config.adminpassFile = "/etc/nextcloud-admin-pass";
-    package = pkgs.nextcloud27;
-    # Instead of using pkgs.nextcloud27Packages.apps,
-    # we'll reference the package version specified above
-    extraApps = with config.services.nextcloud.package.packages.apps; {
-      inherit news contacts calendar tasks;
-    };
-    extraAppsEnable = true;
-  };
-
-  systemd.targets.sleep.enable = false;
-  systemd.targets.suspend.enable = false;
-  systemd.targets.hibernate.enable = false;
-  systemd.targets.hybrid-sleep.enable = false;
-
-  services.getty.greetingLine = "
-    welcome to mainsail    |`-:_
-  ,----....____            |    `+.
- (             ````----....|___   |
-  \\     _                      ````----....____
-   \\    _)                                     ```---.._
-    \\                                                   \\
-  )`.\\  )`.   )`.   )`.   )`.   )`.   )`.   )`.   )`.   )`.   )`.
--'   `-'   `-'   `-'   `-'   `-'   `-'   `-'   `-'   `-'   `-'   `
-  ";
-
-  environment.systemPackages = with pkgs; [
-    vscodium-fhs
-    libreoffice
-
-    anki
-    ytfzf
-    kdenlive
-    libreoffice
-    i3
-    gcc
-    gnumake
-  ];
-}

boxes/netbox.nix

@@ -122,6 +122,23 @@
     '';
   };
 
+  services.paperless = {
+    enable = true;
+    passwordFile = "/etc/paperless-password";
+    port = 3004;
+    address = "localhost";
+    extraConfig = {
+      PAPERLESS_URL = "https://paperless.beepboop.systems";
+    };
+  };
+
+  # services.ntfy-sh = {
+  #   enable = true;
+  #   settings = {
+  #     listen-http = ":3500";
+  #   };
+  # };
+
   services.vaultwarden.enable = true;
 
   # Open ports in the firewall.

builds/rebuild.nix

@@ -1,26 +0,0 @@
-{ stdenv
-, lib
-, bash
-, makeWrapper
-}:
-
-stdenv.mkDerivation rec {
-  pname = "rebuild";
-  version = "1.00";
-
-  src = ./rebuild;
-
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ bash ];
-
-  buildPhase = "";
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp $src/rebuild $out/bin
-    wrapProgram $out/bin/rebuild --prefix PATH : ${lib.makeBinPath [ bash ]}
-  '';
-
-  phases = [ "buildPhase" "installPhase" ];
-}
-

builds/utils.nix

@@ -1,6 +1,5 @@
 { stdenv
 , lib
-, sxhkd
 , bash
 , feh
 , jq
@@ -25,7 +24,7 @@ stdenv.mkDerivation rec {
 
     for i in $(ls $src/sh); do
       cp $src/sh/$i $out/bin
-      wrapProgram $out/bin/$i --prefix PATH : ${lib.makeBinPath [ sxhkd bash feh xrandr jq curl ]}
+      wrapProgram $out/bin/$i --prefix PATH : ${lib.makeBinPath [ bash feh xrandr jq curl ]}
     done
   '';
 

builds/utils/sh/disp

@@ -4,9 +4,7 @@ exists() {
 	xrandr | grep ' connected' | grep -c "${1}"
 }
 
-if [ ! "$(hostname)" = "mainsail" ]; then
+bspc monitor eDP-1 -d 1 2 3 4 5 6 7 8 9
-	bspc monitor eDP-1 -d 1 2 3 4 5 6 7 8 9
-fi
 
 if [ "$(exists "DP-1")" -gt 1 ]; then
 	printf "two"
@@ -15,10 +13,5 @@ if [ "$(exists "DP-1")" -gt 1 ]; then
 	exit 0
 fi
 
-if [ "$(hostname)" = "mainsail" ]; then
+
-	# this is a tower, so there's only one configuration
+# default configuration's fine
-	printf "mainsail detected\n"
-	xrandr --output VGA-1 --left-of HDMI-1
-	bspc monitor VGA-1 -d 1 3 5 7 9
-	bspc monitor HDMI-1 -d 2 4 6 8 0
-fi

builds/utils/sh/mode

@@ -1,4 +0,0 @@
-# mode - change the current effective sxhkd configuration
-
-pkill sxhkd
-sxhkd -c ~/.config/sxhkd/$1 & disown

common/desktop.nix

@@ -63,7 +63,6 @@ in {
     pinentry-curses
     magic-wormhole
     xbrightness
-    xdotool
     figlet
 
     unzip

common/main.nix

@@ -28,8 +28,6 @@ in {
     dig
     htop
     gnumake
-
-    (pkgs.callPackage ../builds/rebuild.nix {})
   ];
 
   system.copySystemConfiguration = true;

config/nvim/init.lua

@@ -157,6 +157,11 @@ local packer = require('packer').startup(function(use)
 	use 'lervag/vimtex'
 	use 'https://github.com/protex/better-digraphs.nvim'
 	use 'https://github.com/itchyny/calendar.vim'
+	use {
+		"empat94/nvim-rss",
+		requires = { "tami5/sqlite.lua" },
+		rocks = "luaexpat",
+	}
 	use {
 		"folke/which-key.nvim",
 		config = function()
@@ -173,6 +178,33 @@ local packer = require('packer').startup(function(use)
 end);
 -- }}}
 
+-- lsp configuration {{{
+local lsp = require('lsp-zero').preset({})
+
+lsp.on_attach(function(client, bufnr)
+  lsp.default_keymaps({buffer = bufnr})
+end)
+
+local lspconfig = require('lspconfig')
+
+lsp.ensure_installed({
+	'rnix',
+	'jedi_language_server',
+})
+
+lspconfig.lua_ls.setup(lsp.nvim_lua_ls())
+lspconfig.rnix.setup({})
+lspconfig.jedi_language_server.setup({})
+
+lsp.setup()
+-- }}}
+
+require("nvim-rss").setup({
+	feeds_dir = "/home/usr",
+	date_format = "%x %r",
+	verbose = false,
+})
+
 nnoremap('<leader>ff', function()
 	require('telescope.builtin').find_files()
 end)

config/sx/sxrc

@@ -1,6 +1,6 @@
 # adjust some keybindings
 keyboard
-#
+
 # start the wm
 sxhkd &
 bspwm

config/sxhkd/mouse

@@ -1,20 +0,0 @@
-q
-	mode sxhkdrc
-
-{ctrl +,shift +,_} h
-	xdotool mousemove_relative -- {-5,-50,-20} 0
-
-{ctrl +,shift +,_} j
-	xdotool mousemove_relative -- 0 {5,50,20}
-
-{ctrl +,shift +,_} k
-	xdotool mousemove_relative -- 0 {-5,-50,-20}
-
-{ctrl +,shift +,_} l
-	xdotool mousemove_relative -- {5,50,20} 0
-
-{ctrl +,_} {a,s,d}
-	xdotool {mousedown,click} {1,2,3}
-
-g
-	xdotool mouseup 1; xdotool mouseup 2; xdotool mouseup 3

config/sxhkd/sxhkdrc

@@ -16,17 +16,32 @@ super + r
   bspc wm -r
 
 super + w
-  disp && wallpaper && statusbar && keyboard
+  disp && wallpaper && statusbar
 
 super + {_,shift + }n
   nws {local,national}
 
-super + m
+super + ctrl + n
-	mode mouse
+	net
+
+super + ctrl + t
+	st -e htop
 
 {XF86AudioRaiseVolume,XF86AudioLowerVolume}
   vol {inc,dec}
 
+super + b
+	fire
+
+super + shift + b
+	fire -P
+
+super + ctrl + b
+	chromium
+
+super + {_,shift + }v
+  vol {inc,dec}
+
 # bspwm
 super + q
   bspc node -c
@@ -41,7 +56,7 @@ super + {_,ctrl +,shift + }{h,j,k,l}
   bspc node -{f,p,s} {west,south,north,east}
 
 super + {_,shift + } {1-9,0}
-  bspc {desktop -f,node -d} '{1-9,10}'
+  bspc {desktop -f,node -d} '^{1-9,10}'
 
 super + {t,f,s}
   bspc node -t {tiled,floating,fullscreen}