From d3b0cb8668798275c25631679722c648d48ff8bb Mon Sep 17 00:00:00 2001 From: Alison Watson Date: Sun, 5 Jun 2022 22:51:41 -0600 Subject: [PATCH] bunch of crap --- applications/alacritty.yml | 15 +- applications/fish | 8 +- applications/gimp/agw.scm | 89 ++- applications/kitty.conf | 924 ++----------------------------- applications/kxkbrc | 2 +- applications/mpv.conf | 3 +- computers/cain/fish/discord | 10 +- computers/cain/fish/pulse-server | 8 +- emacs/data.el | 4 +- emacs/init.el | 30 +- fish/chroot | 10 +- fish/emacs-nw | 2 +- fish/generate-grub | 2 +- fish/ls | 5 + games/alephone/marathon-2.xml | 35 +- games/eternity/doom.cfg | 39 +- games/eternity/keys.csc | 2 + games/eternity/system.cfg | 6 +- games/lutris/lutris.conf | 15 +- sshot/quickshot | 9 + system/autostart/05-pipewire.sh | 3 + system/env/00-vars.sh | 3 +- 22 files changed, 259 insertions(+), 965 deletions(-) create mode 100644 fish/ls create mode 100755 sshot/quickshot create mode 100755 system/autostart/05-pipewire.sh diff --git a/applications/alacritty.yml b/applications/alacritty.yml index fe707d9..120a5e2 100644 --- a/applications/alacritty.yml +++ b/applications/alacritty.yml @@ -1,5 +1,5 @@ env: - TERM: xterm-256color + TERM: alacritty window: dimensions: @@ -12,14 +12,15 @@ window: decorations: full startup_mode: Windowed title: "Terminal" - gtk_theme_variant: None + gtk_theme_variant: dark scrolling: - history: 0 + history: 10000 + multiplier: 3 font: normal: - family: Courier Prime Code + family: monospace style: Regular size: 12.0 offset: @@ -59,4 +60,10 @@ cursor: style: Block unfocused_hollow: true +bell: + animation: EaseOutExpo + duration: 100 + +working_directory: /home/marrub + live_config_reload: false diff --git a/applications/fish b/applications/fish index b4547da..ed56344 100644 --- a/applications/fish +++ b/applications/fish @@ -1,27 +1,25 @@ #!/usr/bin/env fish -# launch tmux if we're in an interactive terminal emulator -if status is-interactive && not status is-login && test -z "$TMUX" - exec tmux new-session -end - # bootstrapping information # required universal variables: # - _agw_dir_bin = volatile binary storage # - _agw_dir_rc = the directory holding this repository # - _agw_dir_src = non-volatile source code storage # - _agw_dir_dev = volatile chroot development environment +# - _agw_dir_res = volatile resource storage switch (uname) case Linux NetBSD set -Ux _agw_dir_bin ~/bin set -Ux _agw_dir_rc ~/rc set -Ux _agw_dir_src ~/src set -Ux _agw_dir_dev ~/dev + set -Ux _agw_dir_res ~/res case Darwin set -Ux _agw_dir_bin ~/Binaries set -Ux _agw_dir_rc ~/Sources/scripts set -Ux _agw_dir_src ~/Sources set -Ux _agw_dir_dev ~/Development + set -Ux _agw_dir_res ~/Resources case \* echo (set_color red)"This platform is not configured!" end diff --git a/applications/gimp/agw.scm b/applications/gimp/agw.scm index a5c26dc..faef629 100644 --- a/applications/gimp/agw.scm +++ b/applications/gimp/agw.scm @@ -1,10 +1,14 @@ -(define (agw-vec-list vl) (vector->list (cadr vl))) +(define author "Alison Gray Watson") +(define license "Public domain") +(define path "/:>") + +(define (agw-vec-list vl) + (vector->list (cadr vl))) (define (agw-p67-font) (for-each (lambda (im) - (let ((dr (car (gimp-image-get-active-drawable im))) - (fname (car (gimp-image-get-filename im)))) + (let ((dr (car (gimp-image-get-active-drawable im)))) (unless (eq? (gimp-image-base-type im) RGB) (gimp-image-convert-rgb im)) (gimp-drawable-desaturate dr DESATURATE-LUMINANCE) @@ -15,8 +19,24 @@ 0 ; num-cols (ign.) FALSE ; alpha-dither FALSE ; remove-unused - "p67 palette") - (gimp-file-save RUN-NONINTERACTIVE im dr fname fname))) + "p67 palette"))) + (agw-vec-list (gimp-image-list)))) + +(define (agw-overwrite-all) + (for-each + (lambda (im) + (let ((dr (car (gimp-image-get-active-drawable im))) + (fn (car (gimp-image-get-filename im)))) + (gimp-file-save RUN-NONINTERACTIVE im dr fn fn))) + (agw-vec-list (gimp-image-list)))) + +(define (agw-overlay-all fn mode) + (for-each + (lambda (im) + (let ((ly (car (gimp-file-load-layer RUN-NONINTERACTIVE im fn)))) + (gimp-image-insert-layer im ly 0 -1) + (gimp-layer-set-mode ly mode) + (gimp-image-merge-down im ly CLIP-TO-IMAGE))) (agw-vec-list (gimp-image-list)))) (define (agw-destructure im) @@ -40,14 +60,52 @@ (fnc nx (if dr? (succ n) n))))))) (fnc (agw-vec-list (gimp-image-get-layers im)) num))) -(define author "Alison Gray Watson") -(define license "Public domain") -(define path "/:>") +(define (agw-240p-ify im1) + (let ((ly1 (car (gimp-image-get-active-layer im1))) + (dr1 (car (gimp-image-get-active-drawable im1))) + (im2 (car (gimp-image-duplicate im1))) + (w (inexact->exact + (floor (/ (car (gimp-image-width im1)) + (/ (car (gimp-image-height im1)) 240)))))) + (gimp-context-set-interpolation INTERPOLATION-NONE) + (gimp-image-scale im1 w 240) + (plug-in-threshold-alpha RUN-NONINTERACTIVE im1 dr1 128) + (gimp-context-set-interpolation INTERPOLATION-CUBIC) + (gimp-image-scale im2 w 240) + (let ((ly2 (car (gimp-layer-new-from-drawable + (car (gimp-image-get-active-drawable im2)) + im1)))) + (gimp-image-insert-layer im1 ly2 0 -1) + (gimp-image-select-rectangle im1 CHANNEL-OP-REPLACE 0 0 w 240) + (gimp-image-select-item im1 CHANNEL-OP-SUBTRACT ly1) + (gimp-drawable-edit-clear ly2) + (gimp-image-select-rectangle im1 CHANNEL-OP-SUBTRACT 0 0 w 240) + (gimp-image-merge-down im1 ly2 CLIP-TO-BOTTOM-LAYER) + (plug-in-autocrop RUN-NONINTERACTIVE im1 + (car (gimp-image-get-active-drawable im1))) + (gimp-image-delete im2)))) + +(define (agw-threshold-all) + (for-each + (lambda (im) + (plug-in-threshold-alpha RUN-NONINTERACTIVE im (car (gimp-image-get-active-drawable im)) 128) + (plug-in-autocrop RUN-NONINTERACTIVE im (car (gimp-image-get-active-drawable im)))) + (agw-vec-list (gimp-image-list)))) (script-fu-register "agw-p67-font" "P67 Font" "Converts open images to a project67 font" author license "2021" "") +(script-fu-register + "agw-overwrite-all" + "Overwrite All Open" "Overwrites all currently open images" + author license "2021" "") +(script-fu-register + "agw-overlay-all" + "Overlay All Open" "Overlays all currently open images with another image" + author license "2021" "" + SF-FILENAME "File" "" + SF-ENUM "Mode" '("LayerMode" "normal")) (script-fu-register "agw-destructure" "Destructure" "Deletes foreground color from all layers" @@ -62,7 +120,20 @@ SF-STRING "Prefix (Optional)" "" SF-STRING "Suffix (Required)" ".png" SF-IMAGE "Image" 0) +(script-fu-register + "agw-240p-ify" + "240p-ify" "Crunches an image to 240p smoothly" + author license "2022" "" + SF-IMAGE "Image" 0) +(script-fu-register + "agw-threshold-all" + "Threshold All" "Crunches all of the open images" + author license "2022" "") -(script-fu-menu-register "agw-p67-font" path) +(script-fu-menu-register "agw-p67-font" path) +(script-fu-menu-register "agw-overwrite-all" path) +(script-fu-menu-register "agw-overlay-all" path) (script-fu-menu-register "agw-destructure" path) (script-fu-menu-register "agw-export-font" path) +(script-fu-menu-register "agw-240p-ify" path) +(script-fu-menu-register "agw-threshold-all" path) diff --git a/applications/kitty.conf b/applications/kitty.conf index 4ae70ba..27d79de 100644 --- a/applications/kitty.conf +++ b/applications/kitty.conf @@ -1,889 +1,63 @@ -# vim:fileencoding=utf-8:ft=conf:foldmethod=marker - -#: Fonts {{{ - -font_family PxPlus IBM EGA8 -bold_font auto -italic_font auto -bold_italic_font auto +font_family JetBrainsMono-Regular +bold_font JetBrainsMono-Bold +italic_font JetBrainsMono-Italic +bold_italic_font JetBrainsMono-BoldItalic font_size 12.0 +force_ltr yes adjust_line_height 0 adjust_column_width 0 +adjust_baseline 0 -symbol_map U+100-U+10FFFF Noto Sans CJK JP Medium +disable_ligatures never -#: Map the specified unicode codepoints to a particular font. Useful -#: if you need special rendering for some symbols, such as for -#: Powerline. Avoids the need for patched fonts. Each unicode code -#: point is specified in the form U+. You -#: can specify multiple code points, separated by commas and ranges -#: separated by hyphens. symbol_map itself can be specified multiple -#: times. Syntax is:: +cursor_shape block +shell_integration no-cursor +cursor_blink_interval 0 +scrollback_lines 10000 -#: symbol_map codepoints Font Family Name +strip_trailing_spaces always -# box_drawing_scale 0.001, 1, 1.5, 2 - -#: Change the sizes of the lines used for the box drawing unicode -#: characters These values are in pts. They will be scaled by the -#: monitor DPI to arrive at a pixel value. There must be four values -#: corresponding to thin, normal, thick, and very thick lines. - -#: }}} - -#: Cursor customization {{{ - -# cursor #cccccc - -#: Default cursor color - -# cursor_text_color #111111 - -#: Choose the color of text under the cursor. If you want it rendered -#: with the background color of the cell underneath instead, use the -#: special keyword: background - -# cursor_shape block - -#: The cursor shape can be one of (block, beam, underline) - -cursor_blink_interval 0.0 -cursor_stop_blinking_after 1.0 - -#: The interval (in seconds) at which to blink the cursor. Set to zero -#: to disable blinking. Note that numbers smaller than repaint_delay -#: will be limited to repaint_delay. Stop blinking cursor after the -#: specified number of seconds of keyboard inactivity. Set to zero to -#: never stop blinking. - -#: }}} - -#: Scrollback {{{ - -scrollback_lines -1 - -#: Number of lines of history to keep in memory for scrolling back. -#: Memory is allocated on demand. Negative numbers are (effectively) -#: infinite scrollback. Note that using very large scrollback is not -#: recommended as it can slow down resizing of the terminal and also -#: use large amounts of RAM. - -# scrollback_pager less --chop-long-lines --RAW-CONTROL-CHARS +INPUT_LINE_NUMBER - -#: Program with which to view scrollback in a new window. The -#: scrollback buffer is passed as STDIN to this program. If you change -#: it, make sure the program you use can handle ANSI escape sequences -#: for colors and text formatting. INPUT_LINE_NUMBER in the command -#: line above will be replaced by an integer representing which line -#: should be at the top of the screen. - -# scrollback_pager_history_size 0 - -#: Separate scrollback history size, used only for browsing the -#: scrollback buffer (in MB). This separate buffer is not available -#: for interactive scrolling but will be piped to the pager program -#: when viewing scrollback buffer in a separate window. The current -#: implementation stores one character in 4 bytes, so approximatively -#: 2500 lines per megabyte at 100 chars per line. A value of zero or -#: less disables this feature. The maximum allowed size is 4GB. - -# wheel_scroll_multiplier 5.0 - -#: Modify the amount scrolled by the mouse wheel. Note this is only -#: used for low precision scrolling devices, not for high precision -#: scrolling on platforms such as macOS and Wayland. Use negative -#: numbers to change scroll direction. - -# touch_scroll_multiplier 1.0 - -#: Modify the amount scrolled by a touchpad. Note this is only used -#: for high precision scrolling devices on platforms such as macOS and -#: Wayland. Use negative numbers to change scroll direction. - -#: }}} - -#: Mouse {{{ - -# url_color #0087BD -# url_style curly - -#: The color and style for highlighting URLs on mouse-over. url_style -#: can be one of: none, single, double, curly - -# open_url_modifiers kitty_mod - -#: The modifier keys to press when clicking with the mouse on URLs to -#: open the URL - -# open_url_with default - -#: The program with which to open URLs that are clicked on. The -#: special value default means to use the operating system's default -#: URL handler. - -# copy_on_select no - -#: Copy to clipboard on select. With this enabled, simply selecting -#: text with the mouse will cause the text to be copied to clipboard. -#: Useful on platforms such as macOS that do not have the concept of -#: primary selections. Note that this is a security risk, as all -#: programs, including websites open in your browser can read the -#: contents of the clipboard. - -# rectangle_select_modifiers ctrl+alt - -#: The modifiers to use rectangular selection (i.e. to select text in -#: a rectangular block with the mouse) - -# select_by_word_characters :@-./_~?&=%+# - -#: Characters considered part of a word when double clicking. In -#: addition to these characters any character that is marked as an -#: alpha-numeric character in the unicode database will be matched. - -# click_interval -1.0 - -#: The interval between successive clicks to detect double/triple -#: clicks (in seconds). Negative numbers will use the system default -#: instead, if available, or fallback to 0.5. - -# mouse_hide_wait 3.0 - -#: Hide mouse cursor after the specified number of seconds of the -#: mouse not being used. Set to zero to disable mouse cursor hiding. - -# focus_follows_mouse no - -#: Set the active window to the window under the mouse when moving the -#: mouse around - -#: }}} - -#: Performance tuning {{{ - -# repaint_delay 10 - -#: Delay (in milliseconds) between screen updates. Decreasing it, -#: increases frames-per-second (FPS) at the cost of more CPU usage. -#: The default value yields ~100 FPS which is more than sufficient for -#: most uses. Note that to actually achieve 100 FPS you have to either -#: set sync_to_monitor to no or use a monitor with a high refresh -#: rate. - -input_delay 0 - -#: Delay (in milliseconds) before input from the program running in -#: the terminal is processed. Note that decreasing it will increase -#: responsiveness, but also increase CPU usage and might cause flicker -#: in full screen programs that redraw the entire screen on each loop, -#: because kitty is so fast that partial screen updates will be drawn. - -sync_to_monitor no - -#: Sync screen updates to the refresh rate of the monitor. This -#: prevents tearing (https://en.wikipedia.org/wiki/Screen_tearing) -#: when scrolling. However, it limits the rendering speed to the -#: refresh rate of your monitor. With a very high speed mouse/high -#: keyboard repeat rate, you may notice some slight input latency. If -#: so, set this to no. - -#: }}} - -#: Terminal bell {{{ +repaint_delay 6 +input_delay 1 enable_audio_bell no -#: Enable/disable the audio bell. Useful in environments that require -#: silence. - -visual_bell_duration 0.0 - -#: Visual bell duration. Flash the screen when a bell occurs for the -#: specified number of seconds. Set to zero to disable. - -window_alert_on_bell yes - -#: Request window attention on bell. Makes the dock icon bounce on -#: macOS or the taskbar flash on linux. - -# bell_on_tab yes - -#: Show a bell symbol on the tab if a bell occurs in one of the -#: windows in the tab and the window is not the currently focused -#: window - -#: }}} - -#: Window layout {{{ - -remember_window_size no -initial_window_width 80c +remember_window_size no +initial_window_width 80c initial_window_height 48c -#: If enabled, the window size will be remembered so that new -#: instances of kitty will have the same size as the previous -#: instance. If disabled, the window will initially have size -#: configured by initial_window_width/height, in pixels. You can use a -#: suffix of "c" on the width/height values to have them interpreted -#: as number of cells instead of pixels. - -# enabled_layouts * - -#: The enabled window layouts. A comma separated list of layout names. -#: The special value all means all layouts. The first listed layout -#: will be used as the startup layout. For a list of available -#: layouts, see the -#: https://sw.kovidgoyal.net/kitty/index.html#layouts. - -# window_resize_step_cells 2 -# window_resize_step_lines 2 - -#: The step size (in units of cell width/cell height) to use when -#: resizing windows. The cells value is used for horizontal resizing -#: and the lines value for vertical resizing. - -# window_border_width 1.0 - -#: The width (in pts) of window borders. Will be rounded to the -#: nearest number of pixels based on screen resolution. Note that -#: borders are displayed only when more than one window is visible. -#: They are meant to separate multiple windows. - -# draw_minimal_borders yes - -#: Draw only the minimum borders needed. This means that only the -#: minimum needed borders for inactive windows are drawn. That is only -#: the borders that separate the inactive window from a neighbor. Note -#: that setting a non-zero window margin overrides this and causes all -#: borders to be drawn. - -# window_margin_width 0.0 - -#: The window margin (in pts) (blank area outside the border) - -# single_window_margin_width -1000.0 - -#: The window margin (in pts) to use when only a single window is -#: visible. Negative values will cause the value of -#: window_margin_width to be used instead. - -# window_padding_width 0.0 - -#: The window padding (in pts) (blank area between the text and the -#: window border) - -# active_border_color #00ff00 - -#: The color for the border of the active window - -# inactive_border_color #cccccc - -#: The color for the border of inactive windows - -# bell_border_color #ff5a00 - -#: The color for the border of inactive windows in which a bell has -#: occurred - -# inactive_text_alpha 1.0 - -#: Fade the text in inactive windows by the specified amount (a number -#: between zero and one, with zero being fully faded). - -# hide_window_decorations no - -#: Hide the window decorations (title-bar and window borders). Whether -#: this works and exactly what effect it has depends on the window -#: manager/operating system. - -#: }}} - -#: Tab bar {{{ - -# tab_bar_edge bottom - -#: Which edge to show the tab bar on, top or bottom - -# tab_bar_margin_width 0.0 - -#: The margin to the left and right of the tab bar (in pts) - -# tab_bar_style fade - -#: The tab bar style, can be one of: fade, separator or hidden. In the -#: fade style, each tab's edges fade into the background color, in the -#: separator style, tabs are separated by a configurable separator. - -# tab_fade 0.25 0.5 0.75 1 - -#: Control how each tab fades into the background when using fade for -#: the tab_bar_style. Each number is an alpha (between zero and one) -#: that controls how much the corresponding cell fades into the -#: background, with zero being no fade and one being full fade. You -#: can change the number of cells used by adding/removing entries to -#: this list. - -# tab_separator " ┇" - -#: The separator between tabs in the tab bar when using separator as -#: the tab_bar_style. - -# tab_title_template {title} - -#: A template to render the tab title. The default just renders the -#: title. If you wish to include the tab-index as well, use something -#: like: {index}: {title}. Useful if you have shortcuts mapped for -#: goto_tab N. - -# active_tab_foreground #000 -# active_tab_background #eee -# active_tab_font_style bold-italic -# inactive_tab_foreground #444 -# inactive_tab_background #999 -# inactive_tab_font_style normal - -#: Tab bar colors and styles - -#: }}} - -#: Color scheme {{{ - -foreground #d3dae3 -background #13131f - -#: The foreground and background colors - -background_opacity 0.9 -dynamic_background_opacity no - -#: The opacity of the background. A number between 0 and 1, where 1 is -#: opaque and 0 is fully transparent. This will only work if -#: supported by the OS (for instance, when using a compositor under -#: X11). Note that it only sets the default background color's -#: opacity. This is so that things like the status bar in vim, -#: powerline prompts, etc. still look good. But it means that if you -#: use a color theme with a background color in your editor, it will -#: not be rendered as transparent. Instead you should change the -#: default background color in your kitty config and not use a -#: background color in the editor color scheme. Or use the escape -#: codes to set the terminals default colors in a shell script to -#: launch your editor. Be aware that using a value less than 1.0 is a -#: (possibly significant) performance hit. If you want to dynamically -#: change transparency of windows set dynamic_background_opacity to -#: yes (this is off by default as it has a performance cost) - -dim_opacity 0.53 - -#: How much to dim text that has the DIM/FAINT attribute set. One -#: means no dimming and zero means fully dimmed (i.e. invisible). - -# selection_foreground #000000 -# selection_background #FFFACD - -#: The foreground and background for text selected with the mouse - - -#: The 16 terminal colors. There are 8 basic colors, each color has a -#: dull and bright version. You can also set the remaining colors from -#: the 256 color table as color16 to color255. - -color0 #4b5164 -color8 #616981 - -#: black - -color1 #e14245 -color9 #e16f7e - -#: red - -color2 #5ca75b -color10 #add488 - -#: green - -color3 #f6ab32 -color11 #fdc35f - -#: yellow - -color4 #4877b1 -color12 #8ca9bf - -#: blue - -color5 #a660c3 -color13 #e2afec - -#: magenta - -color6 #5294e2 -color14 #73c5e2 - -#: cyan - -color7 #a9a9aa -color15 #fcfcfc - -#: white - -#: }}} - -#: Advanced {{{ - -# shell . - -#: The shell program to execute. The default value of . means to use -#: whatever shell is set as the default shell for the current user. -#: Note that on macOS if you change this, you might need to add -#: --login to ensure that the shell starts in interactive mode and -#: reads its startup rc files. - -# editor . - -#: The console editor to use when editing the kitty config file or -#: similar tasks. A value of . means to use the environment variable -#: EDITOR. Note that this environment variable has to be set not just -#: in your shell startup scripts but system-wide, otherwise kitty will -#: not see it. - -# close_on_child_death no - -#: Close the window when the child process (shell) exits. If no (the -#: default), the terminal will remain open when the child exits as -#: long as there are still processes outputting to the terminal (for -#: example disowned or backgrounded processes). If yes, the window -#: will close as soon as the child process exits. Note that setting it -#: to yes means that any background processes still using the terminal -#: can fail silently because their stdout/stderr/stdin no longer work. - -# allow_remote_control no - -#: Allow other programs to control kitty. If you turn this on other -#: programs can control all aspects of kitty, including sending text -#: to kitty windows, opening new windows, closing windows, reading the -#: content of windows, etc. Note that this even works over ssh -#: connections. - -# env - -#: Specify environment variables to set in all child processes. Note -#: that environment variables are expanded recursively, so if you -#: use:: - -#: env MYVAR1=a -#: env MYVAR2=${MYVAR1}/${HOME}/b - -#: The value of MYVAR2 will be a//b. - -# startup_session none - -#: Path to a session file to use for all kitty instances. Can be -#: overridden by using the kitty --session command line option for -#: individual instances. See -#: https://sw.kovidgoyal.net/kitty/index.html#sessions in the kitty -#: documentation for details. Note that relative paths are interpreted -#: with respect to the kitty config directory. Environment variables -#: in the path are expanded. - -# clipboard_control write-clipboard write-primary - -#: Allow programs running in kitty to read and write from the -#: clipboard. You can control exactly which actions are allowed. The -#: set of possible actions is: write-clipboard read-clipboard write- -#: primary read-primary The default is to allow writing to the -#: clipboard and primary selection. Note that enabling the read -#: functionality is a security risk as it means that any program, even -#: one running on a remote server via SSH can read your clipboard. - -# term xterm-kitty - -#: The value of the TERM environment variable to set. Changing this -#: can break many terminal programs, only change it if you know what -#: you are doing, not because you read some advice on Stack Overflow -#: to change it. The TERM variable if used by various programs to get -#: information about the capabilities and behavior of the terminal. If -#: you change it, depending on what programs you run, and how -#: different the terminal you are changing it to is, various things -#: from key-presses, to colors, to various advanced features may not -#: work. - -#: }}} - -#: OS specific tweaks {{{ - -# macos_titlebar_color system - -#: Change the color of the kitty window's titlebar on macOS. A value -#: of system means to use the default system color, a value of -#: background means to use the background color of the currently -#: active window and finally you can use an arbitrary color, such as -#: #12af59 or red. WARNING: This option works by using a hack, as -#: there is no proper Cocoa API for it. It sets the background color -#: of the entire window and makes the titlebar transparent. As such it -#: is incompatible with background_opacity. If you want to use both, -#: you are probably better off just hiding the titlebar with -#: hide_window_decorations. - -# macos_option_as_alt yes - -#: Use the option key as an alt key. With this set to no, kitty will -#: use the macOS native Option+Key = unicode character behavior. This -#: will break any Alt+key keyboard shortcuts in your terminal -#: programs, but you can use the macOS unicode input technique. - -# macos_hide_from_tasks no - -#: Hide the kitty window from running tasks (Option+Tab) on macOS. - -# macos_quit_when_last_window_closed no - -#: Have kitty quit when all the top-level windows are closed. By -#: default, kitty will stay running, even with no open windows, as is -#: the expected behavior on macOS. - -# macos_window_resizable yes - -#: Disable this if you want kitty top-level (OS) windows to not be -#: resizable on macOS. - -# macos_thicken_font 0 - -#: Draw an extra border around the font with the given width, to -#: increase legibility at small font sizes. For example, a value of -#: 0.75 will result in rendering that looks similar to sub-pixel -#: antialiasing at common font sizes. - -# macos_traditional_fullscreen no - -#: Use the traditional full-screen transition, that is faster, but -#: less pretty. - -# macos_custom_beam_cursor no - -#: Enable/disable custom mouse cursor for macOS that is easier to see -#: on both light and dark backgrounds. WARNING: this might make your -#: mouse cursor invisible on dual GPU machines. - -#: }}} - -#: Keyboard shortcuts {{{ - -#: For a list of key names, see: GLFW keys -#: . The name to use -#: is the part after the GLFW_KEY_ prefix. For a list of modifier -#: names, see: GLFW mods -#: - -#: On Linux you can also use XKB key names to bind keys that are not -#: supported by GLFW. See XKB keys -#: for a list of key names. The name to use is the part -#: after the XKB_KEY_ prefix. Note that you should only use an XKB key -#: name for keys that are not present in the list of GLFW keys. - -#: Finally, you can use raw system key codes to map keys. To see the -#: system key code for a key, start kitty with the kitty --debug- -#: keyboard option. Then kitty will output some debug text for every -#: key event. In that text look for ``native_code`` the value of that -#: becomes the key name in the shortcut. For example: - -#: .. code-block:: none - -#: on_key_input: glfw key: 65 native_code: 0x61 action: PRESS mods: 0x0 text: 'a' - -#: Here, the key name for the A key is 0x61 and you can use it with:: - -#: map ctrl+0x61 something - -#: to map ctrl+a to something. - -#: You can use the special action no_op to unmap a keyboard shortcut -#: that is assigned in the default configuration. - -#: You can combine multiple actions to be triggered by a single -#: shortcut, using the syntax below:: - -#: map key combine action1 action2 action3 ... - -#: For example:: - -#: map kitty_mod+e combine : new_window : next_layout - -#: this will create a new window and switch to the next available -#: layout - -#: You can use multi-key shortcuts using the syntax shown below:: - -#: map key1>key2>key3 action - -#: For example:: - -#: map ctrl+f>2 set_font_size 20 - -# kitty_mod ctrl+shift - -#: The value of kitty_mod is used as the modifier for all default -#: shortcuts, you can change it in your kitty.conf to change the -#: modifiers for all the default shortcuts. - -# clear_all_shortcuts no - -#: You can have kitty remove all shortcut definition seen up to this -#: point. Useful, for instance, to remove the default shortcuts. - -#: Clipboard {{{ - -# map kitty_mod+c copy_to_clipboard - -#: There is also a copy_or_interrupt action that can be optionally -#: mapped to Ctrl+c. It will copy only if there is a selection and -#: send an interrupt otherwise. - -# map kitty_mod+v paste_from_clipboard -# map kitty_mod+s paste_from_selection -# map shift+insert paste_from_selection -# map kitty_mod+o pass_selection_to_program - -#: You can also pass the contents of the current selection to any -#: program using pass_selection_to_program. By default, the system's -#: open program is used, but you can specify your own, for example:: - -#: map kitty_mod+o pass_selection_to_program firefox - -#: You can pass the current selection to a terminal program running in -#: a new kitty window, by using the @selection placeholder:: - -#: map kitty_mod+y new_window less @selection - -#: }}} - -#: Scrolling {{{ - -# map kitty_mod+up scroll_line_up -# map kitty_mod+k scroll_line_up -# map kitty_mod+down scroll_line_down -# map kitty_mod+j scroll_line_down -# map kitty_mod+page_up scroll_page_up -# map kitty_mod+page_down scroll_page_down -# map kitty_mod+home scroll_home -# map kitty_mod+end scroll_end -# map kitty_mod+h show_scrollback - -#: You can pipe the contents of the current screen + history buffer as -#: STDIN to an arbitrary program using the ``pipe`` function. For -#: example, the following opens the scrollback buffer in less in an -#: overlay window:: - -#: map f1 pipe @ansi overlay less +G -R - -#: For more details on piping screen and buffer contents to external -#: programs, see pipe. - -#: }}} - -#: Window management {{{ - -# map kitty_mod+enter new_window - -#: You can open a new window running an arbitrary program, for -#: example:: - -#: map kitty_mod+y new_window mutt - -#: You can open a new window with the current working directory set to -#: the working directory of the current window using:: - -#: map ctrl+alt+enter new_window_with_cwd - -#: You can open a new window that is allowed to control kitty via the -#: kitty remote control facility by prefixing the command line with @. -#: Any programs running in that window will be allowed to control -#: kitty. For example:: - -#: map ctrl+enter new_window @ some_program - -# map kitty_mod+n new_os_window -# map kitty_mod+w close_window -# map kitty_mod+] next_window -# map kitty_mod+[ previous_window -# map kitty_mod+f move_window_forward -# map kitty_mod+b move_window_backward -# map kitty_mod+` move_window_to_top -# map kitty_mod+r start_resizing_window -# map kitty_mod+1 first_window -# map kitty_mod+2 second_window -# map kitty_mod+3 third_window -# map kitty_mod+4 fourth_window -# map kitty_mod+5 fifth_window -# map kitty_mod+6 sixth_window -# map kitty_mod+7 seventh_window -# map kitty_mod+8 eighth_window -# map kitty_mod+9 ninth_window -# map kitty_mod+0 tenth_window -#: }}} - -#: Tab management {{{ - -# map kitty_mod+right next_tab -# map kitty_mod+left previous_tab -# map kitty_mod+t new_tab -# map kitty_mod+q close_tab -# map kitty_mod+. move_tab_forward -# map kitty_mod+, move_tab_backward -# map kitty_mod+alt+t set_tab_title - -#: You can also create shortcuts to go to specific tabs, with 1 being -#: the first tab, 2 the second tab and -1 being the previously active -#: tab:: - -#: map ctrl+alt+1 goto_tab 1 -#: map ctrl+alt+2 goto_tab 2 - -#: Just as with new_window above, you can also pass the name of -#: arbitrary commands to run when using new_tab and use -#: new_tab_with_cwd. Finally, if you want the new tab to open next to -#: the current tab rather than at the end of the tabs list, use:: - -#: map ctrl+t new_tab !neighbor [optional cmd to run] -#: }}} - -#: Layout management {{{ - -# map kitty_mod+l next_layout - -#: You can also create shortcuts to switch to specific layouts:: - -#: map ctrl+alt+t goto_layout tall -#: map ctrl+alt+s goto_layout stack - -#: Similarly, to switch back to the previous layout:: - -#: map ctrl+alt+p last_used_layout -#: }}} - -#: Font sizes {{{ - -#: You can change the font size for all top-level kitty OS windows at -#: a time or only the current one. - -# map kitty_mod+equal change_font_size all +2.0 -# map kitty_mod+minus change_font_size all -2.0 -# map kitty_mod+backspace change_font_size all 0 - -#: To setup shortcuts for specific font sizes:: - -#: map kitty_mod+f6 change_font_size all 10.0 - -#: To setup shortcuts to change only the current OS window's font -#: size:: - -#: map kitty_mod+f6 change_font_size current 10.0 -#: }}} - -#: Select and act on visible text {{{ - -#: Use the hints kitten to select text and either pass it to an -#: external program or insert it into the terminal or copy it to the -#: clipboard. - -# map kitty_mod+e kitten hints - -#: Open a currently visible URL using the keyboard. The program used -#: to open the URL is specified in open_url_with. - -# map kitty_mod+p>f kitten hints --type path --program - - -#: Select a path/filename and insert it into the terminal. Useful, for -#: instance to run git commands on a filename output from a previous -#: git command. - -# map kitty_mod+p>shift+f kitten hints --type path - -#: Select a path/filename and open it with the default open program. - -# map kitty_mod+p>l kitten hints --type line --program - - -#: Select a line of text and insert it into the terminal. Use for the -#: output of things like: ls -1 - -# map kitty_mod+p>w kitten hints --type word --program - - -#: Select words and insert into terminal. - -# map kitty_mod+p>h kitten hints --type hash --program - - -#: Select something that looks like a hash and insert it into the -#: terminal. Useful with git, which uses sha1 hashes to identify -#: commits - - -#: The hints kitten has many more modes of operation that you can map -#: to different shortcuts. For a full description see kittens/hints. -#: }}} - -#: Miscellaneous {{{ - -# map kitty_mod+f11 toggle_fullscreen -# map kitty_mod+u kitten unicode_input -# map kitty_mod+f2 edit_config_file -# map kitty_mod+escape kitty_shell window - -#: Open the kitty shell in a new window/tab/overlay/os_window to -#: control kitty using commands. - -# map kitty_mod+a>m set_background_opacity +0.1 -# map kitty_mod+a>l set_background_opacity -0.1 -# map kitty_mod+a>1 set_background_opacity 1 -# map kitty_mod+a>d set_background_opacity default -# map kitty_mod+delete clear_terminal reset active - -#: You can create shortcuts to clear/reset the terminal. For example:: - -#: # Reset the terminal -#: map kitty_mod+f9 clear_terminal reset active -#: # Clear the terminal screen by erasing all contents -#: map kitty_mod+f10 clear_terminal clear active -#: # Clear the terminal scrollback by erasing it -#: map kitty_mod+f11 clear_terminal scrollback active -#: # Scroll the contents of the screen into the scrollback -#: map kitty_mod+f12 clear_terminal scroll active - -#: If you want to operate on all windows instead of just the current -#: one, use all instead of :italic`active`. - -#: It is also possible to remap Ctrl+L to both scroll the current -#: screen contents into the scrollback buffer and clear the screen, -#: instead of just clearing the screen:: - -#: map ctrl+l combine : clear_terminal scroll active : send_text normal,application - - -#: You can tell kitty to send arbitrary (UTF-8) encoded text to the -#: client program when pressing specified shortcut keys. For example:: - -#: map ctrl+alt+a send_text all Special text - -#: This will send "Special text" when you press the ctrl+alt+a key -#: combination. The text to be sent is a python string literal so you -#: can use escapes like \x1b to send control codes or \u21fb to send -#: unicode characters (or you can just input the unicode characters -#: directly as UTF-8 text). The first argument to send_text is the -#: keyboard modes in which to activate the shortcut. The possible -#: values are normal or application or kitty or a comma separated -#: combination of them. The special keyword all means all modes. The -#: modes normal and application refer to the DECCKM cursor key mode -#: for terminals, and kitty refers to the special kitty extended -#: keyboard protocol. - -#: Another example, that outputs a word and then moves the cursor to -#: the start of the line (same as pressing the Home key):: - -#: map ctrl+alt+a send_text normal Word\x1b[H -#: map ctrl+alt+a send_text application Word\x1bOH - -#: }}} - -# }}} +window_border_width 0 + +resize_in_steps yes +background_opacity 0.9 +background #1a141d +foreground #cfd8dc +color0 #37474f +color1 #ff3d00 +color2 #00e676 +color3 #ff9100 +color4 #3d5afe +color5 #7c4dff +color6 #00b0ff +color7 #dcdcdc +color8 #607d8b +color9 #ff1744 +color10 #1de9b6 +color11 #ffc400 +color12 #2979ff +color13 #d500f9 +color14 #00e5ff +color15 #ffffff + +update_check_interval 0 + +clear_all_shortcuts yes + +map ctrl+shift+c copy_to_clipboard +map ctrl+shift+v paste_from_clipboard +map ctrl+backslash show_scrollback +map ctrl+shift+enter new_tab + +# EOF diff --git a/applications/kxkbrc b/applications/kxkbrc index e25c1d3..9165571 100644 --- a/applications/kxkbrc +++ b/applications/kxkbrc @@ -1,5 +1,5 @@ [$Version] -update_info=kxkb_variants.upd:split-variants +update_info=kxkb_variants.upd:split-variants,kxkb.upd:remove-empty-lists,kxkb.upd:add-back-resetoptions [Layout] DisplayNames=pro diff --git a/applications/mpv.conf b/applications/mpv.conf index a46eca1..d620f5f 100644 --- a/applications/mpv.conf +++ b/applications/mpv.conf @@ -1,5 +1,6 @@ save-position-on-quit resume-playback msg-level=all=warn -sub-auto=fuzzy script=/usr/lib/mpv-mpris/mpris.so +sub-auto=all +sub-file-paths=ass:srt:sub:Sub:subs:Subs:subtitles:Subtitles diff --git a/computers/cain/fish/discord b/computers/cain/fish/discord index 2c459a5..99642c7 100644 --- a/computers/cain/fish/discord +++ b/computers/cain/fish/discord @@ -18,20 +18,20 @@ function install-discord -a disver # HACKS FOR SYSTEM ELECTRON # all credits to Kodehawa et al. asar e resources/app.asar resources/app - sed -i "s|process.resourcesPath|'/usr/lib/discord-canary'|" resources/app/app_bootstrap/buildInfo.js + sed -i "s|process.resourcesPath|'/usr/lib/discord-canary/resources'|" resources/app/app_bootstrap/buildInfo.js sed -i "s|exeDir,|'/usr/share/pixmaps',|" resources/app/app_bootstrap/autoStart/linux.js asar p resources/app resources/app.asar rm -rf resources/app echo "#!/bin/sh" >> discord-canary - echo "exec electron13 /usr/lib/discord-canary/app.asar \$@" >> discord-canary + echo "exec electron13 /usr/lib/discord-canary/resources/app.asar \$@" >> discord-canary - sudo install -d /usr/{bin,lib/discord-canary/bootstrap,share/{pixmaps,applications}} + sudo install -d /usr/{bin,lib/discord-canary/resources/bootstrap,share/{pixmaps,applications}} sudo install -Dm 755 discord-canary /usr/bin/discord-canary sudo install -Dm 644 discord.png /usr/share/pixmaps/discord-canary.png sudo install -Dm 644 discord-canary.desktop /usr/share/applications/discord-canary.desktop - sudo install -Dm 644 resources/*.* /usr/lib/discord-canary/ - sudo install -Dm 644 resources/bootstrap/*.* /usr/lib/discord-canary/bootstrap/ + sudo install -Dm 644 resources/*.* /usr/lib/discord-canary/resources/ + sudo install -Dm 644 resources/bootstrap/*.* /usr/lib/discord-canary/resources/bootstrap/ popd end diff --git a/computers/cain/fish/pulse-server b/computers/cain/fish/pulse-server index 276add3..95f6533 100644 --- a/computers/cain/fish/pulse-server +++ b/computers/cain/fish/pulse-server @@ -1,11 +1,7 @@ #!/usr/bin/env fish -function pulse-server-up - pactl load-module module-simple-protocol-tcp rate=24000 format=s16le channels=2 source=alsa_output.usb-Kingston_HyperX_7.1_Audio_00000000-00.analog-stereo.monitor record=true port=6969 -end - -function pulse-server-down - pactl unload-module module-simple-protocol-tcp +function audio-server-up + cvlc -vvv pulse://alsa_output.usb-Kingston_HyperX_7.1_Audio_00000000-00.iec958-stereo.monitor --sout '#transcode{acodec=opus,ab=64,channels=2,samplerate=48000}:standard{access=http,mux=ogg,dst=0.0.0.0:8888/pc.opus}' end ## EOF diff --git a/emacs/data.el b/emacs/data.el index a1ca43b..20c330a 100644 --- a/emacs/data.el +++ b/emacs/data.el @@ -67,7 +67,9 @@ ;; Lithium dialogues mode (setq agw-lithdlg-highlights (let* (( keywords '("dialogue" "terminal" "program" "page" "failure" - "finished" "unfinished" "if" "else")) + "finished" "unfinished" "if" "else" + "lipu_ilo" "toki" "ilo" "seme" "ante" "pakala" + "pini" "lipu" "awen")) (functions '("option" "page" "name" "icon" "remote" "teleport_interlevel" "teleport_intralevel" "script" "logon" "logoff" "pict" "info" "text")) diff --git a/emacs/init.el b/emacs/init.el index b471c28..de8c78a 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -4,18 +4,20 @@ (load usr-data)) ;; tabulation -(setq-default tab-width 3) +(setq-default tab-width 3) +(setq-default standard-indent 3) ;; mode line (setq-default mode-line-format '("%+" mode-line-buffer-identification - mode-line-modes "%5l↑%3c→%6i⇆" (:eval (number-to-string (count-lines (point-min) (point-max)))) "↓" - mode-line-percent-position)) + mode-line-percent-position + " " + mode-line-modes)) ;; scrolling (setq scroll-conservatively 101 @@ -93,16 +95,6 @@ (provide 'agw-base16-fira-theme) (enable-theme 'agw-base16-fira)) -(use-package inkpot-theme - :after base16-theme - :ensure t - :config - (unless (display-graphic-p) - (load-theme 'inkpot t nil)) - (set-face-attribute 'mode-line nil - :background "#0a0a0a" - :foreground "#92ebf0")) - ;; major modes (use-package elisp-mode) (use-package eldoc) @@ -219,6 +211,10 @@ :init (defvaralias 'typescript-indent-level 'tab-width)) +(use-package go-mode + :hook (go-mode . agw-maybe-smart-tabs-mode) + :ensure t) + ;; org-mode (use-package org :hook ((org-mode . agw-flyspell-mode) @@ -320,7 +316,8 @@ :ensure t) (use-package whitespace - :hook (prog-mode . whitespace-mode) + :hook ((prog-mode . whitespace-mode) + (text-mode . whitespace-mode)) :init (setq whitespace-style '(face space-before-tab @@ -331,10 +328,11 @@ trailing)) :config (dolist (face '(whitespace-space whitespace-tab)) - (set-face-attribute face nil :background nil :foreground "#7e4594"))) + (set-face-attribute face nil :background "#0f0c11" :foreground "#7e4594"))) (use-package hl-line - :hook (prog-mode . hl-line-mode)) + :hook ((prog-mode . hl-line-mode) + (text-mode . hl-line-mode))) (use-package image-file :config diff --git a/fish/chroot b/fish/chroot index ee6c784..59c70a4 100644 --- a/fish/chroot +++ b/fish/chroot @@ -22,11 +22,11 @@ end function devrt xbps-uunshare \ - -b $_agw_dir_rc:/home/marrub/rc \ - -b $_agw_dir_src:/home/marrub/src \ - -b $_agw_dir_bin:/home/marrub/bin \ - -b ~/vmshare:/home/marrub/vmshare \ - -b ~/.gem:/home/marrub/.gem \ + -b $_agw_dir_rc:$HOME/rc \ + -b $_agw_dir_src:$HOME/src \ + -b $_agw_dir_bin:$HOME/bin \ + -b $_agw_dir_res:$HOME/res \ + -b ~/.gem:$HOME/.gem \ -- $_agw_dir_dev /usr/bin/env _agw_chroot=1 /usr/bin/fish -l -i -C cd end diff --git a/fish/emacs-nw b/fish/emacs-nw index 276765f..3afa920 100644 --- a/fish/emacs-nw +++ b/fish/emacs-nw @@ -1,7 +1,7 @@ #!/usr/bin/env fish function emacs-nw - env TERM=alacritty-direct ~/.local/bin/emacs -nw $argv + env TERM=kitty-direct ~/.local/bin/emacs -nw $argv end ## EOF diff --git a/fish/generate-grub b/fish/generate-grub index b329a35..eab8c4d 100644 --- a/fish/generate-grub +++ b/fish/generate-grub @@ -2,7 +2,7 @@ function generate-grub -d 'Generates and installs GRUB' sudo grub-mkconfig -o /boot/grub/grub.cfg - sudo grub-install --target=x86_64-efi --efi-directory=/efi --bootloader-id=arch + sudo grub-install --target=x86_64-efi --efi-directory=/efi --bootloader-id=void end ## EOF diff --git a/fish/ls b/fish/ls new file mode 100644 index 0000000..46aaead --- /dev/null +++ b/fish/ls @@ -0,0 +1,5 @@ +#!/usr/bin/env fish + +alias l "exa -FGxbh --git --icons --color-scale --group-directories-first" + +## EOF diff --git a/games/alephone/marathon-2.xml b/games/alephone/marathon-2.xml index c2a025b..ad38c6b 100644 --- a/games/alephone/marathon-2.xml +++ b/games/alephone/marathon-2.xml @@ -1,6 +1,6 @@ - - + + @@ -22,19 +22,20 @@ - - + + - - - + + + - - + + + @@ -59,9 +60,21 @@ - + + + + + + + + + + + + + - + diff --git a/games/eternity/doom.cfg b/games/eternity/doom.cfg index e26eab6..e9e45ec 100644 --- a/games/eternity/doom.cfg +++ b/games/eternity/doom.cfg @@ -46,12 +46,12 @@ max_player_corpse 32 flashing_hom 0 [0-2(2)] 1=take special steps ensuring demo sync, 2=only during recordings -demo_insurance 0 +demo_insurance 1 [0-1(0)] 1 to enable recoil from weapon fire * weapon_recoil 0 -[0-1(0)] 0 - don't center weapon when firing, 1 - center weapon when firing +[0-1(0)] 0 - don't center weapon when firing, 1 - center weapon when firing * r_centerfire 0 [0-4(0)] 0 - normal, 1 - classic, 2 - 11k, 3 - bouncing!, 4 - burst * @@ -70,11 +70,14 @@ crosshair_scale 1 show_scores 1 [0-1(0)] 0 - right handed, 1 - left handed * -lefthanded 0 +lefthanded 1 [0-1(1)] 1 to allow in-slot weapon cycling (e.g. SSG to SG) weapon_hotkey_cycling 1 +[0-1(0)] 1 to keep switching weapon while holding hotkey * +weapon_hotkey_holding 0 + [0-1(1)] 1 to enable player bobbing (view moving up/down slightly) * player_bobbing 1 @@ -130,7 +133,7 @@ sts_traditional_keys 1 leds_always_off 0 [0-?(5)] adjust horizontal (x) mouse sensitivity -mouse_sensitivity_horiz 10.0000 +mouse_sensitivity_horiz 16.0000 [0-?(5)] adjust vertical (y) mouse sensitivity mouse_sensitivity_vert 0.00000 @@ -154,10 +157,10 @@ mouse_vert 0 smooth_turning 0 [0-15(8)] adjust sound effects volume -sfx_volume 7 +sfx_volume 1 [0-15(8)] adjust music volume -music_volume 10 +music_volume 8 [0-1(1)] 1 to enable message display show_messages 1 @@ -352,7 +355,7 @@ chatmacro8 "I'll take care of it." chatmacro9 "Yes" [0-255(247)] color used as background for automap * -mapcolor_back 247 +mapcolor_back 0 [0-255(104)] color used for automap grid lines * mapcolor_grid 104 @@ -379,13 +382,13 @@ mapcolor_bkey 204 mapcolor_ykey 231 [0-255(175)] color used for closed red doors * -mapcolor_rdor 175 +mapcolor_rdor 173 [0-255(204)] color used for closed blue doors * -mapcolor_bdor 204 +mapcolor_bdor 198 [0-255(231)] color used for closed yellow doors * -mapcolor_ydor 231 +mapcolor_ydor 228 [0-255(119)] color used for teleporter lines * mapcolor_tele 119 @@ -454,7 +457,7 @@ message_timer 4000 hud_overlayid 0 [0-4(2)] fullscreen hud layout * -hud_overlaylayout 2 +hud_overlaylayout 1 [0-1(1)] fullscreen hud enabled * hud_enabled 1 @@ -511,7 +514,7 @@ ammo_yellow 50 st_fsalpha 100 [1-200(10)] console speed, pixels/tic -c_speed 20 +c_speed 140 [0-200(100)] console height, pixels c_height 140 @@ -526,7 +529,7 @@ obcolour 0 draw_particles 1 [0-2(1)] particle translucency (0 = none, 1 = smooth, 2 = general) * -particle_trans 2 +particle_trans 1 [0-2(0)] use sprites, particles, or both for blood (sprites = 0) * blood_particles 2 @@ -549,7 +552,7 @@ pevent_rexpl 1 [0-1(0)] draw particle bfg explosions * pevent_bfgexpl 1 -[0-1(0)] stretch short sky textures for mlook * +[0-1(0)] (deprecated; do not use) stretchsky 0 [0-1(1)] 1 to show ENDOOM at exit * @@ -592,7 +595,7 @@ r_columnengine 0 r_spanengine 0 [0-2(1)] Doom object translucency style (0 = none, 1 = Boom, 2 = new) * -r_tlstyle 1 +r_tlstyle 2 [0-2(0)] 0 = off, 1 = emulate like Chocolate Doom, 2 = emulate like PrBoom+ spechits_emulation 0 @@ -601,10 +604,10 @@ spechits_emulation 0 donut_emulation 0 [0-2(1)] 0 = never wait on screen wipes, 1 = always wait, 2 = wait when playing demos -wipewait 1 +wipewait 2 [0-2(1)] 0 = none, 1 = melt, 2 = fade * -wipetype 1 +wipetype 0 [1-6(1)] preamp volume factor for SPC music * snd_spcpreamp 1 @@ -621,6 +624,6 @@ snd_oplemulator 2 [1-8(2)] OPL3 chips to emulate for ADLMIDI * snd_numchips 8 -[0-75(72)] sound bank used for ADLMIDI * +[0-77(72)] sound bank used for ADLMIDI * snd_bank 72 diff --git a/games/eternity/keys.csc b/games/eternity/keys.csc index c0f443c..057bbdb 100644 --- a/games/eternity/keys.csc +++ b/games/eternity/keys.csc @@ -36,6 +36,7 @@ bind g "map_grid" bind h "user4" bind m "map_toggle" bind q "joindemo" +bind q "screenshot" bind r "reload" bind s "backward" bind t "user1" @@ -66,6 +67,7 @@ bind f7 "mn_endgame" bind f8 "hu_messages /" bind f9 "quickload" bind f10 "mn_quit" +bind printscreen "screenshot" bind home "menu_setup" bind pgup "flyup" bind pgup "menu_pageup" diff --git a/games/eternity/system.cfg b/games/eternity/system.cfg index e344ff3..3f71b15 100644 --- a/games/eternity/system.cfg +++ b/games/eternity/system.cfg @@ -58,7 +58,7 @@ iwad_freedm "" iwad_rekkr "" [-1-15(-1)] Number of last IWAD chosen from the IWAD picker -iwad_choice 2 +iwad_choice 3 [("")] Directory containing Master Levels wad files master_levels_dir "/media/store/games/doom/iwads/master" @@ -112,10 +112,10 @@ screenshot_gamma 1 i_videodriverid 0 [("native")] Resolution of the renderer's target (WWWWxHHHH or native) -i_resolution "native" +i_resolution "640x480" [("640x480w")] Description of video mode parameters (WWWWxHHHH[flags]) -i_videomode "1280x720w" +i_videomode "1280x960w" [0-1(0)] Letterbox video modes with aspect ratios narrower than 4:3 i_letterbox 0 diff --git a/games/lutris/lutris.conf b/games/lutris/lutris.conf index 13a6f5a..717044a 100644 --- a/games/lutris/lutris.conf +++ b/games/lutris/lutris.conf @@ -1,5 +1,5 @@ [lutris] -migration_version = 10 +migration_version = 11 dont-support-lutris = True width = 948 height = 593 @@ -17,8 +17,10 @@ hide-wine-non-esync-version-warning = True hide-wine-systemwide-install-warning = True show_hidden_games = false library_ignores = -side_panel_visible = False +side_panel_visible = True selected_category = category:all +window_x = 73 +window_y = 302 [list view] name_column_width = 200 @@ -29,3 +31,12 @@ lastplayed_column_width = 120 installedat_column_width = 120 playtime_column_width = 100 +[services] +lutris = True +gog = True +humblebundle = True +steam = True +egs = True +origin = True +ubisoft = True + diff --git a/sshot/quickshot b/sshot/quickshot new file mode 100755 index 0000000..6f6c723 --- /dev/null +++ b/sshot/quickshot @@ -0,0 +1,9 @@ +#!/usr/bin/env fish + +set f "/tmp/temp-"(date "+%y%m%d-%H%M%S")".png" + +spectacle -b -r -n + +if test -f "/tmp/temp.png" + mv "/tmp/temp.png" "$f" +end diff --git a/system/autostart/05-pipewire.sh b/system/autostart/05-pipewire.sh new file mode 100755 index 0000000..8d947e5 --- /dev/null +++ b/system/autostart/05-pipewire.sh @@ -0,0 +1,3 @@ +#!/bin/sh +killall pipewire pipewire-pulse wireplumber +pipewire & diff --git a/system/env/00-vars.sh b/system/env/00-vars.sh index 78af0a7..3b70c14 100644 --- a/system/env/00-vars.sh +++ b/system/env/00-vars.sh @@ -9,8 +9,9 @@ export XMODIFIERS=@im=ibus export GTK_USE_PORTAL=1 export KRITA_NO_STYLE_OVERRIDE=1 -# misc +# paths export PATH=$HOME/.local/bin:$PATH +export XDG_DATA_DIRS=/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share:$HOME/.local/share:/usr/local/share:/usr/share export DOOMWADDIR=/media/store/games/doom/iwads export EDITOR=vi export WINEPREFIX=$HOME/progs/winepfx