diff options
Diffstat (limited to '')
26 files changed, 51 insertions, 1115 deletions
diff --git a/modules/home.legacy/conf/beets/default.nix b/modules/home.legacy/conf/beets/default.nix index de05ca24..2fec6881 100644 --- a/modules/home.legacy/conf/beets/default.nix +++ b/modules/home.legacy/conf/beets/default.nix @@ -41,9 +41,12 @@ in { color = true; }; - include = [ - "./replace_override.yaml" - ]; + replace = { + "[/]" = "\\\\"; + "[\\x00-\\x1f]" = ""; + "\\s+$" = ""; + "^\\s+" = ""; + }; import = { # move, instead of copying or linking the files @@ -62,15 +65,21 @@ in { }; paths = let - j = lib.strings.concatStringsSep "/"; + join = lib.strings.concatStringsSep "/"; in { - default = j ["[Default]" "$genre" "$first_artist" "$album ($albumtype)" "$track $title"]; - "albumtype:live" = j ["[Live]" "$genre" "$first_artist" "$album ($albumtype)" "$track $title"]; - - "albumtype:album" = j ["Music" "$genre" "$first_artist" "$album ($albumtype)" "$track $title"]; - "albumtype::(Single|EP)" = j ["Music" "$genre" "$first_artist_singleton" "$album ($albumtype)" "$track $title"]; - "albumtype:compilation" = j ["Complilations" "$genre" "Various Artists" "$album ($albumtype)" "$track $title"]; - "albumtype:soundtrack" = j ["Soundtracks" "$genre" "$first_artist" "$album" "$track $title"]; + "albumtype:live" = join [ + "[Live, please delete]" + "$genre" + "$primary_artist" # (= $albumartists[0]). From inline plugin + "$album ($albumtype)" + "$track $title" + ]; + + default = join [ + "$primary_artist" # (= $albumartists[0]). From inline plugin + "$album%aunique{}" + "$track $title" + ]; }; inherit plugins; @@ -102,8 +111,6 @@ in { }; }; - xdg.configFile."beets/replace_override.yaml".source = ./replace_override.yaml; - # Use the json formatter instead of the YAML one, as the YAML formatter mangles the # longer python inline strings. # YAML is a superset of JSON. diff --git a/modules/home.legacy/conf/beets/plugins.nix b/modules/home.legacy/conf/beets/plugins.nix index 09eeac5b..ed78b49e 100644 --- a/modules/home.legacy/conf/beets/plugins.nix +++ b/modules/home.legacy/conf/beets/plugins.nix @@ -17,9 +17,6 @@ # <2024-08-07> # "scrub" - # Help submitting stuff to music brainz - "mbsubmit" - # Extract things from the music file # "xtractor" @@ -29,12 +26,6 @@ # Check for bad files "badfiles" - # Alows to use inline python for parsing tags - "inline" - - # Support player integration - "play" - # Show tags on files/queries "info" @@ -44,12 +35,11 @@ # `mpdupgate` can propagate changed playlist to `mpd`. "smartplaylist" + "inline" + # Warn, when importing a matching item "ihate" - # Allow fuzzy searching - "fuzzy" - # Filter out duplicates "duplicates" @@ -59,9 +49,6 @@ # Download album art "fetchart" - # Fetches tags from `last.fm` and adds them as genres to imported music - "lastgenre" - # Run commands on events "hook" diff --git a/modules/home.legacy/conf/beets/plugins/default.nix b/modules/home.legacy/conf/beets/plugins/default.nix index 65cd935c..d22369be 100644 --- a/modules/home.legacy/conf/beets/plugins/default.nix +++ b/modules/home.legacy/conf/beets/plugins/default.nix @@ -11,13 +11,9 @@ imports = [ ./badfiles ./duplicates - ./fuzzy ./ihate ./inline - ./lastgenre ./lyrics - ./mbsubmit - ./play ./replaygain ./smartplaylist # ./xtractor diff --git a/modules/home.legacy/conf/beets/plugins/fuzzy/default.nix b/modules/home.legacy/conf/beets/plugins/fuzzy/default.nix deleted file mode 100644 index de37c4e8..00000000 --- a/modules/home.legacy/conf/beets/plugins/fuzzy/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de> -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. -{...}: { - programs.beets.settings.fuzzy = { - # The prefix denoting that a search should be run in fuzzy mode - prefix = "."; - }; -} diff --git a/modules/home.legacy/conf/beets/plugins/inline/default.nix b/modules/home.legacy/conf/beets/plugins/inline/default.nix index b5655028..564d5b4c 100644 --- a/modules/home.legacy/conf/beets/plugins/inline/default.nix +++ b/modules/home.legacy/conf/beets/plugins/inline/default.nix @@ -8,44 +8,11 @@ # You should have received a copy of the License along with this program. # If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. {...}: { - programs.beets.settings = { - item_fields = { - # Taken from https://github.com/trapd00r/configs/blob/4f3dada5700846cca6c2869e6fa6b3c795b87b67/beets/config.yaml - first_artist = - /* - python - */ - '' - # import an album to another artists directory, like: - # Tom Jones │1999│ Burning Down the House [Single, CD, FLAC] - # to The Cardigans/+singles/Tom Jones & the Cardigans │1999│ Burning Down the House [Single, CD, FLAC] - # https://github.com/beetbox/beets/discussions/4012#discussioncomment-1021414 - # beet import --set myartist='The Cardigans' - # we must first check to see if myartist is defined, that is, given on - # import time, or we raise an NameError exception. - try: - myartist - except NameError: - import re - return re.split(',|\\s+(feat(.?|uring)|&|(Vs|Ft).)', albumartist, 1, flags=re.IGNORECASE)[0] - else: - return myartist - ''; - - first_artist_singleton = - /* - python - */ - '' - try: - myartist - except NameError: - import re - return re.split(',|\\s+(feat(.?|uring)|&|(Vs|Ft).)', artist, 1, flags=re.IGNORECASE)[0] - else: - return myartist - ''; - }; - album_fields = {}; + programs.beets.settings.item_fields = { + primary_artist = + # python + '' + albumartists[0] + ''; }; } diff --git a/modules/home.legacy/conf/beets/plugins/lastgenre/default.nix b/modules/home.legacy/conf/beets/plugins/lastgenre/default.nix deleted file mode 100644 index 4d3dcfb0..00000000 --- a/modules/home.legacy/conf/beets/plugins/lastgenre/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de> -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. -{...}: { - programs.beets.settings.lastgenre = { - prefer_specific = false; - # Lookup the track, not the album - source = "track"; - }; -} diff --git a/modules/home.legacy/conf/beets/plugins/mbsubmit/default.nix b/modules/home.legacy/conf/beets/plugins/mbsubmit/default.nix index bdcb3721..e69de29b 100644 --- a/modules/home.legacy/conf/beets/plugins/mbsubmit/default.nix +++ b/modules/home.legacy/conf/beets/plugins/mbsubmit/default.nix @@ -1,18 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de> -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. -{ - lib, - pkgs, - ... -}: { - programs.beets.settings.mbsubmit = { - picard_path = lib.getExe pkgs.picard; - }; -} diff --git a/modules/home.legacy/conf/beets/plugins/play/default.nix b/modules/home.legacy/conf/beets/plugins/play/default.nix deleted file mode 100644 index 9d26f16a..00000000 --- a/modules/home.legacy/conf/beets/plugins/play/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de> -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. -{ - lib, - pkgs, - config, - ... -}: { - programs.beets.settings.play = { - command = "${lib.getExe pkgs.mpc} $args add"; - relative_to = config.services.mpd.musicDirectory; - - # Run the command with the returned paths as arguments - raw = true; - }; -} diff --git a/modules/home.legacy/conf/beets/replace_override.yaml b/modules/home.legacy/conf/beets/replace_override.yaml deleted file mode 100644 index aea5e54a..00000000 --- a/modules/home.legacy/conf/beets/replace_override.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de> -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. - ---- -replace: - '[\\/]': _ - '^\.': _ - '[\x00-\x1f]': _ - '[<>:"\?\*\|]': _ - '\.$': _ - '\s+$': '' - '^\s+': '' - '^-': _ diff --git a/modules/home.legacy/conf/default.nix b/modules/home.legacy/conf/default.nix index de02f844..6049e6f8 100644 --- a/modules/home.legacy/conf/default.nix +++ b/modules/home.legacy/conf/default.nix @@ -16,23 +16,16 @@ ./gammastep ./gtk ./himalaya - ./hyfetch - ./iamb ./keepassxc - ./latexindent ./mail - ./mako ./mbsync ./mumble ./neomutt - ./nix-index ./npm ./prusa_slicer ./python - ./rclone ./rofi ./starship ./swayidle - ./tridactyl ]; } diff --git a/modules/home.legacy/conf/hyfetch/default.nix b/modules/home.legacy/conf/hyfetch/default.nix deleted file mode 100644 index bac0731e..00000000 --- a/modules/home.legacy/conf/hyfetch/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de> -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. -{...}: { - programs.hyfetch = { - enable = true; - settings = { - preset = "rainbow"; - mode = "rgb"; - light_dark = "dark"; - lightness = 0.65; - color_align = { - mode = "horizontal"; - custom_colors = []; - fore_back = null; - }; - backend = "neofetch"; - distro = null; - pride_month_shown = []; - pride_month_disable = false; - }; - }; -} diff --git a/modules/home.legacy/conf/iamb/config.json b/modules/home.legacy/conf/iamb/config.json deleted file mode 100644 index ca06d543..00000000 --- a/modules/home.legacy/conf/iamb/config.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "profiles": { - "soispha": { - "user_id": "@soispha:vhack.eu", - "url": "https://matrix.vhack.eu" - } - }, - "default_profile": "soispha" -} diff --git a/modules/home.legacy/conf/iamb/config.json.license b/modules/home.legacy/conf/iamb/config.json.license deleted file mode 100644 index eae6a84c..00000000 --- a/modules/home.legacy/conf/iamb/config.json.license +++ /dev/null @@ -1,9 +0,0 @@ -nixos-config - My current NixOS configuration - -Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de> -SPDX-License-Identifier: GPL-3.0-or-later - -This file is part of my nixos-config. - -You should have received a copy of the License along with this program. -If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. diff --git a/modules/home.legacy/conf/iamb/default.nix b/modules/home.legacy/conf/iamb/default.nix deleted file mode 100644 index 764e2efc..00000000 --- a/modules/home.legacy/conf/iamb/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de> -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. -{...}: { - xdg.configFile."iamb/config.json".source = ./config.json; -} diff --git a/modules/home.legacy/conf/latexindent/default.nix b/modules/home.legacy/conf/latexindent/default.nix deleted file mode 100644 index aeedd411..00000000 --- a/modules/home.legacy/conf/latexindent/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de> -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. -{...}: { - xdg.configFile."latexindent/indentconfig.yaml".source = ./indentconfig.yaml; - xdg.configFile."latexindent/mysettings.yaml".source = ./mysettings.yaml; -} diff --git a/modules/home.legacy/conf/latexindent/indentconfig.yaml b/modules/home.legacy/conf/latexindent/indentconfig.yaml deleted file mode 100644 index 6465a17a..00000000 --- a/modules/home.legacy/conf/latexindent/indentconfig.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de> -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. - -paths: -- /home/dt/.config/latexindent/mysettings.yaml diff --git a/modules/home.legacy/conf/latexindent/mysettings.yaml b/modules/home.legacy/conf/latexindent/mysettings.yaml deleted file mode 100644 index 122821da..00000000 --- a/modules/home.legacy/conf/latexindent/mysettings.yaml +++ /dev/null @@ -1,682 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de> -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. - -# defaultSettings.yaml for latexindent.pl, version 3.19.1, 2022-12-04 -# a script that aims to -# beautify .tex, .sty, .cls files -# -# (or latexindent.exe if you're on Windows) -# -#--------------------------------------------------------------------------------------- -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# See http://www.gnu.org/licenses/. -# -# Chris Hughes, 2017 -# -# For all communication, please visit: https://github.com/cmhughes/latexindent.pl -# -#--------------------------------------------------------------------------------------- -# You should feel encouraged to change anything you like in these settings, but -# it would probably be better to have your own user settings -# files somewhere else - remember that this file may be overwritten -# when you update your tex distribution. Please see the manual linked from: -# -# https://github.com/cmhughes/latexindent.pl -# -# for details of how to create and configure your own settings files. -# -# Please read the manual (linked from above) first to understand what each switch does. -# -#--------------------------------------------------------------------------------------- - -# latexindent can be called to act on a file without using the file's extension, -# e.g, simply -# latexindent myfile -# in which case the choice of file extension is chosen -# according to the choices made in fileExtensionPreference -# Other file extensions can be added. -fileExtensionPreference: - .tex: 1 - .sty: 2 - .cls: 3 - .bib: 4 - -# default file extension of backup file (if -w switch is active) -# for example, if your .tex file is called -# myfile.tex -# and you specify the backupExtension as BACKUP.bak then your -# backup file will be -# myfileBACKUP.bak -backupExtension: .bak - -# only one backup per file: -# - if onlyOneBackUp is 0 then, as a safety measure, -# the number on the extension increments by 1 each time: -# -# myfile.bak0, myfile.bak1, myfile.bak2 -# - if you set onlyOnebackUp to 1, then the backup file will -# be overwritten each time (not recommended until you trust the script) -onlyOneBackUp: 0 - -# some users may want a finite number of backup files, -# say at most 3; in which case, they can change this maxNumberOfBackUps. -# -# If maxNumberOfBackUps is set to 0 (or less) then infinitely -# many backups are possible, unless onlyOneBackUp is switched on -maxNumberOfBackUps: 0 - -# some users may wish to cycle through back up files. -# -# for example, with maxNumberOfBackUps: 4, they may -# wish to delete the oldest back up file, and keep only the most recent. -# -# copy myfile.bak1 to myfile.bak0 -# copy myfile.bak2 to myfile.bak1 -# copy myfile.bak3 to myfile.bak2 -# copy myfile.bak4 to myfile.bak3 -# -# the back up will be written to myfile.bak4 -cycleThroughBackUps: 0 - -# preferences for information displayed in the log file -logFilePreferences: - showEveryYamlRead: 1 - showAmalgamatedSettings: 0 - showDecorationStartCodeBlockTrace: 0 - showDecorationFinishCodeBlockTrace: 0 - endLogFileWith: '--------------' - showGitHubInfoFooter: 1 - Dumper: - Terse: 1 - Indent: 1 - Useqq: 1 - Deparse: 1 - Quotekeys: 0 - Sortkeys: 1 - Pair: " => " - -# verbatim environments specified -# in this field will not be changed at all! -verbatimEnvironments: - verbatim: 1 - lstlisting: 1 - minted: 1 - -# verbatim commands such as \verb! body !, \lstinline$something else$ -verbatimCommands: - verb: 1 - lstinline: 1 - -# no indent blocks (not necessarily verbatim -# environments) which are marked as %\begin{noindent} -# or anything else that you detail in the following -noIndentBlock: - noindent: 1 - cmhtest: 1 - -# \begin{document} and \end{document} are treated differently -# by latexindent within filecontents environments -fileContentsEnvironments: - filecontents: 1 - filecontents*: 1 - -# indent preamble -indentPreamble: 1 - -# assume no preamble in cls, sty, by default -lookForPreamble: - .tex: 1 - .sty: 0 - .cls: 0 - .bib: 0 - -# some preambles can contain \begin and \end statements -# that are not in their 'standard environment block', for example, -# consider the following key = values: -# preheadhook={\begin{mdframed}[style=myframedstyle]}, -# postfoothook=\end{mdframed}, -preambleCommandsBeforeEnvironments: 0 - -# default value of indentation -defaultIndent: " " - -# remove trailing whitespace from all lines -removeTrailingWhitespace: - beforeProcessing: 0 - afterProcessing: 1 - -# name of code blocks that should have their body aligned at ampersand delimiters -lookForAlignDelims: - tabular: - delims: 1 - alignDoubleBackSlash: 1 - spacesBeforeDoubleBackSlash: 1 - multiColumnGrouping: 0 - alignRowsWithoutMaxDelims: 1 - spacesBeforeAmpersand: 1 - spacesAfterAmpersand: 1 - justification: left - alignFinalDoubleBackSlash: 0 - dontMeasure: 0 - delimiterRegEx: '(?<!\\)(&)' - delimiterJustification: left - lookForChildCodeBlocks: 1 - tabularx: - delims: 1 - longtable: 1 - tabu: 1 - array: 1 - matrix: 1 - listabla: 1 - # amsmath - align: 1 - align*: 1 - alignat: 1 - alignat*: 1 - aligned: 1 - bmatrix: 1 - Bmatrix: 1 - cases: 1 - flalign: 1 - flalign*: 1 - pmatrix: 1 - vmatrix: 1 - Vmatrix: 1 - # mathtools - cases*: 1 - dcases: 1 - dcases*: 1 - rcases: 1 - rcases*: 1 - drcases: 1 - drcases*: 1 - # nicematrix - NiceTabular: 1 - NiceMatrix: 1 - pNiceMatrix: 1 - bNiceMatrix: 1 - BNiceMatrix: 1 - vNiceMatrix: 1 - VNiceMatrix: 1 - NiceArray: 1 - pNiceArrayC: 1 - bNiceArrayC: 1 - BNiceArrayC: 1 - vNiceArrayC: 1 - VNiceArrayC: 1 - NiceArrayCwithDelims: 1 - pNiceArrayRC: 1 - bNiceArrayRC: 1 - BNiceArrayRC: 1 - vNiceArrayRC: 1 - VNiceArrayRC: 1 - NiceArrayRCwithDelims: 1 - # tabularray - tblr: 1 - longtblr: 1 - talltblr: 1 - -# if you want the script to look for \item commands -# and format it, as follows (for example), -# \begin{itemize} -# \item content here -# next line is indented -# next line is indented -# \item another item -# \end{itemize} -# then populate indentAfterItems. See also itemNames -indentAfterItems: - itemize: 1 - itemize*: 1 - enumerate: 1 - enumerate*: 1 - description: 1 - description*: 1 - list: 1 - -# if you want to use other names for your items (for example, \part) -# then populate them here; note that you can trick latexindent.pl -# into indenting all kinds of commands (within environments specified in -# indentAfterItems) using this technique. -itemNames: - item: 1 - myitem: 1 - -# specialBeginEnd is, by default, mathmode focus, although -# there's no restrictions -specialBeginEnd: - displayMath: - begin: '\\\[' - end: '\\\]' - lookForThis: 1 - inlineMath: - begin: '(?<!\$)(?<!\\)\$(?!\$)' - end: '(?<!\\)\$(?!\$)' - lookForThis: 1 - displayMathTeX: - begin: '\$\$' - end: '\$\$' - lookForThis: 1 - specialBeforeCommand: 0 - -# if you want to add indentation after -# a heading, such as \part, \chapter, etc -# then populate it in here - you can add -# an indent rule to indentRules if you would -# like something other than defaultIndent -# -# you can also change the level if you like, -# or add your own title command -indentAfterHeadings: - part: - indentAfterThisHeading: 0 - level: 1 - chapter: - indentAfterThisHeading: 0 - level: 2 - section: - indentAfterThisHeading: 0 - level: 3 - subsection: - indentAfterThisHeading: 0 - level: 4 - subsection*: - indentAfterThisHeading: 0 - level: 4 - subsubsection: - indentAfterThisHeading: 0 - level: 5 - paragraph: - indentAfterThisHeading: 0 - level: 6 - subparagraph: - indentAfterThisHeading: 0 - level: 7 - -# maximum indentation, off by default -maximumIndentation: -1 - -# if you don't want to have additional indentation -# in a code block, then add it to noAdditionalIndent; note that -# code blocks in this field will inherit -# the *current* level of indentation they just won't -# get any *additional* indentation -noAdditionalIndent: - myexample: 0 - mydefinition: 0 - problem: 0 - exercises: 0 - mysolution: 0 - foreach: 0 - widepage: 0 - comment: 0 - document: 0 - frame: 0 - -# if you have indent rules for particular code blocks -# then you can populate them in indentRules; for example, you might just want -# to use a space " " or maybe a double tab " " -indentRules: - myenvironment: " " - anotherenvironment: " " - chapter: " " - section: " " - item: " " - myitem: " " - -# set noAdditionalIndent globally for codeblocks -noAdditionalIndentGlobal: - environments: 0 - commands: 0 - optionalArguments: 0 - mandatoryArguments: 0 - ifElseFi: 0 - items: 0 - keyEqualsValuesBracesBrackets: 0 - namedGroupingBracesBrackets: 0 - UnNamedGroupingBracesBrackets: 0 - specialBeginEnd: 0 - afterHeading: 0 - filecontents: 0 - -# set indentRules globally for codeblocks; these need -# to be horizontal spaces, if they are to be used -indentRulesGlobal: - environments: 0 - commands: 0 - optionalArguments: 0 - mandatoryArguments: 0 - ifElseFi: 0 - items: 0 - keyEqualsValuesBracesBrackets: 0 - namedGroupingBracesBrackets: 0 - UnNamedGroupingBracesBrackets: 0 - specialBeginEnd: 0 - afterHeading: 0 - filecontents: 0 - -# command code block details -commandCodeBlocks: - roundParenthesesAllowed: 1 - stringsAllowedBetweenArguments: - - - amalgamate: 1 - - 'node' - - 'at' - - 'to' - - 'decoration' - - '\+\+' - - '\-\-' - - '\#\#\d' - commandNameSpecial: - - - amalgamate: 1 - - '@ifnextchar\[' - -# change dos line breaks into unix -dos2unixlinebreaks: 1 - -# modifyLineBreaks will only be searched if the -m -# switch is active -# -# poly-switch examples: -# -# BeginStartsOnOwnLine: -# modify line breaks before a begin statement -# -# when set to -1, e.g -# some text some text -# \begin{myenvironment} -# will be changed to -# some text some text \begin{myenvironment} -# when set to 0, the switch is ignored -# when set to 1, e.g -# some text some text \begin{myenvironment} -# will be changed to -# some text some text -# \begin{myenvironment} -# when set to 2, e.g -# some text some text \begin{myenvironment} -# will be changed to -# some text some text% -# \begin{myenvironment} -# when set to 3, e.g -# some text some text \begin{myenvironment} -# will be changed to -# some text some text -# -# \begin{myenvironment} -# -# BodyStartsOnOwnLine: -# modify line breaks before the beginning of the body -# -# when set to -1, e.g -# \begin{myenv} -# body text body text -# will be changed to -# \begin{myenv}body text body text -# when set to 0, the switch is ignored -# when set to 1, e.g -# \begin{myenv}body text body text -# will be changed to -# \begin{myenv} -# body text body text -# when set to 2, e.g -# \begin{myenv}body text body text -# will be changed to -# \begin{myenv}% -# body text body text -# when set to 3, e.g -# \begin{myenv}body text body text -# will be changed to -# \begin{myenv} -# -# body text body text -# -# EndStartsOnOwnLine: -# modify line breaks before the end statement -# -# when set to -1, e.g -# some text some text -# \end{myenvironment} -# will be changed to -# some text some text \end{myenvironment} -# when set to 0, the switch is ignored -# when set to 1, e.g -# some text some text \end{myenvironment} -# will be changed to -# some text some text -# \end{myenvironment} -# when set to 2, e.g -# some text some text \end{myenvironment} -# will be changed to -# some text some text% -# \end{myenvironment} -# when set to 3, e.g -# some text some text \end{myenvironment} -# will be changed to -# some text some text -# -# \end{myenvironment} -# -# EndFinishesWithLineBreak: -# modify line breaks after the end statement -# -# when set to -1, e.g -# \end{myenvironment} -# some text some text -# will be changed to -# \end{myenvironment}some text some text -# when set to 0, the switch is ignored -# when set to 1, e.g -# \end{myenvironment}some text some text -# will be changed to -# \end{myenvironment} -# some text some text -# when set to 2, e.g -# \end{myenvironment}some text some text -# will be changed to -# \end{myenvironment}% -# some text some text -# when set to 3, e.g -# \end{myenvironment}some text some text -# will be changed to -# \end{myenvironment} -# -# some text some text -# -# you can specify settings on a per-name basis -modifyLineBreaks: - preserveBlankLines: 1 - condenseMultipleBlankLinesInto: 1 - oneSentencePerLine: - manipulateSentences: 0 - removeSentenceLineBreaks: 1 - multipleSpacesToSingle: 1 - textWrapSentences: 0 # setting to 1 disables main textWrap routine - sentenceIndent: "" - sentencesFollow: - par: 1 - blankLine: 1 - fullStop: 1 - exclamationMark: 1 - questionMark: 1 - rightBrace: 1 - commentOnPreviousLine: 1 - other: 0 - sentencesBeginWith: - A-Z: 1 - a-z: 0 - other: 0 - sentencesEndWith: - basicFullStop: 0 - betterFullStop: 1 - exclamationMark: 1 - questionMark: 1 - other: 0 - textWrapOptions: - columns: 0 - multipleSpacesToSingle: 1 - removeBlockLineBreaks: 1 - blocksFollow: - headings: 1 - commentOnPreviousLine: 1 - par: 1 - blankLine: 1 - verbatim: 1 - filecontents: 1 - other: '\\\]|\\item(?:\h|\[)' # regex - blocksBeginWith: - A-Z: 1 - a-z: 1 - 0-9: 0 - other: 0 # regex - blocksEndBefore: - commentOnOwnLine: 1 - verbatim: 1 - filecontents: 1 - other: '\\begin\{|\\\[|\\end\{' # regex - huge: overflow # forbid mid-word line breaks - separator: "" - # poly-switches below here - environments: - BeginStartsOnOwnLine: 0 - BodyStartsOnOwnLine: 0 - EndStartsOnOwnLine: 0 - EndFinishesWithLineBreak: 0 - equation*: - BeginStartsOnOwnLine: 0 - BodyStartsOnOwnLine: 0 - EndStartsOnOwnLine: 0 - EndFinishesWithLineBreak: 0 - ifElseFi: - IfStartsOnOwnLine: 0 - BodyStartsOnOwnLine: 0 - OrStartsOnOwnLine: 0 - OrFinishesWithLineBreak: 0 - ElseStartsOnOwnLine: 0 - ElseFinishesWithLineBreak: 0 - FiStartsOnOwnLine: 0 - FiFinishesWithLineBreak: 0 - ifnum: - IfStartsOnOwnLine: 0 - BodyStartsOnOwnLine: 0 - OrStartsOnOwnLine: 0 - OrFinishesWithLineBreak: 0 - ElseStartsOnOwnLine: 0 - ElseFinishesWithLineBreak: 0 - FiStartsOnOwnLine: 0 - FiFinishesWithLineBreak: 0 - commands: - CommandStartsOnOwnLine: 0 - CommandNameFinishesWithLineBreak: 0 - optionalArguments: - LSqBStartsOnOwnLine: 0 - OptArgBodyStartsOnOwnLine: 0 - RSqBStartsOnOwnLine: 0 - RSqBFinishesWithLineBreak: 0 - mandatoryArguments: - LCuBStartsOnOwnLine: 0 - MandArgBodyStartsOnOwnLine: 0 - RCuBStartsOnOwnLine: 0 - RCuBFinishesWithLineBreak: 0 - keyEqualsValuesBracesBrackets: - KeyStartsOnOwnLine: 0 - EqualsStartsOnOwnLine: 0 - EqualsFinishesWithLineBreak: 0 - items: - ItemStartsOnOwnLine: 0 - ItemFinishesWithLineBreak: 0 - namedGroupingBracesBrackets: - NameStartsOnOwnLine: 0 - NameFinishesWithLineBreak: 0 - specialBeginEnd: - SpecialBeginStartsOnOwnLine: 0 - SpecialBodyStartsOnOwnLine: 0 - SpecialEndStartsOnOwnLine: 0 - SpecialEndFinishesWithLineBreak: 0 - verbatim: - VerbatimBeginStartsOnOwnLine: 0 - VerbatimEndFinishesWithLineBreak: 0 - -# replacements, only active when either -r or -rr switches are active -replacements: - - - amalgamate: 1 - - - this: 'latexindent.pl' - that: 'pl.latexindent' - lookForThis: 0 - when: before - -# fineTuning allows you to tweak the internal pattern matching that -# is central to latexindent.pl -fineTuning: - environments: - name: '[a-zA-Z@\*0-9_\\]+' - ifElseFi: - name: '(?!@?if[a-zA-Z@]*?\{)@?if[a-zA-Z@]*?' - commands: - name: '[+a-zA-Z@\*0-9_\:]+?' - items: - canBeFollowedBy: '(?:\[[^]]*?\])|(?:<[^>]*?>)' - keyEqualsValuesBracesBrackets: - name: '[a-zA-Z@\*0-9_\/.:\#-]+[a-zA-Z@\*0-9_\/.\h\{\}:\#-]*?' - follow: '(?:(?<!\\)\{)|,|(?:(?<!\\)\[)' - namedGroupingBracesBrackets: - name: '[0-9\.a-zA-Z@\*><]+?' - follow: '\h|\R|\{|\[|\$|\)|\(' - UnNamedGroupingBracesBrackets: - follow: '\{|\[|,|&|\)|\(|\$' - arguments: - before: '(?:#\d\h*;?,?\/?)+|\<.*?\>' - between: '_|\^|\*' - trailingComments: - notPreceededBy: '(?<!\\)' - modifyLineBreaks: - doubleBackSlash: '\\\\(?:\h*\[\h*\d+\h*[a-zA-Z]+\h*\])?' - comma: ',' - betterFullStop: |- - (?x) # ignore spaces in the below - (?: # - \.\) # .) - (?!\h*[a-z]) # not *followed by* a-z - ) # - | # OR - (?: # - (?<! # not *preceeded by* - (?: # - (?:[eE]\.[gG]) # e.g OR E.g OR e.G OR E.G - | # - (?:[iI]\.[eE]) # i.e OR I.e OR i.E OR I.E - | # - (?:etc) # etc - ) # - ) # - ) # - \. # . - (?! # not *followed by* - (?: # - [a-zA-Z0-9-~,] # - | # - \), # ), - | # - \)\. # ). - ) # - ) # diff --git a/modules/home.legacy/conf/mail/accounts/soispha.nix b/modules/home.legacy/conf/mail/accounts/soispha.nix index 3f952ebf..6bcb0da6 100644 --- a/modules/home.legacy/conf/mail/accounts/soispha.nix +++ b/modules/home.legacy/conf/mail/accounts/soispha.nix @@ -42,11 +42,11 @@ # }; # }; smtp = { - host = "mail.vhack.eu"; + host = "mail.foss-syndicate.org"; port = 465; }; imap = { - host = "mail.vhack.eu"; + host = "mail.foss-syndicate.org"; port = 993; }; jmap = { diff --git a/modules/home.legacy/conf/mako/default.nix b/modules/home.legacy/conf/mako/default.nix deleted file mode 100644 index 60400987..00000000 --- a/modules/home.legacy/conf/mako/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de> -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. -{...}: { - services.mako = { - enable = true; - backgroundColor = "#2e3440"; - borderColor = "#88c0d0"; - borderRadius = 25; - borderSize = 2; - defaultTimeout = 5000; - font = "Source Code Pro 10"; - width = 500; - height = 500; - icons = true; - ignoreTimeout = true; - layer = "overlay"; - markup = true; # TODO: - maxIconSize = 64; - sort = "-time"; - extraConfig = '' - [urgency=low] - border-color=#cccccc - - [urgency=normal] - border-color=#d08770 - - [urgency=high] - border-size=3 - border-color=#bf616a - default-timeout=0 - - [urgency=critical] - border-size=4 - border-color=#bf616a - default-timeout=0 - - [category=mpd] - default-timeout=2000 - group-by=category - ''; - }; -} diff --git a/modules/home.legacy/conf/nix-index/default.nix b/modules/home.legacy/conf/nix-index/default.nix deleted file mode 100644 index 7b84d777..00000000 --- a/modules/home.legacy/conf/nix-index/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de> -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. -{...}: { - programs.nix-index = { - enable = true; - symlinkToCacheHome = true; - - # Handled by myself (and the script is overridden) - enableBashIntegration = false; - enableZshIntegration = false; - enableFishIntegration = false; - }; - programs.nix-index-database = { - comma.enable = false; - }; -} diff --git a/modules/home.legacy/conf/rclone/default.nix b/modules/home.legacy/conf/rclone/default.nix deleted file mode 100644 index 87de601b..00000000 --- a/modules/home.legacy/conf/rclone/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de> -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. -{...}: { - xdg.configFile."rclone/rclone.conf".source = ./rclone.conf; -} diff --git a/modules/home.legacy/conf/rclone/rclone.conf b/modules/home.legacy/conf/rclone/rclone.conf deleted file mode 100644 index 9e1c4f08..00000000 --- a/modules/home.legacy/conf/rclone/rclone.conf +++ /dev/null @@ -1,10 +0,0 @@ -[vhack1] -type = sftp -host = server1.vhack.eu -user = soispha -key_use_agent = true -known_hosts_file = ~/.local/share/ssh/known_hosts -shell_type = unix -md5sum_command = md5sum -sha1sum_command = sha1sum - diff --git a/modules/home.legacy/conf/rclone/rclone.conf.license b/modules/home.legacy/conf/rclone/rclone.conf.license deleted file mode 100644 index eae6a84c..00000000 --- a/modules/home.legacy/conf/rclone/rclone.conf.license +++ /dev/null @@ -1,9 +0,0 @@ -nixos-config - My current NixOS configuration - -Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de> -SPDX-License-Identifier: GPL-3.0-or-later - -This file is part of my nixos-config. - -You should have received a copy of the License along with this program. -If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. diff --git a/modules/home.legacy/conf/starship/default.nix b/modules/home.legacy/conf/starship/default.nix index 8d408141..6a6938f7 100644 --- a/modules/home.legacy/conf/starship/default.nix +++ b/modules/home.legacy/conf/starship/default.nix @@ -10,20 +10,24 @@ { lib, nixosConfig, + pkgs, ... }: { programs.starship = { enable = true; enableZshIntegration = true; + settings = { add_newline = false; format = lib.concatStrings [ "$directory" "$username" + "\${custom.in_nixos_shell}" "$cmd_duration" "$status" "$character" ]; + right_format = lib.concatStrings ( [ "$git_metrics" @@ -37,24 +41,30 @@ nixosConfig.soispha.laptop.enable "$battery" ); + scan_timeout = 20; + character = { # success_symbol = "[❯](bold blue)"; # a = "⬢"; success_symbol = "[](bold blue)"; error_symbol = "[](bold red)"; }; + status = { disabled = false; format = "([($common_meaning )($status)( $signal_name)]($style) )"; }; + time = { disabled = false; format = "[\\[$time\\]]($style)"; }; + username = { format = "as [$user]($style) "; }; + git_branch = { format = "[($symbol$branch(:$remote_branch) )]($style)"; }; @@ -85,22 +95,28 @@ tag_symbol = "v"; format = "[(\\[$tag\\] )]($style)"; }; + directory = { truncate_to_repo = true; read_only = " "; before_repo_root_style = "black bold dimmed"; }; + cmd_duration = { min_time = 2000; # Milliseconds style = "bold white"; }; + custom = { - # status_output = { - # format = "$output"; - # command = "if test $STARSHIP_CMD_STATUS -ne 0; then echo \"bold red\"; else echo \"bold cyan\"; fi"; - # shell = [ "${pkgs.dash}" ]; - # }; + in_nixos_shell = { + symbol = "VM "; + style = "bold white"; + when = ''test "$IN_NIXOS_SHELL" = true ''; + shell = ["${lib.getExe pkgs.dash}"]; + description = "Show if a shell is run in a vm"; + }; }; + battery = { # ' ' # ' ' diff --git a/modules/home.legacy/conf/tridactyl/config.vim b/modules/home.legacy/conf/tridactyl/config.vim deleted file mode 100644 index aa843bc8..00000000 --- a/modules/home.legacy/conf/tridactyl/config.vim +++ /dev/null @@ -1,57 +0,0 @@ -" nixos-config - My current NixOS configuration -" -" Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de> -" SPDX-License-Identifier: GPL-3.0-or-later -" -" This file is part of my nixos-config. -" -" You should have received a copy of the License along with this program. -" If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. - -" vim: filetype=vim - -" This wipes all existing settings. This means that if a setting in this file -" is removed, then it will return to default. In other words, this file serves -" as an enforced single point of truth for Tridactyl's configuration. -sanitize tridactyllocal tridactylsync - -" Just use a blank page for new tab. It would be nicer to use the standard -" Firefox homepage, but Tridactyl doesn't support this yet. -"TODO: use custome file -"set newtab file:///home/soispha/new.html - -" Set a nice colorscheme -colorscheme midnight - -" Delete temp files after use -alias editor_rm composite editor | jsb -p tri.native.run(`rm -f '${JS_ARG[0]}'`) -bind --mode=insert <C-i> editor_rm -bind --mode=input <C-i> editor_rm - -" Use vim in tmux for editor. -set editorcmd alacritty -e nvim - -" Ctrl-F should use the browser's native 'find' functionality. -unbind <C-f> - -" But also support Tridactyl search too. -bind / fillcmdline find -bind ? fillcmdline find -? -bind l findnext 1 -bind L findnext -1 -" Remove search highlighting. -bind ,<Space> nohlsearch -" Use sensitive case. Smart case would be nice here, but it doesn't work. -set findcase smartcase - -" Smooth scrolling, yes please. This is still a bit janky in Tridactyl. -set smoothscroll true - -" The default jump of 10 is a bit much. -bind t scrollline 5 -bind n scrollline -5 - -" K and J should move between tabs. x should close them. -bind T tabprev -bind N tabnext -bind x tabclose diff --git a/modules/home.legacy/conf/tridactyl/default.nix b/modules/home.legacy/conf/tridactyl/default.nix deleted file mode 100644 index de92c665..00000000 --- a/modules/home.legacy/conf/tridactyl/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de> -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. -{...}: { - xdg.configFile."tridactyl/tridactylrc".source = ./config.vim; -} |