Merge remote-tracking branch 'refs/remotes/origin/main'

.dotter/global.toml

@@ -4,6 +4,7 @@
 depends = []
 
 [default.files]
+"default/bashrc" = "~/.bashrc"
 "default/bashrc.d" = "~/.bashrc.d"
 "default/config/hyfetch.json" = "~/.config/hyfetch.json"
 "default/config/fastfetch" = "~/.config/fastfetch"
@@ -36,6 +37,7 @@ depends = ["graphical"]
 
 [wayland.files]
 "wayland/config" = { target = "~/.config", type = "symbolic" }
+"wayland/bashrc.d" = "~/.bashrc.d"
 
 [wayland.variables]
 

default/bashrc

@@ -0,0 +1,114 @@
+# ~/.bashrc: executed by bash(1) for non-login shells.
+# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
+# for examples
+
+# If not running interactively, don't do anything
+case $- in
+    *i*) ;;
+      *) return;;
+esac
+
+# don't put duplicate lines or lines starting with space in the history.
+# See bash(1) for more options
+HISTCONTROL=ignoreboth
+
+# append to the history file, don't overwrite it
+shopt -s histappend
+
+# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
+HISTSIZE=1000
+HISTFILESIZE=2000
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+# If set, the pattern "**" used in a pathname expansion context will
+# match all files and zero or more directories and subdirectories.
+#shopt -s globstar
+
+# make less more friendly for non-text input files, see lesspipe(1)
+#[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
+    debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+# set a fancy prompt (non-color, unless we know we "want" color)
+case "$TERM" in
+    xterm-color|*-256color) color_prompt=yes;;
+esac
+
+# uncomment for a colored prompt, if the terminal has the capability; turned
+# off by default to not distract the user: the focus in a terminal window
+# should be on the output of commands, not on the prompt
+#force_color_prompt=yes
+
+if [ -n "$force_color_prompt" ]; then
+    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+	# We have color support; assume it's compliant with Ecma-48
+	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+	# a case would tend to support setf rather than setaf.)
+	color_prompt=yes
+    else
+	color_prompt=
+    fi
+fi
+
+if [ "$color_prompt" = yes ]; then
+    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+else
+    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
+unset color_prompt force_color_prompt
+
+# If this is an xterm set the title to user@host:dir
+case "$TERM" in
+xterm*|rxvt*)
+    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+    ;;
+*)
+    ;;
+esac
+
+# enable color support of ls and also add handy aliases
+if [ -x /usr/bin/dircolors ]; then
+    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+    alias ls='ls --color=auto'
+    #alias dir='dir --color=auto'
+    #alias vdir='vdir --color=auto'
+
+    #alias grep='grep --color=auto'
+    #alias fgrep='fgrep --color=auto'
+    #alias egrep='egrep --color=auto'
+fi
+
+# colored GCC warnings and errors
+#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+
+# some more ls aliases
+#alias ll='ls -l'
+#alias la='ls -A'
+#alias l='ls -CF'
+
+# enable programmable completion features (you don't need to enable
+# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
+# sources /etc/bash.bashrc).
+if ! shopt -oq posix; then
+  if [ -f /usr/share/bash-completion/bash_completion ]; then
+    . /usr/share/bash-completion/bash_completion
+  elif [ -f /etc/bash_completion ]; then
+    . /etc/bash_completion
+  fi
+fi
+
+for file in ~/.bashrc.d/* ; do
+  if [ -f "$file" ] ; then
+    source "$file"
+  fi
+done
+
+if [ -f "${HOME}/.secrets" ] ; then
+  source "${HOME}/.secrets"
+fi

default/bashrc.d/default

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [[ -z ${ZELLIJ} ]] && [[ -z ${SSH_CLIENT} ]]; then
+if [[ -z ${ZELLIJ} ]] && command -v zellij; then
   zellij && exit
 fi
 

default/gitconfig

@@ -5,6 +5,6 @@
 	email = support@pogmom.me
 
 [core]
-	editor = /usr/bin/nvim
+	editor = hx
 [init]
 	defaultBranch = main

graphical/flatpak/io.github.softfever.OrcaSlicer/config/OrcaSlicer/user/default/filament/Generic PETG @System - Copy.json

@@ -19,7 +19,7 @@
         "250"
     ],
     "nozzle_temperature_range_low": [
-        "235"
+        "245"
     ],
     "reduce_fan_stop_start_freq": [
         "0"

graphical/flatpak/io.github.softfever.OrcaSlicer/config/OrcaSlicer/user/default/process/pretty good print settings.json

@@ -1,24 +1,35 @@
 {
     "bottom_surface_pattern": "concentric",
     "from": "User",
+    "gap_infill_speed": "180",
     "inherits": "0.20mm Standard @Creality K1 (0.4 nozzle)",
     "initial_layer_print_height": "0.3",
+    "inner_wall_line_width": "0.35",
+    "inner_wall_speed": "180",
+    "internal_solid_infill_speed": "180",
     "ironing_pattern": "concentric",
     "is_custom_defined": "0",
+    "line_width": "0.32",
     "name": "pretty good print settings",
+    "outer_wall_line_width": "0.32",
+    "outer_wall_speed": "120",
     "print_settings_id": "pretty good print settings",
     "raft_contact_distance": "0.2",
+    "reduce_crossing_wall": "1",
+    "skirt_loops": "3",
     "slow_down_layers": "3",
+    "sparse_infill_density": "40%",
+    "sparse_infill_speed": "300",
     "support_base_pattern": "rectilinear",
     "support_base_pattern_spacing": "3",
-    "support_critical_regions_only": "1",
+    "support_line_width": "0.32",
-    "support_style": "tree_slim",
+    "support_style": "snug",
-    "support_type": "tree(auto)",
+    "top_surface_line_width": "0.32",
     "top_surface_pattern": "concentric",
+    "top_surface_speed": "120",
     "tree_support_branch_angle": "55",
     "tree_support_branch_diameter": "1",
     "tree_support_branch_diameter_organic": "1",
     "tree_support_branch_distance": "1",
-    "version": "2.3.1.10",
+    "version": "2.3.1.10"
-    "wall_loops": "2"
 }

wayland/bashrc.d/wayland

@@ -0,0 +1,2 @@
+mkdir -p "${HOME/.cache/sway/logs/$(date +%Y%m%d).log 2>&1}"
+alias sway="sway >> ${HOME/.cache/sway/logs/$(date +%Y%m%d).log 2>&1}"