From d73eea18892a877433c8ae04f9514cd6f49c4e74 Mon Sep 17 00:00:00 2001 From: noa@gaiwan.org Date: Mon, 18 Mar 2024 23:34:19 +0000 Subject: Initial commit --- fish/config.fish | 34 +++++++++ fish/functions/fish_prompt.fish | 6 ++ fish/functions/fish_right_prompt.fish | 3 + jwmrc | 138 ++++++++++++++++++++++++++++++++++ xdm/README | 1 + xdm/Xresources | 23 ++++++ xdm/Xsession | 131 ++++++++++++++++++++++++++++++++ xdm/Xsetup | 6 ++ xmodmap | 14 ++++ xsession | 9 +++ 10 files changed, 365 insertions(+) create mode 100644 fish/config.fish create mode 100644 fish/functions/fish_prompt.fish create mode 100644 fish/functions/fish_right_prompt.fish create mode 100644 jwmrc create mode 100644 xdm/README create mode 100644 xdm/Xresources create mode 100755 xdm/Xsession create mode 100755 xdm/Xsetup create mode 100644 xmodmap create mode 100755 xsession diff --git a/fish/config.fish b/fish/config.fish new file mode 100644 index 0000000..2f110c6 --- /dev/null +++ b/fish/config.fish @@ -0,0 +1,34 @@ +if status is-interactive + # Commands to run in interactive sessions can go here +end + +set fish_greeting + +fish_add_path $HOME/Scripts + +# unset most of the colours +set fish_color_normal normal +set fish_color_autosuggestion --underline +set fish_color_cancel --reverse +set fish_color_command +set fish_color_comment +set fish_color_cwd +set fish_color_cwd_root +set fish_color_end +set fish_color_error +set fish_color_escape +set fish_color_history_current --underline +set fish_color_host +set fish_color_host_remote +set fish_color_keyword +set fish_color_match --background=red +set fish_color_operator +set fish_color_option +set fish_color_param +set fish_color_quote +set fish_color_redirection +set fish_color_search_match --reverse +set fish_color_selection --background=green +set fish_color_status +set fish_color_user +set fish_color_valid_path diff --git a/fish/functions/fish_prompt.fish b/fish/functions/fish_prompt.fish new file mode 100644 index 0000000..eeec7d8 --- /dev/null +++ b/fish/functions/fish_prompt.fish @@ -0,0 +1,6 @@ +function fish_prompt + #set_color $fish_color_cwd + echo -n (basename $PWD) + #set_color normal + echo -n ' ) ' +end diff --git a/fish/functions/fish_right_prompt.fish b/fish/functions/fish_right_prompt.fish new file mode 100644 index 0000000..c3235a5 --- /dev/null +++ b/fish/functions/fish_right_prompt.fish @@ -0,0 +1,3 @@ +function fish_right_prompt + date '+%H:%M' +end diff --git a/jwmrc b/jwmrc new file mode 100644 index 0000000..801f3e6 --- /dev/null +++ b/jwmrc @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + exec:rofi -show combi -modes combi -combi-modes "window,drun,run" + + + + + + root:1 + + + + + Noto Sans CJK SC-16 + 4 + + 0 + + #000000 + #ffffe8 + #000000 + 1.0 + + + #000000 + #e5e5d0 + #000000 + + + + + #ffffe8 + #000000 + + + + Noto Sans CJK SC-16 + #ffffe8 + #000000 + #000000 + 1 + + + + Sans-9 + + #000000 + #e5e5d8 + + #000000 + #ffffe8 + + + + Sans-9 + #000000 + #ffffe8 + + + + + /usr/share/icons/wm-icons/32x32-aquafusion + + + /usr/local/share/jwm + + + + + #ffffe8 + + + + 400 + + + 2 + + + sloppy + + + border + + + opaque + + + opaque + + + up + down + right + left + left + down + up + right + select + escape + + exec:rofi -show combi -modes combi -combi-modes "window,drun,run" + exec:rofi -show combi -modes combi -combi-modes "window,drun,run" + + exec:brightnessctl -d intel_backlight set 5%- + exec:brightnessctl -d intel_backlight set 5%+ + exec:amixer -D pulse sset Master 5%+ + exec:amixer -D pulse sset Master 5%- + exec:amixer -D pulse sset Master toggle + + restart + + nextstacked + close + desktop# + window + maximize + rdesktop + ldesktop + udesktop + ddesktop + + diff --git a/xdm/README b/xdm/README new file mode 100644 index 0000000..3f5b24b --- /dev/null +++ b/xdm/README @@ -0,0 +1 @@ +The files in this directory should be copied to /etc/X11/xdm/ diff --git a/xdm/Xresources b/xdm/Xresources new file mode 100644 index 0000000..4d7126d --- /dev/null +++ b/xdm/Xresources @@ -0,0 +1,23 @@ +Xcursor.theme: whiteglass + +xlogin.Login.greeting: +xlogin.Login.fail: Incorrect +xlogin.Login.namePrompt: Username: +xlogin.Login.passwdPrompt: Password: +xlogin.Login.echoPasswd: true + +xlogin.Login.face: Noto sans cjk sc-18 +xlogin.Login.greetFace: Noto sans cjk sc-18 +xlogin.Login.greetColor: black +xlogin.Login.promptFace: Noto sans cjk sc-18 +xlogin.Login.failFace: Noto sans cjk sc-18 +xlogin.Login.failColor: black + +! user input colours +xlogin.Login.background: #ffffe8 +xlogin.Login.foreground: #000000 + +xlogin.Login.borderWidth: 1 +xlogin.Login.frameWidth: 0 +xlogin.Login.innerFramesWidth: 0 +xlogin.Login.sepWidth: 0 diff --git a/xdm/Xsession b/xdm/Xsession new file mode 100755 index 0000000..a564fb0 --- /dev/null +++ b/xdm/Xsession @@ -0,0 +1,131 @@ +#!/bin/sh +# +# /etc/X11/Xsession +# +# global Xsession file -- used by display managers and xinit (startx) + +# $Id: Xsession 967 2005-12-27 07:20:55Z dnusinow $ + +set -e + +PROGNAME=Xsession + +message () { + # pretty-print messages of arbitrary length; use xmessage if it + # is available and $DISPLAY is set + MESSAGE="$PROGNAME: $*" + echo "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2 + if [ -n "$DISPLAY" ] && command -v xmessage > /dev/null 2>&1; then + echo "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file - + fi +} + +message_nonl () { + # pretty-print messages of arbitrary length (no trailing newline); use + # xmessage if it is available and $DISPLAY is set + MESSAGE="$PROGNAME: $*" + echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2; + if [ -n "$DISPLAY" ] && command -v xmessage > /dev/null 2>&1; then + echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file - + fi +} + +errormsg () { + # exit script with error + message "$*" + exit 1 +} + +internal_errormsg () { + # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message + # One big call to message() for the sake of xmessage; if we had two then + # the user would have dismissed the error we want reported before seeing the + # request to report it. + errormsg "$*" \ + "Please report the installed version of the \"x11-common\"" \ + "package and the complete text of this error message to" \ + "." +} + +# initialize variables for use by all session scripts + +OPTIONFILE=/etc/X11/Xsession.options + +SYSRESOURCES=/etc/X11/Xresources +USRRESOURCES=$HOME/.Xresources + +SYSSESSIONDIR=/etc/X11/Xsession.d +USERXSESSION=$HOME/.config/xsession +USERXSESSIONRC=$HOME/.xsessionrc +ALTUSERXSESSION=$HOME/.Xsession +ERRFILE=$HOME/.local/share/xsession-errors + +OPTIONS="$( + if [ -r "$OPTIONFILE" ]; then + cat "$OPTIONFILE" + fi + if [ -d /etc/X11/Xsession.options.d ]; then + run-parts --list --regex '\.conf$' /etc/X11/Xsession.options.d | xargs -d '\n' cat + fi +)" + +has_option() { + # Ensure that a later no-foo overrides an earlier foo + if [ "$(echo "$OPTIONS" | grep -Eo "^(no-)?$1\>" | tail -n 1)" = "$1" ]; then + return 0 + else + return 1 + fi +} + +# attempt to create an error file; abort if we cannot +if (umask 077 && touch "$ERRFILE") 2> /dev/null && [ -w "$ERRFILE" ] && + [ ! -L "$ERRFILE" ]; then + chmod 600 "$ERRFILE" +elif ERRFILE=$(mktemp 2> /dev/null); then + if ! ln -sf "$ERRFILE" "${TMPDIR:=/tmp}/xsession-$USER"; then + message "warning: unable to symlink \"$TMPDIR/xsession-$USER\" to" \ + "\"$ERRFILE\"; look for session log/errors in" \ + "\"$TMPDIR/xsession-$USER\"." + fi +else + errormsg "unable to create X session log/error file; aborting." +fi + +exec >>"$ERRFILE" 2>&1 + +echo "$PROGNAME: X session started for $LOGNAME at $(date)" + +# sanity check; is our session script directory present? +if [ ! -d "$SYSSESSIONDIR" ]; then + errormsg "no \"$SYSSESSIONDIR\" directory found; aborting." +fi + +# Attempt to create a file of non-zero length in /tmp; a full filesystem can +# cause mysterious X session failures. We do not use touch, :, or test -w +# because they won't actually create a file with contents. We also let standard +# error from mktemp and echo go to the error file to aid the user in +# determining what went wrong. +WRITE_TEST=$(mktemp) +if ! echo "*" >>"$WRITE_TEST"; then + message "warning: unable to write to ${WRITE_TEST%/*}; X session may exit" \ + "with an error" +fi +rm -f "$WRITE_TEST" + +# use run-parts to source every file in the session directory; we source +# instead of executing so that the variables and functions defined above +# are available to the scripts, and so that they can pass variables to each +# other +SESSIONFILES=$(run-parts --list $SYSSESSIONDIR) +if [ -n "$SESSIONFILES" ]; then + set +e + for SESSIONFILE in $SESSIONFILES; do + . $SESSIONFILE + done + set -e +fi + +exit 0 + +# vim:set ai et sts=2 sw=2 tw=80: diff --git a/xdm/Xsetup b/xdm/Xsetup new file mode 100755 index 0000000..6db7807 --- /dev/null +++ b/xdm/Xsetup @@ -0,0 +1,6 @@ +#!/bin/sh +# +# This script is run as root before showing login widget. + +xsetroot -solid "#ffffe8" +# picom -b --config /home/noa/.config/picom/picom.conf diff --git a/xmodmap b/xmodmap new file mode 100644 index 0000000..b4ab7b2 --- /dev/null +++ b/xmodmap @@ -0,0 +1,14 @@ +clear lock +clear mod1 +clear control + +! Set key left of spacebar to control +keycode 64 = Control_L +add control = Control_L + +! Set key right of spacebar to alt +keycode 108 = Alt_L +add mod1 = Alt_L + +! Set caps lock to search +keycode 66 = XF86Search diff --git a/xsession b/xsession new file mode 100755 index 0000000..5ff0783 --- /dev/null +++ b/xsession @@ -0,0 +1,9 @@ +xmodmap ~/.config/xmodmap +brightnessctl -d intel_backlight set 25% + +cbatticon & +pnmixer & +picom -b + +# exec startfluxbox +exec jwm -f ~/.config/jwmrc -- cgit 1.4.1-2-gfad0