Browse Source

put things in .profile so emacs finds them

Josh Bicking 4 years ago
parent
commit
21c8f0cb63
7 changed files with 48 additions and 10 deletions
  1. 0 3
      bash/.bashrc
  2. 3 2
      i3/.config/i3/config
  3. 1 1
      i3/.config/i3/i3exit.sh
  4. 39 0
      profile/.profile
  5. 1 0
      profile/.zshenv
  6. 4 1
      spacemacs/.spacemacs
  7. 0 3
      zsh/.zshrc

+ 0 - 3
bash/.bashrc

@@ -20,6 +20,3 @@ alias hg='history | grep'
 # Use emacs as the default text editor
 export EDITOR="emacsclient -t"
 export VISUAL="emacsclient -c -a emacs"
-
-# local folder in PATH
-export PATH=$HOME/bin:$PATH

+ 3 - 2
i3/.config/i3/config

@@ -27,7 +27,7 @@ floating_modifier $mod
 
 # start a terminal
 #bindsym $mod+Return exec i3-sensible-terminal
-bindsym $mod+Return exec konsole
+bindsym $mod+Return exec i3-sensible-terminal
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -188,6 +188,7 @@ exec --no-startup-id xbacklight -set 12
 
 # System tray/background apps
 exec --no-startup-id nm-applet
+exec --no-startup-id pasystray
 exec --no-startup-id nextcloud
 exec --no-startup-id xfce4-clipman
 exec --no-startup-id discord
@@ -199,4 +200,4 @@ exec --no-startup-id compton
 # On launch apps
 exec --no-startup-id firefox
 
-# exec --no-startup-id feh --bg-scale ~/...
+exec --no-startup-id feh --bg-scale ~/Nextcloud/Backgrounds/garlic-space-green.jpg

+ 1 - 1
i3/.config/i3/i3exit.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -ex
 lock() {
         $HOME/.config/i3/i3lock/i3lock.sh
 }

+ 39 - 0
profile/.profile

@@ -0,0 +1,39 @@
+# ~/.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
+
+# if running bash
+if [ -n "$BASH_VERSION" ]; then
+    # include .bashrc if it exists
+    if [ -f "$HOME/.bashrc" ]; then
+	      . "$HOME/.bashrc"
+    fi
+fi
+
+if [ -d "$HOME/.pyenv/bin" ]; then
+    PATH="${PATH:+"$PATH:"}$HOME/.pyenv/bin"
+    eval "$(pyenv init -)"
+    eval "$(pyenv virtualenv-init -)"
+fi
+
+pathappend() {
+    for ARG in "$@"
+    do
+        if [ -d "$ARG" ] && [[ ":$PATH:" != *":$ARG:"* ]]; then
+            PATH="${PATH:+"$PATH:"}$ARG"
+        fi
+    done
+}
+
+pathappend "$HOME/bin"
+pathappend "$HOME/.local/bin"
+pathappend "$HOME/.cargo/bin"
+pathappend "$HOME/.poetry/bin"
+
+export RUST_SRC_PATH="$(rustc --print sysroot)/lib/rustlib/src/rust/src/"

+ 1 - 0
profile/.zshenv

@@ -0,0 +1 @@
+.profile

+ 4 - 1
spacemacs/.spacemacs

@@ -383,7 +383,10 @@ you should place your code here."
    flycheck-rust-cargo-executable "/home/josh/.cargo/bin/cargo"
    rust-cargo-bin "cargo")
 
-  (setq haskell-process-path-ghci "ghci"))
+  (setq haskell-process-path-ghci "ghci")
+  (with-eval-after-load 'rust-mode
+    (add-hook 'flycheck-mode-hook #'flycheck-rust-setup))
+  )
 
 ;; Do not write anything past this comment. This is where Emacs will
 ;; auto-generate custom variable definitions.

+ 0 - 3
zsh/.zshrc

@@ -1,9 +1,6 @@
 # local zsh config
 source ~/.zshrc.local
 
-export PATH=$PATH:$HOME/bin
-export PATH=$PATH:$HOME/.local/bin
-
 # load antigen if it exists
 if [ -h ~/.antigen.zsh ]
 then