Skip to content

Commit

Permalink
Drop support of Kubuntu and Ubuntu Server. This now only targets macOS.
Browse files Browse the repository at this point in the history
  • Loading branch information
kdeldycke committed Jan 22, 2020
1 parent cc9d008 commit e667245
Show file tree
Hide file tree
Showing 13 changed files with 55 additions and 643 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ matrix:
- os: osx

os:
- linux
- osx

install:
Expand Down
48 changes: 6 additions & 42 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,43 +1,27 @@
# Kevin's dotfiles [![Build Status](https://img.shields.io/travis/kdeldycke/maildir-deduplicate/develop.svg?style=flat)](https://travis-ci.org/kdeldycke/dotfiles)

Dot-files and system configuration for Python developers, targetting
**macOS**, **Kubuntu** and **Ubuntu Server**.
Dot-files and system configuration for Python developers on **macOS**.

![Mac OS X 10.13 High Sierra solarized terminal and vim
](https://raw.githubusercontent.com/kdeldycke/dotfiles/master/screenshots/macos-10.13.jpg)

![Kubuntu 15.10 Wily Werewolf solarized terminal and vim
](https://raw.githubusercontent.com/kdeldycke/dotfiles/master/screenshots/kubuntu-15.10.png)


## Features

* Aimed at Python programmers using `Neovim`.
* Common configuration for both macOS, Kubuntu and Ubuntu Server.
* [Installs rEFInd boot
loader](https://github.com/kdeldycke/dotfiles/blob/master/scripts/macos-install-refind.sh)
if a Linux partition is detected.
* Produce colored output for most of shell commands.
* All color schemes are based on [Solarized
](http://ethanschoonover.com/solarized).
* All terminal font is [Source Code Pro
* Terminal and coding font is [Source Code Pro
](https://en.wikipedia.org/wiki/Source_Code_Pro).
* Keeps OSes fast and lean.


## Profiles

Profile name | Target OS | Description
:--- |:--- |:---
macOS | macOS 10.15 (Catalina) | Desktop-centric usage for everyday use and work on a personnal, single-user machine.
Kubuntu | Kubuntu 16.04 LTS (Xenial Xerus) | Same as above.
Ubuntu Server | Ubuntu Server 16.04 LTS (Xenial Xerus) | Minimal config to feel at home on a server. Currently needs `root`.
* Keeps macOS fast, lean and secure.


## Pre-installation

### macOS

1. [Reset NVRAM or PRAM on your Mac](https://support.apple.com/en-us/HT204063).

1. Download macOS from the App Store.
Expand Down Expand Up @@ -74,8 +58,6 @@ the macOS image](https://support.apple.com/en-us/HT201372):

Manual setup required to finish up the perfect configuration.

### macOS

This is a list of manual post-installation steps required to fully configure the system. Haven't found any way to automate them all.

* Copy SSH (`./dotfiles/dotfiles-common/.ssh/`) and GPG (`./dotfiles/dotfiles-common/.gnupg/`) keys from backups.
Expand Down Expand Up @@ -111,8 +93,6 @@ improve the maintenance of macOS configuration.
Only the current `master` branch is supported and actively maintained. Older
branches are available for archive.

### macOS

* [macOS 10.15 (Catalina)](https://github.com/kdeldycke/dotfiles/tree/master) (current)
* [macOS 10.14 (Mojave)](https://github.com/kdeldycke/dotfiles/tree/macos-10.14)
* [macOS 10.13 (High Sierra)](https://github.com/kdeldycke/dotfiles/tree/macos-10.13)
Expand All @@ -122,19 +102,9 @@ branches are available for archive.
* [Mac OS X 10.9 (Mavericks)](https://github.com/kdeldycke/dotfiles/tree/osx-10.9)
* [Mac OS X 10.8 (Mountain Lion)](https://github.com/kdeldycke/dotfiles/tree/osx-10.8)

### Kubuntu

* [Kubuntu 16.04 LTS (Xenial Xerus)](https://github.com/kdeldycke/dotfiles/tree/master) (current)
* [Kubuntu 15.10 (Wily Werewolf)](https://github.com/kdeldycke/dotfiles/tree/kubuntu-15.10)
* [Kubuntu 15.04 (Vivid Vervet)](https://github.com/kdeldycke/dotfiles/tree/kubuntu-15.04)
* [Kubuntu 14.10 (Utopic Unicorn)](https://github.com/kdeldycke/dotfiles/tree/kubuntu-14.10)
* [Kubuntu 14.04 LTS (Trusty Tahr)](https://github.com/kdeldycke/dotfiles/tree/kubuntu-14.04)
* [Kubuntu 13.10 (Saucy Salamander)](https://github.com/kdeldycke/dotfiles/tree/kubuntu-13.10)
* [Kubuntu 13.04 (Raring Ringtail)](https://github.com/kdeldycke/dotfiles/tree/kubuntu-13.04)

### Ubuntu Server

* [Ubuntu Server 16.04 LTS (Xenial Xerus)](https://github.com/kdeldycke/dotfiles/tree/master) (current)
In the past the project also targetted Kubuntu and Ubuntu Server Linux
distributions. You can still find these tagged in the repository but are quite
ancient (2016).


## Resources
Expand All @@ -154,12 +124,6 @@ SIL Open Font License version 1.1.
* [Solarized for Terminal.App](https://github.com/tomislav/osx-terminal.app-colors-solarized).
© 2013 Tomislav Filipčić.
Unspecified open-source license.
* [Solarized for Konsole](https://github.com/phiggins/konsole-colors-solarized).
© 2012 Pete Higgins.
Unspecified open-source license.
* [Solarized for Xresources](https://github.com/solarized/xresources).
© 2011 Ethan Schoonover.
Unspecified open-source license.

The rest of the content is configuration and code I accumulated over years.
Some was heavily inspired by other dotfiles repositories. But each time I
Expand Down
76 changes: 23 additions & 53 deletions dotfiles-common/.bash_profile
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,13 @@ export PATH="$PYTHON_LOCAL_BIN:$GNU_COREUTILS_BIN:$GNU_TAR_BIN:$GNU_SED_BIN:$GNU
export LANG="en_US"
export LC_ALL="en_US.UTF-8"

# Detect distribution
if [ "$(uname -s)" == "Darwin" ]; then
IS_MACOS=true
else
IS_MACOS=false
fi

# Do not let homebrew send stats to Google Analytics.
# See: https://github.com/Homebrew/brew/blob/master/share/doc/homebrew/Analytics.md#opting-out
if $IS_MACOS; then
export HOMEBREW_NO_ANALYTICS=1
fi
export HOMEBREW_NO_ANALYTICS=1

# If possible, add tab completion for many more commands
[ -f /etc/bash_completion ] && source /etc/bash_completion
if $IS_MACOS; then
[ -f "$(brew --prefix)/etc/bash_completion" ] && source "$(brew --prefix)/etc/bash_completion"
fi
[ -f "$(brew --prefix)/etc/bash_completion" ] && source "$(brew --prefix)/etc/bash_completion"

# Setting history length
export HISTCONTROL="ignoredups:erasedups"
Expand Down Expand Up @@ -68,11 +57,7 @@ done;
export PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND$'\n'}history -a; history -c; history -r"

# Set user & root prompt
if $IS_MACOS; then
GIT_PROMPT_THEME="Solarized"
else
GIT_PROMPT_THEME="Solarized_Ubuntu"
fi
GIT_PROMPT_THEME="Solarized"
source ~/.bash-git-prompt/gitprompt.sh
export SUDO_PS1='\[\e[31m\]\u\[\e[37m\]:\[\e[33m\]\w\[\e[31m\]\$\[\033[00m\] '

Expand All @@ -81,17 +66,11 @@ export EDITOR="nvim"

# Set default ls color schemes (source: https://github.com/seebi/dircolors-solarized/issues/10 ).
# macOS/Linux color translations generated with http://geoff.greer.fm/lscolors/
if $IS_MACOS; then
export CLICOLOR=1
export LSCOLORS="gxfxbEaEBxxEhEhBaDaCaD"
else
export LS_COLORS="di=36;40:ln=35;40:so=31;:pi=0;:ex=1;;40:bd=0;:cd=37;:su=37;:sg=0;:tw=0;:ow=0;:"
fi
export CLICOLOR=1
export LSCOLORS="gxfxbEaEBxxEhEhBaDaCaD"

# Activate global dir colors if found.
if $IS_MACOS; then
alias dircolors='gdircolors'
fi
alias dircolors='gdircolors'
if [ -f $HOME/.dircolors ]
then
eval "$(dircolors -b $HOME/.dircolors)"
Expand Down Expand Up @@ -121,12 +100,8 @@ alias q='exit'
alias how="howdoi --color"

function cls {
if $IS_MACOS; then
# Source: https://stackoverflow.com/a/2198403
osascript -e 'tell application "System Events" to keystroke "k" using command down'
else
clear
fi
# Source: https://stackoverflow.com/a/2198403
osascript -e 'tell application "System Events" to keystroke "k" using command down'
}
alias c='cls'

Expand Down Expand Up @@ -254,28 +229,23 @@ extract () {
fi
}

# Distribution-specific commands
if $IS_MACOS; then

# Opens current directory in apps
alias f='open -a Finder ./'
# Opens current directory in apps
alias f='open -a Finder ./'

# Replace netstat command on macOS to find ports used by apps
alias netstat="sudo lsof -i -P"
# Replace netstat command on macOS to find ports used by apps
alias netstat="sudo lsof -i -P"

# Add tab completion for `defaults read|write NSGlobalDomain`
# You could just use `-g` instead, but I like being explicit
complete -W "NSGlobalDomain" defaults
# Add tab completion for `defaults read|write NSGlobalDomain`
# You could just use `-g` instead, but I like being explicit
complete -W "NSGlobalDomain" defaults

# Lock the screen
alias lock='/System/Library/CoreServices/Menu\ Extras/User.menu/Contents/Resources/CGSession -suspend'

# Link pinentry and GPG agent together
if test -f $HOME/.gnupg/.gpg-agent-info -a -n "$(pgrep gpg-agent)"; then
source $HOME/.gnupg/.gpg-agent-info
export GPG_AGENT_INFO
else
eval $(gpg-agent --daemon --write-env-file $HOME/.gnupg/.gpg-agent-info)
fi
# Lock the screen
alias lock='/System/Library/CoreServices/Menu\ Extras/User.menu/Contents/Resources/CGSession -suspend'

# Link pinentry and GPG agent together
if test -f $HOME/.gnupg/.gpg-agent-info -a -n "$(pgrep gpg-agent)"; then
source $HOME/.gnupg/.gpg-agent-info
export GPG_AGENT_INFO
else
eval $(gpg-agent --daemon --write-env-file $HOME/.gnupg/.gpg-agent-info)
fi
24 changes: 0 additions & 24 deletions dotfiles-linux/.Xmodmap

This file was deleted.

71 changes: 0 additions & 71 deletions dotfiles-linux/.Xresources

This file was deleted.

31 changes: 0 additions & 31 deletions dotfiles-linux/.kde/share/apps/konsole/Shell.profile

This file was deleted.

Loading

0 comments on commit e667245

Please sign in to comment.