add changes

boxes/mlg.nix

@@ -22,6 +22,7 @@
     libreoffice
     nomacs
     vscodium
+    thunderbird
     minetest
   ];
 

boxes/netbox.nix

@@ -42,18 +42,18 @@
     jails = {
       "nginx-bruteforce" = ''
         enabled = true
-	filter = nginx-bruteforce
+        filter = nginx-bruteforce
-	logpath = /var/log/nginx/access.log
+        logpath = /var/log/nginx/access.log
-	backend = auto
+        backend = auto
-	maxretry = 6
+        maxretry = 6
-	findtime = 600
+        findtime = 600
       '';
 
       "postfix-bruteforce" = ''
         enabled = true
-	filter = postfix-bruteforce
+        filter = postfix-bruteforce
-	maxretry = 6
+        maxretry = 6
-	findtime = 600
+        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";
-#    };
-#  };
 }

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
   ];
 

config/emacs/init.el

@@ -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 "<SPC>"))
-(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 "<leader>rr") 'configreload)
-(evil-define-key 'normal 'global (kbd "<leader>re") 'configread)
-(evil-define-key 'normal 'global (kbd "<leader>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.
- )