From 480dd4688b20be3b69b54043d5e5d3df713926c0 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Wed, 8 Sep 2021 19:35:23 -0700 Subject: linux: remove configurations specific to linux They are all handled by the repository `linux-desktop`. It's easier to have a different repository for this bits of configs. --- Makefile | 6 -- Makefile.darwin | 6 -- Makefile.linux | 17 ---- README.org | 126 ------------------------ Xmodmap | 4 - Xresources | 9 -- config/alacritty/alacritty.yml | 45 --------- config/git/user.personal | 3 - config/git/user.work | 3 - config/i3/config | 172 --------------------------------- config/mpd/mpd.conf | 15 --- config/redshift.conf | 19 ---- config/systemd/user/backup.service | 13 --- config/systemd/user/ssh-agent.service | 12 --- config/systemd/user/sync-music.service | 10 -- config/user-dirs.dirs | 8 -- pam_environment | 1 - xsession | 8 -- 18 files changed, 477 deletions(-) delete mode 100644 Makefile.darwin delete mode 100644 Makefile.linux delete mode 100644 Xmodmap delete mode 100644 Xresources delete mode 100644 config/alacritty/alacritty.yml delete mode 100644 config/git/user.personal delete mode 100644 config/git/user.work delete mode 100644 config/i3/config delete mode 100644 config/mpd/mpd.conf delete mode 100644 config/redshift.conf delete mode 100644 config/systemd/user/backup.service delete mode 100644 config/systemd/user/ssh-agent.service delete mode 100644 config/systemd/user/sync-music.service delete mode 100644 config/user-dirs.dirs delete mode 100644 pam_environment delete mode 100755 xsession diff --git a/Makefile b/Makefile index 8323e15..4ff03ea 100644 --- a/Makefile +++ b/Makefile @@ -2,12 +2,6 @@ OS := $(shell uname -s) LN = @ln -sf -ifeq ($(OS),Darwin) -include Makefile.darwin -else -include Makefile.linux -endif - .PHONY: install-general install-general: @mkdir -p $(HOME)/.config diff --git a/Makefile.darwin b/Makefile.darwin deleted file mode 100644 index 290a48b..0000000 --- a/Makefile.darwin +++ /dev/null @@ -1,6 +0,0 @@ -.PHONY: install-darwin-symlinks -install-darwin-symlinks: install-general - $(LN) $(PWD)/config/git/user.work $(HOME)/.config/git/user - $(LN) $(PWD)/config/emacs $(HOME)/.emacs.d - -install: install-darwin-symlinks diff --git a/Makefile.linux b/Makefile.linux deleted file mode 100644 index a5490dd..0000000 --- a/Makefile.linux +++ /dev/null @@ -1,17 +0,0 @@ -.PHONY: install-linux-symlinks -install-linux-symlinks: install-general - @mkdir -p $(HOME)/.config/systemd - $(LN) $(PWD)/Xmodmap $(HOME)/.Xmodmap - $(LN) $(PWD)/Xresources $(HOME)/.Xresources - $(LN) $(PWD)/config/alacritty $(HOME)/.config/ - $(LN) $(PWD)/config/git/user.personal $(HOME)/.config/git/user - $(LN) $(PWD)/config/i3/ $(HOME)/.config/ - $(LN) $(PWD)/config/mpd/ $(HOME)/.config/ - $(LN) $(PWD)/config/redshift.conf $(HOME)/.config/redshift.conf - $(LN) $(PWD)/config/systemd/user/backup.service $(HOME)/.config/systemd/user/backup.service - $(LN) $(PWD)/config/systemd/user/ssh-agent.service $(HOME)/.config/systemd/user/ssh-agent.service - $(LN) $(PWD)/config/user-dirs.dirs $(HOME)/.config/user-dirs.dirs - $(LN) $(PWD)/pam_environment $(HOME)/.pam_environment - $(LN) $(PWD)/xsession $(HOME)/.xsession - -install: install-linux-symlinks diff --git a/README.org b/README.org index 61b16c1..c7873cb 100644 --- a/README.org +++ b/README.org @@ -29,129 +29,3 @@ If the program you debug needs argument, call =M-x dap-debug-edit-template=. Add The binding =C-c d= will bring an hydra menu for debugging. The REPL is not brought on by default when starting a debugging session, but =M-x dap-ui-repl= will start a REPL (the position is controlled by the variable =dap-ui-buffer-configurations=). -* Linux -** installed packages -Under arch linux, you can run the following to get the list of installed packages: -, -#+begin_src sh -pacman -Qqe -#+end_src - -#+RESULTS: -| alacritty | -| alsa-utils | -| aspell | -| aspell-en | -| base | -| btrfs-progs | -| chromium | -| dmenu | -| docker | -| easytag | -| emacs | -| ethtool | -| faac | -| feh | -| firefox | -| fwupd | -| gcc | -| git | -| gnome-keyring | -| go | -| htop | -| hugo | -| i3-wm | -| i3lock | -| i3status | -| intel-ucode | -| iwd | -| jq | -| kubectl | -| lightdm | -| lightdm-gtk-greeter | -| linux | -| linux-firmware | -| make | -| man-db | -| mc | -| mg | -| mpc | -| mpd | -| mupdf | -| nautilus | -| network-manager-applet | -| nodejs | -| noto-fonts | -| noto-fonts-cjk | -| noto-fonts-emoji | -| openssh | -| podman | -| pulseaudio | -| pulseaudio-alsa | -| qrencode | -| racket-minimal | -| redshift | -| restic | -| rhythmbox | -| ripgrep | -| rsync | -| sane-airscan | -| simple-scan | -| smbclient | -| strace | -| sudo | -| syncthing | -| systemd-resolvconf | -| tcpdump | -| tmux | -| ttf-bitstream-vera | -| ttf-dejavu | -| ttf-droid | -| unzip | -| vi | -| vlc | -| w3m | -| wavemon | -| wireguard-tools | -| wireshark-cli | -| wireshark-qt | -| xclip | -| xdg-user-dirs | -| xf86-video-intel | -| xorg-server | -| xorg-xmodmap | -| xorg-xrandr | -| xorg-xrdb | -| xorg-xsetroot | -| xss-lock | -| xterm | -| zsh | - -** xorg -To fix the touchpad (use reverse / natural scrolling and faster movement): -#+begin_src -#/etc/X11/xorg.conf.d/30-touchpad.conf -Section "InputClass" - Identifier "touchpad" - Driver "libinput" - MatchIsTouchpad "on" - Option "NaturalScrolling" "true" - Option "AccelSpeed" "0.3" -EndSection -#+end_src - -In case it's needed, the configuration for the DELL 4k monitor: -#+begin_src -#/etc/X11/xorg.conf.d/25-dell-monitor-U2718Q.conf -# Dell 4k home monitors (U2718Q) -Section "Monitor" - Identifier "DP-3" - Option "DPMS" "true" -EndSection -#+end_src - -The following udev rules: -#+begin_src -#/etc/udev/rules.d/99-monitor-hotplug.rules -KERNEL=="card0", ACTION=="change", SUBSYSTEM=="drm", ENV{DISPLAY}=":0" ENV{HOTPLUG}=="1", RUN+="/usr/local/bin/monitor-hotplug" -#+end_src diff --git a/Xmodmap b/Xmodmap deleted file mode 100644 index 0553230..0000000 --- a/Xmodmap +++ /dev/null @@ -1,4 +0,0 @@ -clear lock -clear control -keycode 66 = Control_L -add control = Control_L Control_R diff --git a/Xresources b/Xresources deleted file mode 100644 index a5d38e9..0000000 --- a/Xresources +++ /dev/null @@ -1,9 +0,0 @@ -Xft.dpi: 128 -Xft.autohint: 0 -Xft.lcdfilter: lcddefault -Xft.hintstyle: hintfull -Xft.hinting: 1 -Xft.antialias: 1 -Xft.rgba: rgb - -XTerm.vt100.termName: xterm-256color diff --git a/config/alacritty/alacritty.yml b/config/alacritty/alacritty.yml deleted file mode 100644 index 3f1d6ee..0000000 --- a/config/alacritty/alacritty.yml +++ /dev/null @@ -1,45 +0,0 @@ -# Any items in the `env` entry below will be added as -# environment variables. Some entries may override variables -# set by alacritty itself. -env: - # 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 - -scrolling: - # Maximum number of lines in the scrollback buffer. - # Specifying '0' will disable scrolling. - history: 100000 - -font: - size: 10.0 - -# If `true`, bold text is drawn using the bright color variants. -draw_bold_text_with_bright_colors: true - -colors: - primary: - background: '#FFFFE8' - foreground: '#000000' - -# 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: 1.0 - -selection: - # This string contains all characters that are used as separators for "semantic words" in Alacritty. - #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t" - - # When set to `true`, selected text will be copied to the primary clipboard. - save_to_clipboard: true - -cursor: - # Values for `style`: - # - ▇ Block - # - _ Underline - # - | Beam - style: Block - -live_config_reload: true diff --git a/config/git/user.personal b/config/git/user.personal deleted file mode 100644 index 092c2f1..0000000 --- a/config/git/user.personal +++ /dev/null @@ -1,3 +0,0 @@ -[user] - name = Franck Cuny - email = franck@fcuny.net diff --git a/config/git/user.work b/config/git/user.work deleted file mode 100644 index d95b398..0000000 --- a/config/git/user.work +++ /dev/null @@ -1,3 +0,0 @@ -[user] - name = Franck Cuny - email = fcuny@twitter.com diff --git a/config/i3/config b/config/i3/config deleted file mode 100644 index e9e8f29..0000000 --- a/config/i3/config +++ /dev/null @@ -1,172 +0,0 @@ -# i3 config file (v4) -# -# Please see https://i3wm.org/docs/userguide.html for a complete reference! - -set $mod Mod4 - -# Font for window titles. Will also be used by the bar unless a different font -# is used in the bar {} block below. -font pango:Source Code Pro 8 - -set $Locker i3lock && sleep 1 - -# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the -# screen before suspend. Use loginctl lock-session to lock your screen. -exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork - -# lock the screen with i3lock -bindsym $mod+l exec --no-startup-id $Locker, mode "default" - -# Use pactl to adjust volume in PulseAudio. -set $refresh_i3status killall -SIGUSR1 i3status -bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status -bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status -bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status -bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status - -# Use Mouse+$mod to drag floating windows to their wanted position -floating_modifier $mod - -# start a terminal -bindsym $mod+Return exec exec alacritty - -# kill focused window -bindsym $mod+Shift+q kill - -# start dmenu (a program launcher) -bindsym $mod+d exec dmenu_run -# There also is the (new) i3-dmenu-desktop which only displays applications -# shipping a .desktop file. It is a wrapper around dmenu, so you need that -# installed. -# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop - -# change focus -bindsym $mod+j focus left -bindsym $mod+k focus down -bindsym $mod+semicolon focus right - -# alternatively, you can use the cursor keys: -bindsym $mod+Left focus left -bindsym $mod+Down focus down -bindsym $mod+Up focus up -bindsym $mod+Right focus right - -# move focused window -bindsym $mod+Shift+j move left -bindsym $mod+Shift+k move down -bindsym $mod+Shift+l move up -bindsym $mod+Shift+semicolon move right - -# alternatively, you can use the cursor keys: -bindsym $mod+Shift+Left move left -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+Right move right - -# split in horizontal orientation -bindsym $mod+h split h - -# split in vertical orientation -bindsym $mod+v split v - -# enter fullscreen mode for the focused container -bindsym $mod+f fullscreen toggle - -# change container layout (stacked, tabbed, toggle split) -bindsym $mod+s layout stacking -bindsym $mod+w layout tabbed -bindsym $mod+e layout toggle split - -# toggle tiling / floating -bindsym $mod+Shift+space floating toggle - -# change focus between tiling / floating windows -bindsym $mod+space focus mode_toggle - -# focus the parent container -bindsym $mod+a focus parent - -# focus the child container -#bindsym $mod+d focus child - -# Define names for default workspaces for which we configure key bindings later on. -# We use variables to avoid repeating the names in multiple places. -set $ws1 "1" -set $ws2 "2" -set $ws3 "3" -set $ws4 "4" -set $ws5 "5" -set $ws6 "6" -set $ws7 "7" -set $ws8 "8" -set $ws9 "9" -set $ws10 "10" - -# switch to workspace -bindsym $mod+1 workspace number $ws1 -bindsym $mod+2 workspace number $ws2 -bindsym $mod+3 workspace number $ws3 -bindsym $mod+4 workspace number $ws4 -bindsym $mod+5 workspace number $ws5 -bindsym $mod+6 workspace number $ws6 -bindsym $mod+7 workspace number $ws7 -bindsym $mod+8 workspace number $ws8 -bindsym $mod+9 workspace number $ws9 -bindsym $mod+0 workspace number $ws10 - -# move focused container to workspace -bindsym $mod+Shift+1 move container to workspace number $ws1 -bindsym $mod+Shift+2 move container to workspace number $ws2 -bindsym $mod+Shift+3 move container to workspace number $ws3 -bindsym $mod+Shift+4 move container to workspace number $ws4 -bindsym $mod+Shift+5 move container to workspace number $ws5 -bindsym $mod+Shift+6 move container to workspace number $ws6 -bindsym $mod+Shift+7 move container to workspace number $ws7 -bindsym $mod+Shift+8 move container to workspace number $ws8 -bindsym $mod+Shift+9 move container to workspace number $ws9 -bindsym $mod+Shift+0 move container to workspace number $ws10 - -# reload the configuration file -bindsym $mod+Shift+c reload -# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) -bindsym $mod+Shift+r restart -# exit i3 (logs you out of your X session) -bindsym $mod+Shift+e 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'" - -# resize window (you can also use the mouse for that) -mode "resize" { - # These bindings trigger as soon as you enter the resize mode - - # Pressing left will shrink the window’s width. - # Pressing right will grow the window’s width. - # Pressing up will shrink the window’s height. - # Pressing down will grow the window’s height. - bindsym j resize shrink width 10 px or 10 ppt - bindsym k resize grow height 10 px or 10 ppt - bindsym l resize shrink height 10 px or 10 ppt - bindsym semicolon resize grow width 10 px or 10 ppt - - # same bindings, but for the arrow keys - bindsym Left resize shrink width 10 px or 10 ppt - bindsym Down resize grow height 10 px or 10 ppt - bindsym Up resize shrink height 10 px or 10 ppt - bindsym Right resize grow width 10 px or 10 ppt - - # back to normal: Enter or Escape or $mod+r - bindsym Return mode "default" - bindsym Escape mode "default" - bindsym $mod+r mode "default" -} - -assign [class="Alacritty"] 1 -assign [class="emacs"] 2 -assign [class="firefox"] 3 - -# Moving workspaces between screens -bindsym $mod+shift+p move workspace to output right - -# Start i3bar to display a workspace bar (plus the system information i3status -# finds out, if available) -bar { - status_command i3status -} diff --git a/config/mpd/mpd.conf b/config/mpd/mpd.conf deleted file mode 100644 index 27f07f2..0000000 --- a/config/mpd/mpd.conf +++ /dev/null @@ -1,15 +0,0 @@ -music_directory "/home/fcuny/media/music" - -log_file "syslog" - -bind_to_address "localhost" -port "6600" - -auto_update "yes" - -audio_output { - type "pulse" - name "MPD" -} - -filesystem_charset "UTF-8" diff --git a/config/redshift.conf b/config/redshift.conf deleted file mode 100644 index 47f37d3..0000000 --- a/config/redshift.conf +++ /dev/null @@ -1,19 +0,0 @@ -[redshift] -temp-day=5000 -temp-night=4000 - -transition=0 - -gamma-day=0.9 -gamma-night=0.7 - -adjustment-method=randr -location-provider=manual - -; Set the screen brightness. Default is 1.0. -brightness-day=1.0 -brightness-night=0.7 - -[manual] -lat=37.8715 -lon=-122.2730 diff --git a/config/systemd/user/backup.service b/config/systemd/user/backup.service deleted file mode 100644 index 98a9df9..0000000 --- a/config/systemd/user/backup.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=backup my home directory - -[Service] -Type=oneshot - -Environment=RESTIC_REPOSITORY=rest:http://192.168.6.10:8010/ -Environment=RESTIC_PASSWORD_FILE=/home/fcuny/.config/restic/password - -ExecStart=/usr/bin/restic --tag=home --exclude=/home/fcuny/.cache --exclude=/home/fcuny/.mozilla --exclude=/home/fcuny/media --exclude=/home/fcuny/.config/chromium backup /home/fcuny - -[Install] -WantedBy=default.target diff --git a/config/systemd/user/ssh-agent.service b/config/systemd/user/ssh-agent.service deleted file mode 100644 index 5c59cbf..0000000 --- a/config/systemd/user/ssh-agent.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=SSH key agent - -[Service] -Type=simple -Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket -# DISPLAY required for ssh-askpass to work -Environment=DISPLAY=:0 -ExecStart=/usr/bin/ssh-agent -D -a $SSH_AUTH_SOCK - -[Install] -WantedBy=default.target diff --git a/config/systemd/user/sync-music.service b/config/systemd/user/sync-music.service deleted file mode 100644 index acc821a..0000000 --- a/config/systemd/user/sync-music.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Sync my music collection to the NAS - -[Service] -Type=oneshot - -ExecStart=/usr/bin/rsync -a /home/fcuny/media/music/ nas.home:/data/music - -[Install] -WantedBy=default.target diff --git a/config/user-dirs.dirs b/config/user-dirs.dirs deleted file mode 100644 index 18aaee8..0000000 --- a/config/user-dirs.dirs +++ /dev/null @@ -1,8 +0,0 @@ -XDG_DESKTOP_DIR="$HOME/documents" -XDG_DOCUMENTS_DIR="$HOME/documents" -XDG_DOWNLOAD_DIR="$HOME/downloads" -XDG_MUSIC_DIR="$HOME/media/music" -XDG_PICTURES_DIR="$HOME/media/pictures" -XDG_PUBLICSHARE_DIR="$HOME/documents" -XDG_VIDEOS_DIR="$HOME/media/videos" -XDG_TEMPLATES_DIR="$HOME/documents/templates" diff --git a/pam_environment b/pam_environment deleted file mode 100644 index 3bd1a97..0000000 --- a/pam_environment +++ /dev/null @@ -1 +0,0 @@ -SSH_AUTH_SOCK DEFAULT="${XDG_RUNTIME_DIR}/ssh-agent.socket" diff --git a/xsession b/xsession deleted file mode 100755 index 45704c8..0000000 --- a/xsession +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/bash - -xrdb $HOME/.Xresources - -# set the background to something less aggressive than black -xsetroot -solid "#333333" -cursor_name left_ptr - -exec i3 -- cgit 1.4.1