Merge branch 'master' of git.awful.club:jowj/chd

.bashrc

@@ -7,15 +7,7 @@ shopt -s checkwinsize # fix line wrap issues
 
 set completion-ignore-case on # ignore case when tab-completing
 
-# find paths inside agares
-export AGARES=${AGARES:-"$HOME/.agares"}
-
-# update paths with installed executables:
-export PATH=/usr/local/bin:$PATH
-export PATH=/usr/local/share/python:$PATH
-export PATH=/Users/jowj/Library/Python/3.6/bin:$PATH
-export PATH=/home/josiah/.local/bin:$PATH
-export PATH=/home/josiah/.gem/ruby/2.6.0/bin:$PATH
+source ~/.paths
 export EDITOR=emacsclient
 
 # blatantly steal micah's ls aliases because they make SO MUCH SENSE omg.

.config/nixpkgs/config.nix

@@ -0,0 +1 @@
+  { allowUnfree = true; }

.emacs.d/jlj-python.el

@@ -34,11 +34,10 @@
   :hook (python-mode . lsp-deferred)
   :commands (lsp lsp-deferred))
 
-; let's add the lsp company backend
-(use-package company-lsp
-  :ensure t
-  :config
-  (push 'company-lsp company-backends))
+;; ; let's add the lsp company backend
+;; (use-package company-lsp
+;;   :config
+;;   (push 'company-lsp company-backends))
 
 ; also installs lsp as a dependency
 (use-package lsp-ui

.paths

@@ -0,0 +1,20 @@
+# find paths inside agares
+export AGARES=${AGARES:-"$HOME/.agares"}
+
+# guix stuff
+export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale
+export GUIX_PROFILE="$HOME/.guix-profile"
+source "$GUIX_PROFILE/etc/profile"
+
+# fuck with nix stuff
+export XDG_DATA_DIRS="/home/josiah/.nix-profile/share:$XDG_DATA_DIRS"
+if [ -e /home/josiah/.nix-profile/etc/profile.d/nix.sh ]; then 
+        . /home/josiah/.nix-profile/etc/profile.d/nix.sh
+fi
+# update paths with installed executables:
+export PATH=/usr/local/bin:$PATH
+export PATH=/usr/local/share/python:$PATH
+export PATH=/Users/jowj/Library/Python/3.6/bin:$PATH
+export PATH=/home/josiah/.local/bin:$PATH
+export PATH=/home/josiah/.gem/ruby/2.6.0/bin:$PATH
+export PATH=/home/josiah/.config/guix/current/bin/:$PATH

.profile

@@ -0,0 +1,26 @@
+# ~/.profile: executed by the command interpreter for login shells.
+# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
+# exists.
+# see /usr/share/doc/bash/examples/startup-files for examples.
+# the files are located in the bash-doc package.
+
+# the default umask is set in /etc/profile; for setting the umask
+# for ssh logins, install and configure the libpam-umask package.
+#umask 022
+
+source ~/.paths
+
+if [ -d "$HOME/bin" ] ; then
+    PATH="$HOME/bin:$PATH"
+fi
+
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/.local/bin" ] ; then
+    PATH="$HOME/.local/bin:$PATH"
+fi
+
+export LANG=en_US.UTF-8
+export LANGUAGE=en_US.UTF-8
+export LC_COLLATE=C
+export LC_CTYPE=en_US.UTF-8
+

.stumpwm.d/init.lisp

@@ -0,0 +1,80 @@
+;; -*- lisp -*-
+(in-package :stumpwm)
+
+;; hide the idiot laptop window
+(run-shell-command "xrandr --output HDMI-1 --mode 2560x1440 --pos 0x0 --rotate normal --primary --output DP-1 --off  --output DP-4 --off  --output DP-0 --off --output eDP-1 --off")
+
+;; mode line
+(stumpwm:set-fg-color "green")
+(stumpwm:set-bg-color "black")
+
+(setf *window-format* "%m%n%s%c")
+(setf *screen-mode-line-format* (list "[^B%n^b] %W^>%d"))
+;; enable-mode-line takes 3 args; screen, head, and state.
+;; state is just "t" if you want it on, i guess. lol. surely that's implied!!! by the func name!!!
+(stumpwm:enable-mode-line (stumpwm:current-screen)
+                          (stumpwm:current-head)
+			  t)
+
+;; sane defaults, you morons
+
+(setf *message-window-gravity* :bottom-right)
+(setf *input-window-gravity* :center)
+(setf *mouse-focus-policy* :click)
+;set my prefix key to be reasonable
+(set-prefix-key (kbd "C-M-S-s-SPC"))
+
+
+;; group config
+(grename "www")
+(gnewbg "term")
+(gnewbg "emc")
+(gnewbg "mail")
+(gnewbg "comms")
+
+;; (defun jlj/rofi
+;;     "just runs rofi for me :)"
+;;     (run-shell-command "rofi -show combi"))
+
+(defcommand jlj/rofi () ()
+  "Start Emacs or switch to it, if it is already running."
+  (run-shell-command "rofi -combi-modi window,drun,ssh -theme purple -font 'hack 10' -show combi"))
+
+(define-key *root-map* (kbd "R") "restart-hard")
+(define-key *top-map* (kbd "M-SPC") "jlj/rofi")
+
+;; group management
+;;;; note that this is still the hyper key, its just that shift + 1 = !, etc.
+(define-key *top-map* (kbd "C-M-s-!") "gselect 1")
+(define-key *top-map* (kbd "C-M-s-@") "gselect 2")
+(define-key *top-map* (kbd "C-M-s-#") "gselect 3")
+(define-key *top-map* (kbd "C-M-s-$") "gselect 4")
+(define-key *top-map* (kbd "C-M-s-%") "gselect 5")
+
+;; ok only one of these definitely did not work, the fucker
+(define-key *top-map* (kbd "C-M-s-f") "fullscreen")
+(define-key *top-map* (kbd "C-M-s-F") "fullscreen")
+
+;; app menu keys
+;;;; you defcommands as wrapper to running/raising/shelling out, so you can call it later.
+(defcommand firefox () ()
+  "Start Firefox or switch to it, if it is already running."
+  (run-or-raise "firefox" '(:class "Firefox")))
+
+(defcommand mail () ()
+  "Start fastmail or switch to it, if it is already running."
+  (run-or-raise "fastmail" '(:class "Fastmail")))
+
+(defcommand terminal () ()
+  "Start gnome-terminal or switch to it, if it is already running."
+  (run-or-raise "gnome-terminal" '(:class "Terminal")))
+
+(defcommand element () ()
+  "Start gnome-terminal or switch to it, if it is already running."
+  (run-or-raise "element-desktop" '(:class "Element")))
+
+(define-key *root-map* (kbd "f") "firefox")
+(define-key *root-map* (kbd "m") "mail")
+(define-key *root-map* (kbd "t") "terminal")
+(define-key *root-map* (kbd "r") "element")
+

.xinitrc

@@ -1 +1 @@
-awesome
+/home/josiah/.guix-profile/bin/stumpwm