updated for newest changes

install.sh

@@ -2,6 +2,8 @@
 
 set -e
 
+test -n "$DEBUG" && set -x
+
 if test -z "$1"; then
 	printf "Usage: %s machine\n" "$0" 1>&2
 	exit 64 # sysexits.h(3) EX_USAGE
@@ -18,10 +20,16 @@ esac
 
 for item in "$MACHINE"/config/*
 do
-	inst_path="$(printf "%s\n" "$item" | sed "s/$MACHINE\/config\///g")"
+	name="$(printf "%s\n" "$item" | sed "s;$MACHINE/config/;;g")"
+	echo $name
 
-	printf "Creating symlink from %s to %s\n" "$PWD/$item" "$XDG_CONFIG_HOME/$inst_path" 1>&2
+	printf "Creating symlink from %s to %s\n" \
-	ln -sf "$PWD/$item" "$XDG_CONFIG_HOME/$inst_path"
+		"$PWD/$item" "$XDG_CONFIG_HOME/$name" 1>&2
+
+	if test -n "$DEBUG"; then continue; fi
+
+	rm "$XDG_CONFIG_HOME/$name" || true
+	ln -s "$PWD/$item" "$XDG_CONFIG_HOME/$name"
 done
 
 ln -sf "$PWD/$MACHINE/functions" "$HOME/.functions"

noire-carnation/config/foot/everforest-dark-hard.ini

@@ -0,0 +1,22 @@
+# -*- conf -*-
+# Everforest
+
+[colors]
+background=272e33
+foreground=d3c6aa
+regular0=343f44
+regular1=e67e80
+regular2=a7c080
+regular3=dbbc7f
+regular4=7fbbb3
+regular5=d699b6
+regular6=83c092
+regular7=859289
+bright0=3d484d
+bright1=e67e80
+bright2=a7c080
+bright3=dbbc7f
+bright4=7fbbb3
+bright5=d699b6
+bright6=83c092
+bright7=9da9a0

noire-carnation/config/foot/foot.ini

@@ -0,0 +1,34 @@
+dpi-aware=yes
+font=Ubuntu Mono:size=22
+pad=6x6
+
+[cursor]
+blink=yes
+style=underline
+underline-thickness=3px
+
+[mouse]
+hide-when-typing=yes
+
+[scrollback]
+indicator-position=none
+
+[colors] # Everforest Dark Hard
+background=272e33
+foreground=d3c6aa
+regular0=343f44
+regular1=e67e80
+regular2=a7c080
+regular3=dbbc7f
+regular4=7fbbb3
+regular5=d699b6
+regular6=83c092
+regular7=859289
+bright0=3d484d
+bright1=e67e80
+bright2=a7c080
+bright3=dbbc7f
+bright4=7fbbb3
+bright5=d699b6
+bright6=83c092
+bright7=9da9a0

noire-carnation/config/kitty/current-theme.conf

@@ -1,70 +0,0 @@
-# vim:ft=kitty
-## name: Everforest Dark Hard
-## author: Sainnhe Park
-## license: MIT
-## upstream: https://github.com/ewal/kitty-everforest/blob/master/themes/everforest_dark_hard.conf
-## blurb: A green based color scheme designed to be warm and soft
-
-foreground                      #d3c6aa
-background                      #272e33
-selection_foreground            #9da9a0
-selection_background            #4c3743
-
-cursor                          #d3c6aa
-cursor_text_color               #2e383c
-
-url_color                       #7fbbb3
-
-active_border_color             #a7c080
-inactive_border_color           #4f5b58
-bell_border_color               #e69875
-visual_bell_color               none
-
-wayland_titlebar_color          system
-macos_titlebar_color            system
-
-active_tab_background           #272e33
-active_tab_foreground           #d3c6aa
-inactive_tab_background         #374145
-inactive_tab_foreground         #9da9a0
-tab_bar_background              #2e383c
-tab_bar_margin_color            none
-
-mark1_foreground                #272e33
-mark1_background                #7fbbb3
-mark2_foreground                #272e33
-mark2_background                #d3c6aa
-mark3_foreground                #272e33
-mark3_background                #d699b6
-
-#: black
-color0                          #343f44
-color8                          #3d484d
-
-#: red
-color1                          #e67e80
-color9                          #e67e80
-
-#: green
-color2                          #a7c080
-color10                         #a7c080
-
-#: yellow
-color3                          #dbbc7f
-color11                         #dbbc7f
-
-#: blue
-color4                          #7fbbb3
-color12                         #7fbbb3
-
-#: magenta
-color5                          #d699b6
-color13                         #d699b6
-
-#: cyan
-color6                          #83c092
-color14                         #83c092
-
-#: white
-color7                          #859289
-color15                         #9da9a0

noire-carnation/config/kitty/kitty.conf

@@ -1,18 +0,0 @@
-font_family Ubuntu Mono
-bold_font auto
-italic_font auto
-bold_italic_font auto
-
-cursor_shape underline
-cursor_underline_thickness 1
-cursor_blink_interval -1
-
-enable_audio_bell no
-tab_bar_style	separator
-
-window_padding_width 5
-
-# BEGIN_KITTY_THEME
-# Everforest Dark Hard
-include current-theme.conf
-# END_KITTY_THEME

noire-carnation/config/mpv/mpv.conf

@@ -18,7 +18,7 @@ hwdec=auto
 profile=gpu-hq
 # scale=ewa_lanczossharp
 # cscale=ewa_lanczossoft
-video-sync=display-resample
+# video-sync=display-resample
 linear-downscaling=no
 framedrop=no
 

noire-carnation/config/nvim/init.vim

@@ -15,6 +15,13 @@ augroup GlobalOverrides
   autocmd FileType * setlocal noexpandtab tabstop=2 shiftwidth=2
 augroup END
 
+
+" Run rust-analyzer(1) for singular Rust files
+augroup RustOverrides
+	autocmd!
+	autocmd FileType rust RustStartStandaloneServerForBuffer
+augroup END
+
 call plug#begin('~/.config/nvim/plugged')
 
 Plug 'sainnhe/everforest'

noire-carnation/config/pacman/makepkg.conf

@@ -38,9 +38,7 @@ CHOST="x86_64-pc-linux-gnu"
 
 #-- Compiler and Linker Flags
 #CPPFLAGS=""
-CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
+#CFLAGS=""
-        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
-        -fstack-clash-protection -fcf-protection -fuse-ld=mold"
 CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 LTOFLAGS="-flto=auto"

noire-carnation/config/sway/config

@@ -100,10 +100,10 @@ bindsym $mod+Shift+space floating toggle
 bindsym $mod+space focus mode_toggle
 
 # lock screen
-bindsym --release $mod+escape exec swaylock-blur
+bindsym --release $mod+escape exec swaylock --screenshots --effect-blur 7x7
 
 # tools
-bindsym $mod+t exec kitty
+bindsym $mod+t exec foot
 bindsym $mod+d exec fuzzel 
 bindsym $mod+w exec clipman pick --tool=CUSTOM --tool-args="fuzzel -d -w 60"
 

noire-carnation/config/waybar/style.css

@@ -1,5 +1,3 @@
-@import "/home/emma/.cache/wal/colors-waybar.css";
-
 /*
  ********************************************
  *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*

noire-carnation/functions

@@ -1,7 +1,6 @@
 #!/bin/sh 
 
 bmv() {
-	set -x
 	if test -z "$1"; then
 		printf "Usage: %s pattern pattern1 [pattern2]\n" "$0" 1>&2
 		return 64 # sysexits.h(3) EX_USAGE
@@ -15,7 +14,6 @@ bmv() {
 			mv "$file" "$newfile"
 		fi
 	done
-	set +x
 }
 
 ix() {
@@ -64,22 +62,23 @@ sc() {
 }
 
 up() { # updates everything on the system
-    command -v apk >/dev/null && su -c 'apk update' 
+	command -v apk >/dev/null && su -c 'apk update' 
-    command -v cargo-install-update >/dev/null && cargo install-update --all --git
+	command -v cargo-install-update >/dev/null && cargo install-update --all --git
-    command -v kiss >/dev/null && su -c 'kiss u' && su -c 'kiss U'
+	command -v kiss >/dev/null && su -c 'kiss u' && su -c 'kiss U'
-    command -v nvim >/dev/null && nvim +PlugUpdate -c x -c x
+	command -v nvim >/dev/null && nvim +PlugUpdate -c x -c x
-    if command -v paru >/dev/null; then paru
+	if command -v paru >/dev/null; then paru
-    elif command -v pacman >/dev/null; then su -c 'pacman -Syyu'; fi
+	elif command -v pacman >/dev/null; then su -c 'pacman -Syyu'; fi
+	command -v rustup >/dev/null && rustup update
 
-    CWD="$PWD"
+	CWD="$PWD"
 
-    command -v git >/dev/null && \
+	command -v git >/dev/null && \
-    for dir in $HOME/.local/src/git/*/*/*/
+	for dir in $HOME/.local/src/git/*/*/*/
-    do
+	do
-        printf '%s\n' "$dir"
+		printf '%s\n' "$dir"
-        cd "$dir"
+		cd "$dir"
-        git pull --all
+		git pull --all
-    done
+	done
 
-    cd "$CWD"
+	cd "$CWD"
 }

noire-carnation/profile

@@ -2,12 +2,21 @@
 
 ## system
 BROWSER=firefox; export BROWSER
-CC=cc; export CC
 EDITOR=nvim; export EDITOR
-LD_LIBRARY_PATH="$HOME/.local/lib:$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH
 PAGER=less; export PAGER
 PATH="$HOME/.local/bin:$HOME/.local/games:$PATH"; export PATH
 
+### compilation
+CC=cc; export CC
+CFLAGS="-march=native -mtune=native -O2 -pipe -fno-plt -fexceptions \
+	-Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
+	-fstack-clash-protection -fcf-protection -fuse-ld=mold"
+export CFLAGS
+LD_LIBRARY_PATH="$HOME/.local/lib:$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH
+RUSTFLAGS="-Clink-arg=-fuse-ld=mold -Copt-level=z -Ccodegen-units=1 \
+	-Cpanic=abort -Clto=y -Cstrip=symbols -Ctarget-cpu=native -Cembed-bitcode=yes"
+export RUSTFLAGS
+
 ## XDG
 XDG_CACHE_HOME="$HOME/.var/cache"; export XDG_CACHE_HOME
 XDG_CONFIG_HOME="$HOME/.local/etc"; export XDG_CONFIG_HOME
@@ -47,9 +56,10 @@ YT_PL_DIR="$XDG_DATA_HOME/yt"; export YT_PL_DIR
 PLAYER=mpv; export PLAYER
 
 # aliases
+alias ffmpreg='ffmpeg'
+alias tar='bsdtar'
+alias vi='ovi'
 alias weather="curl 'wttr.in/?0'"
-alias vi="busybox vi"
-alias tar="bsdtar"
 
 # zsh configuration settings
 case "$SHELL" in