From 6a2afd8c904a1fcb433fc2a0de92e1d177d5e969 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Mon, 17 Sep 2018 16:02:32 +0100 Subject: [PATCH] Nuke the puppet stuff --- manifests/devices.pp | 9 -- manifests/main.pp | 13 --- manifests/packages.pp | 157 ---------------------------- manifests/pre-packages.pp | 9 -- modules/common/manifests/init.pp | 36 ------- modules/concat | 1 - modules/config/manifests/fonts.pp | 17 --- modules/config/manifests/init.pp | 109 ------------------- modules/config/manifests/private.pp | 13 --- modules/config/manifests/vim.pp | 27 ----- modules/config/manifests/vscode.pp | 59 ----------- modules/devices/manifests/laptop.pp | 22 ---- modules/devices/manifests/work.pp | 16 --- modules/gnome/manifests/init.pp | 11 -- modules/i3/manifests/autostart.pp | 38 ------- modules/i3/manifests/init.pp | 53 ---------- modules/shell/manifests/init.pp | 70 ------------- modules/stdlib | 1 - modules/vcsrepo | 1 - modules/yaourt/manifests/files.pp | 16 --- modules/yaourt/manifests/init.pp | 5 - modules/yaourt/manifests/keys.pp | 28 ----- 22 files changed, 711 deletions(-) delete mode 100644 manifests/devices.pp delete mode 100644 manifests/main.pp delete mode 100644 manifests/packages.pp delete mode 100644 manifests/pre-packages.pp delete mode 100644 modules/common/manifests/init.pp delete mode 160000 modules/concat delete mode 100644 modules/config/manifests/fonts.pp delete mode 100644 modules/config/manifests/init.pp delete mode 100644 modules/config/manifests/private.pp delete mode 100644 modules/config/manifests/vim.pp delete mode 100644 modules/config/manifests/vscode.pp delete mode 100644 modules/devices/manifests/laptop.pp delete mode 100644 modules/devices/manifests/work.pp delete mode 100644 modules/gnome/manifests/init.pp delete mode 100644 modules/i3/manifests/autostart.pp delete mode 100644 modules/i3/manifests/init.pp delete mode 100644 modules/shell/manifests/init.pp delete mode 160000 modules/stdlib delete mode 160000 modules/vcsrepo delete mode 100644 modules/yaourt/manifests/files.pp delete mode 100644 modules/yaourt/manifests/init.pp delete mode 100644 modules/yaourt/manifests/keys.pp diff --git a/manifests/devices.pp b/manifests/devices.pp deleted file mode 100644 index 40ecac0..0000000 --- a/manifests/devices.pp +++ /dev/null @@ -1,9 +0,0 @@ -node default {} - -node 'too-laptop' { - include devices::laptop -} - -node 'too-work' { - include devices::work -} diff --git a/manifests/main.pp b/manifests/main.pp deleted file mode 100644 index 28cef80..0000000 --- a/manifests/main.pp +++ /dev/null @@ -1,13 +0,0 @@ -node default { - Exec { - path => ['/usr/bin', '/usr/sbin', '/usr/local/bin', '/usr/local/sbin'] - } - - include stdlib - - include common - include gnome - include config - include shell - include i3 -} diff --git a/manifests/packages.pp b/manifests/packages.pp deleted file mode 100644 index 6d5522f..0000000 --- a/manifests/packages.pp +++ /dev/null @@ -1,157 +0,0 @@ -node default { - package {[ - 'ttf-google-fonts-typewolf' - ]: - ensure => absent - } - - -> package {[ # Packages that need to be installed first - 'i3-gaps', - 'ttf-google-fonts-git', - 'i3lock-color-git' - ]: - ensure => installed - } - - -> package {[ - 'acpi', - 'advanced-ssh-config', - 'alacritty-git', - 'android-tools', - 'archstrike-keyring', - 'arduino', - 'bcm20702a1-firmware', - 'betterlockscreen', - 'bleachbit', - 'blender', - 'bluez-firmware', - 'brave-bin', - 'brightnessctl', - 'calibre', - 'caprine', - 'caret-bin', - 'catimg', - 'climate', - 'clamtk', - 'corebird', - 'compton', - 'deluge', - 'dex', - 'dmenu', - 'dunst', - 'etcher', - 'etcher-cli', - 'exa', - 'fasd', - 'feedreader', - 'feh', - 'filezilla', - 'firefox', - 'firefox-developer-edition', - 'fonts-meta-extended-lt', - 'gimp', - 'glogg', - 'google-earth-pro', - 'gparted', - 'grub-customizer', - 'grub2-theme-archlinux', - 'gvim', - 'handbrake', - 'hexchat', - 'htop', - 'i3status', - 'i3status-rust', - 'ibus', - 'ibus-uniemoji', - 'inkscape', - 'intellij-idea-ultimate-edition', - 'intellij-idea-ultimate-edition-jre', - 'intellij-jdk', - 'jdk', - 'jshon', - 'kdenlive', - 'keepassxc', - 'keybase-bin', - 'kodi', - 'libinput', - 'libinput-gestures', - 'lightdm', - 'lightdm-webkit2-greeter', - 'lxpolkit-git', - 'lxrandr', - 'minecraft', - 'mkchromecast', - 'nextcloud-client', - 'nnn', - 'nodejs', - 'numix-gtk-theme', - 'nvm', - 'obs-studio', - 'oh-my-zsh-git', - 'onlyoffice-bin', - 'otf-fira-code', - 'otf-font-awesome', - 'pacaur', - 'perl-file-mimeinfo', - 'pigz', - 'playerctl', - 'postgresql', - 'postman-bin', - 'powertop', - 'psensor', - 'pulseaudio-bluetooth-a2dp-gdm-fix', - 'pyenv', - 'pyenv-virtualenv', - 'python-pip', - 'python-virtualenv', - 'python2-pip', - 'python2-virtualenv', - 'qt5-styleplugins', - 'redis', - 'redshift', - 'reptyr', - 'rofi', - 'scrcpy', - 'screenfetch', - 'sl', - 'slack-desktop', - 'slack-term', - 'solaar', - 'spotify', - 'steam', - 'sublime-text', - 'sysstat', - 'tbg', - 'terminator', - 'thefuck', - 'thunderbird', - 'tig', - 'tmux', - 'tor-browser-en', - 'ttf-emojione', - 'ttf-fira-code', - 'ttf-font-awesome', - 'ttf-ms-fonts', - 'ttf-wps-fonts', - 'turtl', - 'tupload', - 'universal-ctags-git', - 'visual-studio-code-bin', - 'virtualbox', - 'vivaldi', - 'vlc', - 'whatsie', - 'wps-office', - 'wps-office-extension-english-uk-dictionary', - 'yaourt', - 'yubikey-manager', - 'yubikey-personalization-gui', - 'zeal', - 'zsh', - 'zsh-completions', - 'zsh-doc', - 'zsh-syntax-highlighting' - ]: - ensure => installed - } -} diff --git a/manifests/pre-packages.pp b/manifests/pre-packages.pp deleted file mode 100644 index 62ff7a5..0000000 --- a/manifests/pre-packages.pp +++ /dev/null @@ -1,9 +0,0 @@ -node default { - Exec { - path => ['/usr/bin', '/usr/sbin', '/usr/local/bin', '/usr/local/sbin'] - } - - include stdlib - - include yaourt -} diff --git a/modules/common/manifests/init.pp b/modules/common/manifests/init.pp deleted file mode 100644 index 2186d18..0000000 --- a/modules/common/manifests/init.pp +++ /dev/null @@ -1,36 +0,0 @@ -class common { - user { 'Make me': - name => 'jake', - allowdupe => false, - auth_membership => 'inclusive', - comment => 'Jake Howard', - home => '/home/jake', - uid => '1000', - shell => '/usr/bin/zsh', - groups => [ - 'input', - 'users', - 'video', - 'wheel' - ] - } - -> file { 'Create home directory': - ensure => directory, - path => '/home/jake', - owner => 'jake' - } - -> file { 'Projects directory': - ensure => directory, - path => '/home/jake/Projects', - owner => 'jake' - } - - exec {'Set Java version': - command => 'archlinux-java set intellij-jdk', - unless => 'archlinux-java get | grep intellij-jdk' - } - exec {'pyenv directory permissions': - command => 'chown -R jake:users /opt/pyenv', - unless => 'getfacl /opt/pyenv | grep "owner: jake"' - } -} diff --git a/modules/concat b/modules/concat deleted file mode 160000 index c600f57..0000000 --- a/modules/concat +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c600f578386505a743d18a15bc2485b5ef2d5abc diff --git a/modules/config/manifests/fonts.pp b/modules/config/manifests/fonts.pp deleted file mode 100644 index 29dde22..0000000 --- a/modules/config/manifests/fonts.pp +++ /dev/null @@ -1,17 +0,0 @@ -class config::fonts { - $fonts = [ - '11-lcdfilter-default.conf', - '10-sub-pixel-rgb.conf', - '30-infinality-aliases.conf' - ]; - - $fonts.each |String $font| { - file { "Enable $font font": - ensure => link, - path => "/etc/fonts/conf.d/$font", - mode => '0644', - source => "/etc/fonts/conf.avail/$font" - - } - } -} diff --git a/modules/config/manifests/init.pp b/modules/config/manifests/init.pp deleted file mode 100644 index a1d5d03..0000000 --- a/modules/config/manifests/init.pp +++ /dev/null @@ -1,109 +0,0 @@ -class config { - include 'config::vim' - include 'config::fonts' - include 'config::private' - include 'config::vscode' - - file { 'Touchpad gestures config': - ensure => file, - mode => '0644', - path => '/etc/libinput-gestures.conf', - source => 'puppet:///modules/config/libinput-gestures.conf' - } - - file { 'Terminator config directory': - ensure => directory, - mode => '0644', - path => '/home/jake/.config/terminator' - } - -> file { 'Terminator config': - ensure => file, - mode => '0644', - path => '/home/jake/.config/terminator/config', - source => 'puppet:///modules/config/terminator.conf' - } - - file { 'Uniemoji config directory': - ensure => directory, - mode => '0644', - path => '/home/jake/.config/uniemoji' - } - -> file { 'Uniemoji config': - ensure => file, - mode => '0644', - path => '/home/jake/.config/uniemoji/custom.json', - source => 'puppet:///modules/config/uniemoji.json' - } - - file { 'Install SSH config': - ensure => file, - mode => '0644', - owner => 'jake', - path => '/home/jake/.ssh/assh.yml', - source => 'puppet:///modules/config/assh.yml' - } - - file { 'Install global gitignore': - ensure => file, - path => '/home/jake/.config/.gitignore', - mode => '0644', - source => 'puppet:///modules/config/gitignore_global' - } - - file { 'Git config': - ensure => file, - path => '/home/jake/.gitconfig', - mode => '0644', - owner => 'jake', - group => 'users', - content => template('config/gitconfig.conf.erb') - } - - file { 'Rofi config directory': - ensure => directory, - mode => '0644', - path => '/home/jake/.config/rofi' - } - -> file { 'Rofi config': - ensure => file, - mode => '0644', - path => '/home/jake/.config/rofi/config', - source => 'puppet:///modules/config/rofi.conf' - } - - file { 'Touchpad configuration': - ensure => file, - mode => '0644', - path => '/usr/share/X11/xorg.conf.d/30-touchpad.conf', - source => 'puppet:///modules/config/touchpad.conf' - } - - file { 'Caret config directory': - ensure => directory, - mode => '0644', - path => '/home/jake/.config/Caret' - } - -> file { 'Caret configuration file': - ensure => file, - mode => '0644', - path => '/home/jake/.config/Caret/Preferences.md', - source => 'puppet:///modules/config/caret-preferences.md' - } - - file { 'Tilix file temporary location': - ensure => file, - path => '/tmp/tilix.conf', - source => 'puppet:///modules/config/tilix.conf' - } - -> exec { 'Load Tilix config': - command => 'dconf load /etc/gexperts/Tilix/ < /tmp/tilix.conf', - user => 'jake' - } - - file { 'Alacritty config': - ensure => file, - owner => 'jake', - path => '/home/jake/.config/alacritty/alacritty.yml', - source => 'puppet:///modules/config/alacritty.yml' - } -} diff --git a/modules/config/manifests/private.pp b/modules/config/manifests/private.pp deleted file mode 100644 index 2d2884e..0000000 --- a/modules/config/manifests/private.pp +++ /dev/null @@ -1,13 +0,0 @@ -class config::private () { - file { 'Check dotfiles': - ensure => directory, - path => '/home/jake/.dotfiles' - } - - file { 'TUpload config': - ensure => link, - target => '/home/jake/.dotfiles/.upload', - path => '/home/jake/.upload', - mode => '0644' - } -} diff --git a/modules/config/manifests/vim.pp b/modules/config/manifests/vim.pp deleted file mode 100644 index 8e28f9c..0000000 --- a/modules/config/manifests/vim.pp +++ /dev/null @@ -1,27 +0,0 @@ -class config::vim { - file { 'vimrc': - ensure => file, - mode => '0644', - owner => 'jake', - group => 'users', - path => '/home/jake/.vimrc', - source => 'puppet:///modules/config/vimrc' - } - - -> file { 'vimrc for root': - ensure => file, - mode => '0644', - owner => 'root', - group => 'users', - path => '/root/.vimrc', - source => 'puppet:///modules/config/vimrc' - } - - -> vcsrepo { 'Vim runtime': - ensure => latest, - provider => git, - user => 'root', - path => '/usr/share/amix_vimrc', - source => 'https://github.com/amix/vimrc.git', - } -} diff --git a/modules/config/manifests/vscode.pp b/modules/config/manifests/vscode.pp deleted file mode 100644 index 93cfc7d..0000000 --- a/modules/config/manifests/vscode.pp +++ /dev/null @@ -1,59 +0,0 @@ -class config::vscode { - $extensions = [ - 'PKief.material-icon-theme', - 'PeterJausovec.vscode-docker', - 'Zignd.html-css-class-completion', - 'bitzl.vscode-puppet', - 'bogdan-sinitsa.theme-dark-monokai', - 'christian-kohler.npm-intellisense', - 'dbaeumer.vscode-eslint', - 'eamodio.gitlens', - 'eg2.tslint', - 'eg2.vscode-npm-script', - 'formulahendry.code-runner', - 'ionutvmi.path-autocomplete', - 'magicstack.MagicPython', - 'mrmlnc.vscode-less', - 'mrmlnc.vscode-scss', - 'ms-python.python', - 'ms-vscode.sublime-keybindings', - 'rokoroku.vscode-theme-darcula', - 'steoates.autoimport', - 'truman.autocomplate-shell', - 'wholroyd.jinja', - 'zolocode.editorzoom', - 'formulahendry.auto-close-tag', - 'James-Yu.latex-workshop', - 'ban.spellright', - 'editorconfig.editorconfig', - 'batisteo.vscode-django', - 'davidanson.vscode-markdownlint', - 'vsciot-vscode.vscode-arduino', - 'vscoss.vscode-ansible', - 'rust-lang.rust' - ]; - - $extensions.each |String $extension| { - exec { "Install $extension extension for VSCode": - command => "code --install-extension $extension", - unless => "code --list-extensions | grep $extension", - user => 'jake' - } - } - - file { 'VSCode config': - ensure => file, - mode => '0644', - owner => 'jake', - path => '/home/jake/.config/Code/User/settings.json', - source => 'puppet:///modules/config/vscode-settings.json' - } - - file { 'VSCode keybindings': - ensure => file, - mode => '0644', - owner => 'jake', - path => '/home/jake/.config/Code/User/keybindings.json', - source => 'puppet:///modules/config/vscode-keybindings.json' - } -} diff --git a/modules/devices/manifests/laptop.pp b/modules/devices/manifests/laptop.pp deleted file mode 100644 index a048676..0000000 --- a/modules/devices/manifests/laptop.pp +++ /dev/null @@ -1,22 +0,0 @@ -class devices::laptop { - package {[ - 'ethtool', - 'smartmontools', - 'tlp' - ]: - ensure => installed - } - -> service {'tlp': - enable => true - } - -> service {'tlp-sleep': - enable => true - } - - file { 'TLP config': - ensure => file, - mode => '0644', - path => '/etc/default/tlp', - source => 'puppet:///modules/devices/tlp.conf' - } -} diff --git a/modules/devices/manifests/work.pp b/modules/devices/manifests/work.pp deleted file mode 100644 index 1e5b6b5..0000000 --- a/modules/devices/manifests/work.pp +++ /dev/null @@ -1,16 +0,0 @@ -class devices::work { - vcsrepo { 'Vim runtime': - ensure => latest, - provider => git, - user => 'jake', - path => '/home/jake/Projects/dotfiles', - source => 'git@github.com:dabapps/dotfiles', - } - -> file { 'DabApps dotfiles': - ensure => link, - owner => 'jake', - target => '/home/jake/Projects/dotfiles/.editorconfig', - path => '/home/jake/Projects/.editorconfig', - mode => '0644' - } -} diff --git a/modules/gnome/manifests/init.pp b/modules/gnome/manifests/init.pp deleted file mode 100644 index e97b72b..0000000 --- a/modules/gnome/manifests/init.pp +++ /dev/null @@ -1,11 +0,0 @@ -class gnome { - file { 'Nautilus Templates': - ensure => directory, - source => 'puppet:///modules/gnome/Templates', - path => '/home/jake/Templates', - owner => 'jake', - group => 'users', - mode => '0755', - recurse => remote - } -} diff --git a/modules/i3/manifests/autostart.pp b/modules/i3/manifests/autostart.pp deleted file mode 100644 index 64975f7..0000000 --- a/modules/i3/manifests/autostart.pp +++ /dev/null @@ -1,38 +0,0 @@ -class i3::autostart { - $programs = [ - 'pulseaudio', - 'org.gnome.SettingsDaemon.XSettings', - 'org.gnome.SettingsDaemon.DiskUtilityNotify', - 'org.gnome.SettingsDaemon.Keyboard', - 'gsettings-data-convert', - 'nm-applet', - 'lxpolkit', - 'solaar' - ]; - - $programs.each |String $program| { - file { "Autostart $program": - ensure => link, - path => "/home/jake/.config/autostart/$program.desktop", - mode => '0644', - owner => 'jake', - source => "/etc/xdg/autostart/$program.desktop" - } - } - - file {'Autostart libinput-gestures': - ensure => link, - path => '/home/jake/.config/autostart/libinput-gestures.desktop', - mode => '0644', - owner => 'jake', - source => '/usr/share/applications/libinput-gestures.desktop' - } - - file {'Install powertop service': - ensure => link, - path => '/etc/systemd/system/powertop.service', - mode => '0644', - owner => 'root', - source => 'puppet:///modules/i3/powertop.service' - } -} diff --git a/modules/i3/manifests/init.pp b/modules/i3/manifests/init.pp deleted file mode 100644 index c9b3ce0..0000000 --- a/modules/i3/manifests/init.pp +++ /dev/null @@ -1,53 +0,0 @@ -class i3 { - include 'i3::autostart' - - file { 'i3 config': - ensure => file, - path => '/home/jake/.config/i3/config', - mode => '0644', - owner => 'jake', - group => 'users', - source => 'puppet:///modules/i3/i3.conf' - } - - file { 'i3status-rust config': - ensure => file, - path => '/home/jake/.config/i3/status.toml', - mode => '0644', - owner => 'jake', - group => 'users', - content => template('i3/i3status-rust.toml.erb') - } - - file { 'i3status config': - ensure => file, - path => '/home/jake/.config/i3status/config', - mode => '0644', - owner => 'jake', - group => 'users', - source => 'puppet:///modules/i3/i3status.conf' - } - - file { 'compton config': - ensure => file, - path => '/home/jake/.config/compton.conf', - mode => '0644', - owner => 'jake', - group => 'users', - source => 'puppet:///modules/i3/compton.conf' - } - - file { 'dunst config directory': - ensure => directory, - path => '/home/jake/.config/dunst' - } - - -> file { 'dunst config': - ensure => file, - path => '/home/jake/.config/dunst/dunstrc', - mode => '0644', - owner => 'jake', - group => 'users', - source => 'puppet:///modules/i3/dunst.conf' - } -} diff --git a/modules/shell/manifests/init.pp b/modules/shell/manifests/init.pp deleted file mode 100644 index 23ae4a2..0000000 --- a/modules/shell/manifests/init.pp +++ /dev/null @@ -1,70 +0,0 @@ -class shell { - $zshrc = '/home/jake/.zshrc' - - $files = [ - 'puppet:///modules/shell/.zshrc', - 'puppet:///modules/shell/base.sh', - 'puppet:///modules/shell/applications.sh', - 'puppet:///modules/shell/catfish.sh', - 'puppet:///modules/shell/javascript.sh', - 'puppet:///modules/shell/environment.sh' - ]; - - concat {'zshrc': - path => $zshrc, - owner => 'jake', - group => 'users', - mode => '0644', - ensure_newline => true - } - - $files.each |String $file| { - concat::fragment {"zshrc concat $file": - target => $zshrc, - source => $file - } - } - - file { 'nvm config directory': - ensure => directory, - owner => 'jake', - group => 'users', - mode => '0644', - path => '/home/jake/.nvm' - } - -> file {'nvm': - path => '/home/jake/.nvm/nvm.sh', - owner => 'jake', - group => 'users', - mode => '0755', - source => '/usr/share/nvm/init-nvm.sh' - } - - file { 'Custom binaries': - ensure => directory, - source => 'puppet:///modules/shell/bin', - path => '/home/jake/.bin', - owner => 'jake', - group => 'users', - mode => '0755', - recurse => remote - } - - file { 'Global Environment': - ensure => file, - mode => '0644', - owner => 'root', - group => 'root', - source => 'puppet:///modules/shell/global-environment', - path => '/etc/environment' - } - - file { 'tmux config': - ensure => file, - owner => 'jake', - group => 'users', - mode => '0755', - source => 'puppet:///modules/shell/tmux.conf', - path => '/home/jake/.tmux.conf' - } -} diff --git a/modules/stdlib b/modules/stdlib deleted file mode 160000 index cef3e89..0000000 --- a/modules/stdlib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cef3e894d642207d2f87e307159b90ce49fcd455 diff --git a/modules/vcsrepo b/modules/vcsrepo deleted file mode 160000 index 1c6b38e..0000000 --- a/modules/vcsrepo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1c6b38e9c0840ff047ba62d4429bb3939dc524eb diff --git a/modules/yaourt/manifests/files.pp b/modules/yaourt/manifests/files.pp deleted file mode 100644 index ccc62c4..0000000 --- a/modules/yaourt/manifests/files.pp +++ /dev/null @@ -1,16 +0,0 @@ -class yaourt::files () { - file { 'Pacman config': - ensure => file, - source => 'puppet:///modules/yaourt/pacman.conf', - path => '/etc/pacman.conf' - } - - file { 'Yaourt config': - ensure => file, - mode => '0644', - owner => 'jake', - group => 'users', - source => 'puppet:///modules/yaourt/.yaourtrc', - path => '/home/jake/.yaourtrc' - } -} diff --git a/modules/yaourt/manifests/init.pp b/modules/yaourt/manifests/init.pp deleted file mode 100644 index 6ae7ffd..0000000 --- a/modules/yaourt/manifests/init.pp +++ /dev/null @@ -1,5 +0,0 @@ -class yaourt { - include 'yaourt::files' - - include 'yaourt::keys' -} diff --git a/modules/yaourt/manifests/keys.pp b/modules/yaourt/manifests/keys.pp deleted file mode 100644 index a0af9cc..0000000 --- a/modules/yaourt/manifests/keys.pp +++ /dev/null @@ -1,28 +0,0 @@ -class yaourt::keys () { - $keys = [ - '8A8F901A', # Sublime Text - 'D1483FA6C3C07136', # Tor Browser - '9D5F1C051D146843CDA4858BDE64825E7CBC0D51', # ArchStrike - '7448C890582975CD' - ] - - $keys.each |$key| { - exec {"Add $key key": - command => "gpg --recv-keys $key", - user => 'jake', - unless => "gpg --list-keys $key" - } - exec { "Add $key for root": # So root can install things - command => "gpg --recv-keys $key", - unless => "gpg --list-keys $key" - } - exec { "Add $key to pacman": - command => "pacman-key -r $key", - unless => "pacman-key --list-keys $key" - } - exec { "Locally sign $key with pacman": - command => "pacman-key --lsign-key $key", - unless => "pacman-key --list-keys $key | grep full" - } - } -}