From aa4dea9330690321805e3c7d1a0d02a6538ea8e2 Mon Sep 17 00:00:00 2001 From: Jack Foltz Date: Sat, 1 Dec 2018 11:56:04 -0500 Subject: [PATCH 1/5] Add alacritty --- lain/.config/alacritty/alacritty.yml | 490 +++++++++++++++++++++++++++++++++++ packages.org | 3 +- 2 files changed, 492 insertions(+), 1 deletion(-) create mode 100644 lain/.config/alacritty/alacritty.yml diff --git a/lain/.config/alacritty/alacritty.yml b/lain/.config/alacritty/alacritty.yml new file mode 100644 index 0000000..4614fac --- /dev/null +++ b/lain/.config/alacritty/alacritty.yml @@ -0,0 +1,490 @@ +# Configuration for Alacritty, the GPU enhanced terminal emulator. + +# Any items in the `env` entry below will be added as +# environment variables. Some entries may override variables +# set by alacritty itself. +#env: + # TERM variable + # + # This value is used to set the `$TERM` environment variable for + # each instance of Alacritty. If it is not present, alacritty will + # check the local terminfo database and use 'alacritty' if it is + # available, otherwise 'xterm-256color' is used. + #TERM: xterm-256color + +window: + # Window dimensions (changes require restart) + # + # Specified in number of columns/lines, not pixels. + # If both are `0`, this setting is ignored. + dimensions: + columns: 80 + lines: 24 + + # Window padding (changes require restart) + # + # Blank space added around the window in pixels. This padding is scaled + # by DPI and the specified value is always added at both opposing sides. + padding: + x: 2 + y: 2 + + # Window decorations + # + # Values for `decorations`: + # - full: Borders and title bar + # - none: Neither borders nor title bar + decorations: full + +scrolling: + # Maximum number of lines in the scrollback buffer. + # Specifying '0' will disable scrolling. + history: 10000 + + # Number of lines the viewport will move for every line scrolled when + # scrollback is enabled (history > 0). + multiplier: 3 + + # Faux Scrolling + # + # The `faux_multiplier` setting controls the number of lines the terminal + # should scroll when the alternate screen buffer is active. This is used + # to allow mouse scrolling for applications like `man`. + # + # Specifying `0` will disable faux scrolling. + faux_multiplier: 3 + + # Scroll to the bottom when new text is written to the terminal. + auto_scroll: false + +# Spaces per Tab (changes require restart) +# +# This setting defines the width of a tab in cells. +# +# Some applications, like Emacs, rely on knowing about the width of a tab. +# To prevent unexpected behavior in these applications, it's also required to +# change the `it` value in terminfo when altering this setting. +tabspaces: 4 + +# Font configuration (changes require restart) +# +# Important font attributes like antialiasing, subpixel aa, and hinting can be +# controlled through fontconfig. Specifically, the following attributes should +# have an effect: +# - hintstyle +# - antialias +# - lcdfilter +# - rgba +# +# For instance, if you wish to disable subpixel antialiasing, you might set the +# rgba property to `none`. If you wish to completely disable antialiasing, you +# can set antialias to `false`. +# +# Please see these resources for more information on how to use fontconfig: +# - https://wiki.archlinux.org/index.php/font_configuration#Fontconfig_configuration +# - file:///usr/share/doc/fontconfig/fontconfig-user.html +font: + # Normal (roman) font face + normal: + family: "Fira Code" + # The `style` can be specified to pick a specific face. + style: "Light" + + # Bold font face + bold: + family: "Fira Code" + # The `style` can be specified to pick a specific face. + style: "Bold" + + # Italic font face + italic: + family: "Source Code Pro" + # The `style` can be specified to pick a specific face. + style: "Medium Italic" + + # Point size + size: 13.0 + + # Offset is the extra space around each character. `offset.y` can be thought of + # as modifying the line spacing, and `offset.x` as modifying the letter spacing. + offset: + x: 0 + y: 0 + + # Glyph offset determines the locations of the glyphs within their cells with + # the default being at the bottom. Increasing `x` moves the glyph to the right, + # increasing `y` moves the glyph upwards. + glyph_offset: + x: 0 + y: 0 + + # Scale the font size based on the monitor's DPI. This will lead to bigger text on HiDPI + # screens and make reading text a little easier. + # On X11 it is possible to change the DPI for each instance of alacritty by using + # `WINIT_HIDPI_FACTOR=1.0 alacritty` to scale the font. + scale_with_dpi: true + +# Display the time it takes to redraw each frame. +render_timer: false + +# If `true`, bold text is drawn using the bright color variants. +draw_bold_text_with_bright_colors: true + +# Colors (Tomorrow Night Bright) +colors: + # Default colors + primary: + background: '0x000000' + foreground: '0xeaeaea' + + # Bright and dim foreground colors + # + # The dimmed foreground color is calculated automatically if it is not present. + # If the bright foreground color is not set, or `draw_bold_text_with_bright_colors` + # is `false`, the normal foreground color will be used. + #dim_foreground: '0x9a9a9a' + #bright_foreground: '0xffffff' + + # Cursor colors + # + # Colors which should be used to draw the terminal cursor. If these are unset, + # the cursor color will be the inverse of the cell color. + #cursor: + # text: '0x000000' + # cursor: '0xffffff' + + # Normal colors + normal: + black: '0x000000' + red: '0xd54e53' + green: '0xb9ca4a' + yellow: '0xe6c547' + blue: '0x7aa6da' + magenta: '0xc397d8' + cyan: '0x70c0ba' + white: '0xffffff' + + # Bright colors + bright: + black: '0x666666' + red: '0xff3334' + green: '0x9ec400' + yellow: '0xe7c547' + blue: '0x7aa6da' + magenta: '0xb77ee0' + cyan: '0x54ced6' + white: '0xffffff' + + # Dim colors + # + # If the dim colors are not set, they will be calculated automatically based + # on the `normal` colors. + dim: + black: '0x333333' + red: '0xf2777a' + green: '0x99cc99' + yellow: '0xffcc66' + blue: '0x6699cc' + magenta: '0xcc99cc' + cyan: '0x66cccc' + white: '0xdddddd' + + # Indexed Colors + # + # The indexed colors include all colors from 16 to 256. + # When these are not set, they're filled with sensible defaults. + #indexed_colors: + # - { index: 16, color: '0x000000' } + +# Visual Bell +# +# Any time the BEL code is received, Alacritty "rings" the visual bell. Once +# rung, the terminal background will be set to white and transition back to the +# default background color. You can control the rate of this transition by +# setting the `duration` property (represented in milliseconds). You can also +# configure the transition function by setting the `animation` property. +# +# Values for `animation`: +# - Ease +# - EaseOut +# - EaseOutSine +# - EaseOutQuad +# - EaseOutCubic +# - EaseOutQuart +# - EaseOutQuint +# - EaseOutExpo +# - EaseOutCirc +# - Linear +# +# Specifying a `duration` of `0` will disable the visual bell. +visual_bell: + animation: EaseOutExpo + duration: 0 + +# Background opacity +# +# Window opacity as a floating point number from `0.0` to `1.0`. +# The value `0.0` is completely transparent and `1.0` is opaque. +background_opacity: 0.8 + +# Mouse bindings +# +# Available fields: +# - mouse +# - action +# - mods (optional) +# +# Values for `mouse`: +# - Middle +# - Left +# - Right +# - Numeric identifier such as `5` +# +# All available `mods` and `action` values are documented in the key binding +# section. +mouse_bindings: + - { mouse: Middle, action: PasteSelection } + +mouse: + # Click settings + # + # The `double_click` and `triple_click` settings control the time + # alacritty should wait for accepting multiple clicks as one double + # or triple click. + double_click: { threshold: 300 } + triple_click: { threshold: 300 } + + # If this is `true`, the cursor is temporarily hidden when typing. + hide_when_typing: true + + url: + # URL launcher + # + # This program is executed when clicking on a text which is recognized as a URL. + # The URL is always added to the command as the last parameter. + launcher: xdg-open + + # URL modifiers + # + # These are the modifiers that need to be held down for opening URLs when clicking + # on them. The available modifiers are documented in the key binding section. + #modifiers: Control|Shift + +selection: + semantic_escape_chars: ",│`|:\"' ()[]{}<>" + + # When set to `true`, selected text will be copied to both the primary and + # the selection clipboard. Otherwise, it will only be copied to the selection + # clipboard. + save_to_clipboard: false + +dynamic_title: true + +cursor: + # Cursor style + # + # Values for 'style': + # - ▇ Block + # - _ Underline + # - | Beam + style: Block + + # If this is `true`, the cursor will be rendered as a hollow box when the + # window is not focused. + unfocused_hollow: true + +# Live config reload (changes require restart) +live_config_reload: true + +# Shell +# +# You can set `shell.program` to the path of your favorite shell, e.g. `/bin/fish`. +# Entries in `shell.args` are passed unmodified as arguments to the shell. +#shell: +# program: /bin/bash +# args: +# - --login + +# Key bindings +# +# Key bindings are specified as a list of objects. Each binding will specify +# a key and modifiers required to trigger it, terminal modes where the binding +# is applicable, and what should be done when the key binding fires. It can +# either send a byte sequnce to the running application (`chars`), execute +# a predefined action (`action`) or fork and execute a specified command plus +# arguments (`command`). +# +# Example: +# `- { key: V, mods: Command, action: Paste }` +# +# Available fields: +# - key +# - mods (optional) +# - chars | action | command (exactly one required) +# - mode (optional) +# +# Values for `key`: +# - `A` -> `Z` +# - `F1` -> `F12` +# - `Key1` -> `Key0` +# +# A full list with available key codes can be found here: +# https://docs.rs/glutin/*/glutin/enum.VirtualKeyCode.html#variants +# +# Instead of using the name of the keys, the `key` field also supports using +# the scancode of the desired key. Scancodes have to be specified as a +# decimal number. +# This command will allow you to display the hex scancodes for certain keys: +# `showkey --scancodes` +# +# Values for `mods`: +# - Command +# - Control +# - Shift +# - Alt +# +# Multiple `mods` can be combined using `|` like this: `mods: Control|Shift`. +# Whitespace and capitalization is relevant and must match the example. +# +# Values for `chars`: +# The `chars` field writes the specified string to the terminal. This makes +# it possible to pass escape sequences. +# To find escape codes for bindings like `PageUp` ("\x1b[5~"), you can run +# the command `showkey -a` outside of tmux. +# Note that applications use terminfo to map escape sequences back to +# keys. It is therefore required to update the terminfo when +# changing an escape sequence. +# +# Values for `action`: +# - Paste +# - PasteSelection +# - Copy +# - IncreaseFontSize +# - DecreaseFontSize +# - ResetFontSize +# - ScrollPageUp +# - ScrollPageDown +# - ScrollToTop +# - ScrollToBottom +# - ClearHistory +# - Hide +# - Quit +# +# Values for `command`: +# The `command` field must be a map containing a `program` string and +# an `args` array of command line parameter strings. +# +# Example: +# `command: { program: "alacritty", args: ["-e", "vttest"] }` +# +# Values for `mode`: +# - ~AppCursor +# - AppCursor +# - ~AppKeypad +# - AppKeypad +key_bindings: + - { key: V, mods: Control|Shift, action: Paste } + - { key: C, mods: Control|Shift, action: Copy } + - { key: Paste, action: Paste } + - { key: Copy, action: Copy } + - { key: Q, mods: Command, action: Quit } + - { key: W, mods: Command, action: Quit } + - { key: Insert, mods: Shift, action: PasteSelection } + - { key: Key0, mods: Control, action: ResetFontSize } + - { key: Equals, mods: Control, action: IncreaseFontSize } + - { key: Subtract, mods: Control, action: DecreaseFontSize } + - { key: Home, chars: "\x1bOH", mode: AppCursor } + - { key: Home, chars: "\x1b[H", mode: ~AppCursor } + - { key: End, chars: "\x1bOF", mode: AppCursor } + - { key: End, chars: "\x1b[F", mode: ~AppCursor } + - { key: PageUp, mods: Shift, chars: "\x1b[5;2~" } + - { key: PageUp, mods: Control, chars: "\x1b[5;5~" } + - { key: PageUp, chars: "\x1b[5~" } + - { key: PageDown, mods: Shift, chars: "\x1b[6;2~" } + - { key: PageDown, mods: Control, chars: "\x1b[6;5~" } + - { key: PageDown, chars: "\x1b[6~" } + - { key: Tab, mods: Shift, chars: "\x1b[Z" } + - { key: Back, chars: "\x7f" } + - { key: Back, mods: Alt, chars: "\x1b\x7f" } + - { key: Insert, chars: "\x1b[2~" } + - { key: Delete, chars: "\x1b[3~" } + - { key: Left, mods: Shift, chars: "\x1b[1;2D" } + - { key: Left, mods: Control, chars: "\x1b[1;5D" } + - { key: Left, mods: Alt, chars: "\x1b[1;3D" } + - { key: Left, chars: "\x1b[D", mode: ~AppCursor } + - { key: Left, chars: "\x1bOD", mode: AppCursor } + - { key: Right, mods: Shift, chars: "\x1b[1;2C" } + - { key: Right, mods: Control, chars: "\x1b[1;5C" } + - { key: Right, mods: Alt, chars: "\x1b[1;3C" } + - { key: Right, chars: "\x1b[C", mode: ~AppCursor } + - { key: Right, chars: "\x1bOC", mode: AppCursor } + - { key: Up, mods: Shift, chars: "\x1b[1;2A" } + - { key: Up, mods: Control, chars: "\x1b[1;5A" } + - { key: Up, mods: Alt, chars: "\x1b[1;3A" } + - { key: Up, chars: "\x1b[A", mode: ~AppCursor } + - { key: Up, chars: "\x1bOA", mode: AppCursor } + - { key: Down, mods: Shift, chars: "\x1b[1;2B" } + - { key: Down, mods: Control, chars: "\x1b[1;5B" } + - { key: Down, mods: Alt, chars: "\x1b[1;3B" } + - { key: Down, chars: "\x1b[B", mode: ~AppCursor } + - { key: Down, chars: "\x1bOB", mode: AppCursor } + - { key: F1, chars: "\x1bOP" } + - { key: F2, chars: "\x1bOQ" } + - { key: F3, chars: "\x1bOR" } + - { key: F4, chars: "\x1bOS" } + - { key: F5, chars: "\x1b[15~" } + - { key: F6, chars: "\x1b[17~" } + - { key: F7, chars: "\x1b[18~" } + - { key: F8, chars: "\x1b[19~" } + - { key: F9, chars: "\x1b[20~" } + - { key: F10, chars: "\x1b[21~" } + - { key: F11, chars: "\x1b[23~" } + - { key: F12, chars: "\x1b[24~" } + - { key: F1, mods: Shift, chars: "\x1b[1;2P" } + - { key: F2, mods: Shift, chars: "\x1b[1;2Q" } + - { key: F3, mods: Shift, chars: "\x1b[1;2R" } + - { key: F4, mods: Shift, chars: "\x1b[1;2S" } + - { key: F5, mods: Shift, chars: "\x1b[15;2~" } + - { key: F6, mods: Shift, chars: "\x1b[17;2~" } + - { key: F7, mods: Shift, chars: "\x1b[18;2~" } + - { key: F8, mods: Shift, chars: "\x1b[19;2~" } + - { key: F9, mods: Shift, chars: "\x1b[20;2~" } + - { key: F10, mods: Shift, chars: "\x1b[21;2~" } + - { key: F11, mods: Shift, chars: "\x1b[23;2~" } + - { key: F12, mods: Shift, chars: "\x1b[24;2~" } + - { key: F1, mods: Control, chars: "\x1b[1;5P" } + - { key: F2, mods: Control, chars: "\x1b[1;5Q" } + - { key: F3, mods: Control, chars: "\x1b[1;5R" } + - { key: F4, mods: Control, chars: "\x1b[1;5S" } + - { key: F5, mods: Control, chars: "\x1b[15;5~" } + - { key: F6, mods: Control, chars: "\x1b[17;5~" } + - { key: F7, mods: Control, chars: "\x1b[18;5~" } + - { key: F8, mods: Control, chars: "\x1b[19;5~" } + - { key: F9, mods: Control, chars: "\x1b[20;5~" } + - { key: F10, mods: Control, chars: "\x1b[21;5~" } + - { key: F11, mods: Control, chars: "\x1b[23;5~" } + - { key: F12, mods: Control, chars: "\x1b[24;5~" } + - { key: F1, mods: Alt, chars: "\x1b[1;6P" } + - { key: F2, mods: Alt, chars: "\x1b[1;6Q" } + - { key: F3, mods: Alt, chars: "\x1b[1;6R" } + - { key: F4, mods: Alt, chars: "\x1b[1;6S" } + - { key: F5, mods: Alt, chars: "\x1b[15;6~" } + - { key: F6, mods: Alt, chars: "\x1b[17;6~" } + - { key: F7, mods: Alt, chars: "\x1b[18;6~" } + - { key: F8, mods: Alt, chars: "\x1b[19;6~" } + - { key: F9, mods: Alt, chars: "\x1b[20;6~" } + - { key: F10, mods: Alt, chars: "\x1b[21;6~" } + - { key: F11, mods: Alt, chars: "\x1b[23;6~" } + - { key: F12, mods: Alt, chars: "\x1b[24;6~" } + - { key: F1, mods: Super, chars: "\x1b[1;3P" } + - { key: F2, mods: Super, chars: "\x1b[1;3Q" } + - { key: F3, mods: Super, chars: "\x1b[1;3R" } + - { key: F4, mods: Super, chars: "\x1b[1;3S" } + - { key: F5, mods: Super, chars: "\x1b[15;3~" } + - { key: F6, mods: Super, chars: "\x1b[17;3~" } + - { key: F7, mods: Super, chars: "\x1b[18;3~" } + - { key: F8, mods: Super, chars: "\x1b[19;3~" } + - { key: F9, mods: Super, chars: "\x1b[20;3~" } + - { key: F10, mods: Super, chars: "\x1b[21;3~" } + - { key: F11, mods: Super, chars: "\x1b[23;3~" } + - { key: F12, mods: Super, chars: "\x1b[24;3~" } diff --git a/packages.org b/packages.org index 99e27ed..dd23ce0 100644 --- a/packages.org +++ b/packages.org @@ -23,5 +23,6 @@ core ncmpcpp core beets * Terminal -core rxvt-unicode +core alacritty +core alacritty-terminfo core fish From 83a383c9425dc9e15e16a353c7cb0bbf4101e2f0 Mon Sep 17 00:00:00 2001 From: Jack Foltz Date: Sat, 1 Dec 2018 13:32:46 -0500 Subject: [PATCH 2/5] Add i3 config --- lain/.config/i3/config.ppi3 | 122 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 lain/.config/i3/config.ppi3 diff --git a/lain/.config/i3/config.ppi3 b/lain/.config/i3/config.ppi3 new file mode 100644 index 0000000..37aa779 --- /dev/null +++ b/lain/.config/i3/config.ppi3 @@ -0,0 +1,122 @@ +############################################################################### +# VARIABLES # +############################################################################### + +#!nobracket + +set $mod Mod1 # Alt key +set $term alacritty + +set $mv 20px # amount to resize windows (also used for how far to +set $mvppt 2ppt # move floating windows with mod+shift+hjkl) + +font pango:SauceCodePro Nerd Font 10 +floating_modifier $mod +focus_follows_mouse no +force_focus_wrapping yes + +############################################################################### +# KEYBINDS # +############################################################################### + +group "default" { + +# launching +bindsym $mod+backslash exec $term +bindsym $mod{,+Shift}+d exec rofi \ + -show {drun,run} + +# window management +bindsym $mod{2|,+Shift}+{1|h,j,k,l,\ # focused window manipulation, + Left,Down,Up,Right} {2|focus,move} \ # vikeys and arrow key support + {1|left,down,up,right}{2|, $mv} + +bindsym $mod+{equal,minus} split {h,v} # horizontal and vertical split +bindsym $mod+f fullscreen toggle # fullscreen + +bindsym $mod+{q,w,e} \ # change container layout + layout {stacking,tabbed,toggle split} + +bindsym $mod{,+Shift}+semicolon \ # floating toggle and focus + {focus mode_,floating }toggle + +bindsym $mod+{a,s} focus {parent,child} # focus parent/child + +bindsym $mod+Shift+q kill + +# workspaces +bindsym $mod{2|,+Shift}+{1|1..9,0} \ + {2|,move container to }\ + workspace number {1|1..10} + +# reload/exit +# restarting/exiting +bindsym $mod+Shift+c \ # run ppi3 and reload config + exec ppi3 ~/.config/i3/config.ppi3 ~/.config/i3/config \ + && i3-msg reload +bindsym $mod+Shift+r restart +bindsym $mod+Shift+e exit + +} + +# dual-monitor setup +bindsym $mod{,+Shift}+slash {focus,move} \ # other monitor + output right +bindsym $mod+Shift+equal {{?\\}} # shoot all workspaces over to my + workspace number {2..10}; move \ # large monitor except 1 + workspace to output HDMI2; {{?\\}} + nop +bindsym $mod+period move workspace to \ # toggle workspace between monitors +output left + +############################################################################### +# MODES # +############################################################################### + +mode "resize" { + bindsym {h,j,k,l,Left,Down,Up,Right} resize \ + {shrink width,grow height,shrink height,grow width} $mv or $mvppt + bindsym Shift+{h,j,k,l,Left,Down,Up,Right} resize \ + {shrink width,grow height,shrink height,grow width} 1px or 1ppt + + bindsym {Return,Escape,space,$mod+r} mode "default" +} +bindsym $mod+r mode "resize" + +############################################################################### +# COLORS AND APPEARANCE # +############################################################################### + +gaps inner 12 +gaps outer 0 +smart_gaps on + +default_border pixel 2 +default_floating_border none +hide_edge_borders both + +set_from_resource $color{1|0..7} color{1|0..7} +set_from_resource $fg foreground +set_from_resource $bg background + +#client.focused $color2 $color2 $fg +#client.focused_inactive $color3 $color3 $fg +#client.unfocused $color3 $color3 $fg +#client.urgent $color2 $color2 $fg +#client.placeholder $color2 $color2 $fg +client.background $color2 + +############################################################################### +# STARTUP # +############################################################################### + +exec --no-startup-id "setxkbmap -option caps:swapescape" +exec --no-startup-id "systemctl --user start ch-wall" + +exec --no-startup-id "compton --config ~/.config/compton/config -b" + +exec --no-startup-id "polybar top" +exec --no-startup-id "polybar bottom" + +exec --no-startup-id "ibus-daemon --xim" + From 56bfd291369f96dd852fdcdc0083f12e5b12f28f Mon Sep 17 00:00:00 2001 From: Jack Foltz Date: Sat, 1 Dec 2018 13:32:58 -0500 Subject: [PATCH 3/5] Add xinitrc --- lain/.xinitrc | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 lain/.xinitrc diff --git a/lain/.xinitrc b/lain/.xinitrc new file mode 100644 index 0000000..c69f4a3 --- /dev/null +++ b/lain/.xinitrc @@ -0,0 +1,36 @@ +#!/bin/sh + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap + +xrdb $userresources + +# merge in defaults and keymaps +if [ -f $sysresources ]; then + xrdb -merge $sysresources +fi + +if [ -f $sysmodmap ]; then + xmodmap $sysmodmap +fi + +if [ -f "$userresources" ]; then + xrdb -merge "$userresources" +fi + +if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" +fi + +# start some nice programs + +if [ -d /etc/X11/xinit/xinitrc.d ] ; then + for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do + [ -x "$f" ] && . "$f" + done + unset f +fi + +exec i3 >~/.config/i3/log From e24a1d1f5535031883cf2ab02eaee03409e3dc9e Mon Sep 17 00:00:00 2001 From: Jack Foltz Date: Sat, 1 Dec 2018 14:24:43 -0500 Subject: [PATCH 4/5] Switch to yaml for package definitions --- install.py | 32 +++++++++++++++++++++++++++++++- lib/__init__.py | 0 lib/configure.py | 5 +++++ {scripts/install => lib}/menu.py | 26 -------------------------- lib/parse.py | 26 ++++++++++++++++++++++++++ packages.org | 28 ---------------------------- packages.yml | 39 +++++++++++++++++++++++++++++++++++++++ scripts/install/parse.py | 34 ---------------------------------- scripts/install/test.py | 10 ---------- 9 files changed, 101 insertions(+), 99 deletions(-) create mode 100644 lib/__init__.py create mode 100644 lib/configure.py rename {scripts/install => lib}/menu.py (77%) create mode 100755 lib/parse.py delete mode 100644 packages.org create mode 100644 packages.yml delete mode 100755 scripts/install/parse.py delete mode 100755 scripts/install/test.py diff --git a/install.py b/install.py index f8d0902..ab2ad11 100755 --- a/install.py +++ b/install.py @@ -1 +1,31 @@ -from subprocess import call +#!/bin/python +import curses +from lib.parse import Category, Package, parse +from lib.menu import Menu +from lib.configure import configure + +categories = parse('packages.yml') + +def noop(): + pass + +class App: + def __init__(self, stdscreen): + self.screen = stdscreen + curses.curs_set(0) + + submenu_items = [ + ('do stuff', noop) + ] + submenu = Menu(self.screen, submenu_items) + + main_menu_items = [ + ('install', noop), + ('submenu', submenu.display) + ] + main_menu = Menu(self.screen, main_menu_items) + main_menu.display() + +if __name__ == '__main__': + curses.wrapper(App) + diff --git a/lib/__init__.py b/lib/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/lib/configure.py b/lib/configure.py new file mode 100644 index 0000000..eaea5e2 --- /dev/null +++ b/lib/configure.py @@ -0,0 +1,5 @@ +from subprocess import call +from lib.parse import Package + +def configure(package): + pass diff --git a/scripts/install/menu.py b/lib/menu.py similarity index 77% rename from scripts/install/menu.py rename to lib/menu.py index ae89d79..6771aeb 100755 --- a/scripts/install/menu.py +++ b/lib/menu.py @@ -1,5 +1,3 @@ -#!/usr/bin/python - import curses from curses import panel @@ -76,27 +74,3 @@ class Menu(BaseMenu): self.should_exit = False self.down() - -class App(object): - def __init__(self, stdscreen): - self.screen = stdscreen - curses.curs_set(0) - - submenu_items = [ - ('beep', curses.beep), - ('flash', curses.flash) - ] - submenu = Menu(self.screen, submenu_items) - - main_menu_items = [ - ('beep', curses.beep), - ('flash', curses.flash), - ('submenu', submenu.display) - ] - main_menu = Menu(self.screen, main_menu_items) - main_menu.display() - -if __name__ == '__main__': - curses.wrapper(App) - - diff --git a/lib/parse.py b/lib/parse.py new file mode 100755 index 0000000..2fd22a3 --- /dev/null +++ b/lib/parse.py @@ -0,0 +1,26 @@ +import yaml + +class Package: + def __init__(self, obj): + if isinstance(obj, dict): + self.name, props = next(iter(obj.items())) + self.source = 'core' + for key, value in props.items(): + setattr(self, key, value) + else: + self.name = obj + self.source = 'core' + def __repr__(self): + return self.name + +class Category: + def __init__(self, name, packages): + self.name = name + self.packages = [Package(pkg) for pkg in packages] + def __repr__(self): + return self.name + ': ' + str(self.packages) + +def parse(file): + f = open(file, 'r') + data = yaml.load(f) + return [Category(name, packages) for name, packages in data.items()] diff --git a/packages.org b/packages.org deleted file mode 100644 index dd23ce0..0000000 --- a/packages.org +++ /dev/null @@ -1,28 +0,0 @@ -* Fonts -core ttf-dejavu -core otf-fira-code -core adobe-source-han-sans-jp-fonts -git https://github.com/domtronn/all-the-icons.el all-the-icons.fish - -* System Tools -core networkmanager - -* Window Manager - -* Desktop Tools -core rofi - -* Editors -core emacs -core neovim - -* Music -core mpd -core mpc -core ncmpcpp -core beets - -* Terminal -core alacritty -core alacritty-terminfo -core fish diff --git a/packages.yml b/packages.yml new file mode 100644 index 0000000..9f23376 --- /dev/null +++ b/packages.yml @@ -0,0 +1,39 @@ +Base: + - fish + - systemd: + source: none + +Terminal: + - alacritty + - alacritty-terminfo + +Editors: + - emacs: + config: .emacs.d + user-units: + - emacs.service + - neovim + +System Tools: + - networkmanager + +Window Manager: + - ppi3-git: + source: aur + +Desktop Tools: + - python-pywal: + script: wal.fish + config: .config/wal + user-units: + - wallpaper.service + - wallpaper.timer + - rofi + +Fonts: + - ttf-dejavu + - otf-fira-code + - adobe-source-han-sans-jp-fonts + - all-the-icons: + source: git + url: https://github.com/domtronn/all-the-icons.el diff --git a/scripts/install/parse.py b/scripts/install/parse.py deleted file mode 100755 index 373ebce..0000000 --- a/scripts/install/parse.py +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/python -import re - -class Package: - def __init__(self, line): - self.type = line[0] - self.name = line[1] - self.script = line[2] if len(line) == 3 else None - @staticmethod - def is_package_line(line): - return re.match(r"^[^*]+", line[0]) - -class Category: - def __init__(self, line): - self.name = ' '.join(line[1:]) - self.packages = [] - @staticmethod - def is_category_line(line): - return re.match(r"^\*+", line[0]) - -def split(lines): - return list(map(lambda line: line.rstrip().split(' '), lines)) - -def parse_package_listing(file): - f = open(file, 'r') - categories = [] - category = None - for line in split(f.readlines()): - if Category.is_category_line(line): - category = Category(line) - categories.append(category) - elif Package.is_package_line(line): - category.packages.append(Package(line)) - return categories diff --git a/scripts/install/test.py b/scripts/install/test.py deleted file mode 100755 index 42fc7cb..0000000 --- a/scripts/install/test.py +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/python - -import parse - -categories = parse.parse_package_listing('packages.org') - -for category in categories: - print(category.name) - for package in category.packages: - print('- ' + package.name) From 63ba3ffba1bd94f671d4e711f8f610509c6a7c95 Mon Sep 17 00:00:00 2001 From: Jack Foltz Date: Sat, 1 Dec 2018 14:25:05 -0500 Subject: [PATCH 5/5] Add wal services --- lain/.config/systemd/user/wallpaper.service | 9 +++++++++ lain/.config/systemd/user/wallpaper.timer | 8 ++++++++ 2 files changed, 17 insertions(+) create mode 100644 lain/.config/systemd/user/wallpaper.service create mode 100644 lain/.config/systemd/user/wallpaper.timer diff --git a/lain/.config/systemd/user/wallpaper.service b/lain/.config/systemd/user/wallpaper.service new file mode 100644 index 0000000..00d6924 --- /dev/null +++ b/lain/.config/systemd/user/wallpaper.service @@ -0,0 +1,9 @@ +[Unit] +Description=Load a random wallpaper and colorscheme + +[Service] +Type=forking +ExecStart=/usr/bin/wal -q -i "/home/lain/Pictures/wallpapers" -a "85" + +[Install] +WantedBy=multi-user.target diff --git a/lain/.config/systemd/user/wallpaper.timer b/lain/.config/systemd/user/wallpaper.timer new file mode 100644 index 0000000..14f8a7d --- /dev/null +++ b/lain/.config/systemd/user/wallpaper.timer @@ -0,0 +1,8 @@ +[Unit] +Description=Periodically run wallpaper service + +[Timer] +OnUnitActiveSec=30min + +[Install] +WantedBy=timers.target