From: Ian Kelling Date: Fri, 28 Oct 2016 13:30:59 +0000 (-0700) Subject: various improvements X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=commitdiff_plain;h=7bb80db9b2945f6d2aca34291410a29794b1ceb5 various improvements --- diff --git a/.gitconfig b/.gitconfig index 0070361..debc9e6 100644 --- a/.gitconfig +++ b/.gitconfig @@ -5,6 +5,7 @@ co = checkout s = status ci = commit + lol = log --graph --decorate --pretty=oneline --abbrev-commit --all [core] excludesfile = /home/ian/.gitignore_global [github] @@ -25,14 +26,32 @@ [gitreview] username = iank + remote = origin # this is for newer git version. Doesn't work for ubuntu 12.04's version #[push] # default = simple [color] ui = auto + status = auto + branch = auto + interactive = auto + diff = auto # for hooks. http://stackoverflow.com/questions/2293498/git-commit-hooks-global-settings [init] templatedir = ~/.git_template [difftool] tool = meld prompt = false +[format] +# for format-patch, use --base=auto. This means we need to do +# git branch --set-upstream-to + useAutoBase = true +[branch] +# sets local branches to have the same remote tracking branch. +# This allows the useAutoBase setting to work without having to +# setup the branch specially with +# git branch --set-upstream-to origin/my_branch +# or git checkout -b my-branch origin/whatever + autoSetupMerge = always + # git pull always does rebase by default + autoSetupRebase = always diff --git a/filesystem/etc/cron.weekly/btrfs-balance-ian b/filesystem/etc/cron.weekly/btrfs-balance-ian index f03c69b..7447740 100755 --- a/filesystem/etc/cron.weekly/btrfs-balance-ian +++ b/filesystem/etc/cron.weekly/btrfs-balance-ian @@ -45,7 +45,10 @@ for x in $($fnd --output "SOURCE" --nofsroot | sort -u); do ) if [[ $date ]]; then date=$(date --date="$date" +%s) - # if date is sooner than 30 days ago + # if date is sooner than 90 days ago + # the wiki recommends 30 days or so, but + # it makes the comp lag like shit for a day, + # so I'm going with 90 days. if (( $date > `date +%s` - 60*60*24*30 )); then echo "skiping scrub of $mnt" continue diff --git a/machine_specific/treetowl/filesystem/etc/btrbk.conf b/machine_specific/treetowl/filesystem/etc/btrbk.conf index 95093f8..d231b26 100644 --- a/machine_specific/treetowl/filesystem/etc/btrbk.conf +++ b/machine_specific/treetowl/filesystem/etc/btrbk.conf @@ -14,7 +14,7 @@ snapshot_preserve_weekly 0 snapshot_preserve_monthly 0 # if something fails and it's not obvious, try doing -btrbk -l debug dryrun +# btrbk -l debug dryrun volume /mnt/btrfs_root subvolume i target send-receive ssh://frodo/mnt/btrfs_root diff --git a/machine_specific/treetowl/subdir_files/.mozilla/firefox/profiles.ini b/machine_specific/treetowl/subdir_files/.mozilla/firefox/profiles.ini index 9115509..e69d7bc 100644 --- a/machine_specific/treetowl/subdir_files/.mozilla/firefox/profiles.ini +++ b/machine_specific/treetowl/subdir_files/.mozilla/firefox/profiles.ini @@ -3,8 +3,8 @@ StartWithLastProfile=1 [Profile0] Name=default -IsRelative=1 -Path=treetowl.default +IsRelative=0 +Path=/p/c/treetowl.default Default=1 [Profile1] diff --git a/subdir_files/.config/i3/config b/subdir_files/.config/i3/config new file mode 100644 index 0000000..ba4dc68 --- /dev/null +++ b/subdir_files/.config/i3/config @@ -0,0 +1,77 @@ +# This file has been auto-generated by i3-config-wizard(1). +# It will not be overwritten, so edit it as you like. +# +# Should you change your keyboard layout some time, delete +# this file and re-run i3-config-wizard(1). +# + +# i3 config file (v4) +# +# Please see http://i3wm.org/docs/userguide.html for a complete reference! + +set $mod Mod4 + + +# exit i3 (logs you out of your X session) +bindsym $mod+q exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" + +bindsym $mod+2 exec "pavucontrol" +bindsym $mod+3 exec "firefox" +bindsym $mod+4 exec "input-setup" +bindsym $mod+w exec "/a/bin/redshift.sh 2" +bindsym $mod+e exec "/a/bin/redshift.sh 1" +bindsym $mod+r exec "/a/bin/redshift.sh 0" +# todo, add mod+t for cycle layout +bindsym $mod+t layout toggle split +# move focused window +bindsym $mod+Delete move left +bindsym $mod+parenright move right +# todo, some other binds in here and beyond. +# reload the configuration file. change to restart if needed. +bindsym $mod+p restart +# start a terminal +bindsym $mod+k exec i3-sensible-terminal +# start dmenu (a program launcher) +bindsym $mod+l exec dmenu_run +# kill focused window +bindsym $mod+c kill + +# Use Mouse+$mod to drag floating windows to their wanted position +floating_modifier $mod + +bindsym F8 focus down + +bindsym $mod+b layout stacking + +# todo, other workspaces +# switch to workspace +bindsym $mod+f workspace 1 +bindsym $mod+d workspace 2 +bindsym $mod+s workspace 3 +bindsym $mod+a workspace 4 +bindsym $mod+7 workspace 5 +bindsym $mod+0 workspace 6 + +# move focused container to workspace +bindsym $mod+Shift+f move container to workspace 1 +bindsym $mod+Shift+d move container to workspace 2 +bindsym $mod+Shift+s move container to workspace 3 +bindsym $mod+Shift+a move container to workspace 4 +bindsym $mod+Shift+7 move container to workspace 5 +bindsym $mod+Shift+0 move container to workspace 6 + + +# Font for window titles. Will also be used by the bar unless a different font +# is used in the bar {} block below. +font pango:monospace 8 + +# This font is widely installed, provides lots of unicode glyphs, right-to-left +# text rendering and scalability on retina/hidpi displays (thanks to pango). +#font pango:DejaVu Sans Mono 8 + +# Before i3 v4.8, we used to recommend this one as the default: +# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1 +# The font above is very space-efficient, that is, it looks good, sharp and +# clear in small sizes. However, its unicode glyph coverage is limited, the old +# X core fonts rendering does not support right-to-left and this being a bitmap +# font, it doesn’t scale on retina/hidpi displays. diff --git a/subdir_files/.config/mpv/mpv.conf b/subdir_files/.config/mpv/mpv.conf index fe2cd56..b12a19b 100644 --- a/subdir_files/.config/mpv/mpv.conf +++ b/subdir_files/.config/mpv/mpv.conf @@ -1 +1,2 @@ loop=inf +shuffle diff --git a/subdir_files/.xmonad/xmonad.hs b/subdir_files/.xmonad/xmonad.hs index 12423d1..9ab7bec 100644 --- a/subdir_files/.xmonad/xmonad.hs +++ b/subdir_files/.xmonad/xmonad.hs @@ -82,7 +82,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ , ((modm, xK_2), spawn "pavucontrol") , ((modm, xK_3), spawn "firefox") - , ((modm, xK_4), spawn "input-setup.sh") + , ((modm, xK_4), spawn "input-setup") -- we would really want to keep track of which workspace is darkened, -- and change things depending on where that workspace is @@ -188,7 +188,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ - -- open workspace, and send to workspace with same key plus control + -- open workspace, and send to workspace with same key plus shift [((m .|. modm, k), windows $ f i) | (i, k) <- zip (XMonad.workspaces conf) [xK_f, xK_d, xK_s, xK_a, xK_z, xK_grave, xK_7, xK_0] , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]]