aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÓscar Nájera <hi@oscarnajera.com>2022-04-01 19:04:30 +0200
committerÓscar Nájera <hi@oscarnajera.com>2022-04-01 19:04:30 +0200
commitae976c2bd8a4b72174f001d84a52850dae01ebeb (patch)
tree9e5e3ece26408970ca0983af173b1a5b5fc7b689
parent9c94f06db9fdc9d40f98a0abd4a9646977f45ea1 (diff)
downloaddotfiles-ae976c2bd8a4b72174f001d84a52850dae01ebeb.tar.gz
dotfiles-ae976c2bd8a4b72174f001d84a52850dae01ebeb.tar.bz2
dotfiles-ae976c2bd8a4b72174f001d84a52850dae01ebeb.zip
Clear employer configs
-rwxr-xr-xbin/tagmail7
-rw-r--r--calendars.conf7
-rw-r--r--config/awesome/rc.lua24
-rw-r--r--config/doom/config.org26
-rw-r--r--config/doom/snippets/message-mode/employer_signature13
-rw-r--r--config/doom/snippets/python-mode/cmktrace7
-rw-r--r--config/doom/snippets/python-mode/cmkwarn7
-rw-r--r--git/tribe292
-rw-r--r--home-dots/dot-zshrc1
-rwxr-xr-xinstall.scm17
-rw-r--r--mail/dot-mbsyncrc.work28
11 files changed, 12 insertions, 127 deletions
diff --git a/bin/tagmail b/bin/tagmail
index 90838bd..31a236d 100755
--- a/bin/tagmail
+++ b/bin/tagmail
@@ -160,11 +160,7 @@ LD_LIBRARY_PATH=$HOME/.guix-profile/lib exec guile -e main -s "$0" "$@"
(define tag-rules
'(("+ci" "from:travis-ci.com or from:travis-ci.org or from:appveyor.com or from:circleci.com or from:mg.gitlab.com and subject:Pipeline")
- ("+CMK-JIRA -inbox" "from:infra@mathias-kettner.de or (from:jira and not subject:\"mentioned you\")")
("+slack" "from:slack.com")
- ("+alle-mk" "to:alle@mathias-kettner.de to:technik@tribe29.com")
- ("+cmk-commits" "to:cmk-internal-commits@mathias-kettner.de")
- ("+cma-commits" "to:cma-commits@mathias-kettner.de")
("+immonews" "from:immobilienscout24.de")
("+immonews/communications" "from:nachrichten.immobilienscout24.de or subject:Kontaktaufnahme and tag:immonews")
("+socialnews" "from:facebookmail.com or from:mail.instagram.com")
@@ -181,8 +177,7 @@ LD_LIBRARY_PATH=$HOME/.guix-profile/lib exec guile -e main -s "$0" "$@"
(define (clear-inbox options ffi-db)
(display (colorize-string "[Inbox]\n" 'BOLD 'YELLOW))
- (let* ((my-emails (list "hi@oscarnajera.com" "hello@oscarnajera.com" "najera.oscar@gmail.com"
- "on@mathias-kettner.de" "oscar.najera@tribe29.com"))
+ (let* ((my-emails (list "hi@oscarnajera.com" "hello@oscarnajera.com" "najera.oscar@gmail.com"))
(sent (format #f "(~{from:~a~^ OR ~}) AND NOT (~:*~{to:~a~^ OR ~})" my-emails)))
(notmuch-tag options ffi-db `(("+sent" ,sent "Emails I have sent")
("+inbox" "*" "Inbox for the rest")) #t)))
diff --git a/calendars.conf b/calendars.conf
index b39d2dc..2042992 100644
--- a/calendars.conf
+++ b/calendars.conf
@@ -12,13 +12,6 @@ passwordstore=CS_storage/cloud.oscarnajera.com:https
url=https://cloud.oscarnajera.com/remote.php/dav/addressbooks/users/oscar/{}?export
addressbooks=contacts
-[work]
-user = on
-passwordstore=Correos/mx.tribe29.com
-url=https://mx.tribe29.com/home/on/{}
-calendars = Calendar
-#Entwickler%20Kalender
-
[personal]
user = oscar
passwordstore=CS_storage/cloud.oscarnajera.com:https
diff --git a/config/awesome/rc.lua b/config/awesome/rc.lua
index 633d2f0..0235ea3 100644
--- a/config/awesome/rc.lua
+++ b/config/awesome/rc.lua
@@ -42,13 +42,10 @@ end
local hostname = io.popen("uname -n"):read()
-- Setup laptop screen
-if "titanroam" == hostname then
- -- awful.spawn.with_shell("nvidia-settings -a [gpu:0]/GPUPowerMizerMode=1") -- load the gpu performance profile saved in home
- awful.spawn.with_shell("xrandr --output eDP1 --mode 1920x1080 --output HDMI2 --mode 1920x1080 --left-of eDP1 --primary")
- awful.spawn.with_shell("xinput --set-prop \"SYN1B7E:01 06CB:2970 Touchpad\" \"Synaptics Two-Finger Scrolling\" 1 1")
-elseif "klappbier" == hostname or "archlive" == hostname then
- awful.spawn.with_shell("xrandr --output eDP-1 --mode 1920x1080 --pos 0x0 --output DP-1-2 --mode 2560x1440 --pos 3840x0 --output DP-1-3 --primary --mode 1920x1080 --pos 1920x0")
-end
+-- awful.spawn.with_shell("nvidia-settings -a [gpu:0]/GPUPowerMizerMode=1") -- load the gpu performance profile saved in home
+awful.spawn.with_shell("xrandr --output eDP-1 --mode 1920x1080 --pos 0x0 --output HDMI-2 --primary --mode 1920x1080 --pos 1920x0")
+awful.spawn.with_shell("xinput --set-prop \"SYN1B7E:01 06CB:2970 Touchpad\" \"Synaptics Two-Finger Scrolling\" 1 1")
+
-- {{{ Variable definitions
-- Themes define colours, icons, font and wallpapers.
@@ -68,12 +65,6 @@ local tools = {
habit = "/home/titan/dev/helpful_scripts/guile/habit.scm",
}
-if "klappbier" == hostname then
- tools.terminal = "gnome-terminal"
- tools.filemanager = "nautilus"
- tools.pass = "/usr/share/doc/pass/examples/dmenu/passmenu"
-end
-
-- Default modkey.
-- Usually, Mod4 is the key with a logo between Control and Alt.
-- If you do not like this or do not have such a key,
@@ -162,12 +153,7 @@ local tasklist_buttons = gears.table.join(
end))
local function set_wallpaper(s)
- local wallpaper
- if "archlive" == hostname then
- wallpaper = awful.util.getdir("config") .. "brown-hair-brunette-green-eyes.jpg"
- elseif "klappbier" == hostname or "archlive" == hostname then
- wallpaper = awful.util.getdir("config") .. "hot sexy red hair girls.jpg"
- end
+ local wallpaper = awful.util.getdir("config") .. "brown-hair-brunette-green-eyes.jpg"
gears.wallpaper.maximized(wallpaper, s, true)
end
diff --git a/config/doom/config.org b/config/doom/config.org
index 8684b3d..5fa2e01 100644
--- a/config/doom/config.org
+++ b/config/doom/config.org
@@ -4,9 +4,7 @@
* Personal information
#+begin_src emacs-lisp
(setq user-full-name "Óscar Nájera"
- user-mail-address (if (string-equal (user-login-name) "on")
- "oscar.najera@tribe29.com"
- "hi@oscarnajera.com"))
+ user-mail-address "hi@oscarnajera.com")
#+end_src
* Editor
** Theme
@@ -33,9 +31,7 @@ Doom manages packages separately. Keep that file separate
#+end_src
** SSH agent
#+begin_src emacs-lisp
-(if (string-equal (user-login-name) "on")
- (setenv "SSH_AUTH_SOCK" (concat "/run/user/1000/gnupg/S.gpg-agent.ssh"))
- (setenv "SSH_AUTH_SOCK" (concat (getenv "XDG_RUNTIME_DIR")"/gnupg/S.gpg-agent.ssh")))
+(setenv "SSH_AUTH_SOCK" (concat (getenv "XDG_RUNTIME_DIR")"/gnupg/S.gpg-agent.ssh"))
#+end_src
** Avy
This allows me to jump to buffer positions using my home row ordering
@@ -221,7 +217,6 @@ this new window.
(setq notmuch-saved-searches
'((:name "inbox" :query "tag:inbox" :key "i" :sort-order newest-first)
- (:name "CMK" :query "(tag:CMK-JIRA or tag:lists/gerrit-check_mk) and tag:unread" :key "c")
(:name "Isar-Speak" :query "(tag:Isar-Speak or tag:lists/isar-speak-officers) and tag:unread" :key "t")
(:name "flagged" :query "tag:flagged" :key "f")
(:name "sent" :query "tag:sent" :key "s")
@@ -232,7 +227,6 @@ this new window.
notmuch-hello-tag-list-make-query "tag:unread and not tag:killed")
(setq notmuch-fcc-dirs '((".*@oscarnajera.com" . "hi_pers/Sent")
- ("oscar.najera@tribe29.com" . "work/Sent")
;;(".*@gmail.com" . "\"gmail/[Gmail]/.Sent Mail\"")
))
@@ -304,9 +298,7 @@ this new window.
(defun set-smtp-server ()
(let* ((default-smtp-conf '("mail.oscarnajera.com" 587 starttls "hi"))
(smtp-from-server-alist
- '(("Oscar Najera <oscar.najera@tribe29.com>"
- "mx.tribe29.com" 587 starttls "oscar.najera")
- ("Oscar Najera <najera.oscar@gmail.com>"
+ '(("Oscar Najera <najera.oscar@gmail.com>"
"smtp.googlemail.com" 587 starttls "najera.oscar")))
(smtp-conf (alist-get (save-restriction
(message-narrow-to-headers)
@@ -433,15 +425,3 @@ Emacs mode for managing ledger text files
#+begin_src emacs-lisp
(use-package! guix)
#+end_src
-* Check_MK
-#+BEGIN_SRC emacs-lisp
-(when (string-equal (user-login-name) "on")
- (global-set-key (kbd "<f10>")
- (lambda ()
- (interactive)
- (async-shell-command "WEBPACK_MODE=quick ~/git/zeug_cmk/bin/f12" "*f12*")))
- (global-set-key (kbd "<f9>")
- (lambda ()
- (interactive)
- (async-shell-command "cd ~/git/check_mk/managed/ && ~/git/check_mk/managed/.f12" "*f12*"))))
-#+END_SRC
diff --git a/config/doom/snippets/message-mode/employer_signature b/config/doom/snippets/message-mode/employer_signature
deleted file mode 100644
index 6e202b8..0000000
--- a/config/doom/snippets/message-mode/employer_signature
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- mode: snippet -*-
-# name: employer_signature
-# key: sig
-# --
-Oscar Najera
-Software Developer
-
-tribe29 GmbH — The Check_MK Company
-oscar.najera@tribe29.com | Phone: +49 89 9982 097 00 | https://tribe29.com
-
-Kellerstraße 29, 81667 München, Germany
-Amtsgericht München, HRB 165902
-Geschäftsführer: Jan Justus, Mathias Kettner \ No newline at end of file
diff --git a/config/doom/snippets/python-mode/cmktrace b/config/doom/snippets/python-mode/cmktrace
deleted file mode 100644
index 85f42a3..0000000
--- a/config/doom/snippets/python-mode/cmktrace
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: cmktrace
-# key: ctrace
-# --
-import traceback
-from cmk.gui.log import logger
-logger.warn("\n\n"+"\n".join(traceback.format_stack()))
diff --git a/config/doom/snippets/python-mode/cmkwarn b/config/doom/snippets/python-mode/cmkwarn
deleted file mode 100644
index d3fe8f9..0000000
--- a/config/doom/snippets/python-mode/cmkwarn
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: cmkwarn
-# key: warn
-# --
-from cmk.gui.log import logger
-import pprint
-logger.warning(pprint.pformat(("$1", $0))) \ No newline at end of file
diff --git a/git/tribe29 b/git/tribe29
deleted file mode 100644
index 4e47e4b..0000000
--- a/git/tribe29
+++ /dev/null
@@ -1,2 +0,0 @@
-[user]
- email = oscar.najera@tribe29.com \ No newline at end of file
diff --git a/home-dots/dot-zshrc b/home-dots/dot-zshrc
index 2a3efb5..5bb7125 100644
--- a/home-dots/dot-zshrc
+++ b/home-dots/dot-zshrc
@@ -66,7 +66,6 @@ plugins=(git archlinux gpg-agent)
# export MANPATH="/usr/local/man:$MANPATH"
export PATH="$HOME/.local/bin:$PATH"
-export PATH="$HOME/git/zeug_cmk/bin:$PATH"
lruby() {
export PATH="$(ruby -e 'puts Gem.user_dir')/bin:$PATH"
diff --git a/install.scm b/install.scm
index 5999f41..ba37465 100755
--- a/install.scm
+++ b/install.scm
@@ -162,8 +162,6 @@
(log-msg 'INFO "Configuring git")
(log-msg 'INFO " Symlink global config")
(config-links "git/global-gitconfig" "~/.gitconfig" #f)
- (log-msg 'INFO " Symlink Tribe29 config")
- (config-links "git/tribe29" "~/git/.gitconfig" #f))
(define (format-config-entry item)
(format #t "[~a]~%" (car item))
@@ -172,24 +170,15 @@
(define (mail-config)
(log-msg 'INFO "Configuring mail")
(log-msg 'INFO " Symlink mbsync")
- (config-links (if (string=? (gethostname) "klappbier")
- "mail/dot-mbsyncrc.work"
- "mail/dot-mbsyncrc.personal")
- "~/.mbsyncrc" #f)
+ (config-links "mail/dot-mbsyncrc.personal" "~/.mbsyncrc" #f)
(let* ((notmuch-config-file (expand-file "~/.notmuch-config"))
(emails
(list
"hi@oscarnajera.com"
"hello@oscarnajera.com"
"najera.oscar@gmail.com"
- "oscar.najera-ocampo@u-psud.fr"
- ;; Employer related
- "oscar.najera@tribe29.com"
- "on@mathias-kettner.de"))
- (user-mail
- (if (string=? (gethostname) "klappbier")
- "oscar.najera@tribe29.com"
- "hi@oscarnajera.com"))
+ ))
+ (user-mail "hi@oscarnajera.com")
;; setting up notmuch config
(config
`((database (path ,(expand-file "~/.mail")))
diff --git a/mail/dot-mbsyncrc.work b/mail/dot-mbsyncrc.work
deleted file mode 100644
index 26092e8..0000000
--- a/mail/dot-mbsyncrc.work
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Work
-IMAPAccount work
-Host mx.tribe29.com
-User on
-PassCmd "pass show tribe29.com/mx"
-AuthMechs LOGIN
-SSLType IMAPS
-
-IMAPStore work-remote
-Account work
-
-MaildirStore work-local
-Path ~/.mail/work/
-Inbox ~/.mail/work/Inbox
-SubFolders Verbatim
-
-Channel work
-Far :work-remote:
-Near :work-local:
-Patterns *
-Create Both
-SyncState *
-Expunge Both
-
-# Local Variables:
-# mode: conf-unix
-# End: