Skip to content

Commit e667245

Browse files
committed
Drop support of Kubuntu and Ubuntu Server. This now only targets macOS.
1 parent cc9d008 commit e667245

13 files changed

+55
-643
lines changed

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ matrix:
66
- os: osx
77

88
os:
9-
- linux
109
- osx
1110

1211
install:

README.md

+6-42
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,27 @@
11
# Kevin's dotfiles [![Build Status](https://img.shields.io/travis/kdeldycke/maildir-deduplicate/develop.svg?style=flat)](https://travis-ci.org/kdeldycke/dotfiles)
22

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

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

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

139
## Features
1410

1511
* Aimed at Python programmers using `Neovim`.
16-
* Common configuration for both macOS, Kubuntu and Ubuntu Server.
1712
* [Installs rEFInd boot
1813
loader](https://github.com/kdeldycke/dotfiles/blob/master/scripts/macos-install-refind.sh)
1914
if a Linux partition is detected.
2015
* Produce colored output for most of shell commands.
2116
* All color schemes are based on [Solarized
2217
](http://ethanschoonover.com/solarized).
23-
* All terminal font is [Source Code Pro
18+
* Terminal and coding font is [Source Code Pro
2419
](https://en.wikipedia.org/wiki/Source_Code_Pro).
25-
* Keeps OSes fast and lean.
26-
27-
28-
## Profiles
29-
30-
Profile name | Target OS | Description
31-
:--- |:--- |:---
32-
macOS | macOS 10.15 (Catalina) | Desktop-centric usage for everyday use and work on a personnal, single-user machine.
33-
Kubuntu | Kubuntu 16.04 LTS (Xenial Xerus) | Same as above.
34-
Ubuntu Server | Ubuntu Server 16.04 LTS (Xenial Xerus) | Minimal config to feel at home on a server. Currently needs `root`.
20+
* Keeps macOS fast, lean and secure.
3521

3622

3723
## Pre-installation
3824

39-
### macOS
40-
4125
1. [Reset NVRAM or PRAM on your Mac](https://support.apple.com/en-us/HT204063).
4226

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

7559
Manual setup required to finish up the perfect configuration.
7660

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

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

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

125-
### Kubuntu
126-
127-
* [Kubuntu 16.04 LTS (Xenial Xerus)](https://github.com/kdeldycke/dotfiles/tree/master) (current)
128-
* [Kubuntu 15.10 (Wily Werewolf)](https://github.com/kdeldycke/dotfiles/tree/kubuntu-15.10)
129-
* [Kubuntu 15.04 (Vivid Vervet)](https://github.com/kdeldycke/dotfiles/tree/kubuntu-15.04)
130-
* [Kubuntu 14.10 (Utopic Unicorn)](https://github.com/kdeldycke/dotfiles/tree/kubuntu-14.10)
131-
* [Kubuntu 14.04 LTS (Trusty Tahr)](https://github.com/kdeldycke/dotfiles/tree/kubuntu-14.04)
132-
* [Kubuntu 13.10 (Saucy Salamander)](https://github.com/kdeldycke/dotfiles/tree/kubuntu-13.10)
133-
* [Kubuntu 13.04 (Raring Ringtail)](https://github.com/kdeldycke/dotfiles/tree/kubuntu-13.04)
134-
135-
### Ubuntu Server
136-
137-
* [Ubuntu Server 16.04 LTS (Xenial Xerus)](https://github.com/kdeldycke/dotfiles/tree/master) (current)
105+
In the past the project also targetted Kubuntu and Ubuntu Server Linux
106+
distributions. You can still find these tagged in the repository but are quite
107+
ancient (2016).
138108

139109

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

164128
The rest of the content is configuration and code I accumulated over years.
165129
Some was heavily inspired by other dotfiles repositories. But each time I

dotfiles-common/.bash_profile

+23-53
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,13 @@ export PATH="$PYTHON_LOCAL_BIN:$GNU_COREUTILS_BIN:$GNU_TAR_BIN:$GNU_SED_BIN:$GNU
1212
export LANG="en_US"
1313
export LC_ALL="en_US.UTF-8"
1414

15-
# Detect distribution
16-
if [ "$(uname -s)" == "Darwin" ]; then
17-
IS_MACOS=true
18-
else
19-
IS_MACOS=false
20-
fi
21-
2215
# Do not let homebrew send stats to Google Analytics.
2316
# See: https://github.com/Homebrew/brew/blob/master/share/doc/homebrew/Analytics.md#opting-out
24-
if $IS_MACOS; then
25-
export HOMEBREW_NO_ANALYTICS=1
26-
fi
17+
export HOMEBREW_NO_ANALYTICS=1
2718

2819
# If possible, add tab completion for many more commands
2920
[ -f /etc/bash_completion ] && source /etc/bash_completion
30-
if $IS_MACOS; then
31-
[ -f "$(brew --prefix)/etc/bash_completion" ] && source "$(brew --prefix)/etc/bash_completion"
32-
fi
21+
[ -f "$(brew --prefix)/etc/bash_completion" ] && source "$(brew --prefix)/etc/bash_completion"
3322

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

7059
# Set user & root prompt
71-
if $IS_MACOS; then
72-
GIT_PROMPT_THEME="Solarized"
73-
else
74-
GIT_PROMPT_THEME="Solarized_Ubuntu"
75-
fi
60+
GIT_PROMPT_THEME="Solarized"
7661
source ~/.bash-git-prompt/gitprompt.sh
7762
export SUDO_PS1='\[\e[31m\]\u\[\e[37m\]:\[\e[33m\]\w\[\e[31m\]\$\[\033[00m\] '
7863

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

8267
# Set default ls color schemes (source: https://github.com/seebi/dircolors-solarized/issues/10 ).
8368
# macOS/Linux color translations generated with http://geoff.greer.fm/lscolors/
84-
if $IS_MACOS; then
85-
export CLICOLOR=1
86-
export LSCOLORS="gxfxbEaEBxxEhEhBaDaCaD"
87-
else
88-
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;:"
89-
fi
69+
export CLICOLOR=1
70+
export LSCOLORS="gxfxbEaEBxxEhEhBaDaCaD"
9071

9172
# Activate global dir colors if found.
92-
if $IS_MACOS; then
93-
alias dircolors='gdircolors'
94-
fi
73+
alias dircolors='gdircolors'
9574
if [ -f $HOME/.dircolors ]
9675
then
9776
eval "$(dircolors -b $HOME/.dircolors)"
@@ -121,12 +100,8 @@ alias q='exit'
121100
alias how="howdoi --color"
122101

123102
function cls {
124-
if $IS_MACOS; then
125-
# Source: https://stackoverflow.com/a/2198403
126-
osascript -e 'tell application "System Events" to keystroke "k" using command down'
127-
else
128-
clear
129-
fi
103+
# Source: https://stackoverflow.com/a/2198403
104+
osascript -e 'tell application "System Events" to keystroke "k" using command down'
130105
}
131106
alias c='cls'
132107

@@ -254,28 +229,23 @@ extract () {
254229
fi
255230
}
256231

257-
# Distribution-specific commands
258-
if $IS_MACOS; then
259-
260-
# Opens current directory in apps
261-
alias f='open -a Finder ./'
232+
# Opens current directory in apps
233+
alias f='open -a Finder ./'
262234

263-
# Replace netstat command on macOS to find ports used by apps
264-
alias netstat="sudo lsof -i -P"
235+
# Replace netstat command on macOS to find ports used by apps
236+
alias netstat="sudo lsof -i -P"
265237

266-
# Add tab completion for `defaults read|write NSGlobalDomain`
267-
# You could just use `-g` instead, but I like being explicit
268-
complete -W "NSGlobalDomain" defaults
238+
# Add tab completion for `defaults read|write NSGlobalDomain`
239+
# You could just use `-g` instead, but I like being explicit
240+
complete -W "NSGlobalDomain" defaults
269241

270-
# Lock the screen
271-
alias lock='/System/Library/CoreServices/Menu\ Extras/User.menu/Contents/Resources/CGSession -suspend'
272-
273-
# Link pinentry and GPG agent together
274-
if test -f $HOME/.gnupg/.gpg-agent-info -a -n "$(pgrep gpg-agent)"; then
275-
source $HOME/.gnupg/.gpg-agent-info
276-
export GPG_AGENT_INFO
277-
else
278-
eval $(gpg-agent --daemon --write-env-file $HOME/.gnupg/.gpg-agent-info)
279-
fi
242+
# Lock the screen
243+
alias lock='/System/Library/CoreServices/Menu\ Extras/User.menu/Contents/Resources/CGSession -suspend'
280244

245+
# Link pinentry and GPG agent together
246+
if test -f $HOME/.gnupg/.gpg-agent-info -a -n "$(pgrep gpg-agent)"; then
247+
source $HOME/.gnupg/.gpg-agent-info
248+
export GPG_AGENT_INFO
249+
else
250+
eval $(gpg-agent --daemon --write-env-file $HOME/.gnupg/.gpg-agent-info)
281251
fi

dotfiles-linux/.Xmodmap

-24
This file was deleted.

dotfiles-linux/.Xresources

-71
This file was deleted.

dotfiles-linux/.kde/share/apps/konsole/Shell.profile

-31
This file was deleted.

0 commit comments

Comments
 (0)