From 2e7f6e6ba72415a3b698a62a08fac0ddcb39fb8a Mon Sep 17 00:00:00 2001 From: josiah Date: Fri, 12 Mar 2021 14:30:42 -0600 Subject: [PATCH 1/7] Fix stupid path problems. --- .bashrc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bashrc b/.bashrc index 974d87f..4ac8fa7 100644 --- a/.bashrc +++ b/.bashrc @@ -10,12 +10,23 @@ set completion-ignore-case on # ignore case when tab-completing # 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 export EDITOR=emacsclient # blatantly steal micah's ls aliases because they make SO MUCH SENSE omg. From ba43baf3c6b6f753dacb83fc88ba1420b1ed072f Mon Sep 17 00:00:00 2001 From: josiah Date: Fri, 12 Mar 2021 14:30:55 -0600 Subject: [PATCH 2/7] Remove company-lsp as its no longer the right way --- .emacs.d/jlj-python.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.emacs.d/jlj-python.el b/.emacs.d/jlj-python.el index 9211858..b819051 100644 --- a/.emacs.d/jlj-python.el +++ b/.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 From ec4a2cff7eaf8389be41447859eec3829be4a25c Mon Sep 17 00:00:00 2001 From: josiah Date: Fri, 12 Mar 2021 14:31:12 -0600 Subject: [PATCH 3/7] Initial nixpkgs commit. --- .config/nixpkgs/config.nix | 1 + 1 file changed, 1 insertion(+) create mode 100644 .config/nixpkgs/config.nix diff --git a/.config/nixpkgs/config.nix b/.config/nixpkgs/config.nix new file mode 100644 index 0000000..f237423 --- /dev/null +++ b/.config/nixpkgs/config.nix @@ -0,0 +1 @@ + { allowUnfree = true; } From 16cd61f1071e9e222c6acbeeb0abe00ce675dce5 Mon Sep 17 00:00:00 2001 From: josiah Date: Sun, 14 Mar 2021 21:45:28 -0500 Subject: [PATCH 4/7] Create stumpwm init file --- .stumpwm.d/init.lisp | 75 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 .stumpwm.d/init.lisp diff --git a/.stumpwm.d/init.lisp b/.stumpwm.d/init.lisp new file mode 100644 index 0000000..6171cf9 --- /dev/null +++ b/.stumpwm.d/init.lisp @@ -0,0 +1,75 @@ +;; -*- 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") + +;; 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") From 6fe3d9eca3d9fb85327bbe822e04f7bd521b5e59 Mon Sep 17 00:00:00 2001 From: josiah Date: Sun, 14 Mar 2021 21:45:40 -0500 Subject: [PATCH 5/7] Move to stumpwm from awesome --- .xinitrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.xinitrc b/.xinitrc index 86088ac..a3ad176 100644 --- a/.xinitrc +++ b/.xinitrc @@ -1 +1 @@ -awesome +/home/josiah/.guix-profile/bin/stumpwm From 2985ff4688abe48238b6b9ad76533b2f89ed04fd Mon Sep 17 00:00:00 2001 From: josiah Date: Sun, 14 Mar 2021 21:46:24 -0500 Subject: [PATCH 6/7] fix pathing issues with .bashrc, .profile, by having them ref 3rd f. --- .bashrc | 21 +-------------------- .paths | 20 ++++++++++++++++++++ .profile | 26 ++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 20 deletions(-) create mode 100644 .paths create mode 100644 .profile diff --git a/.bashrc b/.bashrc index 4ac8fa7..a5c2d05 100644 --- a/.bashrc +++ b/.bashrc @@ -7,26 +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"} - -# 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 +source ~/.paths export EDITOR=emacsclient # blatantly steal micah's ls aliases because they make SO MUCH SENSE omg. diff --git a/.paths b/.paths new file mode 100644 index 0000000..d6cd7b9 --- /dev/null +++ b/.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 diff --git a/.profile b/.profile new file mode 100644 index 0000000..a124e41 --- /dev/null +++ b/.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 + From b9e3e4b4095180afe5b6fd6af0b382016535c3b6 Mon Sep 17 00:00:00 2001 From: josiah Date: Fri, 19 Mar 2021 15:54:03 -0500 Subject: [PATCH 7/7] full screen lol --- .stumpwm.d/init.lisp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.stumpwm.d/init.lisp b/.stumpwm.d/init.lisp index 6171cf9..9d1bfcc 100644 --- a/.stumpwm.d/init.lisp +++ b/.stumpwm.d/init.lisp @@ -51,6 +51,10 @@ (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 () () @@ -73,3 +77,4 @@ (define-key *root-map* (kbd "m") "mail") (define-key *root-map* (kbd "t") "terminal") (define-key *root-map* (kbd "r") "element") +