From 93c424af8261238239de7160332662f600f61e38 Mon Sep 17 00:00:00 2001 From: randomuser Date: Sun, 31 Dec 2023 18:54:59 -0600 Subject: [PATCH 1/5] add changes --- boxes/mlg.nix | 1 + boxes/netbox.nix | 34 +++------ common/desktop.nix | 4 +- config/emacs/init.el | 168 ------------------------------------------- 4 files changed, 11 insertions(+), 196 deletions(-) delete mode 100644 config/emacs/init.el diff --git a/boxes/mlg.nix b/boxes/mlg.nix index 2b25dc5..98e4369 100644 --- a/boxes/mlg.nix +++ b/boxes/mlg.nix @@ -22,6 +22,7 @@ libreoffice nomacs vscodium + thunderbird minetest ]; diff --git a/boxes/netbox.nix b/boxes/netbox.nix index 138ea01..0d032fe 100644 --- a/boxes/netbox.nix +++ b/boxes/netbox.nix @@ -42,18 +42,18 @@ jails = { "nginx-bruteforce" = '' enabled = true - filter = nginx-bruteforce - logpath = /var/log/nginx/access.log - backend = auto - maxretry = 6 - findtime = 600 + filter = nginx-bruteforce + logpath = /var/log/nginx/access.log + backend = auto + maxretry = 6 + findtime = 600 ''; "postfix-bruteforce" = '' enabled = true - filter = postfix-bruteforce - maxretry = 6 - findtime = 600 + filter = postfix-bruteforce + maxretry = 6 + findtime = 600 ''; }; }; @@ -175,14 +175,6 @@ }; }; - services.nginx.virtualHosts."ntfy.beepboop.systems" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://127.0.0.1:3500"; - }; - }; - services.nginx.virtualHosts."skillissue.agency" = { forceSSL = true; enableACME = true; @@ -212,14 +204,4 @@ enable = true; allowedTCPPorts = [ 5232 55555 22 80 443 ]; }; - -# services.paperless = { -# enable = true; -# passwordFile = "/etc/paperless-password"; -# port = 3004; -# address = "localhost"; -# extraConfig = { -# PAPERLESS_URL = "https://paperless.beepboop.systems"; -# }; -# }; } diff --git a/common/desktop.nix b/common/desktop.nix index cf752e4..9004469 100644 --- a/common/desktop.nix +++ b/common/desktop.nix @@ -3,7 +3,7 @@ let home-manager = builtins.fetchTarball { url = "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz"; - sha256 = "16078fwcmqq41dqfnm124xxm8l6zykvqlj1kzgi0fvfil4y86slm"; + sha256 = "1caggh7q5674b24ghx5p8l4jmd22afwrqqj2flfvlh3n6p94wfyc"; }; customPolybar = pkgs.polybar.override { alsaSupport = true; @@ -85,7 +85,7 @@ in { (pkgs.callPackage ../builds/pash.nix {}) ]; - fonts.packages = with pkgs; [ + fonts.fonts = with pkgs; [ fantasque-sans-mono ]; diff --git a/config/emacs/init.el b/config/emacs/init.el deleted file mode 100644 index 856a315..0000000 --- a/config/emacs/init.el +++ /dev/null @@ -1,168 +0,0 @@ -;; rndusr's init.el - -;; configure the package manager -(require 'package) -(add-to-list 'package-archives - '("melpa" . "https://melpa.org/packages/")) -(package-initialize) -;; (package-refresh-contents) - -; disable annoying ui features -(menu-bar-mode -1) -(tool-bar-mode -1) -(scroll-bar-mode -1) -(setq auto-save-default nil) -(add-hook 'prog-mode-hook 'display-line-numbers-mode) - -(defun keymap-symbol (keymap) - "Return the symbol to which KEYMAP is bound, or nil if no such symbol exists." - (catch 'gotit - (mapatoms (lambda (sym) - (and (boundp sym) - (eq (symbol-value sym) keymap) - (not (eq sym 'keymap)) - (throw 'gotit sym)))))) - -(defun get-local-map () (interactive) (message "Current mapping: %S" (keymap-symbol (current-local-map)))) - -;; download packages -(unless (package-installed-p 'evil) - (package-install 'evil)) -(unless (package-installed-p 'org) - (package-install 'org)) -(unless (package-installed-p 'org-drill) - (package-install 'org-drill)) -(unless (package-installed-p 'accent) - (package-install 'accent)) -(unless (package-installed-p 'elfeed) - (package-install 'elfeed)) -(unless (package-installed-p 'hackernews) - (package-install 'hackernews)) -(unless (package-installed-p 'emms) - (package-install 'emms)) -(unless (package-installed-p 'company) - (package-install 'company)) -(unless (package-installed-p 'anaconda-mode) - (package-install 'anaconda-mode)) -(unless (package-installed-p 'company-anaconda) - (package-install 'company-anaconda)) -(unless (package-installed-p 'calfw) - (package-install 'calfw)) -(unless (package-installed-p 'calfw-org) - (package-install 'calfw-org)) -(unless (package-installed-p 'calfw-ical) - (package-install 'calfw-ical)) - -;; activate packages -(require 'evil) -(require 'org) -(require 'calfw) -(require 'calfw-org) -(require 'calfw-ical) -(require 'org-drill) -(require 'accent) -(require 'elfeed) -(require 'hackernews) -(require 'emms) -(require 'company) -(require 'anaconda-mode) -(require 'company-anaconda) - -;; configure packages - -;; - evil-mode -(evil-set-initial-state 'elfeed-search 'emacs) - -;; swap ; and : -(with-eval-after-load 'evil-maps - (define-key evil-motion-state-map (kbd ";") 'evil-ex)) - -(evil-set-leader 'normal (kbd "")) -(defun configreload () (interactive) (load "~/.config/emacs/init.el")) -(defun configread () (interactive) (find-file-noselect "~/dot_testing/config/emacs/init.el")) -(defun nixrebuild () (interactive) (term "rebuild")) - -(evil-define-key 'normal 'global (kbd "rr") 'configreload) -(evil-define-key 'normal 'global (kbd "re") 'configread) -(evil-define-key 'normal 'global (kbd "nrr") 'nixrebuild) -(evil-ex-define-cmd "get-current-mapping" 'get-local-map) -(evil-mode 1) - -;; company-mode -(add-hook 'after-init-hook 'global-company-mode) -(setq company-idle-delay 1 - company-tooltip-idle-delay 10 - company-require-match nil - company-frontends - '(company-pseudo-tooltip-unless-just-one-frontend-with-delay - company-preview-frontend - company-echo-metadata-frontend) - company-backends '(company-capf)) -(setq company-tooltip-align-annotations t) -(add-to-list 'company-backends 'company-anaconda) -(add-hook 'python-mode-hook 'anaconda-mode) - -;; org -(setq org-agenda-files '("~/org")) -(setq calendar-week-start-day 1) -(setq org-todo-keywords '((type "MEETING" "CLASS" "TODO" "REHERSAL" "|" "DONE"))) -(setq org-return-follows-link t) - -;; calfw -(defun google-calendar (id) (concatenate 'string "https://calendar.google.com/calendar/ical/" id "%40group.calendar.google.com/public/basic.ics")) - -(defun my-open-calendar () - (interactive) - (cfw:open-calendar-buffer - :contents-sources - (list - (cfw:org-create-source "Green") - (cfw:ical-create-source "wcs" (google-calendar "c_037e243v5md54rj8kp1k898oo4") "IndianRed") - (cfw:ical-create-source "band" (google-calendar "i6bong6iferbcuf1u25jg47t7k") "Blue") - (cfw:ical-create-source "schoology" "https://wcschools.schoology.com/calendar/feed/ical/1692031887/ef3eab3f5ac45935472a9fa6f601a63a/ical.ics" "Yellow") - ))) - -;; emms -(require 'emms-player-simple) -(require 'emms-source-file) -(require 'emms-source-playlist) - -(emms-all) -(emms-default-players) - -(evil-define-key 'normal 'emms-browser-mode-map (kbd "z") 'emms-browser-expand-one-level) -(evil-define-key 'normal 'emms-browser-mode-map (kbd "RET") 'emms-browser-add-tracks-and-play) -(evil-define-key 'normal 'emms-browser-mode-map (kbd "e") 'emms-browser-add-tracks) - -;; - elfeed -(global-set-key (kbd "C-x w") 'elfeed) - -(setq elfeed-feeds - '("http://nullprogram.com/feed/" - "https://drewdevault.com/blog/index.xml" - "https://digitallibrary.un.org/rss?ln=en&p=libya&rg=50&c=Resource%20Type&c=UN%20Bodies" - "https://planet.emacslife.com/atom.xml")) - -(setq elfeed-db-directory "~/.cache/elfeed") - -;; - accent.el -(evil-define-key 'insert 'global (kbd "C-k") 'accent-menu) - -;; fonts -(set-face-attribute 'default nil - :font "Fantasque Sans Mono 10" - :foreground "white" :background "gray8") - -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(package-selected-packages - '(company-anaconda anaconda-mode company emms bongo accent org-drill hackernews evil elfeed))) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - ) From 80a23ec536f4cb24f73b38d7220cb6b8149bab16 Mon Sep 17 00:00:00 2001 From: randomuser Date: Wed, 24 Jan 2024 18:49:26 -0600 Subject: [PATCH 2/5] changes --- boxes/x230t/default.nix | 5 +++++ builds/utils.nix | 5 +++-- builds/utils/sh/vpn | 5 +++++ flake.lock | 6 +++--- 4 files changed, 16 insertions(+), 5 deletions(-) create mode 100755 builds/utils/sh/vpn diff --git a/boxes/x230t/default.nix b/boxes/x230t/default.nix index e2a89c8..f7c1a72 100644 --- a/boxes/x230t/default.nix +++ b/boxes/x230t/default.nix @@ -18,6 +18,11 @@ thunderbird hue-cli bluetuith + brave + vdirsyncer + isync + khal + todoman ]; hardware.bluetooth = { diff --git a/builds/utils.nix b/builds/utils.nix index 62dfb9e..50ee3ac 100644 --- a/builds/utils.nix +++ b/builds/utils.nix @@ -5,6 +5,7 @@ , libxcb # shell scripts stuff , makeWrapper +, sshuttle , sxhkd , bash , feh @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { src = ./utils; nativeBuildInputs = [ makeWrapper pkg-config libxcb ]; - buildInputs = [ libxcb bash feh xrandr jq curl fzy ytfzf ffmpeg ]; + buildInputs = [ libxcb bash feh xrandr jq curl fzy ytfzf ffmpeg sshuttle ]; buildPhase = '' ls @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { for i in $(ls $src/sh); do cp $src/sh/$i $out/bin ln -sf $out/bin/tmenu_run $out/bin/regenerate - wrapProgram $out/bin/$i --prefix PATH : ${lib.makeBinPath [ sxhkd bash feh xrandr jq figlet curl fzy ytfzf ffmpeg ]} + wrapProgram $out/bin/$i --prefix PATH : ${lib.makeBinPath [ sxhkd bash feh xrandr jq figlet curl fzy ytfzf ffmpeg sshuttle ]} done cp c/status/main $out/bin/statusbar diff --git a/builds/utils/sh/vpn b/builds/utils/sh/vpn new file mode 100755 index 0000000..9c6306c --- /dev/null +++ b/builds/utils/sh/vpn @@ -0,0 +1,5 @@ +#!/bin/sh + +# a poor man's vpn +ip=$(dig +short beepboop.systems) +sshuttle --dns -r ryan@$ip:443 0/0 diff --git a/flake.lock b/flake.lock index 620ce71..56996e5 100644 --- a/flake.lock +++ b/flake.lock @@ -209,12 +209,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-5xUIhLgUWLJ08JmAOugcD2ut0pNNDzoBOJmcoHA5yAg=", - "path": "/nix/store/dz347nzxk63b999sm3cb7k450f90xzlq-source/builds", + "narHash": "sha256-Q/utpukYR3ZDNlXzUFtDrlmLDfusxdseH6THPh9JrQc=", + "path": "/nix/store/6c7g2njv4c637rnhc7vxqvk9xcbq9ghf-source/builds", "type": "path" }, "original": { - "path": "/nix/store/dz347nzxk63b999sm3cb7k450f90xzlq-source/builds", + "path": "/nix/store/6c7g2njv4c637rnhc7vxqvk9xcbq9ghf-source/builds", "type": "path" } }, From 4b40b38e5a275c83b8fffc2ed9f50d5e9bf954f2 Mon Sep 17 00:00:00 2001 From: randomuser Date: Wed, 24 Jan 2024 19:37:55 -0600 Subject: [PATCH 3/5] temporary stop-gap solutions --- boxes/mlg/default.nix | 2 ++ builds/utils/sh/disp | 6 ++++++ flake.lock | 18 +++++++++--------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/boxes/mlg/default.nix b/boxes/mlg/default.nix index 2a7c461..9a894ec 100644 --- a/boxes/mlg/default.nix +++ b/boxes/mlg/default.nix @@ -49,5 +49,7 @@ services.avahi.nssmdns = true; # enables the mDNS NSS plug-in services.avahi.openFirewall = true; # opens the firewall for UDP port 5353 + nixpkgs.config.allowUnfree = true; networking.hostName = "mlg"; + } diff --git a/builds/utils/sh/disp b/builds/utils/sh/disp index 32411e0..64ff359 100755 --- a/builds/utils/sh/disp +++ b/builds/utils/sh/disp @@ -27,6 +27,12 @@ case "$(hostname)" in bspc monitor VGA-1 -d 1 3 5 7 9 bspc monitor HDMI-1 -d 2 4 6 8 0 ;; + "mlg") + # holdover configuration for the time being + xrandr --output eDP-1 --brightness 0 + xrandr --output DP-1 --primary + bspc monitor DP-1 -d 1 2 3 4 5 6 7 8 9 + ;; "x230t") echo "x230t" case "$1" in diff --git a/flake.lock b/flake.lock index d53acea..2197afe 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1705709716, - "narHash": "sha256-YJdWSN3ra0FsAQT5PXe7uXxMeAXxTR+SY/wVOO1c6Bs=", + "lastModified": 1706081037, + "narHash": "sha256-R2dkUMLZa6qvRl4mXOG7bLHaGvoOYf5vIXWeyRDqML0=", "owner": "rycee", "repo": "nur-expressions", - "rev": "d7ad3362283fced58410547650be31e37f9d0f41", + "rev": "5f23ef51cad74dbf30633366e52eb895c9c633d1", "type": "gitlab" }, "original": { @@ -93,11 +93,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705641746, - "narHash": "sha256-D6c2aH8HQbWc7ZWSV0BUpFpd94ImFyCP8jFIsKQ4Slg=", + "lastModified": 1705916986, + "narHash": "sha256-iBpfltu6QvN4xMpen6jGGEb6jOqmmVQKUrXdOJ32u8w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d2003f2223cbb8cd95134e4a0541beea215c1073", + "rev": "d7f206b723e42edb09d9d753020a84b3061a79d8", "type": "github" }, "original": { @@ -209,12 +209,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-iemuV19UU8TriqixcvwdRUTa8lIrxc3Krwt4bHpUUWE=", - "path": "/nix/store/26f187i54ky8clnmd0rbjvv8h3khgc5d-source/builds", + "narHash": "sha256-uu/yGM8VTaGEAqSPHm4gJusVaPFH0wcf8BFMXgFlUPE=", + "path": "/nix/store/hgkpghh249402niaihbsp9h3zdhiaivy-source/builds", "type": "path" }, "original": { - "path": "/nix/store/26f187i54ky8clnmd0rbjvv8h3khgc5d-source/builds", + "path": "/nix/store/hgkpghh249402niaihbsp9h3zdhiaivy-source/builds", "type": "path" } }, From 9fe5e8992887ef08979848a305e74a2dbb72ef4d Mon Sep 17 00:00:00 2001 From: randomuser Date: Wed, 24 Jan 2024 23:04:51 -0600 Subject: [PATCH 4/5] add mlg key --- boxes/mainsail/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boxes/mainsail/default.nix b/boxes/mainsail/default.nix index d17b946..0a90333 100644 --- a/boxes/mainsail/default.nix +++ b/boxes/mainsail/default.nix @@ -56,7 +56,8 @@ }; users.users.usr.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbhM3wj0oqjR3pUaZgpfX4Xo4dlzvBTbQ48zHyg7Pwx usr" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbhM3wj0oqjR3pUaZgpfX4Xo4dlzvBTbQ48zHyg7Pwx usr" # x230t + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB2xUbQw9+RCPVw7qCFm4NNCP/MpS2BIArcwMv0KdKOI usr" # mlg ]; system.stateVersion = "23.11"; From 092c8a75f90d4a2076c635f90df332dcbb9aec07 Mon Sep 17 00:00:00 2001 From: randomuser Date: Wed, 24 Jan 2024 23:27:38 -0600 Subject: [PATCH 5/5] rid myself of the utilpkg flake and put a firewall on mlg --- boxes/mlg/default.nix | 6 ++++-- builds/flake.lock | 27 --------------------------- builds/flake.nix | 28 ---------------------------- flake.lock | 20 +------------------- flake.nix | 6 +----- modules/common.nix | 7 +++---- 6 files changed, 9 insertions(+), 85 deletions(-) delete mode 100644 builds/flake.lock delete mode 100644 builds/flake.nix diff --git a/boxes/mlg/default.nix b/boxes/mlg/default.nix index b057c63..024c6cf 100644 --- a/boxes/mlg/default.nix +++ b/boxes/mlg/default.nix @@ -61,6 +61,8 @@ services.avahi.openFirewall = true; # opens the firewall for UDP port 5353 nixpkgs.config.allowUnfree = true; - networking.hostName = "mlg"; - + networking = { + hostName = "mlg"; + firewall.enable = true; + }; } diff --git a/builds/flake.lock b/builds/flake.lock deleted file mode 100644 index c5ee110..0000000 --- a/builds/flake.lock +++ /dev/null @@ -1,27 +0,0 @@ -{ - "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1703467016, - "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d02d818f22c777aa4e854efc3242ec451e5d462a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/builds/flake.nix b/builds/flake.nix deleted file mode 100644 index 350b96a..0000000 --- a/builds/flake.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; - - outputs = - { nixpkgs, ... }: - let - inherit (nixpkgs) lib; - withSystem = - f: - lib.fold lib.recursiveUpdate { } ( - map f [ - "x86_64-linux" - ] - ); - mkPackages = pkgs: { - st = pkgs.callPackage ./st.nix { }; - rebuild = pkgs.callPackage ./rebuild.nix { }; - utils = pkgs.callPackage ./utils.nix { }; - }; - in - withSystem ( - system: { - overlays.default = final: _: mkPackages final; - - packages.${system} = mkPackages nixpkgs.legacyPackages.${system}; - } - ); -} diff --git a/flake.lock b/flake.lock index ef6132e..99bd06f 100644 --- a/flake.lock +++ b/flake.lock @@ -172,8 +172,7 @@ "firefox-addons": "firefox-addons", "home-manager": "home-manager", "nixpkgs": "nixpkgs", - "simple-nixos-mailserver": "simple-nixos-mailserver", - "utilpkg": "utilpkg" + "simple-nixos-mailserver": "simple-nixos-mailserver" } }, "simple-nixos-mailserver": { @@ -201,23 +200,6 @@ "type": "gitlab" } }, - "utilpkg": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-3icKqIEjS068WDJ+05sEvFDL6DsPB0GpKTc8Bm4F9Po=", - "path": "/nix/store/9797g0387xqz764w22ascnvn3bvm90kd-source/builds", - "type": "path" - }, - "original": { - "path": "/nix/store/9797g0387xqz764w22ascnvn3bvm90kd-source/builds", - "type": "path" - } - }, "utils": { "locked": { "lastModified": 1605370193, diff --git a/flake.nix b/flake.nix index 220cdcd..ebcd34a 100644 --- a/flake.nix +++ b/flake.nix @@ -11,16 +11,12 @@ url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; }; - utilpkg = { - url = "./builds"; - inputs.nixpkgs.follows = "nixpkgs"; - }; simple-nixos-mailserver = { url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11"; }; }; - outputs = { self, nixpkgs, home-manager, firefox-addons, simple-nixos-mailserver, utilpkg, ... }@inputs: { + outputs = { self, nixpkgs, home-manager, firefox-addons, simple-nixos-mailserver, ... }@inputs: { nixosConfigurations = { netbox = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; diff --git a/modules/common.nix b/modules/common.nix index 8d9f344..6336be3 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -6,10 +6,9 @@ ]; environment.systemPackages = [ -# is it this? this throws a similar error; no attr st, etc. - inputs.utilpkg.packages.x86_64-linux.st - inputs.utilpkg.packages.x86_64-linux.rebuild - inputs.utilpkg.packages.x86_64-linux.utils + (pkgs.callPackage ../builds/rebuild.nix {}) + (pkgs.callPackage ../builds/st.nix {}) + (pkgs.callPackage ../builds/utils.nix {}) pkgs.man-pages ];