X1 Carbon Gen 7 Sway Desktop
This commit is contained in:
parent
588cc3455d
commit
74d1b0827e
22 changed files with 677 additions and 272 deletions
22
README.md
22
README.md
|
|
@ -1,27 +1,9 @@
|
||||||
Martin Pitt's desktop
|
Vladan's X1 Carbon Gen 7 Sway Desktop config
|
||||||
=====================
|
============================================
|
||||||
|
|
||||||
This is an [rpm-ostree](https://coreos.github.io/rpm-ostree/) based minimal
|
This is an [rpm-ostree](https://coreos.github.io/rpm-ostree/) based minimal
|
||||||
[Fedora](https://getfedora.org/) developer desktop with the [sway window manager](https://swaywm.org/) and [podman](https://podman.io/)/[toolbox](https://docs.fedoraproject.org/en-US/fedora-silverblue/toolbox/) for doing development and running less common graphical applications.
|
[Fedora](https://getfedora.org/) developer desktop with the [sway window manager](https://swaywm.org/) and [podman](https://podman.io/)/[toolbox](https://docs.fedoraproject.org/en-US/fedora-silverblue/toolbox/) for doing development and running less common graphical applications.
|
||||||
|
|
||||||
It gets [automatically built](.github/workflows/build.yml) every week and [published to my server](https://piware.de/ostree/pitti-workstation/).
|
|
||||||
|
|
||||||
To use it from an existing OSTree based system like [Fedora CoreOS](https://getfedora.org/coreos) or [Fedora Silverblue](https://docs.fedoraproject.org/en-US/fedora-silverblue/), add my server URL as new remote and rebase your tree to it:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
sudo ostree remote add --no-gpg-verify piware https://piware.de/ostree/pitti-workstation/
|
|
||||||
sudo rpm-ostree rebase piware:pitti-desktop
|
|
||||||
```
|
|
||||||
|
|
||||||
After that, you can install weekly updates with
|
|
||||||
|
|
||||||
```
|
|
||||||
sudo rpm-ostree upgrade
|
|
||||||
```
|
|
||||||
|
|
||||||
If anything goes wrong, you can go back to the previous version with `sudo rpm-ostree rollback`.
|
|
||||||
|
|
||||||
|
|
||||||
Original README for [workstation-ostree-config](https://pagure.io/workstation-ostree-config)
|
Original README for [workstation-ostree-config](https://pagure.io/workstation-ostree-config)
|
||||||
=============================================
|
=============================================
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,4 +9,4 @@ if [ ! -d $REPO/objects ]; then
|
||||||
ostree --repo=$REPO init --mode=archive-z2
|
ostree --repo=$REPO init --mode=archive-z2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rpm-ostree compose tree --unified-core --cachedir=$CACHE --repo=$REPO pitti-desktop.yaml
|
rpm-ostree compose tree --unified-core --cachedir=$CACHE --repo=$REPO x1-gen7-sway-desktop.yaml
|
||||||
|
|
|
||||||
78
config/i3status-rust/config.toml
Normal file
78
config/i3status-rust/config.toml
Normal file
|
|
@ -0,0 +1,78 @@
|
||||||
|
# when using 3istsatus-rs with swaybar
|
||||||
|
# https://github.com/greshake/i3status-rust
|
||||||
|
#
|
||||||
|
|
||||||
|
theme = "solarized-dark"
|
||||||
|
icons = "awesome5"
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "temperature"
|
||||||
|
collapsed = false
|
||||||
|
interval = 10
|
||||||
|
format = "gpu {max}°"
|
||||||
|
chip = "amdgpu-pci-*"
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "temperature"
|
||||||
|
collapsed = false
|
||||||
|
interval = 10
|
||||||
|
format = "cpu {max}°"
|
||||||
|
chip = "k10temp-pci-*"
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "temperature"
|
||||||
|
collapsed = true
|
||||||
|
interval = 10
|
||||||
|
format = "nvme: {max}°"
|
||||||
|
chip = "nvme-pci-*"
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "temperature"
|
||||||
|
collapsed = true
|
||||||
|
interval = 10
|
||||||
|
format = "wifi: {max}°"
|
||||||
|
chip = "iwlwifi_1-*"
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "net"
|
||||||
|
device = "wlan0"
|
||||||
|
format = "{ssid} {signal_strength} {ip} {speed_down} {graph_down}"
|
||||||
|
interval = 5
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "disk_space"
|
||||||
|
path = "/"
|
||||||
|
alias = "/"
|
||||||
|
info_type = "available"
|
||||||
|
unit = "GB"
|
||||||
|
interval = 20
|
||||||
|
warning = 20.0
|
||||||
|
alert = 10.0
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "memory"
|
||||||
|
display_type = "memory"
|
||||||
|
format_mem = "{Mup}%"
|
||||||
|
format_swap = "{SUp}%"
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "cpu"
|
||||||
|
interval = 1
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "load"
|
||||||
|
interval = 1
|
||||||
|
format = "{1m}"
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "sound"
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "keyboard_layout"
|
||||||
|
driver = "sway"
|
||||||
|
sway_kb_identifier = "6127:24585:Lite-On_Technology_Corp._ThinkPad_USB_Keyboard_with_TrackPoint"
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "time"
|
||||||
|
interval = 60
|
||||||
|
format = "%a %d/%m %R"
|
||||||
1
config/modprobe.d/i2c_i801-blacklist.conf
Normal file
1
config/modprobe.d/i2c_i801-blacklist.conf
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
blacklist i2c_i801
|
||||||
4
config/modprobe.d/i915.conf
Normal file
4
config/modprobe.d/i915.conf
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
options i915 enable_fbc=1
|
||||||
|
options i915 enable_guc=2
|
||||||
|
options i915 nuclear_pageflip=Y
|
||||||
|
options i915 enable_dc=2
|
||||||
6
config/sway-service.desktop
Normal file
6
config/sway-service.desktop
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
# /usr/share/wayland-sessions/sway-service.desktop
|
||||||
|
[Desktop Entry]
|
||||||
|
Name=Sway Service
|
||||||
|
Comment=i3-compatible Wayland compositor as a systemd service
|
||||||
|
Exec=sway-service.sh
|
||||||
|
Type=Application
|
||||||
7
config/sway-service.sh
Executable file
7
config/sway-service.sh
Executable file
|
|
@ -0,0 +1,7 @@
|
||||||
|
#! /bin/sh
|
||||||
|
# /usr/local/bin/sway-service.sh - needs to be 0755
|
||||||
|
|
||||||
|
# first import environment variables from the login manager
|
||||||
|
systemctl --user import-environment
|
||||||
|
# then start the service
|
||||||
|
exec systemctl --wait --user start sway.service
|
||||||
8
config/swaylock/config
Normal file
8
config/swaylock/config
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
# ~/.config/swayidle/config
|
||||||
|
before-sleep 'systemctl --user start swaylock'
|
||||||
|
lock 'systemctl --user start swaylock'
|
||||||
|
unlock 'swaymsg "output * dpms on"'
|
||||||
|
after-resume 'swaymsg "output * dpms on"'
|
||||||
|
timeout 300 'systemctl --user start swaylock'
|
||||||
|
timeout 600 'swaymsg "output * dpms off"'
|
||||||
|
resume 'swaymsg "output * dpms on"'
|
||||||
10
config/systemd/firefox.service
Normal file
10
config/systemd/firefox.service
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
[Unit]
|
||||||
|
Description=Firefox nightly
|
||||||
|
PartOf=graphical-session.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=exec
|
||||||
|
ExecStart=/opt/firefox/firefox
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=graphical-session.target
|
||||||
15
config/systemd/mako.service
Normal file
15
config/systemd/mako.service
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
[Unit]
|
||||||
|
Description=Lightweight Wayland notification daemon
|
||||||
|
Documentation=man:mako(1)
|
||||||
|
PartOf=sway-session.target
|
||||||
|
After=sway-session.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=dbus
|
||||||
|
BusName=org.freedesktop.Notifications
|
||||||
|
ExecCondition=/bin/sh -c '[ -n "$WAYLAND_DISPLAY" ]'
|
||||||
|
ExecStart=/usr/bin/mako
|
||||||
|
ExecReload=/usr/bin/makoctl reload
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=sway-session.target
|
||||||
14
config/systemd/nm-applet.service
Normal file
14
config/systemd/nm-applet.service
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
[Unit]
|
||||||
|
Description=network monitor and control GUI applet
|
||||||
|
Documentation=man:nm-applet(1)
|
||||||
|
PartOf=wayland-session.target
|
||||||
|
After=wayland-session.target
|
||||||
|
|
||||||
|
# requires nm-applet compiled with -D appindicator=yes
|
||||||
|
[Service]
|
||||||
|
Type=dbus
|
||||||
|
BusName=org.freedesktop.network-manager-applet
|
||||||
|
ExecStart=/usr/bin/nm-applet --indicator
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=wayland-session.target
|
||||||
6
config/systemd/sway-session.target
Normal file
6
config/systemd/sway-session.target
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
[Unit]
|
||||||
|
Description=sway compositor session
|
||||||
|
Documentation=man:systemd.special(7)
|
||||||
|
BindsTo=graphical-session.target wayland-session.target
|
||||||
|
Wants=graphical-session-pre.target
|
||||||
|
After=graphical-session-pre.target
|
||||||
14
config/systemd/sway.service
Normal file
14
config/systemd/sway.service
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
[Unit]
|
||||||
|
Description=sway - i3-compatible Wayland compositor
|
||||||
|
Documentation=man:sway(5)
|
||||||
|
Before=graphical-session.service
|
||||||
|
Wants=graphical-session-pre.service
|
||||||
|
After=graphical-session-pre.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
EnvironmentFile=-%h/.config/sway/env
|
||||||
|
ExecStart=/usr/bin/sway
|
||||||
|
Restart=on-failure
|
||||||
|
RestartSec=1
|
||||||
|
TimeoutStopSec=10
|
||||||
13
config/systemd/swayidle.service
Normal file
13
config/systemd/swayidle.service
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
[Unit]
|
||||||
|
Description=Idle manager for Wayland
|
||||||
|
Documentation=man:swayidle(1)
|
||||||
|
Documentation=https://github.com/gdamjan/swayidle - fork with sd-notify and autolock
|
||||||
|
PartOf=graphical-session.target
|
||||||
|
After=sway-session.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=notify
|
||||||
|
ExecStart=/usr/bin/swayidle -w
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=sway-session.target
|
||||||
11
config/systemd/swaylock.service
Normal file
11
config/systemd/swaylock.service
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
[Unit]
|
||||||
|
Description=swaylock - Screen locker for Wayland
|
||||||
|
Documentation=man:swaylock(1)
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=forking
|
||||||
|
ExecStart=/usr/bin/swaylock -f
|
||||||
|
Restart=on-failure
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=sway-session.target
|
||||||
16
config/systemd/wayland-session.target
Normal file
16
config/systemd/wayland-session.target
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
# SPDX-License-Identifier: LGPL-2.1+
|
||||||
|
#
|
||||||
|
# This file is inspired from systemd's `graphical-session.target`
|
||||||
|
#
|
||||||
|
# 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.
|
||||||
|
|
||||||
|
[Unit]
|
||||||
|
Description=Current wayland user session
|
||||||
|
Documentation=man:systemd.special(7)
|
||||||
|
Requires=basic.target
|
||||||
|
RefuseManualStart=yes
|
||||||
|
StopWhenUnneeded=yes
|
||||||
|
BindsTo=graphical-session.target
|
||||||
95
config/waybar/config
Normal file
95
config/waybar/config
Normal file
|
|
@ -0,0 +1,95 @@
|
||||||
|
{
|
||||||
|
"layer": "top",
|
||||||
|
"position": "bottom",
|
||||||
|
"height": 24,
|
||||||
|
"modules-left": ["sway/workspaces", "idle_inhibitor", "sway/mode"],
|
||||||
|
"modules-center": ["sway/window"],
|
||||||
|
"modules-right": [ "pulseaudio", "backlight", "network", "cpu", "memory", "battery#bat0", "battery#bat1",
|
||||||
|
"tray", "sway/language", "clock" ],
|
||||||
|
"sway/workspaces": {
|
||||||
|
"disable-scroll": true,
|
||||||
|
"all-outputs": true,
|
||||||
|
"format": "{index} {name}"
|
||||||
|
},
|
||||||
|
"sway/mode": {
|
||||||
|
"format": "{}"
|
||||||
|
},
|
||||||
|
"sway/language": {
|
||||||
|
"format": "{}",
|
||||||
|
"max-length": 50
|
||||||
|
},
|
||||||
|
"tray": {
|
||||||
|
// "icon-size": 21,
|
||||||
|
"spacing": 10
|
||||||
|
},
|
||||||
|
"clock": {
|
||||||
|
"tooltip-format": "{:%A\n%d %B %Y\n%H:%M}",
|
||||||
|
"format": "{:%a %d %b %H:%M}",
|
||||||
|
"format-alt": "{:%H:%M}"
|
||||||
|
},
|
||||||
|
"cpu": {
|
||||||
|
"format": "{usage:2}% "
|
||||||
|
},
|
||||||
|
"memory": {
|
||||||
|
"format": "{}% "
|
||||||
|
},
|
||||||
|
"battery#bat0": {
|
||||||
|
"bat": "BAT0",
|
||||||
|
"name": "BAT0",
|
||||||
|
"states": {
|
||||||
|
"warning": 20,
|
||||||
|
"critical": 10
|
||||||
|
},
|
||||||
|
"format": "{capacity}% {icon}",
|
||||||
|
"format-icons": ["", "", "", "", ""]
|
||||||
|
},
|
||||||
|
"battery#bat1": {
|
||||||
|
"bat": "BAT1",
|
||||||
|
"name": "BAT1",
|
||||||
|
"states": {
|
||||||
|
"warning": 20,
|
||||||
|
"critical": 10
|
||||||
|
},
|
||||||
|
"format": "{capacity}% {icon}",
|
||||||
|
"format-icons": ["", "", "", "", ""]
|
||||||
|
},
|
||||||
|
"network": {
|
||||||
|
"interval": 1,
|
||||||
|
"max-width": 50,
|
||||||
|
// "interface": "wlp2s0", // (Optional) To force the use of this interface
|
||||||
|
"format-wifi": "",
|
||||||
|
"format-ethernet": "{bandwidthUpBits} {bandwidthDownBits} ",
|
||||||
|
"format-disconnected": "⚠",
|
||||||
|
"tooltip-format-wifi": " {essid}: {frequency}Mhz ({signalStrength}%)\n{bandwidthUpBits}\n{bandwidthDownBits}",
|
||||||
|
"tooltip-format-ethernet": " {ifname}: {ipaddr}/{cidr}",
|
||||||
|
"tooltip-format-disconnected": "⚠ Disconnected"
|
||||||
|
},
|
||||||
|
"pulseaudio": {
|
||||||
|
//"scroll-step": 1,
|
||||||
|
"format": "{volume}% {icon}",
|
||||||
|
"format-bluetooth": "{volume}% {icon}",
|
||||||
|
"format-muted": "",
|
||||||
|
"format-icons": {
|
||||||
|
"headphones": "",
|
||||||
|
"handsfree": "",
|
||||||
|
"headset": "",
|
||||||
|
"phone": "",
|
||||||
|
"portable": "",
|
||||||
|
"car": "",
|
||||||
|
"default": ["", ""]
|
||||||
|
},
|
||||||
|
"on-click": "pavucontrol"
|
||||||
|
},
|
||||||
|
"backlight": {
|
||||||
|
"device": "intel_backlight",
|
||||||
|
"format": "{percent}% {icon}",
|
||||||
|
"format-icons": ["", ""]
|
||||||
|
},
|
||||||
|
"idle_inhibitor": {
|
||||||
|
"format": "{icon}",
|
||||||
|
"format-icons": {
|
||||||
|
"activated": "",
|
||||||
|
"deactivated": ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
213
config/waybar/style.css
Normal file
213
config/waybar/style.css
Normal file
|
|
@ -0,0 +1,213 @@
|
||||||
|
* {
|
||||||
|
border: none;
|
||||||
|
border-radius: 0;
|
||||||
|
font-family: Roboto, Helvetica, Arial, sans-serif;
|
||||||
|
font-size: 13px;
|
||||||
|
min-height: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
window#waybar {
|
||||||
|
background-color: rgba(43, 48, 59, 0.5);
|
||||||
|
border-bottom: 3px solid rgba(100, 114, 125, 0.5);
|
||||||
|
color: #ffffff;
|
||||||
|
transition-property: background-color;
|
||||||
|
transition-duration: .5s;
|
||||||
|
}
|
||||||
|
|
||||||
|
window#waybar.hidden {
|
||||||
|
opacity: 0.2;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
window#waybar.empty {
|
||||||
|
background-color: transparent;
|
||||||
|
}
|
||||||
|
window#waybar.solo {
|
||||||
|
background-color: #FFFFFF;
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
window#waybar.termite {
|
||||||
|
background-color: #3F3F3F;
|
||||||
|
}
|
||||||
|
|
||||||
|
window#waybar.chromium {
|
||||||
|
background-color: #000000;
|
||||||
|
border: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button {
|
||||||
|
padding: 0 5px;
|
||||||
|
background-color: transparent;
|
||||||
|
color: #ffffff;
|
||||||
|
border-bottom: 3px solid transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
|
||||||
|
#workspaces button:hover {
|
||||||
|
background: rgba(0, 0, 0, 0.2);
|
||||||
|
box-shadow: inherit;
|
||||||
|
border-bottom: 3px solid #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button.focused {
|
||||||
|
background-color: #64727D;
|
||||||
|
border-bottom: 3px solid #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button.urgent {
|
||||||
|
background-color: #eb4d4b;
|
||||||
|
}
|
||||||
|
|
||||||
|
#mode {
|
||||||
|
background-color: #64727D;
|
||||||
|
border-bottom: 3px solid #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
#cpu,
|
||||||
|
#memory,
|
||||||
|
#temperature,
|
||||||
|
#backlight,
|
||||||
|
#network,
|
||||||
|
#pulseaudio,
|
||||||
|
#custom-media,
|
||||||
|
#tray,
|
||||||
|
#mode,
|
||||||
|
#idle_inhibitor {
|
||||||
|
padding: 0 10px;
|
||||||
|
margin: 0 4px;
|
||||||
|
color: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
#clock {
|
||||||
|
padding: 0 10px;
|
||||||
|
color: #ffffff;
|
||||||
|
background-color: #64727D;
|
||||||
|
}
|
||||||
|
|
||||||
|
#battery .BAT0 {
|
||||||
|
margin-left: 9px;
|
||||||
|
}
|
||||||
|
#battery .BAT1 {
|
||||||
|
margin-right: 9px;
|
||||||
|
}
|
||||||
|
#battery {
|
||||||
|
padding: 0 10px;
|
||||||
|
background-color: #ffffff;
|
||||||
|
color: #000000;
|
||||||
|
}
|
||||||
|
|
||||||
|
#battery.charging {
|
||||||
|
color: #ffffff;
|
||||||
|
background-color: #26A65B;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes blink {
|
||||||
|
to {
|
||||||
|
background-color: #ffffff;
|
||||||
|
color: #000000;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#battery.critical:not(.charging) {
|
||||||
|
background-color: #f53c3c;
|
||||||
|
color: #ffffff;
|
||||||
|
animation-name: blink;
|
||||||
|
animation-duration: 0.5s;
|
||||||
|
animation-timing-function: linear;
|
||||||
|
animation-iteration-count: infinite;
|
||||||
|
animation-direction: alternate;
|
||||||
|
}
|
||||||
|
|
||||||
|
label:focus {
|
||||||
|
background-color: #000000;
|
||||||
|
}
|
||||||
|
|
||||||
|
#cpu {
|
||||||
|
background-color: #2ecc71;
|
||||||
|
color: #000000;
|
||||||
|
}
|
||||||
|
|
||||||
|
#memory {
|
||||||
|
background-color: #9b59b6;
|
||||||
|
}
|
||||||
|
|
||||||
|
#backlight {
|
||||||
|
background-color: #90b1b1;
|
||||||
|
}
|
||||||
|
|
||||||
|
#network {
|
||||||
|
background-color: #2980b9;
|
||||||
|
}
|
||||||
|
|
||||||
|
#network.disconnected {
|
||||||
|
background-color: #f53c3c;
|
||||||
|
}
|
||||||
|
|
||||||
|
#pulseaudio {
|
||||||
|
background-color: #f1c40f;
|
||||||
|
color: #000000;
|
||||||
|
}
|
||||||
|
|
||||||
|
#pulseaudio.muted {
|
||||||
|
background-color: #90b1b1;
|
||||||
|
color: #2a5c45;
|
||||||
|
}
|
||||||
|
|
||||||
|
#custom-media {
|
||||||
|
background-color: #66cc99;
|
||||||
|
color: #2a5c45;
|
||||||
|
min-width: 100px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#custom-media.custom-spotify {
|
||||||
|
background-color: #66cc99;
|
||||||
|
}
|
||||||
|
|
||||||
|
#custom-media.custom-vlc {
|
||||||
|
background-color: #ffa000;
|
||||||
|
}
|
||||||
|
|
||||||
|
#temperature {
|
||||||
|
background-color: #f0932b;
|
||||||
|
}
|
||||||
|
|
||||||
|
#temperature.critical {
|
||||||
|
background-color: #eb4d4b;
|
||||||
|
}
|
||||||
|
|
||||||
|
#tray {
|
||||||
|
background-color: #2980b9;
|
||||||
|
}
|
||||||
|
|
||||||
|
#idle_inhibitor {
|
||||||
|
background-color: #2d3436;
|
||||||
|
}
|
||||||
|
|
||||||
|
#idle_inhibitor.activated {
|
||||||
|
background-color: #ecf0f1;
|
||||||
|
color: #2d3436;
|
||||||
|
}
|
||||||
|
|
||||||
|
#mpd {
|
||||||
|
background-color: #66cc99;
|
||||||
|
color: #2a5c45;
|
||||||
|
}
|
||||||
|
|
||||||
|
#mpd.disconnected {
|
||||||
|
background-color: #f53c3c;
|
||||||
|
}
|
||||||
|
|
||||||
|
#mpd.stopped {
|
||||||
|
background-color: #90b1b1;
|
||||||
|
}
|
||||||
|
|
||||||
|
#mpd.paused {
|
||||||
|
background-color: #51a37a;
|
||||||
|
}
|
||||||
|
#custom-layout {
|
||||||
|
background-color: #ecf0f1;
|
||||||
|
color: #2d3436;
|
||||||
|
min-width: 2em;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -1,147 +0,0 @@
|
||||||
include: fedora-common-ostree.yaml
|
|
||||||
|
|
||||||
ref: pitti-desktop
|
|
||||||
rojig:
|
|
||||||
name: pitti-desktop
|
|
||||||
summary: "Pitti Desktop"
|
|
||||||
license: MIT
|
|
||||||
|
|
||||||
repos:
|
|
||||||
- fedora-34
|
|
||||||
- fedora-34-updates
|
|
||||||
- fedora-34-updates-testing
|
|
||||||
- rpmfusion-free
|
|
||||||
- rpmfusion-free-updates
|
|
||||||
|
|
||||||
packages:
|
|
||||||
# hardware/drivers
|
|
||||||
- kernel
|
|
||||||
- kernel-modules-extra
|
|
||||||
- iwl6000g2a-firmware
|
|
||||||
- iwl7260-firmware
|
|
||||||
- alsa-sof-firmware
|
|
||||||
- NetworkManager-wifi
|
|
||||||
- NetworkManager-openvpn-gnome
|
|
||||||
- sane-backends
|
|
||||||
- sane-backends-drivers-scanners
|
|
||||||
- powertop
|
|
||||||
- iwd
|
|
||||||
- wpa_supplicant
|
|
||||||
- udisks2-lvm2
|
|
||||||
- opensc
|
|
||||||
# basic system
|
|
||||||
- acl
|
|
||||||
- attr
|
|
||||||
- basesystem
|
|
||||||
- cryptsetup
|
|
||||||
- dnsmasq
|
|
||||||
- fedora-workstation-backgrounds
|
|
||||||
- filesystem
|
|
||||||
- glibc-langpack-de
|
|
||||||
- glibc-langpack-en
|
|
||||||
- hostname
|
|
||||||
- iproute
|
|
||||||
- kbd
|
|
||||||
- nss-altfiles
|
|
||||||
- pciutils
|
|
||||||
# don't care, but rpm-ostree build fails otherwise
|
|
||||||
- selinux-policy-targeted
|
|
||||||
- sudo
|
|
||||||
- usbutils
|
|
||||||
# shell tools and development
|
|
||||||
- bc
|
|
||||||
- gnupg2
|
|
||||||
- fpaste
|
|
||||||
- lsof
|
|
||||||
- man-db
|
|
||||||
- mtr
|
|
||||||
- tree
|
|
||||||
- bzip2
|
|
||||||
- zip
|
|
||||||
- unzip
|
|
||||||
- vim-enhanced
|
|
||||||
- ranger
|
|
||||||
- bash-completion
|
|
||||||
- fish
|
|
||||||
- qemu-system-x86-core
|
|
||||||
- qemu-ui-sdl
|
|
||||||
- qemu-img
|
|
||||||
- openvpn
|
|
||||||
- mutt
|
|
||||||
- nmap-ncat
|
|
||||||
- isync
|
|
||||||
- weechat
|
|
||||||
- duplicity
|
|
||||||
- openssh-server
|
|
||||||
- systemd-container
|
|
||||||
- git
|
|
||||||
- patchutils
|
|
||||||
- make
|
|
||||||
- strace
|
|
||||||
- wget
|
|
||||||
- w3m
|
|
||||||
- cockpit-system
|
|
||||||
- cockpit-ws
|
|
||||||
- syncthing
|
|
||||||
- krb5-workstation
|
|
||||||
|
|
||||||
# desktop plumbing/apps
|
|
||||||
- dejavu-sans-fonts
|
|
||||||
- dejavu-serif-fonts
|
|
||||||
- dejavu-sans-mono-fonts
|
|
||||||
- fontawesome-fonts
|
|
||||||
- google-noto-emoji-color-fonts
|
|
||||||
|
|
||||||
- gvfs-mtp
|
|
||||||
- pulseaudio-utils
|
|
||||||
- alsa-plugins-pulseaudio
|
|
||||||
- gstreamer1-plugins-good
|
|
||||||
- gstreamer1-plugins-ugly
|
|
||||||
- gstreamer1-libav
|
|
||||||
# for wf-recorder
|
|
||||||
- libavdevice
|
|
||||||
- xdg-desktop-portal-gtk
|
|
||||||
|
|
||||||
- pavucontrol
|
|
||||||
- pcmanfm
|
|
||||||
- simple-scan
|
|
||||||
- nm-connection-editor
|
|
||||||
- eog
|
|
||||||
- evince
|
|
||||||
- rhythmbox
|
|
||||||
- gnome-keyring
|
|
||||||
- pinentry-gnome3
|
|
||||||
- lxpolkit
|
|
||||||
- lxterminal
|
|
||||||
- gnome-disk-utility
|
|
||||||
- gtimelog
|
|
||||||
- rofimoji
|
|
||||||
|
|
||||||
# sway/wayland desktop
|
|
||||||
- sway
|
|
||||||
- swayidle
|
|
||||||
- swaylock
|
|
||||||
- kanshi
|
|
||||||
- mako
|
|
||||||
- waybar
|
|
||||||
- slurp
|
|
||||||
- grim
|
|
||||||
- xorg-x11-server-Xwayland
|
|
||||||
- firefox-wayland
|
|
||||||
- wofi
|
|
||||||
- brightnessctl
|
|
||||||
- wl-clipboard
|
|
||||||
|
|
||||||
exclude-packages:
|
|
||||||
# recommended by sway
|
|
||||||
- alacritty
|
|
||||||
- brltty
|
|
||||||
- glibc-all-langpacks
|
|
||||||
- xdg-desktop-portal-wlr
|
|
||||||
# recommended by gtimelog
|
|
||||||
- yelp
|
|
||||||
|
|
||||||
add-files:
|
|
||||||
- ["2015-RH-IT-Root-CA.pem", "/etc/pki/ca-trust/source/anchors/2015-RH-IT-Root-CA.pem"]
|
|
||||||
|
|
||||||
postprocess-script: pitti-post.sh
|
|
||||||
101
pitti-post.sh
101
pitti-post.sh
|
|
@ -1,101 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
set -xeuo pipefail
|
|
||||||
|
|
||||||
# Enable SysRQ
|
|
||||||
echo 'kernel.sysrq = 1' > /usr/lib/sysctl.d/90-sysrq.conf
|
|
||||||
|
|
||||||
# power saving
|
|
||||||
echo 'blacklist e1000e' > /usr/lib/modprobe.d/blacklist-local.conf
|
|
||||||
|
|
||||||
# NetworkManager config
|
|
||||||
cat <<EOF > /usr/lib/NetworkManager/conf.d/local.conf
|
|
||||||
[main]
|
|
||||||
plugins=
|
|
||||||
|
|
||||||
[device]
|
|
||||||
#wifi.backend=iwd
|
|
||||||
EOF
|
|
||||||
#ln -sfn ../iwd.service /usr/lib/systemd/system/multi-user.target.wants/iwd.service
|
|
||||||
|
|
||||||
ln -sfn /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
|
|
||||||
|
|
||||||
# set up PAM for systemd-homed (https://bugzilla.redhat.com/show_bug.cgi?id=1806949)
|
|
||||||
patch /etc/pam.d/system-auth <<EOF
|
|
||||||
--- /usr/etc/pam.d/system-auth 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ /etc/pam.d/system-auth 2020-04-13 14:31:16.866558333 +0200
|
|
||||||
@@ -3,16 +3,20 @@
|
|
||||||
# User changes will be destroyed the next time authselect is run.
|
|
||||||
auth required pam_env.so
|
|
||||||
auth sufficient pam_unix.so try_first_pass nullok
|
|
||||||
+-auth sufficient pam_systemd_home.so # added
|
|
||||||
auth required pam_deny.so
|
|
||||||
|
|
||||||
-account required pam_unix.so
|
|
||||||
+account sufficient pam_unix.so
|
|
||||||
+-account sufficient pam_systemd_home.so # added
|
|
||||||
|
|
||||||
password requisite pam_pwquality.so try_first_pass local_users_only retry=3 authtok_type=
|
|
||||||
password sufficient pam_unix.so try_first_pass use_authtok nullok sha512 shadow
|
|
||||||
+-password sufficient pam_systemd_home.so # added
|
|
||||||
password required pam_deny.so
|
|
||||||
|
|
||||||
session optional pam_keyinit.so revoke
|
|
||||||
session required pam_limits.so
|
|
||||||
+-session optional pam_systemd_home.so # added
|
|
||||||
-session optional pam_systemd.so
|
|
||||||
session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid
|
|
||||||
session required pam_unix.so
|
|
||||||
EOF
|
|
||||||
patch /etc/pam.d/password-auth <<EOF
|
|
||||||
--- password-auth
|
|
||||||
+++ password-auth
|
|
||||||
@@ -3,16 +3,20 @@
|
|
||||||
# User changes will be destroyed the next time authselect is run.
|
|
||||||
auth required pam_env.so
|
|
||||||
auth sufficient pam_unix.so try_first_pass nullok
|
|
||||||
+-auth sufficient pam_systemd_home.so # added
|
|
||||||
auth required pam_deny.so
|
|
||||||
|
|
||||||
-account required pam_unix.so
|
|
||||||
+account sufficient pam_unix.so
|
|
||||||
+-account sufficient pam_systemd_home.so # added
|
|
||||||
|
|
||||||
password requisite pam_pwquality.so try_first_pass local_users_only retry=3 authtok_type=
|
|
||||||
password sufficient pam_unix.so try_first_pass use_authtok nullok sha512 shadow
|
|
||||||
+-password sufficient pam_systemd_home.so # added
|
|
||||||
password required pam_deny.so
|
|
||||||
|
|
||||||
session optional pam_keyinit.so revoke
|
|
||||||
session required pam_limits.so
|
|
||||||
+-session optional pam_systemd_home.so # added
|
|
||||||
-session optional pam_systemd.so
|
|
||||||
session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid
|
|
||||||
session required pam_unix.so
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# homed is missing a lot of SELinux policy (https://bugzilla.redhat.com/show_bug.cgi?id=1809878)
|
|
||||||
# "disabled" breaks rpm-ostree (https://bugzilla.redhat.com/show_bug.cgi?id=1882933), so just use permissive
|
|
||||||
sed -i 's/SELINUX=enforcing/SELINUX=permissive/' /etc/selinux/config
|
|
||||||
|
|
||||||
# enable other units
|
|
||||||
mkdir -p /usr/lib/systemd/system/getty.target.wants
|
|
||||||
ln -s ../getty@.service /usr/lib/systemd/system/getty.target.wants/getty@tty1.service
|
|
||||||
ln -s ../systemd-timesyncd.service /usr/lib/systemd/system/sysinit.target.wants/systemd-timesyncd.service
|
|
||||||
ln -s ../systemd-homed.service /usr/lib/systemd/system/multi-user.target.wants/systemd-homed.service
|
|
||||||
ln -s ../systemd-resolved.service /usr/lib/systemd/system/multi-user.target.wants/systemd-resolved.service
|
|
||||||
ln -s ../cockpit.socket /usr/lib/systemd/system/sockets.target.wants/cockpit.socket
|
|
||||||
ln -s ../sshd.socket /usr/lib/systemd/system/sockets.target.wants/sshd.socket
|
|
||||||
|
|
||||||
# disable unwanted services
|
|
||||||
ln -sfn /dev/null /usr/lib/systemd/user/at-spi-dbus-bus.service
|
|
||||||
|
|
||||||
# move OS systemd unit defaults to /usr
|
|
||||||
cp -a --verbose /etc/systemd/system /etc/systemd/user /usr/lib/systemd/
|
|
||||||
rm -r /etc/systemd/system /etc/systemd/user
|
|
||||||
|
|
||||||
# avoid LVM spew in /etc
|
|
||||||
sed -i 's/backup = 1/backup = 0/; s/archive = 1/archive = 0/' /etc/lvm/lvm.conf
|
|
||||||
|
|
||||||
# update for Red Hat certificate
|
|
||||||
ln -s /etc/pki/ca-trust/source/anchors/2015-RH-IT-Root-CA.pem /etc/pki/tls/certs/2015-RH-IT-Root-CA.pem
|
|
||||||
update-ca-trust
|
|
||||||
10
post.sh
10
post.sh
|
|
@ -6,13 +6,16 @@
|
||||||
set -xeuo pipefail
|
set -xeuo pipefail
|
||||||
|
|
||||||
# https://github.com/projectatomic/rpm-ostree/issues/1542#issuecomment-419684977
|
# https://github.com/projectatomic/rpm-ostree/issues/1542#issuecomment-419684977
|
||||||
for x in /etc/yum.repos.d/*modular.repo; do
|
# for x in /etc/yum.repos.d/*modular.repo; do
|
||||||
sed -i -e 's,enabled=[01],enabled=0,' ${x}
|
# sed -i -e 's,enabled=[01],enabled=0,' ${x}
|
||||||
done
|
# done
|
||||||
|
|
||||||
|
ls -al /etc/yum.repos.d/
|
||||||
|
|
||||||
# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1265295
|
# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1265295
|
||||||
# Also note the create-new-then-rename dance for rofiles-fuse compat
|
# Also note the create-new-then-rename dance for rofiles-fuse compat
|
||||||
if ! grep -q '^Storage=persistent' /etc/systemd/journald.conf; then
|
if ! grep -q '^Storage=persistent' /etc/systemd/journald.conf; then
|
||||||
|
echo "Journal missing Storage=persistent"
|
||||||
(cat /etc/systemd/journald.conf && echo 'Storage=persistent') > /etc/systemd.journald.conf.new
|
(cat /etc/systemd/journald.conf && echo 'Storage=persistent') > /etc/systemd.journald.conf.new
|
||||||
mv /etc/systemd.journald.conf{.new,}
|
mv /etc/systemd.journald.conf{.new,}
|
||||||
fi
|
fi
|
||||||
|
|
@ -22,6 +25,7 @@ fi
|
||||||
# mid-transaction, which never applies to rpm-ostree. This is structured as a
|
# mid-transaction, which never applies to rpm-ostree. This is structured as a
|
||||||
# loop/glob to avoid hardcoding (or trying to match) the architecture.
|
# loop/glob to avoid hardcoding (or trying to match) the architecture.
|
||||||
for x in /usr/sbin/glibc_post_upgrade.*; do
|
for x in /usr/sbin/glibc_post_upgrade.*; do
|
||||||
|
echo "Disabling srcipt ${x}"
|
||||||
if test -f ${x}; then
|
if test -f ${x}; then
|
||||||
ln -srf /usr/bin/true ${x}
|
ln -srf /usr/bin/true ${x}
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
156
x1-gen7-sway-desktop.yaml
Normal file
156
x1-gen7-sway-desktop.yaml
Normal file
|
|
@ -0,0 +1,156 @@
|
||||||
|
include: fedora-common-ostree.yaml
|
||||||
|
|
||||||
|
ref: x1-gen7-sway-desktop
|
||||||
|
rojig:
|
||||||
|
name: x1-gen7-sway-desktop
|
||||||
|
summary: "Thinkpad X1 Gen 7 Sway Desktop"
|
||||||
|
license: MIT
|
||||||
|
|
||||||
|
repos:
|
||||||
|
- fedora-34
|
||||||
|
- fedora-34-updates
|
||||||
|
- fedora-34-updates-testing
|
||||||
|
- rpmfusion-free
|
||||||
|
- rpmfusion-free-updates
|
||||||
|
|
||||||
|
packages:
|
||||||
|
# hardware / drivers
|
||||||
|
- alsa-sof-firmware
|
||||||
|
- fwupd
|
||||||
|
- iwl6000g2a-firmware
|
||||||
|
- iwl7260-firmware
|
||||||
|
- kernel
|
||||||
|
- kernel-modules-extra
|
||||||
|
- libva-intel-driver
|
||||||
|
- libva-intel-hybrid-driver
|
||||||
|
- opensc
|
||||||
|
- udisks2-lvm2
|
||||||
|
# basic system
|
||||||
|
- acl
|
||||||
|
- attr
|
||||||
|
- basesystem
|
||||||
|
- coreutils
|
||||||
|
- coreutils-common
|
||||||
|
- cpio
|
||||||
|
- cryptsetup
|
||||||
|
- dnsmasq
|
||||||
|
- filesystem
|
||||||
|
- glibc-langpack-en
|
||||||
|
- glibc-langpack-mk
|
||||||
|
- hostname
|
||||||
|
- kbd
|
||||||
|
- nss-altfiles
|
||||||
|
- passwd
|
||||||
|
- sddm
|
||||||
|
- selinux-policy-targeted
|
||||||
|
- sudo
|
||||||
|
- systemd
|
||||||
|
- usbutils
|
||||||
|
- util-linux
|
||||||
|
# diagnostic / utils
|
||||||
|
- bind-utils
|
||||||
|
- htop
|
||||||
|
- iotop
|
||||||
|
- iproute
|
||||||
|
- lm_sensors
|
||||||
|
- lsof
|
||||||
|
- mtr
|
||||||
|
- net-tools
|
||||||
|
- nmap-ncat
|
||||||
|
- pciutils
|
||||||
|
- powertop
|
||||||
|
# alternative modern rust apps
|
||||||
|
- bat
|
||||||
|
- ripgrep
|
||||||
|
# wifi
|
||||||
|
- iwd
|
||||||
|
- NetworkManager
|
||||||
|
- network-manager-applet
|
||||||
|
- wpa_supplicant
|
||||||
|
# shell tools and development
|
||||||
|
- alacritty
|
||||||
|
- bash-completion
|
||||||
|
- bc
|
||||||
|
- bzip2
|
||||||
|
- emacs
|
||||||
|
- git
|
||||||
|
- gnupg2
|
||||||
|
- make
|
||||||
|
- man-db
|
||||||
|
- neovim
|
||||||
|
- openssh-server
|
||||||
|
- patchutils
|
||||||
|
- squashfs-tools
|
||||||
|
- strace
|
||||||
|
- systemd-container
|
||||||
|
- tree
|
||||||
|
- unzip
|
||||||
|
- vim-enhanced
|
||||||
|
- w3m
|
||||||
|
- wget
|
||||||
|
- zip
|
||||||
|
- zram-generator
|
||||||
|
# fonts
|
||||||
|
- dejavu-sans-fonts
|
||||||
|
- dejavu-serif-fonts
|
||||||
|
- dejavu-sans-mono-fonts
|
||||||
|
- fontawesome-fonts
|
||||||
|
- google-noto-emoji-color-fonts
|
||||||
|
# audio / video
|
||||||
|
- alsa-plugins-pulseaudio
|
||||||
|
- ffmpeg
|
||||||
|
- gstreamer1-libav
|
||||||
|
- gstreamer1-plugins-good
|
||||||
|
- gstreamer1-plugins-ugly
|
||||||
|
- gvfs-mtp
|
||||||
|
- libavdevice
|
||||||
|
- libva
|
||||||
|
- libva-utils
|
||||||
|
- pavucontrol
|
||||||
|
- pulseaudio-utils
|
||||||
|
- vlc
|
||||||
|
# misc
|
||||||
|
- okular
|
||||||
|
- redshift
|
||||||
|
- xdg-desktop-portal-gtk
|
||||||
|
# sway / wayland desktop
|
||||||
|
- brightnessctl
|
||||||
|
- firefox-wayland
|
||||||
|
- grim
|
||||||
|
- i3status-rs
|
||||||
|
- kanshi
|
||||||
|
- mako
|
||||||
|
- slurp
|
||||||
|
- sway
|
||||||
|
- swayidle
|
||||||
|
- swaylock
|
||||||
|
- waybar
|
||||||
|
- wl-clipboard
|
||||||
|
- wofi
|
||||||
|
# virtualization
|
||||||
|
- libguestfs-tools
|
||||||
|
- libvirt-daemon-config-network
|
||||||
|
- libvirt-daemon-kvm
|
||||||
|
- python-libguestfs
|
||||||
|
- qemu-img
|
||||||
|
- qemu-kvm
|
||||||
|
- qemu-system-x86-core
|
||||||
|
- qemu-ui-sdl
|
||||||
|
- virt-install
|
||||||
|
- virt-manager
|
||||||
|
- virt-top
|
||||||
|
- virt-viewer
|
||||||
|
|
||||||
|
add-files:
|
||||||
|
- ["config/systemd/firefox.service", "/etc/systemd/user/firefox.service"]
|
||||||
|
- ["config/systemd/mako.service", "/etc/systemd/user/mako.service"]
|
||||||
|
- ["config/systemd/nm-applet.service", "/etc/systemd/user/nm-applet.service"]
|
||||||
|
- ["config/systemd/swayidle.service", "/etc/systemd/user/swayidle.service"]
|
||||||
|
- ["config/systemd/swaylock.service", "/etc/systemd/user/swaylock.service"]
|
||||||
|
- ["config/systemd/sway.service", "/etc/systemd/user/sway.service"]
|
||||||
|
- ["config/systemd/sway-session.target", "/etc/systemd/user/sway-session.target"]
|
||||||
|
- ["config/systemd/wayland-session.target", "/etc/systemd/user/wayland-session.target"]
|
||||||
|
- ["config/sway-service.desktop", "/usr/share/wayland-sessions/sway-service.desktop"]
|
||||||
|
- ["config/sway-service.sh", "/usr/bin/sway-service.sh"]
|
||||||
|
- ["config/modprobe.d/i915.conf", "/etc/modprobe.d/i915.conf"]
|
||||||
|
- ["config/modprobe.d/i2c_i801-blacklist.conf", "/etc/modprobe.d/i2c_i801-blacklist.conf"]
|
||||||
Loading…
Reference in a new issue