From d5645e10d83dc9dc9b0ff1e25fbe479482be4351 Mon Sep 17 00:00:00 2001
From: Aria Nolan <tacocat@chytrid.org>
Date: Thu, 23 Nov 2023 16:56:40 -0500
Subject: [PATCH] removed emacs

---
 users/tacocat/emacs/default.nix               | 98 -------------------
 users/tacocat/emacs/org-publish.el            | 28 ------
 users/tacocat/home.nix                        |  2 +-
 users/tacocat/services/default.nix            |  2 -
 users/tacocat/wayland/sway/config.d/autostart |  1 +
 5 files changed, 2 insertions(+), 129 deletions(-)
 delete mode 100644 users/tacocat/emacs/default.nix
 delete mode 100644 users/tacocat/emacs/org-publish.el

diff --git a/users/tacocat/emacs/default.nix b/users/tacocat/emacs/default.nix
deleted file mode 100644
index 65c428e..0000000
--- a/users/tacocat/emacs/default.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-{pkgs, ...}: {
-  programs.emacs = {
-    enable = true;
-    package = pkgs.emacs29-gtk3;
-    extraConfig = ''
-            (menu-bar-mode -1)
-            (tool-bar-mode -1)
-            (scroll-bar-mode -1)
-            (blink-cursor-mode 0)
-
-            ;; scale headings in org-mode
-            (setq zenburn-scale-org-headlines t)
-
-            ;; scale headings in outline-mode
-            (setq zenburn-scale-outline-headlines t)
-            (load-theme 'zenburn :no-confirm)
-
-            (add-to-list 'default-frame-alist
-                   '(font . "Maple Mono-12"))
-
-            (global-set-key (kbd "C-c a") #'org-agenda)
-            (global-set-key (kbd "C-c f") #'recentf-open)
-            (global-hl-line-mode 1)
-
-            (global-visual-line-mode 1)
-            (setq evil-respect-visual-line-mode 1)
-
-            (require 'evil)
-            (evil-mode 1)
-
-            (require 'evil-org)
-            (add-hook 'org-mode-hook 'evil-org-mode)
-            (evil-org-set-key-theme '(textobjects insert navigation additional shift todo heading))
-            (require 'evil-org-agenda)
-            (evil-org-agenda-set-keys)
-
-            (setq org-startup-with-inline-images 1)
-            (setq org-startup-indented 1)
-
-            ;;(global-display-line-numbers-mode 1)
-            ;;(setq display-line-numbers-type 'visual)
-
-            (require 'org-download)
-
-            ;; Drag-and-drop to `dired`
-            (add-hook 'dired-mode-hook 'org-download-enable)
-
-            (setq org-image-actual-width nil)
-            (setq ring-bell-function 'ignore)
-            (setq org-agenda-files '(
-              "~/sync/org/agenda.org"
-              "~/sync/org/school/agendas/"
-            ))
-            (setq org-agenda-span 'fortnight)
-
-
-      (require 'ox-publish) (setq org-publish-project-alist
-            '(
-
-             ;; ... add all the components here (see below)...
-
-      	("org-notes"
-      	    :base-directory "~/sync/org/"
-      	    :base-extension "org"
-      	    :publishing-directory "~/public_html/"
-      	    :recursive t
-      	    :publishing-function org-html-publish-to-html
-      	    :headline-levels 4             ; Just the default for this project.
-      	    :auto-preamble t
-      	    )
-
-      	("org-static"
-      	    :base-directory "~/sync/org/"
-      	    :base-extension "css\\|js\\|png\\|jpg\\|gif\\|pdf\\|mp3\\|ogg\\|swf"
-      	    :publishing-directory "~/public_html/"
-      	    :recursive t
-      	    :publishing-function org-publish-attachment
-      	)
-
-      	;; publish component
-      	("org" :components ("org-notes" "org-static"))
-
-            ))
-
-    ''; # TODO move plugin setup into a seperate file to keep things organized
-    # also add autoloading so emacs starts faster
-    extraPackages = epkgs:
-      with epkgs; [
-        zenburn-theme
-        color-theme-tangotango
-        evil
-        evil-org
-        org-download
-        ox-pandoc
-        monokai-theme
-      ];
-  };
-}
diff --git a/users/tacocat/emacs/org-publish.el b/users/tacocat/emacs/org-publish.el
deleted file mode 100644
index 5d0c711..0000000
--- a/users/tacocat/emacs/org-publish.el
+++ /dev/null
@@ -1,28 +0,0 @@
-(require 'ox-publish) (setq org-publish-project-alist
-      '(
-
-       ;; ... add all the components here (see below)...
-
-	("org-notes"
-	    :base-directory "~/sync/org/"
-	    :base-extension "org"
-	    :publishing-directory "~/public_html/"
-	    :recursive t
-	    :publishing-function org-html-publish-to-html
-	    :headline-levels 4             ; Just the default for this project.
-	    :auto-preamble t
-	    )
-
-	("org-static"
-	    :base-directory "~/sync/org/"
-	    :base-extension "css\\|js\\|png\\|jpg\\|gif\\|pdf\\|mp3\\|ogg\\|swf"
-	    :publishing-directory "~/public_html/"
-	    :recursive t
-	    :publishing-function org-publish-attachment
-	)
-
-	;; publish component
-	("org" :components ("org-notes" "org-static"))
-
-      ))
-
diff --git a/users/tacocat/home.nix b/users/tacocat/home.nix
index a9f9245..2b16468 100644
--- a/users/tacocat/home.nix
+++ b/users/tacocat/home.nix
@@ -15,6 +15,7 @@
     packages = with pkgs; [
       rnote
       sops
+      mpv
       neovim
       libreoffice
       notify-desktop
@@ -62,7 +63,6 @@
     ./services
     ./shell
     ./helix
-    ./emacs
     ./wayland
   ];
 
diff --git a/users/tacocat/services/default.nix b/users/tacocat/services/default.nix
index 0ebba1f..8e9f5cc 100644
--- a/users/tacocat/services/default.nix
+++ b/users/tacocat/services/default.nix
@@ -6,8 +6,6 @@
 
   services.gammastep = {
     enable = true;
-    # dawnTime = "8:00-9:30";
-    # duskTime = "22:30-0:00";
     provider = "geoclue2";
     tray = true;
   };
diff --git a/users/tacocat/wayland/sway/config.d/autostart b/users/tacocat/wayland/sway/config.d/autostart
index 77cdb65..000f9b6 100755
--- a/users/tacocat/wayland/sway/config.d/autostart
+++ b/users/tacocat/wayland/sway/config.d/autostart
@@ -1,4 +1,5 @@
 exec nm-applet
+exec blueman-applet
 # exec systemctl --user restart wireplumber
 exec gammastep-indicator
 exec dunst