From f9a4610fec0c5e806806d4d5f8167539ab93b896 Mon Sep 17 00:00:00 2001 From: Dym Sohin Date: Sat, 20 Jan 2024 18:10:59 +0100 Subject: [PATCH] ups --- @reboot.sh | 12 +- LICENSE | 236 +------------- _install.sh | 6 +- _installs/blender.sh | 4 +- _installs/certbot.sh | 47 --- _installs/chrome-canary.sh | 15 - _installs/chrome-stable.sh | 2 - _installs/docker.sh | 22 +- firefox/_install.sh => _installs/firefox.sh | 0 _installs/fojego.sh | 51 ---- _installs/go.sh | 3 +- _installs/godot.sh | 23 -- _installs/gotosocial.sh | 26 -- _installs/inkscape.sh | 1 - _installs/kdenlive.sh | 1 - _installs/krita.sh | 4 +- _installs/nextcloud.sh | 15 - _installs/nix.sh | 8 + _installs/noco.sh | 3 + _installs/nodejs.sh | 10 +- _installs/obs.sh | 7 +- _installs/penpot.sh | 9 + _installs/pipewire.sh | 18 ++ _installs/seafile.sh | 26 -- _installs/sftp.sh | 22 -- _installs/suitcrm.sh | 7 - _installs/transmission.sh | 6 +- _installs/woeusb.sh | 31 -- _scripts/_install.sh | 26 -- _scripts/bak-current.sh | 31 -- _scripts/bak-current_to_archive.sh | 55 ---- _scripts/bak-data.sh | 34 --- _scripts/bak-home.sh | 80 ----- _scripts/device-info.sh | 26 -- _scripts/devices-report.sh | 17 -- _scripts/disable-power-button.sh | 6 - _scripts/heic.sh | 7 - _scripts/hourly-backup.sh | 79 ----- _scripts/kk.sh | 3 - _scripts/off.sh | 6 - _scripts/opti.sh | 44 --- _scripts/pdf-slice.sh | 19 -- _scripts/prtscr.sh | 6 - _scripts/prtwnd.sh | 11 - _scripts/purge.sh | 49 --- _scripts/restart.sh | 6 - _scripts/save-cfg.sh | 6 - _scripts/sort_out.sh | 22 -- _scripts/to_dec.sh | 23 -- _scripts/to_hex.sh | 23 -- _scripts/to_mp3.sh | 22 -- _scripts/upd.sh | 30 -- _sys/.config/mimeapps.list | 61 ---- _sys/.config/pavucontrol.ini | 8 - _sys/.config/user-dirs.dirs | 10 - _sys/.nvidia-settings-rc | 100 ------ _sys/50unattended-upgrades | 4 + _sys/_install.sh | 5 - _sys/dirs.sh | 34 ++- _sys/fancontrol | 10 + _sys/fstab | 9 - _sys/fstab_231120 | 24 ++ _sys/fstab_240120 | 18 ++ _sys/hostname | 1 - _sys/logind.conf | 37 +++ _sys/nvidia-vulkan.sh | 8 +- _sys/roccat.sh | 11 - _sys/ssh_config | 55 +--- _sys/user-dirs.dirs | 15 + _sys/{.config => }/user-dirs.locale | 0 _sys/xorg.conf | 63 ---- apache/var-www/db | 1 - apache/var-www/html | 1 - apache/var-www/it-bike | 1 - doublecmd/doublecmd.xml | 155 ++++++---- doublecmd/session.ini | 2 +- emoji/_install.sh | 19 +- firefox/SponsorBlock.json | 172 ----------- firefox/_install-esr.sh | 7 - firefox/gesturefy.json | 81 ----- firefox/keepassxc.json | 1 - firefox/readme.md | 57 ---- firefox/ublock--full.txt | 62 ---- gtk/bookmarks | 7 - i3/config | 63 ++-- {oh-my-zsh => kb}/.Xmodmap | 0 oh-my-zsh/.xsession => kb/.xkb | 17 +- kb/_install.sh | 5 + kb/jp-translit-hiro.sh | 15 + kb/jp-translit-kana.sh | 15 + kb/ru-translit-mac.sh | 15 + kb/us-mac.sh | 15 + meta.kdl | 4 +- nginx/DOMAIN.TLD.conf | 32 -- nginx/_install.sh | 12 - nginx/dym.sh--gts.conf | 47 --- nginx/dym.sh--serve-www.conf | 56 ---- nginx/ipv6.sh | 11 - nginx/mail.conf | 43 --- nginx/nginx.conf | 71 ----- nginx/source.garden.conf | 56 ---- nix/dym.nix | 21 ++ oh-my-zsh/.fehbg | 2 + oh-my-zsh/.profile | 2 +- oh-my-zsh/.xsessionrc | 21 ++ oh-my-zsh/.zshrc | 3 +- oh-my-zsh/_install.sh | 8 + oh-my-zsh/env.sh | 64 ---- penpot/docker-compose.yaml | 288 ++++++++++++++++++ php/_install-7.4.sh | 55 ---- php/{_install-default.sh => _install-8.x.sh} | 15 +- php/{_install-8.sh => _install-latest.sh} | 19 +- php/{phpMyAdmin.sh => phpMyAdmin-7.4.sh} | 0 poste-io/@reboot.sh | 30 -- poste-io/_install.sh | 16 - _installs/postgres.sh => postgres/_install.sh | 10 +- postgres/pg_hba.conf | 5 + python/pip.conf | 3 + python/python-3.11.sh | 21 -- python/python-3.12.sh | 35 +++ readme.md | 5 + sublime-merge/_install.sh | 7 +- sublime-text/Formatter.quick-options | 1 + sublime-text/JsPrettier.sublime-settings | 3 + sublime-text/Package Control.sublime-settings | 7 +- sublime-text/Preferences.sublime-settings | 66 ++-- sublime-text/_install.sh | 12 +- sublime-text/delete_subword.sublime-macro | 15 + .../delete_subword.sublime-macro.json | 15 + .../delete_subword_forward.sublime-macro | 15 + .../noads.css | 14 +- vscode/_install.sh | 8 - vscode/keybindings.json | 50 --- vscode/settings.json | 128 -------- vscode/vscode.sh | 23 -- {xnview => xnviewmp}/1080p.xbs | 0 {xnview => xnviewmp}/2160p.xbs | 0 {xnview => xnviewmp}/_install.sh | 0 {xnview => xnviewmp}/auto-crop.xbs | 0 {xnview => xnviewmp}/crop frames, 1080p.xbs | 0 .../crop to 4K, 1080p, webp.xbs | 0 {xnview => xnviewmp}/crop, 1080p, webp.xbs | 0 {xnview => xnviewmp}/flat (black bg).xbs | 0 {xnview => xnviewmp}/flat (white bg).xbs | 0 {xnview => xnviewmp}/insta story crop.xbs | 0 .../ipad store horizontal.xbs | 0 {xnview => xnviewmp}/ipad store vert.xbs | 0 {xnview => xnviewmp}/ipad store.xbs | 0 {xnview => xnviewmp}/webp, crop 60px vert.xbs | 0 {xnview => xnviewmp}/webp.xbs | 0 {xnview => xnviewmp}/webp100.xbs | 0 {xnview => xnviewmp}/xnview.ini | 0 152 files changed, 972 insertions(+), 2777 deletions(-) delete mode 100755 _installs/certbot.sh delete mode 100755 _installs/chrome-canary.sh delete mode 100755 _installs/chrome-stable.sh rename firefox/_install.sh => _installs/firefox.sh (100%) delete mode 100755 _installs/fojego.sh delete mode 100755 _installs/godot.sh delete mode 100755 _installs/gotosocial.sh delete mode 100755 _installs/nextcloud.sh create mode 100755 _installs/nix.sh create mode 100755 _installs/noco.sh create mode 100755 _installs/penpot.sh create mode 100755 _installs/pipewire.sh delete mode 100755 _installs/seafile.sh delete mode 100755 _installs/sftp.sh delete mode 100755 _installs/suitcrm.sh delete mode 100755 _installs/woeusb.sh delete mode 100755 _scripts/_install.sh delete mode 100755 _scripts/bak-current.sh delete mode 100755 _scripts/bak-current_to_archive.sh delete mode 100755 _scripts/bak-data.sh delete mode 100755 _scripts/bak-home.sh delete mode 100755 _scripts/device-info.sh delete mode 100755 _scripts/devices-report.sh delete mode 100755 _scripts/disable-power-button.sh delete mode 100755 _scripts/heic.sh delete mode 100755 _scripts/hourly-backup.sh delete mode 100755 _scripts/kk.sh delete mode 100755 _scripts/off.sh delete mode 100755 _scripts/opti.sh delete mode 100755 _scripts/pdf-slice.sh delete mode 100755 _scripts/prtscr.sh delete mode 100755 _scripts/prtwnd.sh delete mode 100755 _scripts/purge.sh delete mode 100755 _scripts/restart.sh delete mode 100755 _scripts/save-cfg.sh delete mode 100755 _scripts/sort_out.sh delete mode 100755 _scripts/to_dec.sh delete mode 100755 _scripts/to_hex.sh delete mode 100755 _scripts/to_mp3.sh delete mode 100755 _scripts/upd.sh delete mode 100644 _sys/.config/mimeapps.list delete mode 100644 _sys/.config/pavucontrol.ini delete mode 100644 _sys/.config/user-dirs.dirs delete mode 100644 _sys/.nvidia-settings-rc create mode 100644 _sys/50unattended-upgrades delete mode 100755 _sys/_install.sh create mode 100644 _sys/fancontrol delete mode 100644 _sys/fstab create mode 100644 _sys/fstab_231120 create mode 100644 _sys/fstab_240120 delete mode 100644 _sys/hostname create mode 100644 _sys/logind.conf delete mode 100755 _sys/roccat.sh create mode 100644 _sys/user-dirs.dirs rename _sys/{.config => }/user-dirs.locale (100%) delete mode 100644 _sys/xorg.conf delete mode 120000 apache/var-www/db delete mode 120000 apache/var-www/html delete mode 120000 apache/var-www/it-bike delete mode 100644 firefox/SponsorBlock.json delete mode 100755 firefox/_install-esr.sh delete mode 100644 firefox/gesturefy.json delete mode 120000 firefox/keepassxc.json delete mode 100644 firefox/readme.md delete mode 100644 firefox/ublock--full.txt delete mode 100644 gtk/bookmarks rename {oh-my-zsh => kb}/.Xmodmap (100%) rename oh-my-zsh/.xsession => kb/.xkb (56%) create mode 100755 kb/_install.sh create mode 100755 kb/jp-translit-hiro.sh create mode 100755 kb/jp-translit-kana.sh create mode 100755 kb/ru-translit-mac.sh create mode 100755 kb/us-mac.sh delete mode 100644 nginx/DOMAIN.TLD.conf delete mode 100755 nginx/_install.sh delete mode 100644 nginx/dym.sh--gts.conf delete mode 100644 nginx/dym.sh--serve-www.conf delete mode 100755 nginx/ipv6.sh delete mode 100644 nginx/mail.conf delete mode 100644 nginx/nginx.conf delete mode 100644 nginx/source.garden.conf create mode 100644 nix/dym.nix create mode 100755 oh-my-zsh/.fehbg delete mode 100644 oh-my-zsh/env.sh create mode 100644 penpot/docker-compose.yaml delete mode 100755 php/_install-7.4.sh rename php/{_install-default.sh => _install-8.x.sh} (81%) mode change 100644 => 100755 rename php/{_install-8.sh => _install-latest.sh} (75%) rename php/{phpMyAdmin.sh => phpMyAdmin-7.4.sh} (100%) delete mode 100755 poste-io/@reboot.sh delete mode 100755 poste-io/_install.sh rename _installs/postgres.sh => postgres/_install.sh (83%) create mode 100644 postgres/pg_hba.conf create mode 100644 python/pip.conf delete mode 100755 python/python-3.11.sh create mode 100755 python/python-3.12.sh create mode 100644 readme.md create mode 100644 sublime-text/Formatter.quick-options create mode 100644 sublime-text/JsPrettier.sublime-settings create mode 100644 sublime-text/delete_subword.sublime-macro create mode 100644 sublime-text/delete_subword.sublime-macro.json create mode 100644 sublime-text/delete_subword_forward.sublime-macro rename firefox/ublock--custom-filters.txt => vivaldi/noads.css (82%) delete mode 100755 vscode/_install.sh delete mode 100644 vscode/keybindings.json delete mode 100644 vscode/settings.json delete mode 100755 vscode/vscode.sh rename {xnview => xnviewmp}/1080p.xbs (100%) rename {xnview => xnviewmp}/2160p.xbs (100%) rename {xnview => xnviewmp}/_install.sh (100%) rename {xnview => xnviewmp}/auto-crop.xbs (100%) rename {xnview => xnviewmp}/crop frames, 1080p.xbs (100%) rename {xnview => xnviewmp}/crop to 4K, 1080p, webp.xbs (100%) rename {xnview => xnviewmp}/crop, 1080p, webp.xbs (100%) rename {xnview => xnviewmp}/flat (black bg).xbs (100%) rename {xnview => xnviewmp}/flat (white bg).xbs (100%) rename {xnview => xnviewmp}/insta story crop.xbs (100%) rename {xnview => xnviewmp}/ipad store horizontal.xbs (100%) rename {xnview => xnviewmp}/ipad store vert.xbs (100%) rename {xnview => xnviewmp}/ipad store.xbs (100%) rename {xnview => xnviewmp}/webp, crop 60px vert.xbs (100%) rename {xnview => xnviewmp}/webp.xbs (100%) rename {xnview => xnviewmp}/webp100.xbs (100%) rename {xnview => xnviewmp}/xnview.ini (100%) diff --git a/@reboot.sh b/@reboot.sh index e852f1f..9930c9f 100755 --- a/@reboot.sh +++ b/@reboot.sh @@ -1,5 +1,15 @@ -#!/usr/bin/zsh +#!/bin/sh + +# ~/.xsession 2>&1 & imwheel 2>&1 & nfancurve 2>&1 & copyq 2>&1 & + +sleep 5 && \ + sshfs infra:/ /Servers/infra -C 2>&1 & + +## already done in /etc/fstab +sleep 5 && \ +sudo mount 192.168.0.222:/nfs/Public /Data 2>&1 & +# sudo mount 169.254.186.28:/nfs/Public /Data 2>&1 & diff --git a/LICENSE b/LICENSE index 0c97efd..b1334a5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,235 +1,5 @@ -GNU AFFERO GENERAL PUBLIC LICENSE -Version 3, 19 November 2007 +Copyright (C) 2023 by Dym Sohin -Copyright (C) 2007 Free Software Foundation, Inc. +Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted. -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - - Preamble - -The GNU Affero General Public License is a free, copyleft license for software and other kinds of works, specifically designed to ensure cooperation with the community in the case of network server software. - -The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. - -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - -Developers that use our General Public Licenses protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License which gives you legal permission to copy, distribute and/or modify the software. - -A secondary benefit of defending all users' freedom is that improvements made in alternate versions of the program, if they receive widespread use, become available for other developers to incorporate. Many developers of free software are heartened and encouraged by the resulting cooperation. However, in the case of software used on network servers, this result may fail to come about. The GNU General Public License permits making a modified version and letting the public access it on a server without ever releasing its source code to the public. - -The GNU Affero General Public License is designed specifically to ensure that, in such cases, the modified source code becomes available to the community. It requires the operator of a network server to provide the source code of the modified version running there to the users of that server. Therefore, public use of a modified version, on a publicly accessible server, gives the public access to the source code of the modified version. - -An older license, called the Affero General Public License and published by Affero, was designed to accomplish similar goals. This is a different license, not a version of the Affero GPL, but Affero has released a new version of the Affero GPL which permits relicensing under this license. - -The precise terms and conditions for copying, distribution and modification follow. - - TERMS AND CONDITIONS - -0. Definitions. - -"This License" refers to version 3 of the GNU Affero General Public License. - -"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - -"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. - -To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. - -A "covered work" means either the unmodified Program or a work based on the Program. - -To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. - -To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. - -1. Source Code. -The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work. - -A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. - -The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. - -The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those -subprograms and other parts of the work. - -The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. - -The Corresponding Source for a work in source code form is that same work. - -2. Basic Permissions. -All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. - -You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. - -3. Protecting Users' Legal Rights From Anti-Circumvention Law. -No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. - -When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. - -4. Conveying Verbatim Copies. -You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. - -You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. - -5. Conveying Modified Source Versions. -You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". - - c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. - -A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. - -6. Conveying Non-Source Forms. -You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: - - a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. - - d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. - -A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. - -A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. - -"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. - -If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). - -The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. - -7. Additional Terms. -"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. - -When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or authors of the material; or - - e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. - -All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. - -8. Termination. - -You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). - -However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. - -Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. - -9. Acceptance Not Required for Having Copies. - -You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. - -10. Automatic Licensing of Downstream Recipients. - -Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. - -An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. - -11. Patents. - -A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". - -A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. - -In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. - -If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. - -A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. - -12. No Surrender of Others' Freedom. - -If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - -13. Remote Network Interaction; Use with the GNU General Public License. - -Notwithstanding any other provision of this License, if you modify the Program, your modified version must prominently offer all users interacting with it remotely through a computer network (if your version supports such interaction) an opportunity to receive the Corresponding Source of your version by providing access to the Corresponding Source from a network server at no charge, through some standard or customary means of facilitating copying of software. This Corresponding Source shall include the Corresponding Source for any work covered by version 3 of the GNU General Public License that is incorporated pursuant to the following paragraph. - -Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the work with which it is combined will remain governed by version 3 of the GNU General Public License. - -14. Revised Versions of this License. - -The Free Software Foundation may publish revised and/or new versions of the GNU Affero General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. - -Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. - -15. Disclaimer of Warranty. - -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -16. Limitation of Liability. - -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -17. Interpretation of Sections 15 and 16. - -If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - -END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero 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 Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - -If your software can interact with users remotely through a computer network, you should also make sure that it provides a way for users to get its source. For example, if your program is a web application, its interface could display a "Source" link that leads users to an archive of the code. There are many ways you could offer source, and different solutions will be better for different programs; see section 13 for the specific requirements. - -You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see . +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/_install.sh b/_install.sh index c98cd04..6ff755e 100755 --- a/_install.sh +++ b/_install.sh @@ -45,9 +45,13 @@ sudo apt install -y \ gnumeric \ xdotool + sudo systemctl disable rsyslog sudo systemctl stop rsyslog sudo timedatectl set-timezone Europe/Berlin - +sudo visudo +## or sudo nano /etc/sudoers +## add the line +# Defaults timestamp_timeout=-1 diff --git a/_installs/blender.sh b/_installs/blender.sh index 637ec2a..222a555 100755 --- a/_installs/blender.sh +++ b/_installs/blender.sh @@ -1,4 +1,4 @@ -#!/usr/bin/zsh +#!/bin/sh sudo add-apt-repository -y \ ppa:savoury1/ffmpeg4 \ @@ -6,7 +6,7 @@ sudo add-apt-repository -y \ sudo apt-get update -y sudo apt-get upgrade -y -sudo apt-get dist-upgrade -y +# sudo apt-get dist-upgrade -y sudo apt-get install -y \ ffmpeg blender diff --git a/_installs/certbot.sh b/_installs/certbot.sh deleted file mode 100755 index 2cad9df..0000000 --- a/_installs/certbot.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/zsh - -sudo apt-get remove -y \ - python3-cryptography - -pip3 install \ - certbot \ - cryptography - - -certbot certonly \ - -d 'source.garden' \ - -d '*.source.garden' \ - --email 'certbot+source.garden@dym.sh' \ - --agree-tos \ - --manual-public-ip-logging-ok \ - --renew-by-default \ - --rsa-key-size 4096 \ - --no-bootstrap \ - --manual \ - --preferred-challenges dns-01 \ - --server https://acme-v02.api.letsencrypt.org/directory - - -certbot certonly \ - -d 'dym.sh' \ - -d '*.dym.sh' \ - --email 'certbot+dym.sh@dym.sh' \ - --agree-tos \ - --manual-public-ip-logging-ok \ - --renew-by-default \ - --rsa-key-size 4096 \ - --no-bootstrap \ - --manual \ - --preferred-challenges dns-01 \ - --server https://acme-v02.api.letsencrypt.org/directory - - -# check every month and on server-restart -echo ' -# letsencrypt renews -1 1 1 * * letsencrypt renew --nginx --quiet -@reboot letsencrypt renew --nginx --quiet -' >> /etc/crontab - -# -systemctl restart cron.service diff --git a/_installs/chrome-canary.sh b/_installs/chrome-canary.sh deleted file mode 100755 index 7176118..0000000 --- a/_installs/chrome-canary.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/zsh - -wget -q -O - \ - 'https://dl.google.com/linux/linux_signing_key.pub' \ - | sudo apt-key add - - -sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B - -echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' \ - | sudo tee -a '/etc/apt/sources.list.d/google.list' - -sudo apt update -y - -sudo apt install -y \ - google-chrome-unstable diff --git a/_installs/chrome-stable.sh b/_installs/chrome-stable.sh deleted file mode 100755 index 9a8d310..0000000 --- a/_installs/chrome-stable.sh +++ /dev/null @@ -1,2 +0,0 @@ - -sudo apt-mark hold google-chrome-stable diff --git a/_installs/docker.sh b/_installs/docker.sh index 4028056..7595a24 100755 --- a/_installs/docker.sh +++ b/_installs/docker.sh @@ -16,6 +16,16 @@ sudo apt-get install -y \ gnupg \ lsb-release +# "security" +sudo apt-key adv --keyserver keyserver.ubuntu.com \ + --recv-keys 7FCC7D46ACCC4CF8 +sudo apt-key adv --keyserver keyserver.ubuntu.com \ + --recv-keys 7EA0A9C3F273FCD8 +sudo apt-key adv --keyserver keyserver.ubuntu.com \ + --recv-keys 40976EAF437D05B5 +sudo apt-key adv --keyserver keyserver.ubuntu.com \ + --recv-keys 3B4FE6ACC0B21F32 + # docker.com key file curl -fsSL 'https://download.docker.com/linux/ubuntu/gpg' \ @@ -43,15 +53,15 @@ $DISTRO stable \ # update sources -sudo apt update -y +sudo apt-get update -y # check avaliable versions -apt-cache \ - madison docker-ce +sudo apt-cache \ + madison docker # install docker -sudo apt install -y \ - docker-ce docker-ce-cli containerd.io docker-compose +sudo apt-get install -y \ + docker docker-compose # manage rootless @@ -67,8 +77,6 @@ sudo apt install ./docker-desktop.deb systemctl --user start docker-desktop - - # image of OSX # 40GB disk space required: 20GB original image 20GB your container. docker pull sickcodes/docker-osx:auto diff --git a/firefox/_install.sh b/_installs/firefox.sh similarity index 100% rename from firefox/_install.sh rename to _installs/firefox.sh diff --git a/_installs/fojego.sh b/_installs/fojego.sh deleted file mode 100755 index 8cc7a1d..0000000 --- a/_installs/fojego.sh +++ /dev/null @@ -1,51 +0,0 @@ -apt-get install -y \ - git git-lfs - -wget https://codeberg.org/forgejo/forgejo/releases/download/v1.19.3-0/forgejo-1.19.3-0-linux-amd64 -chmod +x forgejo-1.19.3-0-linux-amd64 - -gpg --keyserver keys.openpgp.org --recv EB114F5E6C0DC2BCDD183550A4B61A2DC5923710 -wget https://codeberg.org/forgejo/forgejo/releases/download/v1.19.3-0/forgejo-1.19.3-0-linux-amd64.asc -gpg --verify forgejo-1.19.3-0-linux-amd64.asc forgejo-1.19.3-0-linux-amd64 - -mv forgejo-1.19.3-0-linux-amd64 /usr/local/bin/forgejo -chmod 755 /usr/local/bin/forgejo - - -groupadd --system git - -adduser --system --shell /bin/bash --comment 'Git Version Control' \ - --gid git --home-dir /home/git --create-home git - -mkdir /var/lib/forgejo -chown git:git /var/lib/forgejo \ - && chmod 750 /var/lib/forgejo - -mkdir /usr/local/bin/data -chown root:git /usr/local/bin/data \ - && chmod 770 /usr/local/bin/data - -mkdir /usr/local/bin/log -chown root:git /usr/local/bin/log \ - && chmod 770 /usr/local/bin/log - -mkdir /usr/local/bin/custom -chown root:git /usr/local/bin/custom \ - && chmod 770 /usr/local/bin/custom - -mkdir /etc/forgejo -chown root:git /etc/forgejo \ - && chmod 770 /etc/forgejo - - -wget -O \ - /etc/systemd/system/forgejo.service \ - 'https://codeberg.org/forgejo/forgejo/raw/branch/forgejo/contrib/systemd/forgejo.service' - -# If you’re not using sqlite, but MySQL or MariaDB or PostgreSQL, you’ll have to edit that file (/etc/systemd/system/forgejo.service) and uncomment the corresponding Wants= and After= lines. Otherwise it should work as it is. - -systemctl enable forgejo.service -systemctl start forgejo.service - -# open http://source.garden:3000 - diff --git a/_installs/go.sh b/_installs/go.sh index 9edc581..e07e005 100755 --- a/_installs/go.sh +++ b/_installs/go.sh @@ -1,4 +1,4 @@ -#!/usr/bin/zsh +#!/bin/sh # install go @@ -10,3 +10,4 @@ tar -C '/Apps/go--app' -xzf 'go1.19.4.linux-amd64.tar.gz' rm 'go1.19.4.linux-amd64.tar.gz' sudo chown $USER:$USER -R '/usr/local/go' sudo ln -s /usr/local/go/bin/* /Apps/ --force + diff --git a/_installs/godot.sh b/_installs/godot.sh deleted file mode 100755 index da3485e..0000000 --- a/_installs/godot.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/zsh - - -wget https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb \ - -O packages-microsoft-prod.deb -sudo dpkg -i \ - packages-microsoft-prod.deb -# rm packages-microsoft-prod.deb - -sudo apt-get update -sudo apt-get install -y \ - dotnet-sdk-7.0 \ - aspnetcore-runtime-7.0 - - -sudo apt install gnupg ca-certificates -sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF -echo "deb https://download.mono-project.com/repo/ubuntu nightly-focal main" \ - | sudo tee /etc/apt/sources.list.d/mono-official-nightly.list -echo "deb https://download.mono-project.com/repo/ubuntu preview-focal main" \ - | sudo tee /etc/apt/sources.list.d/mono-official-preview.list -sudo apt update - diff --git a/_installs/gotosocial.sh b/_installs/gotosocial.sh deleted file mode 100755 index bd31048..0000000 --- a/_installs/gotosocial.sh +++ /dev/null @@ -1,26 +0,0 @@ -mkdir -p /gotosocial/storage/certs - -wget 'https://github.com/superseriousbusiness/gotosocial/releases/download/v0.5.2/gotosocial_0.5.2_linux_amd64.tar.gz' -tar -xzf gotosocial_ - -cp ./example/config.yaml . -nano ./config.yaml - -./gotosocial --config-path ./config.yaml server start - -./gotosocial --config-path ./config.yaml admin account create --username dym --email dym@dym.sh --password '!gts_pass_123' - -./gotosocial --config-path ./config.yaml admin account promote --username dym - - -sudo useradd -r gotosocial -sudo groupadd gotosocial -sudo usermod -a -G gotosocial gotosocial -sudo chown -R gotosocial:gotosocial /gotosocial - -sudo cp /gotosocial/example/gotosocial.service /etc/systemd/system/ -sudo systemctl enable --now gotosocial.service - - -curl -L https://dym.sh/.well-known/webfinger\?resource\=acct:dym@dym.com - diff --git a/_installs/inkscape.sh b/_installs/inkscape.sh index 6378dac..a203b37 100755 --- a/_installs/inkscape.sh +++ b/_installs/inkscape.sh @@ -7,6 +7,5 @@ sudo add-apt-repository -y \ ppa:inkscape.dev/stable sudo apt update -y - sudo apt install -y \ inkscape diff --git a/_installs/kdenlive.sh b/_installs/kdenlive.sh index 9d4c539..1f63539 100755 --- a/_installs/kdenlive.sh +++ b/_installs/kdenlive.sh @@ -4,6 +4,5 @@ sudo add-apt-repository -y \ ppa:kdenlive/kdenlive-stable sudo apt update -y - sudo apt install -y \ kdenlive diff --git a/_installs/krita.sh b/_installs/krita.sh index 7713d1f..adc0e82 100755 --- a/_installs/krita.sh +++ b/_installs/krita.sh @@ -1,11 +1,11 @@ -#!/usr/bin/zsh +#!/usr/bin/env zsh sudo add-apt-repository -y \ ppa:kritalime/ppa sudo apt-get update -y sudo apt-get upgrade -y -sudo apt-get dist-upgrade -y +# sudo apt-get dist-upgrade -y sudo apt-get install -y \ krita diff --git a/_installs/nextcloud.sh b/_installs/nextcloud.sh deleted file mode 100755 index 28956d0..0000000 --- a/_installs/nextcloud.sh +++ /dev/null @@ -1,15 +0,0 @@ -curl -fsSL https://get.docker.com | sudo sh - -sudo docker run \ ---sig-proxy=false \ ---name nextcloud-aio-mastercontainer \ ---restart always \ ---publish 80:80 \ ---publish 8080:8080 \ ---publish 8443:8443 \ ---volume nextcloud_aio_mastercontainer:/mnt/docker-aio-config \ ---volume /var/run/docker.sock:/var/run/docker.sock:ro \ -nextcloud/all-in-one:latest - - -firefox 'https://:8080' diff --git a/_installs/nix.sh b/_installs/nix.sh new file mode 100755 index 0000000..5c14855 --- /dev/null +++ b/_installs/nix.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env zsh + +sudo mkdir /nix +sudo chown $USER:$USER /nix +sudo chmod g+s /nix + +sh <(curl -L https://nixos.org/nix/install) --no-daemon + diff --git a/_installs/noco.sh b/_installs/noco.sh new file mode 100755 index 0000000..915beb0 --- /dev/null +++ b/_installs/noco.sh @@ -0,0 +1,3 @@ +curl http://get.nocodb.com/linux-x64 -o nocodb -L +chmod +x nocodb +./nocodb diff --git a/_installs/nodejs.sh b/_installs/nodejs.sh index b7db036..95adda8 100755 --- a/_installs/nodejs.sh +++ b/_installs/nodejs.sh @@ -12,13 +12,15 @@ sudo rm -rf /usr/share/npm sudo rm -rf /usr/share/nodejs +VER='v20.9.0' + # install node + npm wget -O 'node.xz' \ - 'https://nodejs.org/dist/v18.16.0/node-v18.16.0-linux-x64.tar.xz' + "https://nodejs.org/dist/$VER/node-$VER-linux-x64.tar.xz" tar -xf 'node.xz' -rm 'node.xz' -sudo mv node-v18.16.0-linux-x64/bin/* /usr/local/bin/ -sudo mv node-v18.16.0-linux-x64/lib/node_modules/ /usr/local/lib/ +# rm 'node.xz' +sudo mv node-$VER-linux-x64/bin/* /usr/local/bin/ +sudo mv node-$VER-linux-x64/lib/node_modules/ /usr/local/lib/ sudo mkdir -p \ '/usr/lib/nodejs' \ diff --git a/_installs/obs.sh b/_installs/obs.sh index db732c8..e69260d 100755 --- a/_installs/obs.sh +++ b/_installs/obs.sh @@ -7,8 +7,9 @@ sudo add-apt-repository -y \ # install OBS and additional tooling -sudo apt update -y -sudo apt install -y \ +sudo apt-get update -y +sudo apt-get install -y \ obs-studio \ - ffmpeg \ v4l2loopback-dkms +# ffmpeg \ + diff --git a/_installs/penpot.sh b/_installs/penpot.sh new file mode 100755 index 0000000..d9de724 --- /dev/null +++ b/_installs/penpot.sh @@ -0,0 +1,9 @@ +mkdir -p /Forks/penpot/ +cd /Forks/penpot/ + +wget https://raw.githubusercontent.com/penpot/penpot/main/docker/images/docker-compose.yaml + +docker-compose \ + -p penpot \ + -f docker-compose.yaml \ + up -d diff --git a/_installs/pipewire.sh b/_installs/pipewire.sh new file mode 100755 index 0000000..cce7290 --- /dev/null +++ b/_installs/pipewire.sh @@ -0,0 +1,18 @@ +#!/bin/sh + + +sudo add-apt-repository -y \ + ppa:pipewire-debian/pipewire-upstream +sudo add-apt-repository -y \ + ppa:pipewire-debian/wireplumber-upstream + +sudo apt-get update -y + +sudo apt install -y \ + gstreamer1.0-pipewire \ + libpipewire-0.3-{0,dev,modules} \ + libspa-0.2-{bluetooth,dev,jack,modules} \ + pipewire{,-{audio-client-libraries,pulse,bin,jack,alsa,v4l2,libcamera,locales,tests}} + +sudo apt install -y pipewire-doc + diff --git a/_installs/seafile.sh b/_installs/seafile.sh deleted file mode 100755 index 9d39703..0000000 --- a/_installs/seafile.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/zsh - -# seafile -# /from https://help.seafile.com/syncing_client/install_linux_client/ - -sudo wget 'https://linux-clients.seafile.com/seafile.asc' \ - -O '/usr/share/keyrings/seafile-keyring.asc' - -sudo bash -c " - echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/seafile-keyring.asc] https://linux-clients.seafile.com/seafile-deb/focal/ stable main' \ - > /etc/apt/sources.list.d/seafile.list - " - -sudo apt update -y -sudo apt install -y \ - seafile-gui - -# opt debug -sudo apt-get install -y \ - libsearpc-dbg \ - ccnet-dbg \ - libccnet-dbg \ - seafile-daemon-dbg \ - libseafile-dbg \ - seafile-gui-dbg - diff --git a/_installs/sftp.sh b/_installs/sftp.sh deleted file mode 100755 index b3a3e0b..0000000 --- a/_installs/sftp.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/zsh - -apt install ssh - -nano /etc/ssh/sshd_config -```cfg -Match group sftp -ChrootDirectory /home -X11Forwarding no -AllowTcpForwarding no -ForceCommand internal-sftp -``` - -systemctl restart ssh -addgroup sftp -useradd -m sftpuser -g sftp -passwd sftpuser -chmod 700 /home/sftpuser/ - -sftp sftpuser@127.0.0.1 - -open sftp://127.0.0.1 \ No newline at end of file diff --git a/_installs/suitcrm.sh b/_installs/suitcrm.sh deleted file mode 100755 index 235f9dd..0000000 --- a/_installs/suitcrm.sh +++ /dev/null @@ -1,7 +0,0 @@ - - -cd /var/www/crm -find . -type d -not -perm 2755 -exec chmod 2755 {} \; -find . -type f -not -perm 0644 -exec chmod 0644 {} \; -find . ! -user www-data -exec chown www-data:www-data {} \; -chmod +x bin/console diff --git a/_installs/transmission.sh b/_installs/transmission.sh index c14c4c1..00544af 100755 --- a/_installs/transmission.sh +++ b/_installs/transmission.sh @@ -1,11 +1,11 @@ -#!/usr/bin/zsh +#!/bin/sh sudo add-apt-repository -y \ ppa:transmissionbt/ppa sudo apt-get update -y sudo apt-get upgrade -y -sudo apt-get dist-upgrade -y sudo apt-get install -y \ - transmission transmission-gtk + transmission-gtk + diff --git a/_installs/woeusb.sh b/_installs/woeusb.sh deleted file mode 100755 index 6fd82aa..0000000 --- a/_installs/woeusb.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/zsh - -sudo apt install -y \ - git \ - p7zip-full \ - python3-pip \ - python3-wxgtk4.0 \ - grub2-common \ - grub-pc-bin \ - build-essential - - -# install -sudo add-apt-repository -y \ - ppa:tomtomtom/woeusb - -sudo apt update -y -sudo apt install -y \ - woeusb \ - wimlib-imagex \ - wimtools - - -# get disk list -sudo fdisk -l - -# use -sudo woeusb \ - --target-filesystem NTFS \ - -d /Data/Iso/wnd-10.iso \ - /dev/sdX diff --git a/_scripts/_install.sh b/_scripts/_install.sh deleted file mode 100755 index be34d9d..0000000 --- a/_scripts/_install.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/zsh - -BIN=~/.local/bin -mkdir -p "$BIN" - -cd /Cfg/_scripts/ - -# link scripts -ln -s `pwd`/upd.sh "$BIN/upd" --force - -ln -s `pwd`/opti.sh "$BIN/opti" --force - -ln -s `pwd`/prtscr.sh "$BIN/prtscr" --force -ln -s `pwd`/prtwnd.sh "$BIN/prtwnd" --force - -ln -s `pwd`/kk.sh "$BIN/kk" --force -ln -s `pwd`/purge.sh "$BIN/purge" --force - -ln -s `pwd`/restart.sh "$BIN/restart" --force -ln -s `pwd`/off.sh "$BIN/off" --force - -ln -s `pwd`/to_mp3.sh "$BIN/to_mp3" --force - -ln -s `pwd`/to_hex.sh "$BIN/to_hex" --force -ln -s `pwd`/to_dec.sh "$BIN/to_dec" --force - diff --git a/_scripts/bak-current.sh b/_scripts/bak-current.sh deleted file mode 100755 index df8d64e..0000000 --- a/_scripts/bak-current.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/zsh - -BAK="/media/dym/priv_bak" -if [ ! -z "$1" ]; then - BAK="$1" -fi - - -cd `realpath "$0" | xargs dirname` -./bak-home.sh "$BAK/Home" - -DIRS=( - Apps - Cfg - Projects - Site - Work -) -for DIR in "${DIRS[@]}"; do - echo "- -- -# '$DIR'" - sudo \ - rsync -zrhP --links --size-only --verbose --delete \ - --exclude '**/.Trash-1000' \ - --exclude '**/__sapper__/' \ - --exclude '**/node_modules/' \ - --exclude '**/target/' \ - "/$DIR/" \ - "$BAK/${DIR}" -done diff --git a/_scripts/bak-current_to_archive.sh b/_scripts/bak-current_to_archive.sh deleted file mode 100755 index 0e4106a..0000000 --- a/_scripts/bak-current_to_archive.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/zsh - -BAK="/Data/_bak" - - -# restic init '/home/dym/.privat' \ -# -p '/home/dym/.privat/restic/p.txt' \ -# -r "$BAK/.privat" - -restic backup '/home/dym/.privat' \ - -p '/home/dym/.privat/restic/p.txt' \ - -r "$BAK/.privat" - - -cd `realpath "$0" | xargs dirname` -./bak-home.sh "$BAK/Home" - - -sudo \ -rsync -zrhP --links --size-only --verbose --delete \ - --exclude '**/.Trash-1000' \ - --exclude '**/__sapper__/' \ - --exclude '**/node_modules/' \ - --exclude '**/target/' \ - "/My/" \ - "/Data/_my" - - -sudo \ -rsync -zrhP --links --size-only --verbose --delete \ - --exclude '**/.Trash-1000' \ - --exclude '**/__sapper__/' \ - --exclude '**/node_modules/' \ - --exclude '**/target/' \ - "/Work/" \ - "$BAK/work-aggents" - - -DIRS=( - Apps - Cfg -) -for DIR in "${DIRS[@]}"; do - echo "- -- -# '$DIR'" - sudo \ - rsync -zrhP --links --size-only --verbose --delete \ - --exclude '**/.Trash-1000' \ - --exclude '**/__sapper__/' \ - --exclude '**/node_modules/' \ - --exclude '**/target/' \ - "/$DIR/" \ - "$BAK/${DIR}" -done diff --git a/_scripts/bak-data.sh b/_scripts/bak-data.sh deleted file mode 100755 index 52767cf..0000000 --- a/_scripts/bak-data.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/zsh - -BAK="/media/data_bak" -if [ ! -z "$1" ]; then - BAK="$1" -fi - -DIRS=( - Apps_andr - Apps_deb - Apps_wnd - Audio - Books - Bugs - Code - Drivers - Fonts - Img - Iso - Music - Posts - Texts - Video -) -for DIR in "${DIRS[@]}"; do - echo "- -- -# '$DIR'" - sudo \ - rsync -zrhP --links --size-only --verbose --delete \ - --exclude '**/.Trash-1000' \ - "/Data/${DIR}/" \ - "$BAK/${DIR}" -done diff --git a/_scripts/bak-home.sh b/_scripts/bak-home.sh deleted file mode 100755 index b447bb6..0000000 --- a/_scripts/bak-home.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/usr/bin/zsh - -# home.sh -BAK='/Data/_bak/Home' -if [ ! -z "$1" ]; then - BAK="$1" -fi - -echo "BAK: backing up '$HOME' to '$BAK'" - - -# bak $HOME to Data or $BAK - # --exclude '.config/smartsvn/' \ - # --exclude '.config/libreoffice/' \ - # --exclude '.eclipse/' \ - # --exclude '.fonts/' \ - # --exclude '.local' \ - -rsync -rhP --links --size-only --verbose --delete \ - --exclude '**/.Trash-1000/' \ - --exclude '**/*.log' \ - --exclude '**/*.part' \ - --exclude '**/*~' \ - --exclude '**/hyphen-data/' \ - --exclude '**/logs/' \ - --exclude '**/node_modules/' \ - --exclude '**/storage/default/' \ - --exclude '**/datareporting/' \ - --exclude '.local/share/lutris' \ - --exclude '.local/share/Trash' \ - --exclude '.android/' \ - --exclude '.bun/' \ - --exclude '.zoom/' \ - --exclude '.cabal/' \ - --exclude '.cache/' \ - --exclude '.cargo/' \ - --exclude '.cinnamon/' \ - --exclude '.config/agregore-browser/' \ - --exclude '.config/chromium/' \ - --exclude '.config/google-chrome/' \ - --exclude '.config/google-chrome-unstable/' \ - --exclude '.config/vivaldi/' \ - --exclude '.config/Code/Cache*' \ - --exclude '.config/Code/Service Worker/' \ - --exclude '.config/Code/Crashpad/' \ - --exclude '.config/Code/User/History/' \ - --exclude '.config/Code/User/workspaceStorage/' \ - --exclude '.config/xnviewmp/' \ - --exclude '.deno/' \ - --exclude '.electron-gyp/' \ - --exclude '.figma/' \ - --exclude '.gnupg/' \ - --exclude '.gphoto/' \ - --exclude '.gnome/' \ - --exclude '.docker/' \ - --exclude '.gradle/' \ - --exclude '.java/' \ - --exclude '.linuxmint/' \ - --exclude '.node/' \ - --exclude '.npm/' \ - --exclude '.nv/' \ - --exclude '.pipupgrade/' \ - --exclude '.pki/' \ - --exclude '.privat/' \ - --exclude '.Private/' \ - --exclude '.pub-cache/' \ - --exclude '.rustup/' \ - --exclude '.ssh' \ - --exclude '.steam*' \ - --exclude 'Android/' \ - --exclude 'FontBase/' \ - --exclude 'Games/' \ - --exclude 'go/' \ - --exclude 'Private/' \ - --exclude 'snap/' \ - --exclude 'Steam/' \ - --exclude 'tmp/' \ - --exclude '.thunderbird' \ - "/home/dym/" \ - "$BAK" diff --git a/_scripts/device-info.sh b/_scripts/device-info.sh deleted file mode 100755 index d7f0a81..0000000 --- a/_scripts/device-info.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/zsh - -# devices info -sudo apt install -y \ - hddtemp lm-sensors - - -sudo hddtemp /dev/sd* - -sudo sensors-detect -sudo sensors - - - -free -h - -sensors - -sudo hddtemp SATA:/dev/sda -sudo hddtemp SATA:/dev/sdb -sudo hddtemp SATA:/dev/sdc -sudo hddtemp SATA:/dev/sdd - - -# hdd details -iostat -dx /dev/sd* diff --git a/_scripts/devices-report.sh b/_scripts/devices-report.sh deleted file mode 100755 index e2cb53b..0000000 --- a/_scripts/devices-report.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/zsh - -echo -e "Subject: server report on $(date -u '+%Y-%m-%d @ %H:%M:%S')\n\n" \ - > ~/devinfo.txt - -free -h \ - >> ~/devinfo.txt - -df -H \ - >> ~/devinfo.txt - -iostat -dx /dev/sd* \ - >> ~/devinfo.txt - -cat ~/devinfo.txt \ - | sendmail \ - -v server@dym.sh diff --git a/_scripts/disable-power-button.sh b/_scripts/disable-power-button.sh deleted file mode 100755 index 67b5e3f..0000000 --- a/_scripts/disable-power-button.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/zsh - -# power button -gsettings set org.gnome.settings-daemon.plugins.power button-sleep "nothing" -gsettings set org.gnome.settings-daemon.plugins.power button-suspend "nothing" -gsettings set org.gnome.settings-daemon.plugins.power button-hibernate "nothing" diff --git a/_scripts/heic.sh b/_scripts/heic.sh deleted file mode 100755 index 6257338..0000000 --- a/_scripts/heic.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/zsh - -for f in "$@" -do - echo "Converting $f ..." - heif-convert $f "$f-$(date +\%Y-\%m-\%d@\%H-\%M).jpg" -done \ No newline at end of file diff --git a/_scripts/hourly-backup.sh b/_scripts/hourly-backup.sh deleted file mode 100755 index 9c6aa71..0000000 --- a/_scripts/hourly-backup.sh +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/bash - -bpath="/backup_new" - -db_name='' -db_login='' -db_pass='' - -db_name2='' -db_login2='' -db_pass2='' - - -[ ! -d "$bpath/day" ] \ - && mkdir -p "${bpath}/day" -[ ! -d "$bpath/week" ] \ - && mkdir -p "${bpath}/week" -[ ! -d "$bpath/month" ] \ - && mkdir -p "${bpath}/month" -[ ! -d "$bpath/year" ] \ - && mkdir -p "${bpath}/year" - - -year=`date +"%Y"` -month=`date +"%m"` -day=`date +"%d"` -time=`date +"%H-00"` - -date="${year}-${month}-${day}" -tmp_short="b_${date}_${time}" -tmp_full="${bpath}/${tmp_short}" - -mkdir -p "$tmp_full" - - -mysqldump -u "$db_login" -p"$db_pass" --databases "$db_name" \ - > "${tmp_full}/bu_${db_name}__${date}_${time}.sql" - -mysqldump -u "$db_login2" -p"$db_pass2" --databases "$db_name2" \ - > "${tmp_full}/bu_${db_name2}__${date}_${time}.sql" - - -archive="${tmp_full}.tar.gz" -cd "$bpath" -tar -czf "$archive" "$tmp_short" - - -ln "$archive" "${bpath}/day/" - -if [ "$time" == "00-00" ] -then - ln "$archive" "${bpath}/week/" - - if [ "$day" == "01" ] - then - ln "$archive" "${bpath}/month/" - - if [ "$month" == "01" ] - then - ln "$archive" "${bpath}/year/" - fi - fi -fi - -if [ "$time" == "02-00" ] -then - scp -rp \ - -i ~/.ssh/backup+ \ - "$archive" \ - 'backup@:/b_incoming/' -fi - - -rm $archive -rm -rf "$tmp_full" - -find ${bpath}/day/* -mtime +1 -exec rm {} \; -find ${bpath}/week/* -mtime +7 -exec rm {} \; -find ${bpath}/month/* -mtime +365 -exec rm {} \; diff --git a/_scripts/kk.sh b/_scripts/kk.sh deleted file mode 100755 index 2a76a71..0000000 --- a/_scripts/kk.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/zsh - -kill -9 `ps aux | grep "$1" | awk '{print $2}'` \ No newline at end of file diff --git a/_scripts/off.sh b/_scripts/off.sh deleted file mode 100755 index ea30429..0000000 --- a/_scripts/off.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/zsh - -# off - -sudo systemctl stop mysql -sudo shutdown now diff --git a/_scripts/opti.sh b/_scripts/opti.sh deleted file mode 100755 index 1c316e4..0000000 --- a/_scripts/opti.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/zsh - -# optimize png and jpg files - -calc_reduction() -{ - SIZE_PRE="$1" - SIZE_POST="$2" - PERECENT=` echo "scale=2; 100 - (100 * $SIZE_POST / $SIZE_PRE)" | bc ` - RESULT="$(( $SIZE_PRE / 1000 ))-$(( ( $SIZE_PRE - $SIZE_POST ) / 1000 )) kb \ -($PERECENT%) -" - echo " $RESULT" -} - -for FILENAME in "$@" -do - FILETYPE=` file -b --mime-type "$FILENAME" ` - echo "$FILENAME : $FILETYPE" - - SIZE_PRE=` stat "$FILENAME" -c '%s' ` - - case "$FILETYPE" in - 'image/png') - mogrify "$FILENAME" - pngcrush -nolimits -s "$FILENAME" "$FILENAME.tmp.png" - if [ -f "$FILENAME.tmp.png" ] \ - && [ -s "$FILENAME.tmp.png" ] - then - mv "$FILENAME.tmp.png" "$FILENAME" - else - rm "$FILENAME.tmp.png" - fi - ;; - - 'image/jpeg') - jpegoptim "$FILENAME" -qsftp - ;; - esac - - SIZE_POST=` stat "$FILENAME" -c '%s' ` - [ $SIZE_PRE -gt $SIZE_POST ] \ - && echo ` calc_reduction "$SIZE_PRE" "$SIZE_POST" ` -done diff --git a/_scripts/pdf-slice.sh b/_scripts/pdf-slice.sh deleted file mode 100755 index 4379898..0000000 --- a/_scripts/pdf-slice.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/zsh - -for PAGE in {1..25};do - gs -sDEVICE=pdfwrite -dNOPAUSE -dBATCH -dSAFER \ - -dFirstPage=$PAGE -dLastPage=$PAGE \ - -sOutputFile=p_$PAGE.pdf all.pdf -done - -gs -sDEVICE=pdfwrite -dNOPAUSE -dBATCH -dSAFER \ - -sOutputFile=crit_2.pdf \ - p_{5..7}.pdf - -gs -sDEVICE=pdfwrite -dNOPAUSE -dBATCH -dSAFER \ - -sOutputFile=crit_3.pdf \ - p_{8..9}.pdf - -gs -sDEVICE=pdfwrite -dNOPAUSE -dBATCH -dSAFER \ - -sOutputFile=crit_4.pdf \ - p_{11..16}.pdf diff --git a/_scripts/prtscr.sh b/_scripts/prtscr.sh deleted file mode 100755 index d98eadc..0000000 --- a/_scripts/prtscr.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/zsh - -# print screen all monitors - -import -window root \ - "/_/PrtScr--$(date '+%Y%m%d@%H%M%S').png" diff --git a/_scripts/prtwnd.sh b/_scripts/prtwnd.sh deleted file mode 100755 index 9b92efd..0000000 --- a/_scripts/prtwnd.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/zsh - -# print screen current window - -WND=`xprop -root \ - | grep '_NET_ACTIVE_WINDOW(WINDOW)' \ - | grep -oE '0x\w+' - ` - -import -window "$WND" \ - "/_/PrtWnd--$(date '+%Y%m%d@%H%M%S').png" diff --git a/_scripts/purge.sh b/_scripts/purge.sh deleted file mode 100755 index 1e8c2c7..0000000 --- a/_scripts/purge.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/zsh - -# purge memory -free -h - -echo "clearing memory" -sudo sync -sudo sh -c 'echo 3 > /proc/sys/vm/drop_caches' -free -h - - -# clear logs -echo "clearing /var/log" -sudo du -hs /var/log -sudo find /var/log -type f -delete -sudo du -hs /var/log - -# -rm -rf /var/lib/systemd/coredump/* - -echo "clearing /etc/apache2/logs" -sudo du -hs /etc/apache2/logs -sudo find /etc/apache2/logs -type f -delete -sudo du -hs /etc/apache2/logs - -rm ~/.xsession-errors* - - -# empty trash -rm -rf ~/.local/share/Trash -sudo rm -rf /root/.local/share/Trash/* -sudo rm -rf /_/.Trash-1000 -sudo rm -rf /[A-Z]*/.Trash-1000 -sudo rm -rf /media/*/.Trash-1000 -sudo rm -rf /media/*/*/.Trash-1000 -# rm -rf /_servers/*/.Trash-1000 - - -#Cleaning the old kernels -dpkg-query -l | grep 'linux-im*' -#dpkg-query -l | grep linux-im* | awk '{print $2}' - -sudo apt-get purge -y $(dpkg -l 'linux-*' \ - | sed '/^ii/!d;/'"$(uname -r | sed "s/\(.*\)-\([^0-9]\+\)/\1/")"'/d;s/^[^ ]* [^ ]* \([^ ]*\).*/\1/;/[0-9]/!d' | head -n -1) \ - --assume-yes - -sudo apt-get install -y linux-headers-`uname -r \ - |cut -d'-' -f3`-`uname -r \ - |cut -d'-' -f4` diff --git a/_scripts/restart.sh b/_scripts/restart.sh deleted file mode 100755 index 4e2c6c8..0000000 --- a/_scripts/restart.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/zsh - -# restart - -sudo systemctl stop mysql -sudo shutdown -r now diff --git a/_scripts/save-cfg.sh b/_scripts/save-cfg.sh deleted file mode 100755 index 1cfab30..0000000 --- a/_scripts/save-cfg.sh +++ /dev/null @@ -1,6 +0,0 @@ -rm -rf /Site/config/desktop-ubuntu -sudo cp -r /Cfg /Site/config/desktop-ubuntu -sudo chown -R $USER:$USER /Site/config/desktop-ubuntu/ -cd /Site/config/desktop-ubuntu/ -git add . -shipit diff --git a/_scripts/sort_out.sh b/_scripts/sort_out.sh deleted file mode 100755 index 54b91d8..0000000 --- a/_scripts/sort_out.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/zsh - -Y=`date '+%Y'` -M=`date '+%m'` - - -IMG_PATH="/Data/Img/$Y/$M/" -[ ! -d "$IMG_PATH" ] \ - && mkdir -p "$IMG_PATH" -mv /_/*.(jpg|png|gif|webp|avif|svg) "$IMG_PATH" - - -DUST_PATH='/Data/Video/yt/@watchdust/' -[ ! -d "$DUST_PATH" ] \ - && mkdir -p "$DUST_PATH" -mv /_/yt-Sci-Fi*.(mp4|webm|mkv) "$DUST_PATH" - - -VID_PATH="/Data/Video/$Y/$M/" -[ ! -d "$VID_PATH" ] \ - && mkdir -p "$VID_PATH" -mv /_/*.(mp4|webm|mkv|mov|3gp|avi|mp2) "$VID_PATH" diff --git a/_scripts/to_dec.sh b/_scripts/to_dec.sh deleted file mode 100755 index a7a9287..0000000 --- a/_scripts/to_dec.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/zsh - -# convert hexadecimal to base10 - -# #TODO -# - whitespace-separated arguments to corresponding array of values -# (exluding -f/--flags) -# - convert hex-colors[with alpha] to rgb[a]() -# (i.e. "#00FFCC[80]" to "rgba(0, 255, 204[, 0.5])") - - -HEX=`echo "$1" | tr 'a-z' 'A-Z'` -DEC=`echo "obase=10; ibase=16; $HEX" \ - | bc - ` - -if [[ $@ =~ '-v' ]]; then - echo "HEX: '$HEX' -DEC: '$DEC' -" -else - echo "$DEC" -fi diff --git a/_scripts/to_hex.sh b/_scripts/to_hex.sh deleted file mode 100755 index 69e2703..0000000 --- a/_scripts/to_hex.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/zsh - -# convert base10 to hexadecimal - -# #TODO -# - whitespace-separated arguments to corresponding array of values -# (exluding -f/--flags) -# - multiple convert arguments to acco -# (i.e. "0 255 204" to "00 FF CC") - - -DEC="$1" -HEX=`echo "obase=16; ibase=10; $DEC" \ - | bc - ` - -if [[ $@ =~ '-v' ]]; then - echo "DEC: '$DEC' -HEX: '$HEX' -" -else - echo "$HEX" -fi diff --git a/_scripts/to_mp3.sh b/_scripts/to_mp3.sh deleted file mode 100755 index 417314e..0000000 --- a/_scripts/to_mp3.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/zsh - -# convert to mp3 - -echo "to mp3: [ $@ ]" -for UNCOMPRESSED in "$@" -do - MP3=` echo "$UNCOMPRESSED" \ - | sd '\.\w+$' ' [conv].mp3' \ - ` - echo "'$UNCOMPRESSED'" - echo ">> '$MP3'" - - ffmpeg \ - -i "$UNCOMPRESSED" \ - -codec:a libmp3lame \ - -qscale:a 2 \ - -loglevel quiet \ - -y "$MP3" \ - && \ - rm "$UNCOMPRESSED" -done diff --git a/_scripts/upd.sh b/_scripts/upd.sh deleted file mode 100755 index ecc8ae6..0000000 --- a/_scripts/upd.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/zsh - -# .deb -sudo apt update -y -sudo apt upgrade -y - -sudo apt-get autoclean -y -sudo apt-get remove --purge -y \ - software-properties-common -sudo apt-get autoremove -y -deborphan | xargs sudo apt-get -y remove --purge -sudo apt-get clean -y - - -# oh-my-zsh -cd ~/.oh-my-zsh/ \ - && ./tools/upgrade.sh \ - && cd - - - -# rust & co -rustup update -cargo install-update -a - -# bun -bun upgrade - -# deno -deno upgrade - diff --git a/_sys/.config/mimeapps.list b/_sys/.config/mimeapps.list deleted file mode 100644 index 607adeb..0000000 --- a/_sys/.config/mimeapps.list +++ /dev/null @@ -1,61 +0,0 @@ -[Default Applications] -text/html=firefox.desktop -x-scheme-handler/http=firefox.desktop -x-scheme-handler/https=firefox.desktop -x-scheme-handler/about=google-chrome.desktop -x-scheme-handler/unknown=google-chrome.desktop -x-scheme-handler/chrome=firefox.desktop -application/x-extension-htm=firefox.desktop -application/x-extension-html=firefox.desktop -application/x-extension-shtml=firefox.desktop -application/xhtml+xml=firefox.desktop -application/x-extension-xhtml=firefox.desktop -application/x-extension-xht=firefox.desktop -video/webm=vlc.desktop; -image/webp=XnView.desktop; -x-scheme-handler/nc=com.nextcloud.desktopclient.nextcloud.desktop -audio/mpeg=vlc.desktop; -image/x-eps=inkscape.desktop; -image/png=XnView.desktop; -application/rss+xml=code.desktop; -x-scheme-handler/eclipse+command=_Apps_eclipse-2022--app_.desktop -image/jpeg=XnView.desktop; -x-scheme-handler/msteams=teams.desktop -application/pdf=firefox.desktop; -text/plain=code.desktop; -inode/directory=doublecmd.desktop; -audio/x-opus+ogg=vlc.desktop; -audio/x-vorbis+ogg=vlc.desktop; -image/svg+xml=firefox.desktop; -x-scheme-handler/anytype=anytype2.desktop -application/octet-stream=firefox.desktop; -image/tiff=XnView.desktop; -video/mp4=vlc.desktop; - -[Added Associations] -x-scheme-handler/http=firefox.desktop; -x-scheme-handler/https=firefox.desktop; -x-scheme-handler/chrome=firefox.desktop; -text/html=firefox.desktop; -application/x-extension-htm=firefox.desktop; -application/x-extension-html=firefox.desktop; -application/x-extension-shtml=firefox.desktop; -application/xhtml+xml=firefox.desktop; -application/x-extension-xhtml=firefox.desktop; -application/x-extension-xht=firefox.desktop; -video/webm=vlc.desktop; -image/webp=XnView.desktop; -audio/mpeg=vlc.desktop; -image/x-eps=inkscape.desktop; -image/png=XnView.desktop; -application/rss+xml=code.desktop; -image/jpeg=XnView.desktop; -application/pdf=firefox.desktop; -text/plain=code.desktop; -inode/directory=doublecmd.desktop; -audio/x-opus+ogg=vlc.desktop; -audio/x-vorbis+ogg=vlc.desktop; -image/svg+xml=firefox.desktop; -application/octet-stream=firefox.desktop; -image/tiff=XnView.desktop; -video/mp4=vlc.desktop; diff --git a/_sys/.config/pavucontrol.ini b/_sys/.config/pavucontrol.ini deleted file mode 100644 index 0d7d570..0000000 --- a/_sys/.config/pavucontrol.ini +++ /dev/null @@ -1,8 +0,0 @@ -[window] -width=1920 -height=1080 -sinkInputType=1 -sourceOutputType=1 -sinkType=0 -sourceType=1 -showVolumeMeters=1 diff --git a/_sys/.config/user-dirs.dirs b/_sys/.config/user-dirs.dirs deleted file mode 100644 index d35ab95..0000000 --- a/_sys/.config/user-dirs.dirs +++ /dev/null @@ -1,10 +0,0 @@ -XDG_DESKTOP_DIR="/_" -XDG_DOWNLOAD_DIR="/_" -XDG_TEMPLATES_DIR="/_" -XDG_PUBLICSHARE_DIR="/_" -XDG_DOCUMENTS_DIR="/_" -XDG_PICTURES_DIR="/_" - -XDG_MUSIC_DIR="/Data/Music" -XDG_VIDEOS_DIR="/Data/Video" - diff --git a/_sys/.nvidia-settings-rc b/_sys/.nvidia-settings-rc deleted file mode 100644 index 0990a39..0000000 --- a/_sys/.nvidia-settings-rc +++ /dev/null @@ -1,100 +0,0 @@ -# -# /Cfg/_sys/.nvidia-settings-rc -# -# Configuration file for nvidia-settings - the NVIDIA Settings utility -# Generated on Sun May 7 17:17:37 2023 -# - -# ConfigProperties: - -RcFileLocale = C -DisplayStatusBar = Yes -SliderTextEntries = Yes -IncludeDisplayNameInConfigFile = No -ShowQuitDialog = No -UpdateRulesOnProfileNameChange = Yes -Timer = PowerMizer_Monitor_(GPU_0),Yes,1000 -Timer = Thermal_Monitor_(GPU_0),Yes,1000 -Timer = Memory_Used_(GPU_0),Yes,3000 - -# Attributes: - -0/SyncToVBlank=1 -0/LogAniso=0 -0/FSAA=0 -0/TextureClamping=1 -0/FXAA=0 -0/AllowFlipping=1 -0/FSAAAppControlled=1 -0/LogAnisoAppControlled=1 -0/OpenGLImageSettings=2 -0/FSAAAppEnhanced=0 -0/ShowGraphicsVisualIndicator=0 -[DPY:DVI-D-0]/Dithering=0 -[DPY:DVI-D-0]/DitheringMode=0 -[DPY:DVI-D-0]/DitheringDepth=0 -[DPY:DVI-D-0]/ColorSpace=0 -[DPY:DVI-D-0]/ColorRange=0 -[DPY:DVI-D-0]/SynchronousPaletteUpdates=0 -[DPY:DP-0]/RedBrightness=0.000000 -[DPY:DP-0]/GreenBrightness=0.000000 -[DPY:DP-0]/BlueBrightness=0.000000 -[DPY:DP-0]/RedContrast=0.000000 -[DPY:DP-0]/GreenContrast=0.000000 -[DPY:DP-0]/BlueContrast=0.000000 -[DPY:DP-0]/RedGamma=1.000000 -[DPY:DP-0]/GreenGamma=1.000000 -[DPY:DP-0]/BlueGamma=1.000000 -[DPY:DP-0]/Dithering=0 -[DPY:DP-0]/DitheringMode=0 -[DPY:DP-0]/DitheringDepth=0 -[DPY:DP-0]/DigitalVibrance=0 -[DPY:DP-0]/ColorSpace=0 -[DPY:DP-0]/ColorRange=0 -[DPY:DP-0]/SynchronousPaletteUpdates=0 -[DPY:DP-1]/Dithering=0 -[DPY:DP-1]/DitheringMode=0 -[DPY:DP-1]/DitheringDepth=0 -[DPY:DP-1]/ColorSpace=0 -[DPY:DP-1]/ColorRange=0 -[DPY:DP-1]/SynchronousPaletteUpdates=0 -[DPY:HDMI-0]/RedBrightness=0.000000 -[DPY:HDMI-0]/GreenBrightness=0.000000 -[DPY:HDMI-0]/BlueBrightness=0.000000 -[DPY:HDMI-0]/RedContrast=0.000000 -[DPY:HDMI-0]/GreenContrast=0.000000 -[DPY:HDMI-0]/BlueContrast=0.000000 -[DPY:HDMI-0]/RedGamma=1.000000 -[DPY:HDMI-0]/GreenGamma=1.000000 -[DPY:HDMI-0]/BlueGamma=1.000000 -[DPY:HDMI-0]/Dithering=0 -[DPY:HDMI-0]/DitheringMode=0 -[DPY:HDMI-0]/DitheringDepth=0 -[DPY:HDMI-0]/DigitalVibrance=0 -[DPY:HDMI-0]/ColorSpace=0 -[DPY:HDMI-0]/ColorRange=0 -[DPY:HDMI-0]/SynchronousPaletteUpdates=0 -[DPY:DP-2]/Dithering=0 -[DPY:DP-2]/DitheringMode=0 -[DPY:DP-2]/DitheringDepth=0 -[DPY:DP-2]/ColorSpace=0 -[DPY:DP-2]/ColorRange=0 -[DPY:DP-2]/SynchronousPaletteUpdates=0 -[DPY:DP-3]/Dithering=0 -[DPY:DP-3]/DitheringMode=0 -[DPY:DP-3]/DitheringDepth=0 -[DPY:DP-3]/ColorSpace=0 -[DPY:DP-3]/ColorRange=0 -[DPY:DP-3]/SynchronousPaletteUpdates=0 -[DPY:DP-4]/Dithering=0 -[DPY:DP-4]/DitheringMode=0 -[DPY:DP-4]/DitheringDepth=0 -[DPY:DP-4]/ColorSpace=0 -[DPY:DP-4]/ColorRange=0 -[DPY:DP-4]/SynchronousPaletteUpdates=0 -[DPY:DP-5]/Dithering=0 -[DPY:DP-5]/DitheringMode=0 -[DPY:DP-5]/DitheringDepth=0 -[DPY:DP-5]/ColorSpace=0 -[DPY:DP-5]/ColorRange=0 -[DPY:DP-5]/SynchronousPaletteUpdates=0 diff --git a/_sys/50unattended-upgrades b/_sys/50unattended-upgrades new file mode 100644 index 0000000..add854e --- /dev/null +++ b/_sys/50unattended-upgrades @@ -0,0 +1,4 @@ +Unattended-Upgrade::Package-Blacklist { + "nvidia-"; + "libnvidia-"; +} diff --git a/_sys/_install.sh b/_sys/_install.sh deleted file mode 100755 index f8126f9..0000000 --- a/_sys/_install.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/zsh - -cd /Cfg/_sys - -ln -s `pwd`/.config/* ~/.config/ --force diff --git a/_sys/dirs.sh b/_sys/dirs.sh index b078334..3e38381 100755 --- a/_sys/dirs.sh +++ b/_sys/dirs.sh @@ -1,21 +1,31 @@ -#!/usr/bin/zsh +#!/usr/bin/env zsh DIRS=( - '/_' - '/Apps' - '/Cfg' - '/Data' - '/My' - '/Work' + /_ + /Apps + /Books + /Cfg + /Code + /Fonts + /Forks + /Servers + /Data + /Img + /Music + /My + /Work + /Ui ) # create dirs -sudo mkdir -m 755 $DIRS -sudo chown -R "$USER:$USER" $DIRS -sudo chmod g+s -R $DIRS +for DIR in $DIRS; do + sudo mkdir -m 755 $DIR + sudo chown -R "$USER:$USER" $DIR + sudo chmod g+s -R $DIR +done -mkdir -m 700 \ - '/home/dym/.privat' +# mkdir -m 700 \ +# /home/dym/.privat # uuids for fstab diff --git a/_sys/fancontrol b/_sys/fancontrol new file mode 100644 index 0000000..1234cd9 --- /dev/null +++ b/_sys/fancontrol @@ -0,0 +1,10 @@ +# Configuration file generated by pwmconfig, changes will be lost +INTERVAL=10 +DEVPATH= +DEVNAME= +FCTEMPS= +FCFANS= +MINTEMP= +MAXTEMP= +MINSTART= +MINSTOP= diff --git a/_sys/fstab b/_sys/fstab deleted file mode 100644 index 807c685..0000000 --- a/_sys/fstab +++ /dev/null @@ -1,9 +0,0 @@ -# -UUID=744cdea3-25f4-4ecc-8238-ad9c9be377af / ext4 errors=remount-ro 0 1 -UUID=1A9E-C4E6 /boot/efi vfat umask=0077 0 1 -/swapfile none swap sw 0 0 -192.168.0.5:/nfs/Public /Data nfs auto 0 0 -UUID=c6222983-f9e5-456d-abcf-f80dc451ec95 /mnt/self-files btrfs defaults 0 0 - -/mnt/self-files/My /My none bind -/mnt/self-files/Work /Work none bind diff --git a/_sys/fstab_231120 b/_sys/fstab_231120 new file mode 100644 index 0000000..85362f0 --- /dev/null +++ b/_sys/fstab_231120 @@ -0,0 +1,24 @@ +# + +UUID=0b394fec-0396-4593-bdee-9e022566be32 / ext4 errors=remount-ro 0 1 + +UUID=C196-824A /boot/efi vfat umask=0077 0 1 + +/swapfile none swap sw 0 0 + +192.168.0.222:/nfs/Public /Data nfs auto 0 0 + +UUID=0310747e-ae8c-459b-913f-b7f190835785 /Servers/self ext4 defaults 0 0 + +/Servers/self/My /My none bind +/Servers/self/Work /Work none bind + +/Servers/self/_ /_ none bind +/Servers/self/Books /Books none bind +/Servers/self/Code /Code none bind +/Servers/self/Fonts /Fonts none bind +/Servers/self/Forks /Forks none bind +/Servers/self/Img /Img none bind +/Servers/self/Music /Music none bind +/Servers/self/Templates /Templates none bind +/Servers/self/Ui /Ui none bind diff --git a/_sys/fstab_240120 b/_sys/fstab_240120 new file mode 100644 index 0000000..50dfeff --- /dev/null +++ b/_sys/fstab_240120 @@ -0,0 +1,18 @@ +# +UUID=adc2f974-1e62-4783-bbf4-72c25d05c87b / ext4 errors=remount-ro 0 1 +UUID=16AE-F044 /boot/efi vfat umask=0077 0 1 +UUID=ed74d056-f795-49d5-b977-c444148e4383 none swap sw 0 0 + +192.168.0.222:/nfs/Public /Data nfs auto 0 0 + +UUID=0310747e-ae8c-459b-913f-b7f190835785 /Servers/self ext4 defaults 0 0 +/Servers/self/My /My none bind +/Servers/self/Work /Work none bind +/Servers/self/_ /_ none bind +/Servers/self/Books /Books none bind +/Servers/self/Code /Code none bind +/Servers/self/Fonts /Fonts none bind +/Servers/self/Forks /Forks none bind +/Servers/self/Img /Img none bind +/Servers/self/Music /Music none bind +/Servers/self/Ui /Ui none bind diff --git a/_sys/hostname b/_sys/hostname deleted file mode 100644 index 6ee084a..0000000 --- a/_sys/hostname +++ /dev/null @@ -1 +0,0 @@ -mint20 diff --git a/_sys/logind.conf b/_sys/logind.conf new file mode 100644 index 0000000..74562bf --- /dev/null +++ b/_sys/logind.conf @@ -0,0 +1,37 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# Entries in this file show the compile time defaults. +# You can change settings by editing this file. +# Defaults can be restored by simply deleting this file. +# +# See logind.conf(5) for details. + +[Login] +#NAutoVTs=6 +#ReserveVT=6 +KillUserProcesses=yes +#KillOnlyUsers= +KillExcludeUsers=root +#InhibitDelayMaxSec=5 +#HandlePowerKey=poweroff +#HandleSuspendKey=suspend +#HandleHibernateKey=hibernate +#HandleLidSwitch=suspend +#HandleLidSwitchExternalPower=suspend +#HandleLidSwitchDocked=ignore +#PowerKeyIgnoreInhibited=no +#SuspendKeyIgnoreInhibited=no +#HibernateKeyIgnoreInhibited=no +#LidSwitchIgnoreInhibited=yes +#HoldoffTimeoutSec=30s +#IdleAction=ignore +#IdleActionSec=30min +#RuntimeDirectorySize=10% +RemoveIPC=yes +#InhibitorsMax=8192 +#SessionsMax=8192 diff --git a/_sys/nvidia-vulkan.sh b/_sys/nvidia-vulkan.sh index 6769be2..a7892ce 100755 --- a/_sys/nvidia-vulkan.sh +++ b/_sys/nvidia-vulkan.sh @@ -12,13 +12,17 @@ sudo add-apt-repository -y \ sudo apt upgrade -y sudo apt install -y \ - vulkan-tools + vulkan-tools \ + nvidia-driver-390 + +sudo apt-mark hold 'nvidia-*' + sudo nvidia-xconfig \ -a --cool-bits=28 \ --allow-empty-initial-configuration -sudo apt-mark hold 'nvidia-*' +nvidia-smi -q -d TEMPERATURE # ffmpeg for nvidia diff --git a/_sys/roccat.sh b/_sys/roccat.sh deleted file mode 100755 index e824838..0000000 --- a/_sys/roccat.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/zsh - -sudo add-apt-repository -y ppa:x3n0m0rph59/eruption -sudo apt update -y -sudo apt install -y eruption - -systemctl --user enable --now eruption-fx-proxy.service -systemctl --user enable --now eruption-audio-proxy.service -systemctl --user enable --now eruption-process-monitor.service - -sudo systemctl enable --now eruption.service diff --git a/_sys/ssh_config b/_sys/ssh_config index 540ae76..463dde7 100644 --- a/_sys/ssh_config +++ b/_sys/ssh_config @@ -1,53 +1,8 @@ - -# This is the ssh client system-wide configuration file. See -# ssh_config(5) for more information. This file provides defaults for -# users, and the values can be changed in per-user configuration files -# or on the command line. - -# Configuration data is parsed as follows: -# 1. command line options -# 2. user-specific file -# 3. system-wide file -# Any configuration value is only changed the first time it is set. -# Thus, host-specific definitions should be at the beginning of the -# configuration file, and defaults at the end. - -# Site-wide defaults for some commonly used options. For a comprehensive -# list of available options, their meanings and defaults, please see the -# ssh_config(5) man page. - Include /etc/ssh/ssh_config.d/*.conf Host * -# ForwardAgent no -# ForwardX11 no -# ForwardX11Trusted yes -# PasswordAuthentication yes -# HostbasedAuthentication no -# GSSAPIAuthentication no -# GSSAPIDelegateCredentials no -# GSSAPIKeyExchange no -# GSSAPITrustDNS no -# BatchMode no -# CheckHostIP yes -# AddressFamily any -# ConnectTimeout 0 -# StrictHostKeyChecking ask -# IdentityFile ~/.ssh/id_rsa -# IdentityFile ~/.ssh/id_dsa -# IdentityFile ~/.ssh/id_ecdsa -# IdentityFile ~/.ssh/id_ed25519 -# Port 22 -# Ciphers aes128-ctr,aes192-ctr,aes256-ctr,aes128-cbc,3des-cbc -# MACs hmac-md5,hmac-sha1,umac-64@openssh.com -# EscapeChar ~ -# Tunnel no -# TunnelDevice any:any -# PermitLocalCommand no -# VisualHostKey no -# ProxyCommand ssh -q -W %h:%p gateway.example.com -# RekeyLimit 1G 1h -# UserKnownHostsFile ~/.ssh/known_hosts.d/%k - SendEnv LANG LC_* - HashKnownHosts no - GSSAPIAuthentication yes + IdentityFile ~/.ssh/github + IdentityFile ~/.ssh/source-garden + SendEnv LANG LC_* + HashKnownHosts no + GSSAPIAuthentication yes diff --git a/_sys/user-dirs.dirs b/_sys/user-dirs.dirs new file mode 100644 index 0000000..376055e --- /dev/null +++ b/_sys/user-dirs.dirs @@ -0,0 +1,15 @@ +# This file is written by xdg-user-dirs-update +# If you want to change or add directories, just edit the line you're +# interested in. All local changes will be retained on the next run. +# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped +# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an +# absolute path. No other format is supported. +# +XDG_DESKTOP_DIR="/_" +XDG_DOWNLOAD_DIR="/_" +XDG_TEMPLATES_DIR="/_" +XDG_PUBLICSHARE_DIR="/_" +XDG_DOCUMENTS_DIR="/_" +XDG_PICTURES_DIR="/_" +XDG_MUSIC_DIR="/_" +XDG_VIDEOS_DIR="/_" diff --git a/_sys/.config/user-dirs.locale b/_sys/user-dirs.locale similarity index 100% rename from _sys/.config/user-dirs.locale rename to _sys/user-dirs.locale diff --git a/_sys/xorg.conf b/_sys/xorg.conf deleted file mode 100644 index b2176d6..0000000 --- a/_sys/xorg.conf +++ /dev/null @@ -1,63 +0,0 @@ -# nvidia-settings: X configuration file generated by nvidia-settings -# nvidia-settings: version 510.47.03 - -Section "ServerLayout" - Identifier "Layout0" - Screen 0 "Screen0" 0 0 - InputDevice "Keyboard0" "CoreKeyboard" - InputDevice "Mouse0" "CorePointer" - Option "Xinerama" "0" -EndSection - -Section "Files" -EndSection - -Section "InputDevice" - # generated from default - Identifier "Mouse0" - Driver "mouse" - Option "Protocol" "auto" - Option "Device" "/dev/psaux" - Option "Emulate3Buttons" "no" - Option "ZAxisMapping" "4 5" -EndSection - -Section "InputDevice" - # generated from default - Identifier "Keyboard0" - Driver "kbd" -EndSection - -Section "Monitor" - # HorizSync source: edid, VertRefresh source: edid - Identifier "Monitor0" - VendorName "Unknown" - ModelName "LG Electronics LG HDR 4K" - HorizSync 30.0 - 135.0 - VertRefresh 56.0 - 61.0 - Option "DPMS" -EndSection - -Section "Device" - Identifier "Device0" - Driver "nvidia" - VendorName "NVIDIA Corporation" - BoardName "NVIDIA GeForce GTX 1060 6GB" -EndSection - -Section "Screen" - Identifier "Screen0" - Device "Device0" - Monitor "Monitor0" - DefaultDepth 24 - Option "Stereo" "0" - Option "nvidiaXineramaInfoOrder" "DFP-1" - Option "metamodes" "DP-0: nvidia-auto-select +1920+0, HDMI-0: nvidia-auto-select +0+960" - Option "SLI" "Off" - Option "MultiGPU" "Off" - Option "BaseMosaic" "off" - SubSection "Display" - Depth 24 - EndSubSection -EndSection - diff --git a/apache/var-www/db b/apache/var-www/db deleted file mode 120000 index 42a264c..0000000 --- a/apache/var-www/db +++ /dev/null @@ -1 +0,0 @@ -/Apps/phpMyAdmin--app \ No newline at end of file diff --git a/apache/var-www/html b/apache/var-www/html deleted file mode 120000 index f4ee277..0000000 --- a/apache/var-www/html +++ /dev/null @@ -1 +0,0 @@ -/Projects \ No newline at end of file diff --git a/apache/var-www/it-bike b/apache/var-www/it-bike deleted file mode 120000 index b5756ba..0000000 --- a/apache/var-www/it-bike +++ /dev/null @@ -1 +0,0 @@ -/Work/it-bike.de/drupal \ No newline at end of file diff --git a/doublecmd/doublecmd.xml b/doublecmd/doublecmd.xml index 6dbab52..9c87339 100644 --- a/doublecmd/doublecmd.xml +++ b/doublecmd/doublecmd.xml @@ -1,5 +1,5 @@ - + False @@ -129,7 +129,7 @@ rar %commander_path%/plugins/wcx/unrar/unrar.wcx - 607 + 68 jar @@ -328,7 +328,6 @@ False - False False xterm -e sh -c '{command}; echo -n Press ENTER to exit... ; read a' @@ -340,11 +339,9 @@ False 0 0 - 0 - 0 + 0 1 - 1 - 1 + 1 1 B KB @@ -385,7 +382,7 @@ False - code + /usr/bin/subl False False @@ -484,19 +481,8 @@ True 24 16 - False False - 0 - %COMMANDER_PATH% - 0 - - True - 24 - 16 - False - False - False True True @@ -521,8 +507,6 @@ True False False - False - False @@ -628,7 +612,7 @@ 2 - 1 + 4 @@ -725,9 +709,30 @@ /usr/share/applications/ applications + + + + + 1 + 13 + + + + + + + /Cfg/doublecmd/ + + + + + Default + + + - 2 + 6 @@ -824,6 +829,72 @@ /Work/ Work + + + + + 1 + 13 + + + + + + + /home/dym/Inbox/ + + + + + Default + + + 3 + /home/dym/Inbox/ + Inbox + + + + + + 1 + 13 + + + + + + + /My/config/desktop-ubuntu-24/ + + + + + Default + + + + + + + + 1 + 13 + + + + + + + /home/dym/.config/doublecmd/ + + + + + Default + + + @@ -991,7 +1062,7 @@ Name [DC().GETFILENAME{}] - 1118 + 1119 0 DejaVu Sans Mono @@ -1037,7 +1108,7 @@ Ext [DC().GETFILETYPE{}] - 271 + 272 1 DejaVu Sans Mono @@ -1085,38 +1156,18 @@ - 1920 + 0 0 - 3840 - 2160 - False + 1916 + 1025 + True 50 - 150 + 96 - {BC322BF1-2185-47F6-9F99-D27ED1E23E53} - - - {BC322BF1-2185-47F6-9F99-D27ED1E23E53} - [N] - html - 0 - 0 - - - - True - False - 1 - 1 - 0 - - False - False - - - - + + True diff --git a/doublecmd/session.ini b/doublecmd/session.ini index 72412cd..1fae562 100644 --- a/doublecmd/session.ini +++ b/doublecmd/session.ini @@ -137,7 +137,7 @@ Screen_PixelsPerInch=192 TfrmMultiRename_Height=2160 TfrmMultiRename_Width=1920 TfrmMultiRename_WindowState=wsNormal -TfrmMultiRename_Left=3840 +TfrmMultiRename_Left=1920 TfrmMultiRename_Top=0 Screen_PixelsPerInch=150 lsvwFile_Columns.Item0_Width=652 diff --git a/emoji/_install.sh b/emoji/_install.sh index c2f37c1..ca69b8a 100755 --- a/emoji/_install.sh +++ b/emoji/_install.sh @@ -5,8 +5,10 @@ sudo apt install -y \ 'fonts-noto-*' # uninstall outdated noto-emoji -sudo apt remove -y \ +sudo apt-get purge -y \ fonts-noto-color-emoji +sudo apt-get purge -y \ + fonts-symbola ttf-ancient-fonts-symbola # get latest noto-emoji mkdir -p ~/.fonts/NotoEmoji/ @@ -14,11 +16,20 @@ mkdir -p ~/.fonts/NotoEmoji/ curl -L 'https://raw.githubusercontent.com/googlefonts/noto-emoji/main/fonts/NotoColorEmoji.ttf' \ -o ~/.fonts/NotoEmoji/NotoColorEmoji.ttf +ln -s ~/.fonts/NotoEmoji \ + '/usr/local/share/fonts/' + # link font-priority config cd /Cfg/emoji/ -ln -s `pwd`/.fonts.conf ~/ --force +ln -s `pwd`/.fonts.conf \ + ~/ --force + mkdir -p ~/.config/fontconfig/ -ln -s `pwd`/.fonts.conf ~/.config/fontconfig/fonts.conf --force +ln -s `pwd`/.fonts.conf \ + ~/.config/fontconfig/fonts.conf --force # rebuild fonts-cache -fc-cache -fv +fc-cache -f -v + + +firefox 'https://getemoji.com' diff --git a/firefox/SponsorBlock.json b/firefox/SponsorBlock.json deleted file mode 100644 index 786bce3..0000000 --- a/firefox/SponsorBlock.json +++ /dev/null @@ -1,172 +0,0 @@ -{ - "highlightCategoryAdded": true, - "highlightCategoryUpdate": true, - "autoSkipOnMusicVideosUpdate": true, - "categorySelections": - [ - { - "name": "sponsor", - "option": 2 - }, - { - "name": "poi_highlight", - "option": 1 - }, - { - "name": "selfpromo", - "option": 2 - }, - { - "name": "interaction", - "option": 2 - }, - { - "name": "intro", - "option": 2 - }, - { - "name": "outro", - "option": 2 - }, - { - "name": "preview", - "option": 2 - }, - { - "name": "music_offtopic", - "option": 2 - } - ], - "dontShowNotice": true, - "showDonationLink": false, - "segmentTimes": - [], - "defaultCategory": "chooseACategory", - "whitelistedChannels": - [], - "forceChannelCheck": false, - "skipKeybind": "Enter", - "startSponsorKeybind": ";", - "submitKeybind": "'", - "minutesSaved": 0, - "skipCount": 0, - "sponsorTimesContributed": 0, - "submissionCountSinceCategories": 0, - "showTimeWithSkips": true, - "disableSkipping": false, - "muteSegments": true, - "trackViewCount": true, - "trackViewCountInPrivate": true, - "noticeVisibilityMode": 3, - "hideVideoPlayerControls": false, - "hideInfoButtonPlayerControls": false, - "hideDeleteButtonPlayerControls": false, - "hideUploadButtonPlayerControls": false, - "hideSkipButtonPlayerControls": false, - "hideDiscordLaunches": 0, - "hideDiscordLink": false, - "invidiousInstances": - [ - "invidious.snopyta.org" - ], - "supportInvidious": false, - "serverAddress": "https://sponsor.ajay.app", - "minDuration": 0, - "skipNoticeDuration": 4, - "audioNotificationOnSkip": false, - "checkForUnlistedVideos": false, - "testingServer": false, - "refetchWhenNotFound": true, - "ytInfoPermissionGranted": false, - "allowExpirements": true, - "autoHideInfoButton": true, - "autoSkipOnMusicVideos": false, - "barTypes": - { - "preview-chooseACategory": - { - "color": "#ffffff", - "opacity": "0.7" - }, - "sponsor": - { - "color": "#00d400", - "opacity": "0.7" - }, - "preview-sponsor": - { - "color": "#007800", - "opacity": "0.7" - }, - "selfpromo": - { - "color": "#ffff00", - "opacity": "0.7" - }, - "preview-selfpromo": - { - "color": "#bfbf35", - "opacity": "0.7" - }, - "interaction": - { - "color": "#cc00ff", - "opacity": "0.7" - }, - "preview-interaction": - { - "color": "#6c0087", - "opacity": "0.7" - }, - "intro": - { - "color": "#00ffff", - "opacity": "0.7" - }, - "preview-intro": - { - "color": "#008080", - "opacity": "0.7" - }, - "outro": - { - "color": "#0202ed", - "opacity": "0.7" - }, - "preview-outro": - { - "color": "#000070", - "opacity": "0.7" - }, - "preview": - { - "color": "#008fd6", - "opacity": "0.7" - }, - "preview-preview": - { - "color": "#005799", - "opacity": "0.7" - }, - "music_offtopic": - { - "color": "#ff9900", - "opacity": "0.7" - }, - "preview-music_offtopic": - { - "color": "#a6634a", - "opacity": "0.7" - }, - "poi_highlight": - { - "color": "#ff1684", - "opacity": "0.7" - }, - "preview-poi_highlight": - { - "color": "#9b044c", - "opacity": "0.7" - } - } -} \ No newline at end of file diff --git a/firefox/_install-esr.sh b/firefox/_install-esr.sh deleted file mode 100755 index 1a9ce4d..0000000 --- a/firefox/_install-esr.sh +++ /dev/null @@ -1,7 +0,0 @@ -sudo add-apt-repository -y \ - ppa:mozillateam/ppa - -sudo apt update -y - -sudo apt install -y \ - firefox-esr diff --git a/firefox/gesturefy.json b/firefox/gesturefy.json deleted file mode 100644 index 0392b59..0000000 --- a/firefox/gesturefy.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "Gestures": [ - { - "pattern": [ - [ - 200, - 0 - ] - ], - "command": { - "name": "SaveImage", - "settings": { - "promptDialog": false - } - } - }, - { - "pattern": [ - [ - -200, - 0 - ] - ], - "command": { - "name": "OpenImageInNewTab", - "settings": { - "position": "default", - "focus": true - } - } - }, - { - "pattern": [ - [ - 0, - -200 - ] - ], - "command": { - "name": "SearchTextSelectionInNewTab", - "settings": { - "searchEngineURL": "", - "openEmptySearch": false, - "position": "", - "focus": true - } - } - }, - { - "pattern": [ - [ - 0, - 200 - ] - ], - "command": { - "name": "CloseTab", - "settings": { - "nextFocus": "default", - "closePinned": false - } - } - } - ], - "Settings": { - "Gesture": { - "mouseButton": "2", - "Trace": { - "display": false - }, - "Command": { - "display": false - }, - "matchingAlgorithm": "shape-independent" - }, - "General": { - "updateNotification": false, - "theme": "dark" - } - } -} \ No newline at end of file diff --git a/firefox/keepassxc.json b/firefox/keepassxc.json deleted file mode 120000 index f54a7b2..0000000 --- a/firefox/keepassxc.json +++ /dev/null @@ -1 +0,0 @@ -../keepassxc/keepassxc.json \ No newline at end of file diff --git a/firefox/readme.md b/firefox/readme.md deleted file mode 100644 index 2439f77..0000000 --- a/firefox/readme.md +++ /dev/null @@ -1,57 +0,0 @@ -# Firefox - - -## Addons -see `~/bookmarks/addons-firefox.md` - - -## Theme -- [Dark](https://addons.mozilla.org/en-US/firefox/addon/nicothin-dark-theme/) – true gray dark theme - - -## about:config - -### don't trigger menu-focus on pressing alt -`ui.key.menuAccessKeyFocuses` = false - -### block auto-refresh/-redirects -> i.e. appstore -`accessibility.blockautorefresh` = frue - -### tweak cache sizes -whichever of `browser.cache.` looks too small (in MB) - -### allow use of userChrome.css -> to customize browser-window look -`toolkit.legacyUserProfileCustomizations.stylesheets` = true - -### compact ui theme -`browser.uidensity` = 1 - -### Hi-Dpi correction -> so 100% zoom would closer match with monitor resolution (measured by `window.innerWidth`) -`layout.css.devPixelsPerPx` = 1.75 - -### enable css [backdrop-filter](https://developer.mozilla.org/en-US/docs/Web/CSS/backdrop-filter#browser_compatibility) -- `gfx.webrender.enabled` = true -- `gfx.webrender.all` = true -- `layout.css.backdrop-filter.enabled` = true - -### enable WebGL -- `webgl.disabled` = false -- `webgl.force-enabled` = true - -### disable [Ctrl+Q] -- `browser.quitShortcut.disabled` = true - - -## Cookies - -### always-block -- `medium.com` - - -## address bar - -### only show latin letters in domain names (add `xn--` otherwise) -- `network.IDN_show_punycode` = true diff --git a/firefox/ublock--full.txt b/firefox/ublock--full.txt deleted file mode 100644 index d2fbac3..0000000 --- a/firefox/ublock--full.txt +++ /dev/null @@ -1,62 +0,0 @@ -{ - "timeStamp": 1627994548241, - "version": "1.37.2", - "userSettings": { - "importedLists": [ - "https://www.fanboy.co.nz/enhancedstats.txt" - ], - "popupPanelSections": 31, - "tooltipsDisabled": true - }, - "selectedFilterLists": [ - "user-filters", - "ublock-filters", - "ublock-badware", - "ublock-privacy", - "ublock-abuse", - "ublock-unbreak", - "adguard-generic", - "adguard-mobile", - "easylist", - "adguard-spyware", - "easyprivacy", - "urlhaus-1", - "spam404-0", - "adguard-annoyance", - "fanboy-thirdparty_social", - "fanboy-cookiemonster", - "fanboy-annoyance", - "ublock-annoyances", - "dpollock-0", - "plowe-0", - "DEU-0", - "RUS-0", - "https://www.fanboy.co.nz/enhancedstats.txt" - ], - "hiddenSettings": {}, - "whitelist": [ - "about-scheme", - "chrome-extension-scheme", - "chrome-scheme", - "codepen.io", - "coub.com", - "cutefishos.com", - "dribbble.com", - "edge-scheme", - "kisscartoon.sh", - "linktr.ee", - "moz-extension-scheme", - "old.reddit.com", - "opera-scheme", - "studio.youtube.com", - "ui8.net", - "vivaldi-scheme", - "www.pornhub.com", - "www.syncfusion.com", - "wyciwyg-scheme" - ], - "dynamicFilteringString": "behind-the-scene * * noop\nbehind-the-scene * inline-script noop\nbehind-the-scene * 1p-script noop\nbehind-the-scene * 3p-script noop\nbehind-the-scene * 3p-frame noop\nbehind-the-scene * image noop\nbehind-the-scene * 3p noop", - "urlFilteringString": "", - "hostnameSwitchesString": "no-large-media: behind-the-scene false\nno-csp-reports: * true", - "userFilters": "! 6/21/2020 https://apps.apple.com\napps.apple.com###ember243\n\n! 2021-01-15 https://www.instagram.com\nwww.instagram.com##._9AhH0\n\n! 2021-02-13 https://www.instagram.com\nwww.instagram.com##._4bSq7\nwww.instagram.com##.GZkEI.ccgHY.NP414\n\n! 2021-03-14 https://www.reddit.com\nwww.reddit.com##._3Axd0OX2sZP0PEIHdeocc3\nwww.reddit.com##button._2KotRmn9DgdA58Ikji2mnV:nth-of-type(2)\nwww.reddit.com##h3._18Q1kN_hFY6M09dHaoehBF\n\n! 2021-03-30\n##[class^='onetrust-']\n\n! 2021-04-05\nwww.tiktok.com\n\n! 2021-08-02 https://www.imdb.com\nwww.imdb.com##[data-testid=\"media-viewer__touch-handler\"]\n\n! 2021-08-02 https://hashnode.com\n##[class^=fbc-badge]\n" -} \ No newline at end of file diff --git a/gtk/bookmarks b/gtk/bookmarks deleted file mode 100644 index d26b93e..0000000 --- a/gtk/bookmarks +++ /dev/null @@ -1,7 +0,0 @@ -file:///Cfg -file:///Apps -file:///Data -file:///Site -file:///Projects -file:///home/dym/.privat/cv -file:///Work diff --git a/i3/config b/i3/config index cd466e4..7e99d19 100644 --- a/i3/config +++ b/i3/config @@ -1,6 +1,7 @@ ## global -- modifiers set $Alt Mod1 set $Meta Mod4 +set $prtscr `import -window root "/_/PrtScr--$(date '+%Y%m%d@%H%M%S').png"` # window properties new_window none @@ -27,15 +28,15 @@ bindsym XF86Hibernate exec --no-startup-id "systemctl hibernate" bindsym $Meta+Shift+k restart && exec --no-startup-id "xmodmap $HOME/.Xmodmap" # screenshots -bindsym Print exec --no-startup-id prtscr -bindsym $Alt+Print exec --no-startup-id prtscr -bindsym $Meta+Print exec --no-startup-id prtscr -bindsym Control+Print exec --no-startup-id prtscr -bindsym Shift+Print exec --no-startup-id prtscr -bindsym $Meta+Control+$Alt+Print exec --no-startup-id prtscr -bindsym $Meta+Shift+$Alt+Print exec --no-startup-id prtscr -bindsym $Meta+Control+Shift+$Alt+Print exec --no-startup-id prtscr -bindsym XF86Tools exec --no-startup-id prtscr +bindsym Print exec --no-startup-id $prtscr +bindsym $Alt+Print exec --no-startup-id $prtscr +bindsym $Meta+Print exec --no-startup-id $prtscr +bindsym Control+Print exec --no-startup-id $prtscr +bindsym Shift+Print exec --no-startup-id $prtscr +bindsym $Meta+Control+$Alt+Print exec --no-startup-id $prtscr +bindsym $Meta+Shift+$Alt+Print exec --no-startup-id $prtscr +bindsym $Meta+Control+Shift+$Alt+Print exec --no-startup-id $prtscr +bindsym XF86Tools exec --no-startup-id $prtscr # new terminal window bindsym $Meta+Shift+Return exec $(which alacritty) @@ -62,7 +63,7 @@ bindsym $Meta+Button4 workspace prev bindsym $Meta+Button5 workspace next ## navigating windows -- closing, positioning, and resizing -bindsym $Meta+Shift+Q kill +bindsym $Meta+Shift+Q kill bindsym $Meta+Shift+KP_0 fullscreen toggle bindsym $Meta+Shift+KP_5 floating toggle # move focused window between monitors @@ -90,16 +91,16 @@ bindsym XF86AudioPrev exec playerctl previous # workspaces (numbers row) -set $w__1 "100: www" -bindsym $Meta+1 workspace $w__1; exec [ $(wmctrl -l | grep 'Mozilla Firefox' | wc -l) = 0 ] && $(which firefox) -s +set $w__1 "100: web" +bindsym $Meta+1 workspace $w__1; exec [ $(ps -A | grep vivaldi | wc -l) = 0 ] && $(which vivaldi) -s -set $w__2 "200: cmd" -bindsym $Meta+2 workspace $w__2; exec [ $(ps h -C doublecmd | wc -l) = 0 ] && $(which doublecmd) -s +set $w__2 "200: files" +bindsym $Meta+2 workspace $w__2; exec [ $(ps -A | grep doublecmd | wc -l) = 0 ] && $(which doublecmd) -set $w__3 "300: code" -bindsym $Meta+3 workspace $w__3; exec [ $(ps h -C code | wc -l) = 0 ] && $(which code) +set $w__3 "300: text" +bindsym $Meta+3 workspace $w__3; exec [ $(ps -A | grep subl | wc -l) = 0 ] && $(which subl) -set $w__4 "400: term" +set $w__4 "400: console" bindsym $Meta+4 workspace $w__4; exec [ $(ps h -C alacritty | wc -l) = 0 ] && $(which alacritty) set $w__5 "500: ..." @@ -132,13 +133,13 @@ bindsym $Meta+$Alt+9 move container to workspace $w__9 # workspaces (keypad) set $w__KP_0 "KP_0: notes" -bindsym $Meta+KP_0 workspace $w__KP_0; exec [ $(ps h -C inventory | wc -l) = 0 ] && $(which inventory) +bindsym $Meta+KP_0 workspace $w__KP_0; exec [ $(ps h -C inventory | wc -l) = 0 ] && inventory set $w__KP_1 "KP_1: img" -bindsym $Meta+KP_1 workspace $w__KP_1; exec [ $(ps h -C xnview | wc -l) = 0 ] && $(which xnview) +bindsym $Meta+KP_1 workspace $w__KP_1; exec [ $(ps -A | grep xnview | wc -l) = 0 ] && xnview /_ -set $w__KP_2 "KP_2: mail" -bindsym $Meta+KP_2 workspace $w__KP_2; exec [ $(ps h -C thunderbird | wc -l) = 0 ] && $(which thunderbird) +set $w__KP_2 "KP_2: sync" +bindsym $Meta+KP_2 workspace $w__KP_2; exec [ $(ps -A | grep nextcloud | wc -l) = 0 ] && nextcloud set $w__KP_3 "KP_3: music" bindsym $Meta+KP_3 workspace $w__KP_3; exec $(which rhythmbox) @@ -147,23 +148,21 @@ set $w__KP_4 "KP_4: pwd" bindsym $Meta+KP_4 workspace $w__KP_4; exec [ $(ps h -C keepassxc | wc -l) = 0 ] && $(which keepassxc) set $w__KP_5 "KP_5: src" -bindsym $Meta+KP_5 workspace $w__KP_5; exec [ $(ps h -C sublime_merge | wc -l) = 0 ] && $(which sublime_merge) +bindsym $Meta+KP_5 workspace $w__KP_5; exec [ $(ps -A | grep sublime_merge | wc -l) = 0 ] && $(which sublime_merge) assign [class="sublime_merge"] $w__KP_5 for_window [class="sublime_merge$"] move container to workspace $w__KP_5 -set $w__KP_6 "KP_6: chrome" -bindsym $Meta+KP_6 workspace $w__KP_6; exec [ $(wmctrl -l | grep ' - Google Chrome' | wc -l) = 0 ] && $(which google-chrome) -assign [class="google-chrome-stable"] $w__KP_6 -for_window [class="google-chrome-stable$"] move container to workspace $w__KP_6 +set $w__KP_6 "KP_6: webb" +bindsym $Meta+KP_6 workspace $w__KP_6; exec [ $(wmctrl -l | grep 'Mozilla Firefox' | wc -l) = 0 ] && $(which firefox) set $w__KP_7 "KP_7: design" -bindsym $Meta+KP_7 workspace $w__KP_7; exec [ $(xdotool search -class '_' | wc -l) = 0 ] && _ +bindsym $Meta+KP_7 workspace $w__KP_7; exec [ $(xdotool search -class 'penpot' | wc -l) = 0 ] && penpot set $w__KP_8 "KP_8: DB" bindsym $Meta+KP_8 workspace $w__KP_8; exec [ $(wmctrl -l | grep 'DBeaver' | wc -l) = 0 ] && $(which dbeaver) set $w__KP_9 "KP_9: chat" -bindsym $Meta+KP_9 workspace $w__KP_9; exec [ $(wmctrl -l | grep '_' | wc -l) = 0 ] _; +bindsym $Meta+KP_9 workspace $w__KP_9; exec [ $(wmctrl -l | grep 'chats' | wc -l) = 0 ] chats ## workspaces (keypad) -- window-actions bindsym $Meta+$Alt+KP_0 move container to workspace $w__KP_0 @@ -179,12 +178,12 @@ bindsym $Meta+$Alt+KP_9 move container to workspace $w__KP_9 # keyboard layouts -bindsym $Meta+F11 exec --no-startup-id "setxkbmap us -variant mac && xmodmap $HOME/.Xmodmap" -bindsym $Meta+F12 exec --no-startup-id "setxkbmap -layout 'ru,us' -variant 'phonetic_mac,mac'" +bindsym $Meta+F9 exec --no-startup-id "/Cfg/kb/jp-translit-hiro.sh" +bindsym $Meta+F10 exec --no-startup-id "/Cfg/kb/jp-translit-kana.sh" +bindsym $Meta+F11 exec --no-startup-id "/Cfg/kb/ru-translit-mac.sh" +bindsym $Meta+F12 exec --no-startup-id "/Cfg/kb/us-mac.sh" # startup exec_always --no-startup-id numlockx on -exec --no-startup-id "~/.xsession" exec --no-startup-id i3-msg "workspace $w__4; exec $(which alacritty)" -exec --no-startup-id i3-msg "workspace $w__1; exec $(which firefox)" diff --git a/oh-my-zsh/.Xmodmap b/kb/.Xmodmap similarity index 100% rename from oh-my-zsh/.Xmodmap rename to kb/.Xmodmap diff --git a/oh-my-zsh/.xsession b/kb/.xkb similarity index 56% rename from oh-my-zsh/.xsession rename to kb/.xkb index 21801c2..36f5232 100755 --- a/oh-my-zsh/.xsession +++ b/kb/.xkb @@ -1,5 +1,6 @@ -#!/usr/bin/zsh +#!/bin/sh +# ± # keyboard settings setxkbmap -option caps:none @@ -17,16 +18,4 @@ xset -dpms # xrdb -merge /etc/X11/xinit/.Xresources xrdb -merge ~/.Xresources # xmodmap /etc/X11/xinit/.Xmodmap -xmodmap "$HOME/.Xmodmap" - - -# reset audio -pulseaudio -k - - -# start-apps -/Cfg/@reboot.sh 2>&1 & - -# xrandr --output DP-0 --scale 1x1 --fb 3840x2160 --mode 3840x2160 --pos 0x0 -# xrandr --output HDMI-0 --scale 1x1 --mode 1920x1080 --pos 3840x0 - +xmodmap ~/.Xmodmap diff --git a/kb/_install.sh b/kb/_install.sh new file mode 100755 index 0000000..afe3b53 --- /dev/null +++ b/kb/_install.sh @@ -0,0 +1,5 @@ +#!/usr/bin/zsh + + +cd /Cfg/kb/ +ln -s `pwd`/.[a-zA-Z]* ~/ --force diff --git a/kb/jp-translit-hiro.sh b/kb/jp-translit-hiro.sh new file mode 100755 index 0000000..46045c1 --- /dev/null +++ b/kb/jp-translit-hiro.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +setxkbmap jp -variant mozc + +numlockx off + +# xset s off +# xset s noblank +xset b off +xset -dpms + +# xrdb -merge /etc/X11/xinit/.Xresources +xrdb -merge ~/.Xresources +# xmodmap /etc/X11/xinit/.Xmodmap +xmodmap ~/.Xmodmap diff --git a/kb/jp-translit-kana.sh b/kb/jp-translit-kana.sh new file mode 100755 index 0000000..77779b3 --- /dev/null +++ b/kb/jp-translit-kana.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +setxkbmap jp -variant kana + +numlockx off + +# xset s off +# xset s noblank +xset b off +xset -dpms + +# xrdb -merge /etc/X11/xinit/.Xresources +xrdb -merge ~/.Xresources +# xmodmap /etc/X11/xinit/.Xmodmap +xmodmap ~/.Xmodmap diff --git a/kb/ru-translit-mac.sh b/kb/ru-translit-mac.sh new file mode 100755 index 0000000..44f5706 --- /dev/null +++ b/kb/ru-translit-mac.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +setxkbmap -layout 'ru,us' -variant 'phonetic_mac,mac' + +numlockx off + +# xset s off +# xset s noblank +xset b off +xset -dpms + +# xrdb -merge /etc/X11/xinit/.Xresources +xrdb -merge ~/.Xresources +# xmodmap /etc/X11/xinit/.Xmodmap +xmodmap ~/.Xmodmap diff --git a/kb/us-mac.sh b/kb/us-mac.sh new file mode 100755 index 0000000..ea2e81f --- /dev/null +++ b/kb/us-mac.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +setxkbmap us -variant mac + +numlockx off + +# xset s off +# xset s noblank +xset b off +xset -dpms + +# xrdb -merge /etc/X11/xinit/.Xresources +xrdb -merge ~/.Xresources +# xmodmap /etc/X11/xinit/.Xmodmap +xmodmap ~/.Xmodmap diff --git a/meta.kdl b/meta.kdl index 76a93ef..e628de4 100644 --- a/meta.kdl +++ b/meta.kdl @@ -1,7 +1,7 @@ title "desktop-ubuntu" description "system settings, config files, and scripts" media-type "cli" -tags "config" "scripts" -license "AGPL" +tags "config" "scripts" "docs" +license "0BSD" homepage "https://dym.sh/desktop-ubuntu/" source "https://source.garden/config/desktop-ubuntu/" diff --git a/nginx/DOMAIN.TLD.conf b/nginx/DOMAIN.TLD.conf deleted file mode 100644 index 23448d9..0000000 --- a/nginx/DOMAIN.TLD.conf +++ /dev/null @@ -1,32 +0,0 @@ -server { - server_name .; - listen 80; - listen [::]:80; - - location ~ /\.well-known/acme-challenge { - root /var/lib/letsencrypt/; - } - location / { - add_header Strict-Transport-Security "max-age=15768000; includeSubDomains" always; - return 301 https://$server_name$request_uri; - } -} - - -server { - server_name .; - - listen 443 ssl http2; - listen [::]:443 ssl http2; - - ssl_trusted_certificate /etc/letsencrypt/live/./chain.pem; - ssl_certificate /etc/letsencrypt/live/./fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/./privkey.pem; - - - location / { - root /home/www/.; - autoindex on; - charset utf-8; - } -} diff --git a/nginx/_install.sh b/nginx/_install.sh deleted file mode 100755 index 93fb4e5..0000000 --- a/nginx/_install.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/zsh - -sudo apt install -y \ - nginx \ - nginx-extras - -mkdir -p /etc/nginx/ssl/ -openssl req -x509 -nodes -days 365 -newkey rsa:4096 \ - -keyout /etc/nginx/ssl/nginx.key \ - -out /etc/nginx/ssl/nginx.crt - -openssl dhparam -out /etc/nginx/dhparam.pem 4096 diff --git a/nginx/dym.sh--gts.conf b/nginx/dym.sh--gts.conf deleted file mode 100644 index 9d1fa82..0000000 --- a/nginx/dym.sh--gts.conf +++ /dev/null @@ -1,47 +0,0 @@ -server { - server_name dym.sh; - listen 80; - listen [::]:80; - - location ~ /\.well-known/acme-challenge { - root /var/lib/letsencrypt/; - } - location / { - add_header Strict-Transport-Security "max-age=15768000; includeSubDomains" always; - return 301 https://$server_name$request_uri; - } -} - -server { - server_name dym.sh; - listen 443 ssl http2; - listen [::]:443 ssl http2; - - ssl_trusted_certificate /etc/letsencrypt/live/dym.sh/chain.pem; - ssl_certificate /etc/letsencrypt/live/dym.sh/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dym.sh/privkey.pem; - - location /favicon.ico { - return 302 https://$server_name/assets/favicon.ico; - } - location /icon.png { - return 302 https://$server_name/assets/logo.png; - } - location /th.png { - return 302 https://$server_name/assets/th.png; - } - location /rss { - return 302 https://$server_name/assets/rss; - } - - location / { - # set to 127.0.0.1 instead of localhost to work around https://stackoverflow.com/a/52550758 - proxy_pass http://127.0.0.1:10099; - proxy_set_header Host $host; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Forwarded-Proto $scheme; - } - client_max_body_size 100M; -} diff --git a/nginx/dym.sh--serve-www.conf b/nginx/dym.sh--serve-www.conf deleted file mode 100644 index 963f31a..0000000 --- a/nginx/dym.sh--serve-www.conf +++ /dev/null @@ -1,56 +0,0 @@ -server { - server_name dym.sh; - listen 80; - listen [::]:80; - - location ~ /\.well-known/acme-challenge { - root /var/lib/letsencrypt/; - } - location / { - add_header Strict-Transport-Security "max-age=15768000; includeSubDomains" always; - return 301 https://$server_name$request_uri; - } -} - -server { - server_name *.dym.sh; - listen 80; - listen [::]:80; - - location / { - return 301 https://dym.sh$request_uri; - } -} - - -server { - server_name *.dym.sh; - - listen 443 ssl http2; - listen [::]:443 ssl http2; - - ssl_trusted_certificate /etc/letsencrypt/live/dym.sh/chain.pem; - ssl_certificate /etc/letsencrypt/live/dym.sh/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dym.sh/privkey.pem; - - location / { - return 301 https://dym.sh$request_uri; - } -} - -server { - server_name dym.sh; - - listen 443 ssl http2; - listen [::]:443 ssl http2; - - ssl_trusted_certificate /etc/letsencrypt/live/dym.sh/chain.pem; - ssl_certificate /etc/letsencrypt/live/dym.sh/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dym.sh/privkey.pem; - - location / { - root /var/www/dym.sh; - autoindex on; - charset utf-8; - } -} diff --git a/nginx/ipv6.sh b/nginx/ipv6.sh deleted file mode 100755 index 1ee2f11..0000000 --- a/nginx/ipv6.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/zsh - -# enable_ipv6 - -ip addr add 2a02:c206:3009:9964::1/112 dev eth0 -ip -6 addr show - -ip route add default via fe80::1 dev eth0 -ip -6 route show - -ping -6 2a02:c206:3009:9964::1 diff --git a/nginx/mail.conf b/nginx/mail.conf deleted file mode 100644 index 3492200..0000000 --- a/nginx/mail.conf +++ /dev/null @@ -1,43 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80; - server_name mail.*; - - # For SSL domain validation - root /var/www/html; - location /.well-known/acme-challenge/ { allow all; } - location /.well-known/pki-validation/ { allow all; } - location / { return 301 https://$server_name$request_uri; } -} - -server { - listen 443 ssl http2 default_server; - listen [::]:443 ssl http2; - server_name mail.*; - - ssl_certificate /opt/mailcow-dockerized/data/assets/ssl/cert.pem; - ssl_certificate_key /opt/mailcow-dockerized/data/assets/ssl/key.pem; - ssl_dhparam /etc/nginx/ssl/dhparam.pem; - ssl_ecdh_curve secp384r1; - - ssl_session_timeout 7d; - ssl_protocols TLSv1.2 TLSv1.3; - ssl_prefer_server_ciphers on; - ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!DH:!ADH:!EDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA:!AES256-GCM-SHA384'; - - # Change to your upload limit - client_max_body_size 500m; - - location / { - proxy_pass http://127.0.0.1:10080; - proxy_buffer_size 128k; - proxy_buffers 64 512k; - proxy_busy_buffers_size 512k; - proxy_set_header X-Forwarded-Proto $scheme; - client_max_body_size 0; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_redirect off; - } -} diff --git a/nginx/nginx.conf b/nginx/nginx.conf deleted file mode 100644 index bad362f..0000000 --- a/nginx/nginx.conf +++ /dev/null @@ -1,71 +0,0 @@ -user www-data; -worker_processes auto; -pid /run/nginx.pid; -include /etc/nginx/modules-enabled/*.conf; - -events { - worker_connections 768; - # multi_accept on; -} - -http { - error_log /var/log/nginx/error.log; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - # server_tokens off; - - server_names_hash_bucket_size 128; - # server_name_in_redirect off; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - - client_max_body_size 1024m; - - ssl_session_timeout 1d; - ssl_session_cache shared:MozSSL:10m; - ssl_session_tickets off; - ssl_protocols TLSv1.2 TLSv1.3; - ssl_ciphers "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; - ssl_prefer_server_ciphers off; - ssl_ecdh_curve X25519:prime256v1:secp384r1:secp521r1; - ssl_stapling on; - ssl_stapling_verify on; - - gzip on; - gzip_vary on; - gzip_proxied any; - gzip_comp_level 6; - gzip_buffers 16 8k; - gzip_http_version 1.1; - - gzip_types application/activity+json - application/atom+xml - application/javascript - application/json - application/manifest+json - application/rss+xml - application/xml - text/cache-manifest - text/calendar - text/css - text/javascript - text/markdown - text/plain - text/vcard - text/vnd.wap.wml - text/vtt - text/x-component - text/xml - ; - - index index.html; - - include /etc/nginx/conf.d/*.conf; - include /etc/nginx/sites-enabled/*; -} diff --git a/nginx/source.garden.conf b/nginx/source.garden.conf deleted file mode 100644 index fce34cc..0000000 --- a/nginx/source.garden.conf +++ /dev/null @@ -1,56 +0,0 @@ -server { - server_name source.garden; - listen 80; - listen [::]:80; - - location ~ /\.well-known/acme-challenge { - root /var/lib/letsencrypt/; - } - location / { - add_header Strict-Transport-Security "max-age=15768000; includeSubDomains" always; - return 301 https://$server_name$request_uri; - } -} - -server { - server_name *.source.garden; - listen 80; - listen [::]:80; - - location / { - return 301 https://$server_name$request_uri; - } -} - - -server { - server_name www.source.garden; - - listen 443 ssl http2; - listen [::]:443 ssl http2; - - ssl_trusted_certificate /etc/letsencrypt/live/source.garden-0002/chain.pem; - ssl_certificate /etc/letsencrypt/live/source.garden-0002/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/source.garden-0002/privkey.pem; - - location / { - return 301 https://source.garden$request_uri; - } -} - -server { - server_name source.garden; - - listen 443 ssl http2; - listen [::]:443 ssl http2; - - ssl_trusted_certificate /etc/letsencrypt/live/source.garden-0002/chain.pem; - ssl_certificate /etc/letsencrypt/live/source.garden-0002/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/source.garden-0002/privkey.pem; - - location / { - root /var/www/source.garden; - autoindex on; - charset utf-8; - } -} diff --git a/nix/dym.nix b/nix/dym.nix new file mode 100644 index 0000000..37c7916 --- /dev/null +++ b/nix/dym.nix @@ -0,0 +1,21 @@ +{ config, lib, pkgs, ... }: + +{ + services = { + + postgresql = { + enable = true; + package = pkgs.postgresql_15; + ensureDatabases = [ "postgres" ]; + enableTCPIP = true; + port = 5432; + authentication = pkgs.lib.mkOverride 10 '' + # type db DBuser auth-method + local all all trust + # type db DBuser origin-address auth-method + host all all 127.0.0.1/32 trust + host all all ::1/128 trust + ''; + }; + }; +}; diff --git a/oh-my-zsh/.fehbg b/oh-my-zsh/.fehbg new file mode 100755 index 0000000..47d1149 --- /dev/null +++ b/oh-my-zsh/.fehbg @@ -0,0 +1,2 @@ +#!/bin/sh +feh --no-fehbg --bg-fill '/Img/2023/12/blob-on-green_20231223212830.png' diff --git a/oh-my-zsh/.profile b/oh-my-zsh/.profile index 45ae14e..12ac2e8 100755 --- a/oh-my-zsh/.profile +++ b/oh-my-zsh/.profile @@ -22,4 +22,4 @@ export XDG_CONFIG_HOME="/home/dym/.config" . "$HOME/.cargo/env" -eval `ssh-agent -s` +if [ -e /home/dym/.nix-profile/etc/profile.d/nix.sh ]; then . /home/dym/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer diff --git a/oh-my-zsh/.xsessionrc b/oh-my-zsh/.xsessionrc index 389db4c..2f06b04 100755 --- a/oh-my-zsh/.xsessionrc +++ b/oh-my-zsh/.xsessionrc @@ -1,3 +1,24 @@ +#!/bin/sh + +# ssh +eval `ssh-agent -s` + + +. ~/.xkb +. ~/.fehbg + + +# reset audio +pulseaudio -k + + +# start-apps +/Cfg/@reboot.sh 2>&1 & + +# xrandr --output DP-0 --scale 1x1 --fb 3840x2160 --mode 3840x2160 --pos 0x0 +# xrandr --output HDMI-0 --scale 1x1 --mode 1920x1080 --pos 3840x0 + + LC_ALL="en_US.utf8" LC_COLLATE="C" LC_ADDRESS="de_DE.UTF-8" diff --git a/oh-my-zsh/.zshrc b/oh-my-zsh/.zshrc index c59a494..70fd9f7 100755 --- a/oh-my-zsh/.zshrc +++ b/oh-my-zsh/.zshrc @@ -37,7 +37,7 @@ alias d='du -ch --max-depth=1' alias i='sudo apt-get install -y' alias un='sudo apt-get remove -y' -alias subs='youtube-dl --write-auto-sub --sub-lang en' +alias subs='yt-dlp --write-auto-sub --sub-lang en' alias x+='chmod +x' alias x-='chmod -x' @@ -73,3 +73,4 @@ export PATH="$BUN_INSTALL/bin:$PATH" # deno export DENO_INSTALL="/home/dym/.deno" export PATH="$DENO_INSTALL/bin:$PATH" + diff --git a/oh-my-zsh/_install.sh b/oh-my-zsh/_install.sh index c9c2aed..08d0952 100755 --- a/oh-my-zsh/_install.sh +++ b/oh-my-zsh/_install.sh @@ -15,3 +15,11 @@ sudo chsh -s `which zsh` cd /Cfg/oh-my-zsh/ ln -s `pwd`/.[a-zA-Z]* ~/ --force + +git clone --depth 1 \ + 'https://github.com/chisui/zsh-nix-shell.git' \ + "$ZSH_CUSTOM/plugins/nix-shell" + +# maybe add to .zshrc +# ZSH_CUSTOM=$HOME/.config/oh-my-zsh + diff --git a/oh-my-zsh/env.sh b/oh-my-zsh/env.sh deleted file mode 100644 index b312306..0000000 --- a/oh-my-zsh/env.sh +++ /dev/null @@ -1,64 +0,0 @@ -GJS_DEBUG_TOPICS=JS ERROR;JS LOG -SSH_AUTH_SOCK=/run/user/1000/keyring/ssh -SESSION_MANAGER=local/mint:@/tmp/.ICE-unix/1174,unix/mint:/tmp/.ICE-unix/1174 -TERMINAL=/home/dym/.cargo/bin/alacritty -GNOME_TERMINAL_SCREEN=/org/gnome/Terminal/screen/4c047675_013c_4809_bbf3_c19a402d74ce -GTK3_MODULES=xapp-gtk3-module -LANG=en_US.UTF-8 -LC_IDENTIFICATION=de_DE.UTF-8 -SSH_AGENT_PID=1252 -XDG_SESSION_CLASS=user -XDG_CURRENT_DESKTOP=X-Cinnamon -LANGUAGE=en_US -GPG_AGENT_INFO=/run/user/1000/gnupg/S.gpg-agent:0:1 -XDG_GREETER_DATA_DIR=/var/lib/lightdm-data/dym -HOME=/home/dym -LC_MEASUREMENT=de_DE.UTF-8 -GJS_DEBUG_OUTPUT=stderr -XDG_SESSION_PATH=/org/freedesktop/DisplayManager/Session0 -COLORTERM=truecolor -USER=dym -DISPLAY=:0 -DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus -XDG_VTNR=7 -XDG_SEAT=seat0 -LC_NUMERIC=de_DE.UTF-8 -GTK_MODULES=gail:atk-bridge -XDG_CONFIG_DIRS=/etc/xdg/xdg-cinnamon:/etc/xdg -VTE_VERSION=6003 -XDG_SESSION_DESKTOP=cinnamon -PWD=/Cfg/_scripts -QT_ACCESSIBILITY=1 -DESKTOP_SESSION=cinnamon -ARCHFLAGS=-arch x86_64 -GTK_OVERLAY_SCROLLING=1 -GNOME_DESKTOP_SESSION_ID=this-is-deprecated -QT_AUTO_SCREEN_SCALE_FACTOR=0 -GNOME_TERMINAL_SERVICE=:1.330 -LC_PAPER=de_DE.UTF-8 -XDG_SEAT_PATH=/org/freedesktop/DisplayManager/Seat0 -PATH=/Apps:/Apps/bin:/usr/sbin:/usr/bin -XDG_RUNTIME_DIR=/run/user/1000 -LOGNAME=dym -XDG_SESSION_ID=c1 -LC_MONETARY=de_DE.UTF-8 -GTK2_RC_FILES=/home/dym/.gtkrc-2.0 -XDG_SESSION_TYPE=x11 -EDITOR=sublime_text not found -SHELL=/usr/bin/zsh -LC_TELEPHONE=de_DE.UTF-8 -GDM_LANG=en_US -SHLVL=1 -XAUTHORITY=/home/dym/.Xauthority -CINNAMON_VERSION=4.8.6 -XDG_DATA_DIRS=/usr/share/cinnamon:/usr/share/gnome:/home/dym/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:/usr/local/share:/usr/share -LC_NAME=de_DE.UTF-8 -TERM=xterm-256color -LC_ADDRESS=de_DE.UTF-8 -QT_QPA_PLATFORMTHEME=gtk2 -GDMSESSION=cinnamon -OLDPWD=/Cfg/ssh -PAGER=less -LESS=-R -LSCOLORS=Gxfxcxdxbxegedabagacad -_=/usr/bin/env diff --git a/penpot/docker-compose.yaml b/penpot/docker-compose.yaml new file mode 100644 index 0000000..7e85d17 --- /dev/null +++ b/penpot/docker-compose.yaml @@ -0,0 +1,288 @@ +--- +version: "3.5" + +networks: + penpot: + +volumes: + penpot_postgres_v15: + penpot_assets: + # penpot_traefik: + # penpot_minio: + +services: + ## Traefik service declaration example. Consider using it if you are going to expose + ## penpot to the internet or different host than `localhost`. + + # traefik: + # image: traefik:v2.9 + # networks: + # - penpot + # command: + # - "--api.insecure=true" + # - "--entryPoints.web.address=:80" + # - "--providers.docker=true" + # - "--providers.docker.exposedbydefault=false" + # - "--entryPoints.websecure.address=:443" + # - "--certificatesresolvers.letsencrypt.acme.tlschallenge=true" + # - "--certificatesresolvers.letsencrypt.acme.email=" + # - "--certificatesresolvers.letsencrypt.acme.storage=/traefik/acme.json" + # volumes: + # - "penpot_traefik:/traefik" + # - "/var/run/docker.sock:/var/run/docker.sock" + # ports: + # - "80:80" + # - "443:443" + + penpot-frontend: + image: "penpotapp/frontend:latest" + restart: always + ports: + - 9001:80 + + volumes: + - penpot_assets:/opt/data/assets + + depends_on: + - penpot-backend + - penpot-exporter + + networks: + - penpot + + labels: + - "traefik.enable=true" + + ## HTTP: example of labels for the case if you are going to expose penpot to the + ## internet using only HTTP (without HTTPS) with traefik + + # - "traefik.http.routers.penpot-http.entrypoints=web" + # - "traefik.http.routers.penpot-http.rule=Host(``)" + # - "traefik.http.services.penpot-http.loadbalancer.server.port=80" + + ## HTTPS: example of labels for the case if you are going to expose penpot to the + ## internet using with HTTPS using traefik + + # - "traefik.http.middlewares.http-redirect.redirectscheme.scheme=https" + # - "traefik.http.middlewares.http-redirect.redirectscheme.permanent=true" + # - "traefik.http.routers.penpot-http.entrypoints=web" + # - "traefik.http.routers.penpot-http.rule=Host(``)" + # - "traefik.http.routers.penpot-http.middlewares=http-redirect" + # - "traefik.http.routers.penpot-https.entrypoints=websecure" + # - "traefik.http.routers.penpot-https.rule=Host(``)" + # - "traefik.http.services.penpot-https.loadbalancer.server.port=80" + # - "traefik.http.routers.penpot-https.tls=true" + # - "traefik.http.routers.penpot-https.tls.certresolver=letsencrypt" + + ## Configuration envronment variables for frontend the container. In this case this + ## container only needs the `PENPOT_FLAGS`. This environment variable is shared with + ## other services but not all flags are relevant to all services. + + environment: + ## Relevant flags for frontend: + ## - demo-users + ## - login-with-github + ## - login-with-gitlab + ## - login-with-google + ## - login-with-ldap + ## - login-with-oidc + ## - login-with-password + ## - registration + ## - webhooks + ## + ## You can read more about all available flags on: + ## https://help.penpot.app/technical-guide/configuration/#advanced-configuration + + - PENPOT_FLAGS=enable-registration enable-login-with-password + + penpot-backend: + image: "penpotapp/backend:latest" + restart: always + + volumes: + - penpot_assets:/opt/data/assets + + depends_on: + - penpot-postgres + - penpot-redis + + networks: + - penpot + + ## Configuration envronment variables for backend the + ## container. + + environment: + + ## Relevant flags for backend: + ## - demo-users + ## - email-verification + ## - log-emails + ## - log-invitation-tokens + ## - login-with-github + ## - login-with-gitlab + ## - login-with-google + ## - login-with-ldap + ## - login-with-oidc + ## - login-with-password + ## - registration + ## - secure-session-cookies + ## - smtp + ## - smtp-debug + ## - telemetry + ## - webhooks + ## - prepl-server + ## + ## You can read more about all available flags and other + ## environment variables for the backend here: + ## https://help.penpot.app/technical-guide/configuration/#advanced-configuration + + - PENPOT_FLAGS=enable-registration enable-login-with-password disable-email-verification enable-smtp enable-prepl-server + + ## Penpot SECRET KEY. It serves as a master key from which other keys for subsystems + ## (eg http sessions, or invitations) are derived. + ## + ## If you leve it commented, all created sessions and invitations will + ## become invalid on container restart. + ## + ## If you going to uncomment this, we recommend use here a trully randomly generated + ## 512 bits base64 encoded string. You can generate one with: + ## + ## python3 -c "import secrets; print(secrets.token_urlsafe(64))" + + # - PENPOT_SECRET_KEY=my-insecure-key + + ## The PREPL host. Mainly used for external programatic access to penpot backend + ## (example: admin). By default it listen on `localhost` but if you are going to use + ## the `admin`, you will need to uncomment this and set the host to `0.0.0.0`. + + # - PENPOT_PREPL_HOST=0.0.0.0 + + ## Public URI. If you are going to expose this instance to the internet and use it + ## under different domain than 'localhost', you will need to adjust it to the final + ## domain. + ## + ## Consider using traefik and set the 'disable-secure-session-cookies' if you are + ## not going to serve penpot under HTTPS. + + - PENPOT_PUBLIC_URI=http://localhost:9001 + + ## Database connection parameters. Don't touch them unless you are using custom + ## postgresql connection parameters. + + - PENPOT_DATABASE_URI=postgresql://penpot-postgres/penpot + - PENPOT_DATABASE_USERNAME=penpot + - PENPOT_DATABASE_PASSWORD=penpot + + ## Redis is used for the websockets notifications. Don't touch unless the redis + ## container has different parameters or different name. + + - PENPOT_REDIS_URI=redis://penpot-redis/0 + + ## Default configuration for assets storage: using filesystem based with all files + ## stored in a docker volume. + + - PENPOT_ASSETS_STORAGE_BACKEND=assets-fs + - PENPOT_STORAGE_ASSETS_FS_DIRECTORY=/opt/data/assets + + ## Also can be configured to to use a S3 compatible storage + ## service like MiniIO. Look below for minio service setup. + + # - AWS_ACCESS_KEY_ID= + # - AWS_SECRET_ACCESS_KEY= + # - PENPOT_ASSETS_STORAGE_BACKEND=assets-s3 + # - PENPOT_STORAGE_ASSETS_S3_ENDPOINT=http://penpot-minio:9000 + # - PENPOT_STORAGE_ASSETS_S3_BUCKET= + + ## Telemetry. When enabled, a periodical process will send anonymous data about this + ## instance. Telemetry data will enable us to learn on how the application is used, + ## based on real scenarios. If you want to help us, please leave it enabled. You can + ## audit what data we send with the code available on github + + - PENPOT_TELEMETRY_ENABLED=true + + ## Example SMTP/Email configuration. By default, emails are sent to the mailcatch + ## service, but for production usage is recommended to setup a real SMTP + ## provider. Emails are used to confirm user registrations & invitations. Look below + ## how mailcatch service is configured. + + - PENPOT_SMTP_DEFAULT_FROM=no-reply@example.com + - PENPOT_SMTP_DEFAULT_REPLY_TO=no-reply@example.com + - PENPOT_SMTP_HOST=penpot-mailcatch + - PENPOT_SMTP_PORT=1025 + - PENPOT_SMTP_USERNAME= + - PENPOT_SMTP_PASSWORD= + - PENPOT_SMTP_TLS=false + - PENPOT_SMTP_SSL=false + + penpot-exporter: + image: "penpotapp/exporter:latest" + restart: always + networks: + - penpot + + environment: + # Don't touch it; this uses internal docker network to + # communicate with the frontend. + - PENPOT_PUBLIC_URI=http://penpot-frontend + + ## Redis is used for the websockets notifications. + - PENPOT_REDIS_URI=redis://penpot-redis/0 + + penpot-postgres: + image: "postgres:15" + restart: always + stop_signal: SIGINT + + volumes: + - penpot_postgres_v15:/var/lib/postgresql/data + + networks: + - penpot + + environment: + - POSTGRES_INITDB_ARGS=--data-checksums + - POSTGRES_DB=penpot + - POSTGRES_USER=penpot + - POSTGRES_PASSWORD=penpot + + penpot-redis: + image: redis:7 + restart: always + networks: + - penpot + + ## A mailcatch service, used as temporal SMTP server. You can access via HTTP to the + ## port 1080 for read all emails the penpot platform has sent. Should be only used as a + ## temporal solution meanwhile you don't have a real SMTP provider configured. + + penpot-mailcatch: + image: sj26/mailcatcher:latest + restart: always + expose: + - '1025' + ports: + - "1080:1080" + networks: + - penpot + + ## Example configuration of MiniIO (S3 compatible object storage service); If you don't + ## have preference, then just use filesystem, this is here just for the completeness. + + # minio: + # image: "minio/minio:latest" + # command: minio server /mnt/data --console-address ":9001" + # restart: always + # + # volumes: + # - "penpot_minio:/mnt/data" + # + # environment: + # - MINIO_ROOT_USER=minioadmin + # - MINIO_ROOT_PASSWORD=minioadmin + # + # ports: + # - 9000:9000 + # - 9001:9001 + + diff --git a/php/_install-7.4.sh b/php/_install-7.4.sh deleted file mode 100755 index f85c53e..0000000 --- a/php/_install-7.4.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/zsh - -sudo apt install -y \ - software-properties-common \ - aptitude - -sudo aptitude update -sudo aptitude -y install \ - php7.4 \ - composer - -php -v - -sudo aptitude install -y \ - libapache2-mod-php7.4 \ - libapache2-mod-fcgid \ - php7.4-apcu \ - php7.4-bcmath \ - php7.4-cli \ - php7.4-common \ - php7.4-curl \ - php7.4-gd \ - php7.4-imap \ - php7.4-intl \ - php7.4-json \ - php7.4-ldap \ - php7.4-mbstring \ - php7.4-mysql \ - php7.4-mysqli \ - php7.4-opcache \ - php7.4-readline \ - php7.4-soap \ - php7.4-xml \ - php7.4-zip - -php -m - -sudo a2enmod php7.4 -sudo a2enmod rewrite -sudo a2enmod ssl -sudo a2enmod proxy -sudo a2enmod proxy_http -sudo a2enmod headers - -sudo systemctl restart apache2 - -sudo usermod -a -G www-data $USER -sudo chown -R $USER:www-data /var/www/ -sudo chown -R www-data:www-data /var/lib/php/ - - - -sudo ln -s \ - '/Cfg/php/php7.ini' \ - '/etc/php/7.4/apache2/php.ini' --force diff --git a/php/_install-default.sh b/php/_install-8.x.sh old mode 100644 new mode 100755 similarity index 81% rename from php/_install-default.sh rename to php/_install-8.x.sh index a084ed0..78f8e51 --- a/php/_install-default.sh +++ b/php/_install-8.x.sh @@ -1,11 +1,17 @@ -#!/usr/bin/zsh +#!/bin/sh sudo apt install -y \ software-properties-common \ aptitude -sudo aptitude update -sudo aptitude -y install \ + +sudo add-apt-repository -y \ + ppa:ondrej/php + +sudo apt update -y +sudo apt install -y \ + php8 \ + apache2 \ php \ composer @@ -28,6 +34,7 @@ sudo aptitude install -y \ php-mysql \ php-mysqli \ php-opcache \ + php-pgsql \ php-readline \ php-soap \ php-xml \ @@ -35,7 +42,7 @@ sudo aptitude install -y \ php -m -sudo a2enmod php +sudo a2enmod php8.1 sudo a2enmod rewrite sudo a2enmod ssl sudo a2enmod proxy diff --git a/php/_install-8.sh b/php/_install-latest.sh similarity index 75% rename from php/_install-8.sh rename to php/_install-latest.sh index e6bf972..f4d3c25 100755 --- a/php/_install-8.sh +++ b/php/_install-latest.sh @@ -1,4 +1,4 @@ -#!/usr/bin/zsh +#!/bin/sh sudo apt install -y \ software-properties-common \ @@ -7,12 +7,13 @@ sudo apt install -y \ sudo aptitude update sudo aptitude -y install \ apache2 \ - php + php \ + composer php -v sudo aptitude install -y \ - libapache2-mod-php \ + libapache2-mod-php \ libapache2-mod-fcgid \ php-apcu \ php-bcmath \ @@ -50,6 +51,12 @@ sudo chown -R $USER:www-data /var/www/ sudo chown -R www-data:www-data /var/lib/php/ -sudo ln -s \ - '/Cfg/php/php8.ini' \ - '/etc/php/8.1/apache2/php.ini' --force +## 7.x +# sudo ln -s \ +# '/Cfg/php/php7.ini' \ +# '/etc/php/7.4/apache2/php.ini' --force + +## 8.x +# sudo ln -s \ +# '/Cfg/php/php8.ini' \ +# '/etc/php/8.1/apache2/php.ini' --force diff --git a/php/phpMyAdmin.sh b/php/phpMyAdmin-7.4.sh similarity index 100% rename from php/phpMyAdmin.sh rename to php/phpMyAdmin-7.4.sh diff --git a/poste-io/@reboot.sh b/poste-io/@reboot.sh deleted file mode 100755 index 5a0ebfb..0000000 --- a/poste-io/@reboot.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/zsh - -# clear port 25 for landing -# lsof -i :25 -pkill sendmail - -# stop and remove old container -docker stop mailserver -docker rm `docker ps -a -q` -docker container rm -f `docker ps -a -q` -docker container prune -# update container -docker pull analogic/poste.io - -# start -docker run \ - --detach \ - --restart always \ - --name 'mailserver' \ - --hostname 'mx.dym.sh' \ - --publish 25:25 \ - --publish 143:143 \ - --publish 587:587 \ - --publish 993:993 \ - --publish 4190:4190 \ - --publish 12080:80 \ - --publish 12443:443 \ - --volume /etc/localtime:/etc/localtime:ro \ - --volume /var/mail/data:/data \ - --tty analogic/poste.io diff --git a/poste-io/_install.sh b/poste-io/_install.sh deleted file mode 100755 index a44dceb..0000000 --- a/poste-io/_install.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/zsh - -# start poste-io now to configure and such -`pwd`/@reboot.sh - -# admin settings -firefox https://mail..:12443/admin/install/server - - -# start poste-io on reboot -mkdir -p '/home/scripts/' -cp `pwd`/@reboot.sh '/home/scripts/mailserver.sh' - -echo "`crontab -l` -@reboot /home/scripts/mailserver.sh" \ - | crontab - diff --git a/_installs/postgres.sh b/postgres/_install.sh similarity index 83% rename from _installs/postgres.sh rename to postgres/_install.sh index b207784..fa62b20 100755 --- a/_installs/postgres.sh +++ b/postgres/_install.sh @@ -27,14 +27,14 @@ curl -sS 'https://www.postgresql.org/media/keys/ACCC4CF8.asc' \ apt update -y apt install -y \ - postgresql-14 - -psql --version + postgresql sudo systemctl start \ - postgresql-14 postgresql-client-14 + postgresql postgresql-client -sudo nano /etc/postgresql/14/main/pg_hba.conf +VER=`psql --version | grep -Eo ' [0-9]+\.[0-9]+ ' | grep -Eo ' [0-9]+' | xargs` + +sudo nano /etc/postgresql/$VER/main/pg_hba.conf # `local all all trust` sudo systemctl restart postgresql.service diff --git a/postgres/pg_hba.conf b/postgres/pg_hba.conf new file mode 100644 index 0000000..cd83a66 --- /dev/null +++ b/postgres/pg_hba.conf @@ -0,0 +1,5 @@ +# type db DBuser auth-method +local all all trust +# type db DBuser origin-address auth-method +host all all 127.0.0.1/32 trust +host all all ::1/128 trust diff --git a/python/pip.conf b/python/pip.conf new file mode 100644 index 0000000..2614ea7 --- /dev/null +++ b/python/pip.conf @@ -0,0 +1,3 @@ +[global] +break-system-packages = true + diff --git a/python/python-3.11.sh b/python/python-3.11.sh deleted file mode 100755 index 795a689..0000000 --- a/python/python-3.11.sh +++ /dev/null @@ -1,21 +0,0 @@ -sudo apt update -y -sudo apt upgrade -y -sudo apt install -y \ - software-properties-common - -sudo add-apt-repository -y \ - ppa:deadsnakes/ppa - -sudo apt update -y -sudo apt install -y \ - python3.11 \ - python3.11-full - -sudo ln -s `which python3.11` \ - /usr/bin/python3 \ - --force - -curl -sS https://bootstrap.pypa.io/get-pip.py | sudo python3.11 - -python --version -pip --version diff --git a/python/python-3.12.sh b/python/python-3.12.sh new file mode 100755 index 0000000..5ba9549 --- /dev/null +++ b/python/python-3.12.sh @@ -0,0 +1,35 @@ +sudo apt-get update -y +sudo apt-get upgrade -y +sudo apt-get install -y \ + software-properties-common + +sudo add-apt-repository -y \ + ppa:deadsnakes/ppa + +sudo apt-get update -y +sudo apt-get install -y \ + python3.11 \ + python3.11-full + +sudo ln -s `which python3.11` \ + /usr/bin/python3 \ + --force + +curl -sS https://bootstrap.pypa.io/get-pip.py | sudo python3.11 + +python --version +pip --version + + +# OR + + +wget https://www.python.org/ftp/python/3.12.1/Python-3.12.1.tgz +tar -xzvf Python-3.12.1.tgz +cd Python-3.12.1/ +./configure --enable-optimizations +make -j `nproc` +make altinstall +python3.12 -V +ln -s /usr/local/bin/python3.12 /usr/local/bin/python + diff --git a/readme.md b/readme.md new file mode 100644 index 0000000..1182ee5 --- /dev/null +++ b/readme.md @@ -0,0 +1,5 @@ +# desktop-ubuntu + +> system settings, config files, and scripts + +implied use of LinuxMint 20 (based on Ubuntu 20.04 Focal) \ No newline at end of file diff --git a/sublime-merge/_install.sh b/sublime-merge/_install.sh index 5a57001..9cf9339 100755 --- a/sublime-merge/_install.sh +++ b/sublime-merge/_install.sh @@ -32,10 +32,7 @@ ln -s '/opt/sublime_merge/sublime_merge' "$BIN/sublime_merge" # link configs mkdir -p ~/.config/sublime-merge/Packages/ -mv ~/.config/sublime-merge/Packages/User \ - ~/.config/sublime-merge/Packages/User_bak - cd /Cfg/sublime-merge/ -ln -s `pwd` \ - ~/.config/sublime-merge/Packages/User +ln -s `pwd`/* \ + ~/.config/sublime-merge/Packages/User/ diff --git a/sublime-text/Formatter.quick-options b/sublime-text/Formatter.quick-options new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/sublime-text/Formatter.quick-options @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/sublime-text/JsPrettier.sublime-settings b/sublime-text/JsPrettier.sublime-settings new file mode 100644 index 0000000..db5b2fe --- /dev/null +++ b/sublime-text/JsPrettier.sublime-settings @@ -0,0 +1,3 @@ +{ "node_path" : "/run/current-system/sw/bin/node" +, "prettier_cli_path" : "/home/dym/.npm-packages/bin/prettier" +} \ No newline at end of file diff --git a/sublime-text/Package Control.sublime-settings b/sublime-text/Package Control.sublime-settings index 4c73481..68bb341 100644 --- a/sublime-text/Package Control.sublime-settings +++ b/sublime-text/Package Control.sublime-settings @@ -7,16 +7,19 @@ [ "Advanced CSV", "Column Select", + "Column Sort", "Dartlight", + "Dictionary", "Emoji", - "FlutterEnhancements", + "Formatter", "HTML-CSS-JS Prettify", "InsertDate", + "KDL", "Kotlin", "Package Control", "Pretty JSON", "Svelte", "TOML", - "TypeScript", + "ZSH", ], } diff --git a/sublime-text/Preferences.sublime-settings b/sublime-text/Preferences.sublime-settings index f62278f..b6d5a9f 100644 --- a/sublime-text/Preferences.sublime-settings +++ b/sublime-text/Preferences.sublime-settings @@ -1,35 +1,33 @@ -{ "added_words" : [ "Frontend"], - "animation_enabled" : false, - "atomic_save" : false, - "auto_close_tags" : false, - "auto_complete_commit_on_tab" : false, - "auto_complete_cycle" : true, - "auto_indent" : true, - "auto_match_enabled" : false, - "caret_style" : "solid", - "color_scheme" : "Packages/Color Scheme - Default/Monokai.sublime-color-scheme", - "copy_with_empty_selection" : false, - "dart_sdk_path" : "/usr/local/flutter/bin/", - "default_line_ending" : "unix", - "dictionary" : "Packages/Language - English/en_US.dic", - "drag_text" : false, - "font_face" : "Ubuntu Mono", - "font_size" : 13, - "ignored_packages" : [ "Vintage", -], - "line_padding_bottom" : 3, - "line_padding_top" : 3, - "native_tabs" : "disabled", - "open_files_in_new_window" : false, - "save_on_focus_lost" : true, - "shift_tab_unindent" : true, - "show_encoding" : true, - "tab_size" : 2, - "theme" : "Adaptive.sublime-theme", - "translate_tabs_to_spaces" : false, - "trim_automatic_white_space" : true, - "trim_trailing_white_space_on_save" : true, - "ui_scale" : 1, - "word_wrap" : true, - "update_check": false, +{ "animation_enabled": false, + "atomic_save": false, + "auto_close_tags": false, + "auto_complete_commit_on_tab": false, + "auto_complete_cycle": true, + "auto_indent": true, + "auto_match_enabled": false, + "caret_style": "solid", + "color_scheme": "Monokai.sublime-color-scheme", + "copy_with_empty_selection": false, + "default_line_ending": "unix", + "dictionary": "Packages/Language - English/en_US.dic", + "drag_text": false, + "font_size": 10, + "line_padding_bottom": 3, + "line_padding_top": 3, + "native_tabs": "disabled", + "open_files_in_new_window": false, + "save_on_focus_lost": true, + "shift_tab_unindent": true, + "show_encoding": true, + "tab_size": 2, + "theme": "Adaptive.sublime-theme", + "translate_tabs_to_spaces": false, + "trim_automatic_white_space": true, + "trim_trailing_white_space_on_save": true, + "ui_scale": 1, + "word_wrap": true, + "update_check": false, + "ignored_packages": ["Vintage", + ], + "index_files": false, } diff --git a/sublime-text/_install.sh b/sublime-text/_install.sh index 0dbba5e..060b39e 100755 --- a/sublime-text/_install.sh +++ b/sublime-text/_install.sh @@ -24,12 +24,8 @@ ln -s '/opt/sublime_text/sublime_text' "$BIN/s" # link configs -mkdir -p ~/.config/sublime-text/Packages/ - -mv ~/.config/sublime-text/Packages/User \ - ~/.config/sublime-text/Packages/User_bak - +mkdir -p ~/.config/sublime-text/Packages/User/ cd /Cfg/sublime-text/ - -ln -s `pwd` \ - ~/.config/sublime-text/Packages/User +ln -s `pwd`/[a-zA-Z0-9]* \ + ~/.config/sublime-text/Packages/User/ \ + --force diff --git a/sublime-text/delete_subword.sublime-macro b/sublime-text/delete_subword.sublime-macro new file mode 100644 index 0000000..62a608a --- /dev/null +++ b/sublime-text/delete_subword.sublime-macro @@ -0,0 +1,15 @@ +[ + { + "command": "move", + "args": + { + "by": "subwords", + "extend": true, + "forward": false + } + }, + { + "args": {}, + "command": "left_delete" + } +] diff --git a/sublime-text/delete_subword.sublime-macro.json b/sublime-text/delete_subword.sublime-macro.json new file mode 100644 index 0000000..62a608a --- /dev/null +++ b/sublime-text/delete_subword.sublime-macro.json @@ -0,0 +1,15 @@ +[ + { + "command": "move", + "args": + { + "by": "subwords", + "extend": true, + "forward": false + } + }, + { + "args": {}, + "command": "left_delete" + } +] diff --git a/sublime-text/delete_subword_forward.sublime-macro b/sublime-text/delete_subword_forward.sublime-macro new file mode 100644 index 0000000..7952a42 --- /dev/null +++ b/sublime-text/delete_subword_forward.sublime-macro @@ -0,0 +1,15 @@ +[ + { + "command": "move", + "args": + { + "by": "subwords", + "extend": true, + "forward": true + } + }, + { + "args": {}, + "command": "right_delete" + } +] \ No newline at end of file diff --git a/firefox/ublock--custom-filters.txt b/vivaldi/noads.css similarity index 82% rename from firefox/ublock--custom-filters.txt rename to vivaldi/noads.css index cc49c92..0890dd4 100644 --- a/firefox/ublock--custom-filters.txt +++ b/vivaldi/noads.css @@ -1,17 +1,12 @@ +/* ##.fancybox-spaceball ##[class^='onetrust-'] ##[class^=fbc-badge] ||styles.redditmedia.com/t5_2t0no/styles/bannerBackgroundImage_ediz3eckp6441.png?width=4000&s=6f85eab69bef7aa5e1a15ee46d8215734eb0d092$image apps.apple.com###ember243 imdb.com##[data-testid="media-viewer__touch-handler"] -instagram.com##._4bSq7 -instagram.com##._9AhH0 -instagram.com##.GZkEI.ccgHY.NP414 tiktok.com www.imdb.com##[data-testid="media-viewer__touch-handler"] -www.instagram.com##._4bSq7 -www.instagram.com##._9AhH0 -www.instagram.com##.GZkEI.ccgHY.NP414 www.reddit.com##._1o0rv7Kcd4-rywKyuwuS4d._3dZnYgFFpifT-M_Vs2FAq6 www.reddit.com##._24UNt1hkbrZxLzs5vkvuDh www.reddit.com##.icon-campaign.icon._1jAt0x8BSB9mgoXbsDuKJ6 @@ -21,3 +16,10 @@ www.reddit.com##button._2KotRmn9DgdA58Ikji2mnV:nth-of-type(2) www.reddit.com##h3._18Q1kN_hFY6M09dHaoehBF www.tiktok.com youtube.com##.ytp-ce-element +*/ + +._4bSq7 +, ._9AhH0 +, .GZkEI.ccgHY.NP414 +{ display: none !important +} \ No newline at end of file diff --git a/vscode/_install.sh b/vscode/_install.sh deleted file mode 100755 index a0fcf94..0000000 --- a/vscode/_install.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/zsh - -cd /Cfg/vscode/ - -mkdir -p ~/.config/Code/User/ - -ln -s `pwd`/*.json \ - ~/.config/Code/User/ --force diff --git a/vscode/keybindings.json b/vscode/keybindings.json deleted file mode 100644 index 2dd9901..0000000 --- a/vscode/keybindings.json +++ /dev/null @@ -1,50 +0,0 @@ -[ - { - "key": "ctrl+tab", - "command": "workbench.action.nextEditor" - }, - { - "key": "ctrl+shift+tab", - "command": "workbench.action.previousEditor" - }, - { - "key": "ctrl+cmd+=", - "command": "wwm.aligncode", - "when": "editorTextFocus && !editorReadonly" - }, - { - "key": "ctrl+meta+w", - "command": "-workbench.action.toggleTabsVisibility" - }, - { - "key": "meta+c", - "command": "editor.action.clipboardCopyAction" - }, - { - "key": "meta+v", - "command": "editor.action.clipboardPasteAction" - }, - { - "key": "ctrl+q", - "command": "-workbench.action.quit" - }, - { - "key": "meta+down", - "command": "editor.action.moveLinesDownAction", - "when": "editorTextFocus && !editorReadonly" - }, - { - "key": "meta+up", - "command": "editor.action.moveLinesUpAction", - "when": "editorTextFocus && !editorReadonly" - }, - { - "key": "meta+r", - "command": "toggleFindRegex", - "when": "editorFocus" - }, - { - "key": "meta+z", - "command": "editor.action.toggleWordWrap" - }, -] \ No newline at end of file diff --git a/vscode/settings.json b/vscode/settings.json deleted file mode 100644 index 079dd49..0000000 --- a/vscode/settings.json +++ /dev/null @@ -1,128 +0,0 @@ -{ - "[css]": { - "editor.defaultFormatter": "vscode.css-language-features" - }, - "[html]": { - "editor.defaultFormatter": "vscode.html-language-features" - }, - "[javascript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[jsonc]": { - "editor.defaultFormatter": "vscode.json-language-features" - }, - "[markdown]": { - "editor.quickSuggestions": { - "comments": "off", - "other": "off", - "strings": "off" - }, - "editor.unicodeHighlight.ambiguousCharacters": false, - "editor.unicodeHighlight.invisibleCharacters": false, - "editor.wordWrap": "on" - }, - "[php]": { - "editor.defaultFormatter": "bmewburn.vscode-intelephense-client" - }, - "[svelte]": { - "editor.defaultFormatter": "svelte.svelte-vscode" - }, - "alignment.surroundSpace": { - "arrow": [ - 1, - 1 - ], - "assignment": [ - 1, - 1 - ], - "colon": [ - 1, - 1 - ], - "comment": 2 - }, - "cSpell.language": "en,de-de", - "cSpell.languageSettings": [], - "cSpell.userWords": [ - "DSGVO", - "expowand", - "firstname", - "gdpr", - "immo", - "leadvalue", - "selfdisclosure", - "Selfdisclosure", - "termin", - "wiget", - "wigets" - ], - "css.format.enable": true, - "editor.acceptSuggestionOnEnter": "on", - "editor.autoClosingBrackets": "never", - "editor.autoClosingDelete": "never", - "editor.autoClosingOvertype": "never", - "editor.autoClosingQuotes": "never", - "editor.autoIndent": "keep", - "editor.autoSurround": "never", - "editor.bracketPairColorization.enabled": true, - "editor.cursorBlinking": "solid", - "editor.dragAndDrop": false, - "editor.emptySelectionClipboard": false, - "editor.fontFamily": "DejaVu Sans Mono", - "editor.fontSize": 18, - "editor.formatOnPaste": false, - "editor.formatOnSave": false, - "editor.insertSpaces": false, - "editor.lineHeight": 1.55, - "editor.multiCursorModifier": "ctrlCmd", - "editor.renderFinalNewline": "on", - "editor.snippetSuggestions": "top", - "editor.tabSize": 4, - "editor.trimAutoWhitespace": true, - "editor.wordWrap": "on", - "explorer.confirmDelete": false, - "explorer.confirmDragAndDrop": false, - "extensions.ignoreRecommendations": true, - "files.autoSave": "onFocusChange", - "files.trimTrailingWhitespace": true, - "git.enableSmartCommit": true, - "javascript.preferences.quoteStyle": "single", - "php.suggest.basic": false, - "php.validate.enable": true, - "php.validate.executablePath": "/usr/bin/php", - "redhat.telemetry.enabled": false, - "security.workspace.trust.banner": "never", - "security.workspace.trust.emptyWindow": false, - "security.workspace.trust.enabled": false, - "security.workspace.trust.startupPrompt": "never", - "security.workspace.trust.untrustedFiles": "open", - "svelte.enable-ts-plugin": true, - "typescript.preferences.quoteStyle": "single", - "update.mode": "none", - "update.showReleaseNotes": false, - "window.customMenuBarAltFocus": false, - "window.enableMenuBarMnemonics": false, - "window.openFilesInNewWindow": "off", - "window.titleBarStyle": "custom", - "workbench.colorCustomizations": { - "[Monokai]": { - "activityBar.background": "#222", - "editor.background": "#222", - "editor.lineHighlightBackground": "#222", - "sideBar.background": "#222" - } - }, - "workbench.colorTheme": "Monokai", - "workbench.editor.untitled.hint": "hidden", - "workbench.reduceMotion": "on", - "workbench.startupEditor": "none", - "[sql]": {}, - "[svg]": { - "editor.defaultFormatter": "redhat.vscode-xml" - }, - "git.openRepositoryInParentFolders": "never", - "files.associations": { - "*.tmpl": "html" - }, -} \ No newline at end of file diff --git a/vscode/vscode.sh b/vscode/vscode.sh deleted file mode 100755 index 8b64e6b..0000000 --- a/vscode/vscode.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/zsh - -sudo apt-get install -y \ - wget gpg -wget -qO- 'https://packages.microsoft.com/keys/microsoft.asc' \ - | gpg --dearmor > 'packages.microsoft.gpg' - -sudo install -o root -g root -m 644 \ - 'packages.microsoft.gpg' \ - '/etc/apt/trusted.gpg.d/' - -sudo sh -c \ - 'echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/trusted.gpg.d/packages.microsoft.gpg] \ - https://packages.microsoft.com/repos/code stable main" \ - > /etc/apt/sources.list.d/vscode.list' - -rm -f packages.microsoft.gpg - -sudo apt install -y \ - apt-transport-https -sudo apt update -y -sudo apt install -y \ - code # or code-insiders diff --git a/xnview/1080p.xbs b/xnviewmp/1080p.xbs similarity index 100% rename from xnview/1080p.xbs rename to xnviewmp/1080p.xbs diff --git a/xnview/2160p.xbs b/xnviewmp/2160p.xbs similarity index 100% rename from xnview/2160p.xbs rename to xnviewmp/2160p.xbs diff --git a/xnview/_install.sh b/xnviewmp/_install.sh similarity index 100% rename from xnview/_install.sh rename to xnviewmp/_install.sh diff --git a/xnview/auto-crop.xbs b/xnviewmp/auto-crop.xbs similarity index 100% rename from xnview/auto-crop.xbs rename to xnviewmp/auto-crop.xbs diff --git a/xnview/crop frames, 1080p.xbs b/xnviewmp/crop frames, 1080p.xbs similarity index 100% rename from xnview/crop frames, 1080p.xbs rename to xnviewmp/crop frames, 1080p.xbs diff --git a/xnview/crop to 4K, 1080p, webp.xbs b/xnviewmp/crop to 4K, 1080p, webp.xbs similarity index 100% rename from xnview/crop to 4K, 1080p, webp.xbs rename to xnviewmp/crop to 4K, 1080p, webp.xbs diff --git a/xnview/crop, 1080p, webp.xbs b/xnviewmp/crop, 1080p, webp.xbs similarity index 100% rename from xnview/crop, 1080p, webp.xbs rename to xnviewmp/crop, 1080p, webp.xbs diff --git a/xnview/flat (black bg).xbs b/xnviewmp/flat (black bg).xbs similarity index 100% rename from xnview/flat (black bg).xbs rename to xnviewmp/flat (black bg).xbs diff --git a/xnview/flat (white bg).xbs b/xnviewmp/flat (white bg).xbs similarity index 100% rename from xnview/flat (white bg).xbs rename to xnviewmp/flat (white bg).xbs diff --git a/xnview/insta story crop.xbs b/xnviewmp/insta story crop.xbs similarity index 100% rename from xnview/insta story crop.xbs rename to xnviewmp/insta story crop.xbs diff --git a/xnview/ipad store horizontal.xbs b/xnviewmp/ipad store horizontal.xbs similarity index 100% rename from xnview/ipad store horizontal.xbs rename to xnviewmp/ipad store horizontal.xbs diff --git a/xnview/ipad store vert.xbs b/xnviewmp/ipad store vert.xbs similarity index 100% rename from xnview/ipad store vert.xbs rename to xnviewmp/ipad store vert.xbs diff --git a/xnview/ipad store.xbs b/xnviewmp/ipad store.xbs similarity index 100% rename from xnview/ipad store.xbs rename to xnviewmp/ipad store.xbs diff --git a/xnview/webp, crop 60px vert.xbs b/xnviewmp/webp, crop 60px vert.xbs similarity index 100% rename from xnview/webp, crop 60px vert.xbs rename to xnviewmp/webp, crop 60px vert.xbs diff --git a/xnview/webp.xbs b/xnviewmp/webp.xbs similarity index 100% rename from xnview/webp.xbs rename to xnviewmp/webp.xbs diff --git a/xnview/webp100.xbs b/xnviewmp/webp100.xbs similarity index 100% rename from xnview/webp100.xbs rename to xnviewmp/webp100.xbs diff --git a/xnview/xnview.ini b/xnviewmp/xnview.ini similarity index 100% rename from xnview/xnview.ini rename to xnviewmp/xnview.ini