diff options
Diffstat (limited to 'users')
9 files changed, 7 insertions, 197 deletions
diff --git a/users/glittershark/emacs.d/config.el b/users/glittershark/emacs.d/config.el index 29d46e24e0c0..659f26ea76e4 100644 --- a/users/glittershark/emacs.d/config.el +++ b/users/glittershark/emacs.d/config.el @@ -284,34 +284,6 @@ (setq doom-modeline-height 12) -(load "/home/grfn/code/org-clubhouse/org-clubhouse.el") -(use-package! org-clubhouse - :config - (setq org-clubhouse-state-alist - '(("PROPOSED" . "Proposed") - ("BACKLOG" . "Backlog") - ("TODO" . "Scheduled") - ("ACTIVE" . "In Progress") - ("PR" . "Peer Review") - ("TESTING" . "Stakeholder Review") - ("DONE" . "Completed")) - org-clubhouse-username "griffin" - org-clubhouse-claim-story-on-status-update - '("ACTIVE" "PR" "TESTING" "DONE") - org-clubhouse-create-stories-with-labels 'existing - org-clubhouse-workflow-name "Urbint") - - (defun grfn/sprint-tasks () - (interactive) - (find-file "/home/griffin/notes/work.org") - (goto-char 1) - (search-forward "* Sprint Tasks") - (goto-eol) (insert-char ?\n) - (org-clubhouse-headlines-from-query - 2 - "owner:griffin state:Scheduled"))) - - ;; Should really figure out which of these is correct, eventually @@ -521,34 +493,6 @@ ; ) -(defun urbint/format-haskell-source () - (interactive) - (let ((output-buffer (generate-new-buffer "brittany-out")) - (config-file-path - (concat (string-trim - (shell-command-to-string "stack path --project-root")) - "/brittany.yaml"))) - (when (= 0 (call-process-region - (point-min) (point-max) - "stack" - nil output-buffer nil - "exec" "--" "brittany" "--config-file" config-file-path)) - (let ((pt (point)) - (wst (window-start)) - (formatted-source (with-current-buffer output-buffer - (buffer-string)))) - (erase-buffer) - (insert formatted-source) - (goto-char pt) - (set-window-start nil wst))))) - -(add-hook - 'before-save-hook - (lambda () - (when (and (eq major-mode 'haskell-mode) - (bound-and-true-p brittany-haskell-mode)) - (urbint/format-haskell-source)))) - (require 'alert) (setq alert-default-style 'libnotify) @@ -1129,39 +1073,6 @@ ) ) -;; (use-package! mu4e -;; :config -;; (setq mu4e-contexts -;; `(,(make-mu4e-context -;; :name "work" -;; :match-func -;; (lambda (msg) -;; (when msg -;; (string-match-p "^/work" -;; (mu4e-message-field msg :maildir)))) -;; :vars -;; '((user-mail-address . "griffin@urbint.com"))) -;; ,(make-mu4e-context -;; :name "personal" -;; :match-func -;; (lambda (msg) -;; (when msg -;; (string-match-p "^/personal" -;; (mu4e-message-field msg :maildir)))) -;; :vars -;; '((user-mail-address . "root@gws.fyi")))) -;; mu4e-maildir (expand-file-name "mail" "~") -;; sendmail-program "msmtp" -;; send-mail-function #'smtpmail-send-it -;; message-sendmail-f-is-evil t -;; message-sendmail-extra-arguments '("--read-envelope-from") -;; message-send-mail-function #'message-send-mail-with-sendmail) - -;; (set-email-account! -;; "work" -;; '((user-mail-address . "griffin@urbint.com") -;; (smtmpmail-smtp-user . "griffin@urbint.com")))) - (solaire-global-mode -1) (use-package! wsd-mode) diff --git a/users/glittershark/system/home/machines/chupacabra.nix b/users/glittershark/system/home/machines/chupacabra.nix index a3d841839b0d..105882ba571d 100644 --- a/users/glittershark/system/home/machines/chupacabra.nix +++ b/users/glittershark/system/home/machines/chupacabra.nix @@ -10,7 +10,6 @@ in { ../modules/common.nix ../modules/games.nix ../modules/rtlsdr.nix - ../modules/urbint.nix ../modules/ptt.nix ]; diff --git a/users/glittershark/system/home/modules/development.nix b/users/glittershark/system/home/modules/development.nix index 3056f8547a0d..fd00be86375a 100644 --- a/users/glittershark/system/home/modules/development.nix +++ b/users/glittershark/system/home/modules/development.nix @@ -32,7 +32,6 @@ with lib; imports = [ ./lib/zshFunctions.nix ./development/kube.nix - ./development/urbint.nix ./development/agda.nix ]; diff --git a/users/glittershark/system/home/modules/development/urbint.nix b/users/glittershark/system/home/modules/development/urbint.nix deleted file mode 100644 index 63f92bf50d4e..000000000000 --- a/users/glittershark/system/home/modules/development/urbint.nix +++ /dev/null @@ -1,55 +0,0 @@ -# urbint-only dev stuff -{ config, lib, pkgs, ... }: - -let - - yarn2nix = (import (pkgs.fetchFromGitHub { - owner = "moretea"; - repo = "yarn2nix"; - rev = "9e7279edde2a4e0f5ec04c53f5cd64440a27a1ae"; - sha256 = "0zz2lrwn3y3rb8gzaiwxgz02dvy3s552zc70zvfqc0zh5dhydgn7"; - }) { inherit pkgs; }).yarn2nix; - -in - -{ - home.packages = with pkgs; [ - yarn2nix - python36 - python36Packages.ipython - ]; - - programs.zsh = { - shellAliases = { - ipy = "ipython"; - amerge = "alembic merge heads"; - }; - - functions = { - aup = "alembic upgrade \${1:-head}"; - adown = "alembic downgrade \${1:--1}"; - }; - }; - - programs.git = { - extraConfig.filter.black100to80 = - let inherit (pkgs.python36Packages) black; in { - clean = "${black}/bin/black --target-version py36 -l 100 -"; - smudge = "${black}/bin/black --target-version py36 -l 80 -"; - }; - - - includes = [{ - condition = "gitdir:~/code/urb/"; - contents = { - user.email = "grfn@urbint.com"; - }; - }]; - }; - - home.file.".ipython/profile_default/ipython_config.py".text = '' - c.InteractiveShellApp.exec_lines = ['%autoreload 2'] - c.InteractiveShellApp.extensions = ['autoreload'] - c.TerminalInteractiveShell.editing_mode = 'vi' - ''; -} diff --git a/users/glittershark/system/home/modules/email.nix b/users/glittershark/system/home/modules/email.nix index 48d6b5f3cc04..77e068f43fbb 100644 --- a/users/glittershark/system/home/modules/email.nix +++ b/users/glittershark/system/home/modules/email.nix @@ -12,15 +12,10 @@ let in stringAsChars subst name; accounts = { - work = { - primary = true; - address = "griffin@urbint.com"; - aliases = [ "grfn@urbint.com" ]; - passEntry = "urbint/msmtp-app-password"; - }; - personal = { + primary = true; address = "root@gws.fyi"; + aliases = [ "grfn@gws.fyi" ]; passEntry = "root-gws-msmtp"; }; }; diff --git a/users/glittershark/system/home/modules/shell.nix b/users/glittershark/system/home/modules/shell.nix index 8d4febbb5d73..09d2c6356172 100644 --- a/users/glittershark/system/home/modules/shell.nix +++ b/users/glittershark/system/home/modules/shell.nix @@ -15,8 +15,6 @@ let ns = "nix-shell"; nb = "nix build -f ."; nbl = "nix build -f . --builders ''"; # nix build local - nc = "nix copy --to https://nix.urbinternal.com"; - "nc." = "nix copy -f . --to https://nix.urbinternal.com"; lwo = "lorri watch --once"; # Docker and friends diff --git a/users/glittershark/system/home/modules/urbint.nix b/users/glittershark/system/home/modules/urbint.nix deleted file mode 100644 index 013735f0de74..000000000000 --- a/users/glittershark/system/home/modules/urbint.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, lib, pkgs, ... }: - -if lib.pathExists (~/code/urb/urbos) -then { - imports = - [ ~/code/urb/urbos/home ]; - - urbint.projectPath = "code/urb"; -} else {} diff --git a/users/glittershark/system/system/machines/chupacabra.nix b/users/glittershark/system/system/machines/chupacabra.nix index 38ec11e97769..6793d7211836 100644 --- a/users/glittershark/system/system/machines/chupacabra.nix +++ b/users/glittershark/system/system/machines/chupacabra.nix @@ -5,7 +5,6 @@ ../modules/common.nix ../modules/reusable/battery.nix ../modules/tvl.nix - ../modules/urbint.nix ../modules/fcitx.nix ../modules/rtlsdr.nix ../../../../../ops/nixos/v4l2loopback.nix @@ -42,9 +41,13 @@ }; }; - kernel.sysctl."vm.swappiness" = 1; kernelModules = [ "kvm-intel" ]; kernelParams = [ "acpi_rev_override" ]; + + kernel.sysctl = { + "kernel.perf_event_paranoid" = -1; + "vm.swappiness" = 1; + }; }; services.thermald.enable = true; diff --git a/users/glittershark/system/system/modules/urbint.nix b/users/glittershark/system/system/modules/urbint.nix deleted file mode 100644 index 9790b69dcbb5..000000000000 --- a/users/glittershark/system/system/modules/urbint.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -{ - virtualisation.docker.enable = true; - - nix = rec { - binaryCaches = [ "https://nix.urbinternal.com" ]; - trustedBinaryCaches = binaryCaches; - requireSignedBinaryCaches = false; - }; - - services.openvpn.servers.urbint = { - config = '' - config /root/openvpn/urbint.conf - ''; - autoStart = false; - }; - - users.users."grfn".extraGroups = [ "docker" ]; - - services.clamav = { - daemon.enable = true; - updater = { - enable = true; - interval = "daily"; - frequency = 1; # per day - }; - }; -} |