Skip to content

Commit

Permalink
Run prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
davidjharder committed Feb 2, 2024
1 parent 0c879da commit 657232a
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 57 deletions.
2 changes: 1 addition & 1 deletion devlog/2024-01-29-dont-call-me-mate.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Back in our [4.4 release post](https://getsol.us/2023/07/08/solus-4-4-released/)

## The problem

MATE and XFCE are similar enough that eager Solusians can, and have, installed XCFE on their MATE machines with nothing more than a couple of `eopkg` commands. We're pretty sure our resident `bash` script enthusiast (ermo) could hammer out a working transition script in an evening. But we want a more polished experience. We know *you* follow Solus news; after all, you're reading this. However, we assume there are users who dutifully update their systems, but have no interest in keeping up with our blog posts. How do we get their attention and prompt them to move away from MATE?
MATE and XFCE are similar enough that eager Solusians can, and have, installed XCFE on their MATE machines with nothing more than a couple of `eopkg` commands. We're pretty sure our resident `bash` script enthusiast (ermo) could hammer out a working transition script in an evening. But we want a more polished experience. We know _you_ follow Solus news; after all, you're reading this. However, we assume there are users who dutifully update their systems, but have no interest in keeping up with our blog posts. How do we get their attention and prompt them to move away from MATE?

## Introducing the Solus MATE Transition Tool

Expand Down
2 changes: 1 addition & 1 deletion docs/packaging/prepare-for-packaging.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ You should now have the following available from your shell:

| Function | Description | Usage |
| ----------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ |
| **cpesearch** | Search for CPE Names for packages. For use when writing the [`monitoring.yml`](/docs/packaging/monitoring.yml.md) file for a package | `cpesearch search-term` |
| **cpesearch** | Search for CPE Names for packages. For use when writing the [`monitoring.yml`](/docs/packaging/monitoring.yml.md) file for a package | `cpesearch search-term` |
| **goroot** | When in the solus monorepo, change directory to the root directory of the git repository. | `goroot` |
| **gotopkg** | Change directory to any solus package. You can type part of the package name then double press `Tab` to get autocompletion for this function. | `gotopkg firefox` |
| **gotosoluspkgs** | Change directory to the solus monorepo from anywhere on the filesystem. | `gotosoluspkgs` |
Expand Down
16 changes: 8 additions & 8 deletions docs/user/software/configuration_files.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ Different software expects user configuration files in different places. Many so

Some common configuration files:

| Software | Configuration files |
| -------------------------------------------------- | ------------------------------------------------------- |
| apcupsd | `/etc/changeme` |
| cups | `/etc/cups/` |
| [samba](/docs/user/software/networking/samba) | `/etc/samba/smb.conf`<br />`/usr/share/defaults/samba/` |
| pam | `/etc/pam.d/`<br />`/usr/share/defaults/etc/pam.d/` |
| ssh | `$HOME/.ssh/`<br />`/usr/share/defaults/etc/ssh/` |
| ssl | `/etc/ssl/`<br />`/usr/share/defaults/etc/ssl/` |
| Software | Configuration files |
| --------------------------------------------------- | ------------------------------------------------------- |
| apcupsd | `/etc/changeme` |
| cups | `/etc/cups/` |
| [samba](/docs/user/software/networking/samba) | `/etc/samba/smb.conf`<br />`/usr/share/defaults/samba/` |
| pam | `/etc/pam.d/`<br />`/usr/share/defaults/etc/pam.d/` |
| ssh | `$HOME/.ssh/`<br />`/usr/share/defaults/etc/ssh/` |
| ssl | `/etc/ssl/`<br />`/usr/share/defaults/etc/ssl/` |
| [tigervnc](/docs/user/software/networking/tigervnc) | `$HOME/.vnc/xstartup` |
| [xrdp](/docs/user/software/networking/xrdp) | `/etc/X11/Xwrapper.config` |
113 changes: 66 additions & 47 deletions docs/user/troubleshooting/plasma.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ This contains fixes for various issues you might encounter with the Plasma deskt
This is often caused by a Firefox bug. It can be triggered by various things, like moving Firefox windows.

**Symptoms:**

- Can't click on anything on the desktop.
- Bringing up windows with keyboard shortcuts (ex: Super for the app menu, F9 for a drop down terminal) works, but they don't get focused. You can't interact with them.
- Mouse cursor is stuck in move mode, it looks like a cross.
Expand All @@ -20,16 +21,20 @@ You may not need to reboot to recover from this state. Killing all firefox proce

1. Open a virtual terminal by pressing `Ctrl+Alt+F3`.
1. Run the following to kill all firefox windows:
```bash
killall firefox
```
This should close all Firefox windows.

```bash
killall firefox
```

This should close all Firefox windows.

1. Return to the Plasma session by pressing `Ctrl+Alt+F2`.
You should now be able to use Plasma normally.
You should now be able to use Plasma normally.

## Application windows look corrupt / incomplete

**Symptoms**

- Application windows look corrupt. For example, NeoChat does not display room or user icons.
- Menus in an application are blank.

Expand All @@ -42,55 +47,69 @@ You should not be logged into your Plasma session while deleting the cache files
:::

1. While still logged into your Plasma session, go to your home directory:
```bash
cd
```

```bash
cd
```

1. Run these commands to back up the following directories:
```bash
cp -av ~/.kde{,.bak}
cp -av ~/.config{,.bak}
cp -av ~/.local{,.bak}
cp -av ~/share{,.bak}
```
The commands create a copy of the folders. Each copy has the `.bak` extension (Example: `~/.config.bak`). These can be used to recover configuration files, if necessary.

```bash
cp -av ~/.kde{,.bak}
cp -av ~/.config{,.bak}
cp -av ~/.local{,.bak}
cp -av ~/share{,.bak}
```

The commands create a copy of the folders. Each copy has the `.bak` extension (Example: `~/.config.bak`). These can be used to recover configuration files, if necessary.

1. Shut down the system.
1. Boot from a live USB, which you can create from one of the [Solus installers](https://getsol.us/download/).
1. [Mount your hard drive's file system](./boot-rescue.md#mounting-your-system).
1. Change to your user's directory where you mounted your file system. For example, if you used `/mount`:
```bash
cd /mount/home/username
```
Replace "username" with the username you use for Solus.
You can make sure the directory is correct by listing the files:
```bash
ls -laH
```
You should see the files you would usually see in your home directory when logged into Solus normally.

```bash
cd /mount/home/username
```

Replace "username" with the username you use for Solus.
You can make sure the directory is correct by listing the files:

```bash
ls -laH
```

You should see the files you would usually see in your home directory when logged into Solus normally.

1. Remove the various caches that Plasma uses.
Execute the following commands:
```bash
rm -rf .kde
rm -rf .cache/plasmashell*
rm -rf .cache/org.kde.dirmodel-qml.kcache
rm -rf .cache/kioexec/ .cache/krunner/ .cache/ksycoca5*
rm -rf .cache/krunnerbookmarkrunnerfirefoxdbfile.sqlite

cd ../.local/
rm -rf kate/ kded5/ klipper/ knewstuff3/ kscreen/ konsole/ kwalletd/ ksysguard/ kmail2/ kcookiejar/ kactivitymanagerd/

cd ../share/
rm -rf dolphin kate kcookiejar kded5 keyrings klipper kmail2 knewstuff3 konsole kscreen ksysguard kwalletd kxmlgui5 plasma_engine_comic plasma plasma_notes org.kde.gwenview

cd ../.config/
rm -f plasma*
rm -rf kde* akonadi* KDE kconf_updaterc baloo* dolphinrc drkonqirc gwenviewrc kmail2rc k*rc katemetainfos
```
Execute the following commands:

```bash
rm -rf .kde
rm -rf .cache/plasmashell*
rm -rf .cache/org.kde.dirmodel-qml.kcache
rm -rf .cache/kioexec/ .cache/krunner/ .cache/ksycoca5*
rm -rf .cache/krunnerbookmarkrunnerfirefoxdbfile.sqlite

cd ../.local/
rm -rf kate/ kded5/ klipper/ knewstuff3/ kscreen/ konsole/ kwalletd/ ksysguard/ kmail2/ kcookiejar/ kactivitymanagerd/

cd ../share/
rm -rf dolphin kate kcookiejar kded5 keyrings klipper kmail2 knewstuff3 konsole kscreen ksysguard kwalletd kxmlgui5 plasma_engine_comic plasma plasma_notes org.kde.gwenview

cd ../.config/
rm -f plasma*
rm -rf kde* akonadi* KDE kconf_updaterc baloo* dolphinrc drkonqirc gwenviewrc kmail2rc k*rc katemetainfos
```

1. Shut down the live environment and remove the live USB drive.
1. Reboot back into your regular Plasma session. Verify the issue is fixed.
1. If you experience system instability, restore the previously backed up folders.

To restore an entire directory:
```
cp -rav .kde.bak/share/config/ .kde/share/config
```
After restoring the files or directories, restart your system.
To restore an entire directory:

```
cp -rav .kde.bak/share/config/ .kde/share/config
```

After restoring the files or directories, restart your system.

0 comments on commit 657232a

Please sign in to comment.