diff --git a/2015-RH-IT-Root-CA.pem b/2015-RH-IT-Root-CA.pem new file mode 100644 index 0000000..f306f00 --- /dev/null +++ b/2015-RH-IT-Root-CA.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIENDCCAxygAwIBAgIJANunI0D662cnMA0GCSqGSIb3DQEBCwUAMIGlMQswCQYD +VQQGEwJVUzEXMBUGA1UECAwOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcMB1JhbGVp +Z2gxFjAUBgNVBAoMDVJlZCBIYXQsIEluYy4xEzARBgNVBAsMClJlZCBIYXQgSVQx +GzAZBgNVBAMMElJlZCBIYXQgSVQgUm9vdCBDQTEhMB8GCSqGSIb3DQEJARYSaW5m +b3NlY0ByZWRoYXQuY29tMCAXDTE1MDcwNjE3MzgxMVoYDzIwNTUwNjI2MTczODEx +WjCBpTELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9saW5hMRAwDgYD +VQQHDAdSYWxlaWdoMRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRMwEQYDVQQLDApS +ZWQgSGF0IElUMRswGQYDVQQDDBJSZWQgSGF0IElUIFJvb3QgQ0ExITAfBgkqhkiG +9w0BCQEWEmluZm9zZWNAcmVkaGF0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBALQt9OJQh6GC5LT1g80qNh0u50BQ4sZ/yZ8aETxt+5lnPVX6MHKz +bfwI6nO1aMG6j9bSw+6UUyPBHP796+FT/pTS+K0wsDV7c9XvHoxJBJJU38cdLkI2 +c/i7lDqTfTcfLL2nyUBd2fQDk1B0fxrskhGIIZ3ifP1Ps4ltTkv8hRSob3VtNqSo +GxkKfvD2PKjTPxDPWYyruy9irLZioMffi3i/gCut0ZWtAyO3MVH5qWF/enKwgPES +X9po+TdCvRB/RUObBaM761EcrLSM1GqHNueSfqnho3AjLQ6dBnPWlo638Zm1VebK +BELyhkLWMSFkKwDmne0jQ02Y4g075vCKvCsCAwEAAaNjMGEwHQYDVR0OBBYEFH7R +4yC+UehIIPeuL8Zqw3PzbgcZMB8GA1UdIwQYMBaAFH7R4yC+UehIIPeuL8Zqw3Pz +bgcZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB +CwUAA4IBAQBDNvD2Vm9sA5A9AlOJR8+en5Xz9hXcxJB5phxcZQ8jFoG04Vshvd0e +LEnUrMcfFgIZ4njMKTQCM4ZFUPAieyLx4f52HuDopp3e5JyIMfW+KFcNIpKwCsak +oSoKtIUOsUJK7qBVZxcrIyeQV2qcYOeZhtS5wBqIwOAhFwlCET7Ze58QHmS48slj +S9K0JAcps2xdnGu0fkzhSQxY8GPQNFTlr6rYld5+ID/hHeS76gq0YG3q6RLWRkHf +4eTkRjivAlExrFzKcljC4axKQlnOvVAzz+Gm32U0xPBF4ByePVxCJUHw1TsyTmel +RxNEp7yHoXcwn+fXna+t5JWh1gxUZty3 +-----END CERTIFICATE----- diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 7f8f94e..0000000 --- a/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is furnished -to do so, subject to the following conditions: - -The above copyright notice and this permission notice (including the next -paragraph) shall be included in all copies or substantial portions of the -Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS -OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF -OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index 9744e91..31f49b8 100644 --- a/README.md +++ b/README.md @@ -1,100 +1,73 @@ -# Vladan's X13 Gen 1 Sway Desktop config - -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. - -Run `sudo ./compose.sh` from the root folder of this repo to build the rootfs in a local repo. Don't forget to change the path related env vars. - ---- -Original README for [workstation-ostree-config](https://pagure.io/workstation-ostree-config) ---- - -# Manifests for rpm-ostree based Fedora variants - -This is the configuration needed to create -[rpm-ostree](https://coreos.github.io/rpm-ostree/) based variants of Fedora. -Each variant is described in a YAML -[treefile](https://coreos.github.io/rpm-ostree/treefile/) which is then used by -rpm-ostree to compose an ostree commit with the package requested. - -In the Fedora infrastructure, this happens via -[pungi](https://pagure.io/pungi-fedora) with -[Lorax](https://github.com/weldr/lorax) -([templates](https://pagure.io/fedora-lorax-templates)). - -## Fedora Silverblue - -- Website: https://silverblue.fedoraproject.org/ ([sources](https://github.com/fedora-silverblue/silverblue-site)) -- Documentation: https://docs.fedoraproject.org/en-US/fedora-silverblue/ ([sources](https://github.com/fedora-silverblue/silverblue-docs)) -- Issue tracker: https://github.com/fedora-silverblue/issue-tracker/issues - -## Fedora Kinoite - -- Website: https://kinoite.fedoraproject.org/ ([sources](https://pagure.io/fedora-kde/kinoite-site)) -- Documentation: https://docs.fedoraproject.org/en-US/fedora-kinoite/ ([sources](https://pagure.io/fedora-kde/kinoite-docs)) -- Issue tracker: https://pagure.io/fedora-kde/SIG/issues - -## Building - -Instructions to perform a local build of Silverblue: - -``` -# Clone the config -git clone https://pagure.io/workstation-ostree-config && cd workstation-ostree-config - -# Prepare directories -mkdir -p repo cache -ostree --repo=repo init --mode=archive - -# Build (compose) the variant of your choice -sudo rpm-ostree compose tree --repo=repo --cachedir=cache fedora-silverblue.yaml - -# Update summary file -ostree summary --repo=repo --update -``` - -## Testing - -Instructions to test the resulting build: - -- First, serve the ostree repo using an HTTP server. You can use any static file server. For example using : - - ``` - simple-http-server --index --ip 192.168.122.1 --port 8000 - ``` - -- Then, on an already installed Silverblue system: - -``` -# Add an ostree remote -sudo ostree remote add testremote http://192.168.122.1:8000/repo --no-gpg-verify - -# Pin the currently deployed (and probably working) version -sudo ostree admin pin 0 - -# List refs from variant remote -sudo ostree remote refs testremote - -# Switch to your variant -sudo rpm-ostree rebase testremote:fedora/rawhide/x86_64/silverblue - -# Reboot and test! -``` - -## Historical references - -Building and testing instructions: - -- https://dustymabe.com/2017/10/05/setting-up-an-atomic-host-build-server/ -- https://dustymabe.com/2017/08/08/how-do-we-create-ostree-repos-and-artifacts-in-fedora/ -- https://www.projectatomic.io/blog/2017/12/compose-custom-ostree/ -- https://www.projectatomic.io/docs/compose-your-own-tree/ - For some background, see: -- -- -- -- + - https://fedoraproject.org/wiki/Workstation/AtomicWorkstation + - https://fedoraproject.org/wiki/Changes/WorkstationOstree + +(Note also this repo obsoletes https://pagure.io/atomic-ws) -Note also this repo obsoletes https://pagure.io/atomic-ws +High level design +----------------- + +The goal of the system is to be a workstation, using +rpm-ostree for the base OS, and a combination of +Docker and Flatpak containers, as well as virtualization +tools such as Vagrant. + +Status +------ + +This project is actively maintained and is ready for use +by sophisticated and interested users, but not ready +for widespread promotion. + +See some [https://lists.fedoraproject.org/archives/list/desktop@lists.fedoraproject.org/thread/J6BJS7Z4NKNOQUZWGYXZZIEKYMWBBSUY/](discussion about the first release). + +Installing +------------ + +See the Silverblue documentation at +https://docs.fedoraproject.org/en-US/fedora-silverblue/installation-guide/. +There's also a guide for installing inside an existing system: +https://docs.fedoraproject.org/en-US/fedora-silverblue/installation-dual-boot/. + +Important issues: +----------------------- + + - [flatpak system repo](https://github.com/flatpak/flatpak/issues/113#issuecomment-247022006) + +Using the system +-------------------- + +One of the first things you should do use is use a container runtime of your +choice to manage one or more "pet" containers. This is where you will use +`yum/dnf` to install utilities. + +With `docker` for example, you can use the `-v /srv:/srv` command line option so +these containers can share content with your host (such as git repositories). +Note that if you want to share content between multiple Docker containers and +the host (e.g. your desktop session), you should execute (once): + +``` +sudo chcon -R -h -t container_file_t /var/srv +``` + +Next, let's try flatpak. Before you do: There's a known flatpak issue on +AtomicWS - run [this workaround](https://github.com/flatpak/flatpak/issues/113#issuecomment-247022006), +which you only need to do once. After that, [try flatpak](http://flatpak.org/apps.html). + +If you are a developer for server applications, +try [oc cluster up](https://github.com/openshift/origin/blob/master/docs/cluster_up_down.md) to +create a local OpenShift v3 cluster. + +Finally, try out `rpm-ostree install` to layer additional packages directly on +the host. This is needed for "host extensions" - privileged software that +doesn't make sense to live in a container. For example, `rpm-ostree install +powerline` to use that software for the shell prompts of the host. Another +good example is `rpm-ostree install vagrant-libvirt` to use [Vagrant](https://www.vagrantup.com/) +to manage VMs. + +Future work +----------- + + - GNOME Software support for both rpm-ostree/flatpak and possibly docker + - automated tests that run on this content diff --git a/better-fonts-37.repo b/better-fonts.repo similarity index 90% rename from better-fonts-37.repo rename to better-fonts.repo index 90740cc..48a44c8 100644 --- a/better-fonts-37.repo +++ b/better-fonts.repo @@ -1,6 +1,6 @@ [copr:copr.fedorainfracloud.org:dawid:better_fonts] name=Copr repo for better_fonts owned by dawid -baseurl=https://download.copr.fedorainfracloud.org/results/dawid/better_fonts/fedora-37-$basearch/ +baseurl=https://download.copr.fedorainfracloud.org/results/dawid/better_fonts/fedora-34-$basearch/ type=rpm-md skip_if_unavailable=True gpgcheck=1 diff --git a/compose.sh b/compose.sh index ca99030..8038f04 100755 --- a/compose.sh +++ b/compose.sh @@ -1,7 +1,7 @@ #!/bin/sh set -eu -CACHE=/var/cache/x13-gen1-sway-ostree -REPO=/srv/ostree/x13-gen1-sway-repo +CACHE=/var/cache/x1-gen7-sway-ostree +REPO=/srv/ostree/repo mkdir -p $CACHE @@ -9,5 +9,4 @@ if [ ! -d $REPO/objects ]; then ostree --repo=$REPO init --mode=archive-z2 fi -rpm-ostree compose tree --unified-core --cachedir=$CACHE --repo=$REPO x13-gen1-sway-desktop.yaml -ostree summary --repo=$REPO --update +rpm-ostree compose tree --unified-core --cachedir=$CACHE --repo=$REPO x1-gen7-sway-desktop.yaml diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index f2e053b..92636ab 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -141,6 +141,7 @@ desktop_exclude_list: - evince-nautilus - file-roller - file-roller-nautilus + - gedit - gnome-boxes - gnome-calculator - gnome-calendar @@ -154,7 +155,6 @@ desktop_exclude_list: - gnome-maps - gnome-photos - gnome-screenshot - - gnome-text-editor - gnome-weather - jwhois - rdist diff --git a/config.ini b/config.ini index 4a7200f..35a9cc7 100644 --- a/config.ini +++ b/config.ini @@ -10,10 +10,10 @@ os_pretty_name = Fedora ostree Workstation tree_name = workstation tree_file = %(os_name)s-%(tree_name)s.json arch = x86_64 -release = 36 +release = rawhide ref = %(os_name)s/%(release)s/%(arch)s/%(tree_name)s # Force use of a closeish and fastish HTTP mirror, so that the HTTP proxy works -yum_baseurl = https://download.fedoraproject.org/pub/fedora/linux/development/36/Everything/%(arch)s/os/ +yum_baseurl = https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/%(arch)s/os/ # lorax_additional_repos = http://127.0.0.1/fedora-atomic/local-overrides # lorax_include_packages = fedora-productimg-atomic docker_os_name = fedora diff --git a/config/modprobe.d/i2c_i801-blacklist.conf b/config/modprobe.d/i2c_i801-blacklist.conf new file mode 100644 index 0000000..70f1f9b --- /dev/null +++ b/config/modprobe.d/i2c_i801-blacklist.conf @@ -0,0 +1 @@ +blacklist i2c_i801 diff --git a/config/sway-service.desktop b/config/sway-service.desktop new file mode 100644 index 0000000..63f18af --- /dev/null +++ b/config/sway-service.desktop @@ -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 diff --git a/config/sway/bin/keyboard-layout-per-window.py b/config/sway/bin/keyboard-layout-per-window.py deleted file mode 100755 index 15e5dfb..0000000 --- a/config/sway/bin/keyboard-layout-per-window.py +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env python - -# This script keeps track of active keyboard layouts per window. -# -# This script requires i3ipc-python package (install it from a system package -# manager or pip). -# -# https://github.com/swaywm/sway/pull/4504/files -import i3ipc - -sway = i3ipc.Connection() -prev_focused = sway.get_tree().find_focused().id -windows = {} - -def on_window_focus(ipc, event): - global windows, prev_focused - - # Save current layouts - layouts = {input.identifier: input.xkb_active_layout_index for input in sway.get_inputs()} - windows[prev_focused] = layouts - - # Restore layout of the newly focused window - if event.container.id in windows: - for (input_id, layout_index) in windows[event.container.id].items(): - if layout_index != layouts[input_id]: - sway.command(f'input "{input_id}" xkb_switch_layout {layout_index}') - - prev_focused = event.container.id - -def on_window_close(ipc, event): - global windows - if event.container.id in windows: - del(windows[event.container.id]) - -def on_window(ipc, event): - if event.change == "focus": - on_window_focus(ipc, event) - elif event.change == "close": - on_window_close(ipc, event) - -sway.on("window", on_window) -sway.main() diff --git a/config/sway/config b/config/sway/config deleted file mode 100644 index a1fafba..0000000 --- a/config/sway/config +++ /dev/null @@ -1 +0,0 @@ -include /etc/sway/config.d/* diff --git a/config/sway/config.d/10-variables.conf b/config/sway/config.d/10-variables.conf deleted file mode 100644 index 6397e62..0000000 --- a/config/sway/config.d/10-variables.conf +++ /dev/null @@ -1,15 +0,0 @@ -### Variables -# -# Logo key. Use Mod1 for Alt. -set $mod Mod4 -# Home row direction keys, like vim -set $left h -set $down j -set $up k -set $right l -# Your preferred terminal emulator -set $term alacritty -# Your preferred application launcher -# Note: it's recommended that you pass the final command to sway -# set $menu wofi -c $HOME/.config/wofi/config -s $HOME/.config/wofi/style.css | xargs swaymsg exec -- -set $menu wldash diff --git a/config/sway/config.d/20-output.conf b/config/sway/config.d/20-output.conf deleted file mode 100644 index 3a723ab..0000000 --- a/config/sway/config.d/20-output.conf +++ /dev/null @@ -1,16 +0,0 @@ -### Output configuration -# -# Example configuration: -# -# output HDMI-A-1 resolution 1920x1080 position 1920,0 -# -# You can get the names of your outputs by running: swaymsg -t get_outputs -# -output DP-1 bg ~/.config/sway/bkg2.jpg fill -output DP-1 scale 1.2 res 3840x2160 pos 0 0 -output DP-2 bg ~/.config/sway/bkg2.jpg fill -output DP-2 scale 1.2 res 3840x2160 pos 0 0 -output HDMI-A-1 bg ~/.config/sway/bkg2.jpg fill -output HDMI-A-1 scale 1.2 res 3840x2160 pos 0 0 -output eDP-1 bg ~/.config/sway/bkg.jpg fill -output eDP-1 scale 1.0 res 1920x1080 pos 640 1800 diff --git a/config/sway/config.d/30-input.conf b/config/sway/config.d/30-input.conf deleted file mode 100644 index 9dfbe9d..0000000 --- a/config/sway/config.d/30-input.conf +++ /dev/null @@ -1,27 +0,0 @@ -### Input configuration -# -# Example configuration: -# -# input "2:14:SynPS/2_Synaptics_TouchPad" { -# dwt enabled -# tap enabled -# natural_scroll enabled -# middle_emulation enabled -# } -# -# You can get the names of your inputs by running: swaymsg -t get_inputs -# Read `man 5 sway-input` for more information about this section. - -input * xkb_layout "us,mk" -input * xkb_variant "typewriter" -input * xkb_options "grp:caps_toggle" - -# Pulse Audio controls -bindsym XF86AudioRaiseVolume exec pactl set-sink-volume 0 +5% #increase sound volume -bindsym XF86AudioLowerVolume exec pactl set-sink-volume 0 -5% #decrease sound volume -bindsym XF86AudioMute exec pactl set-sink-mute 0 toggle # mute sound -bindsym XF86AudioMicMute exec pactl set-source-mute alsa_input.pci-0000_00_1b.0.analog-stereo toggle # mute mic - -# Sreen brightness controls -bindsym XF86MonBrightnessUp exec brightnessctl -q s +10% -bindsym XF86MonBrightnessDown exec brightnessctl -q s 10%- diff --git a/config/sway/config.d/50-style.conf b/config/sway/config.d/50-style.conf deleted file mode 100644 index 49f4ab4..0000000 --- a/config/sway/config.d/50-style.conf +++ /dev/null @@ -1,47 +0,0 @@ -# -# Status Bar: -# -# Read `man 5 sway-bar` for more information about this section. -bar { - position top - - # When the status_command prints a new line to stdout, swaybar updates. - # The default just shows the current date and time. - swaybar_command waybar -} - -# Remove title from windows -default_border pixel 1 -default_floating_border normal -bindsym $mod+t border toggle - -hide_edge_borders smart - -# Background -set $bg #232425 -# Background active -set $ba #191919 -# Background inactive -set $bi #3f3f3f -# Foreground active -set $fa #eff1f5 -# Foreground inactive -set $fi #646464 -# Border active -set $bra #9a9a9a -# Border inactive -set $bri #000000 - -# class border backgr. text indicator child_border -client.focused $bra $bra $bg $bg $bra -client.focused_inactive $bra $ba $fa $bg $bri -client.unfocused $bri $bi $fi $bg $bri -#client.urgent $br $br $fg $bg $br #currently not implemented -#client.placeholder $br $br $fg $bg $br #currently not implemented -client.background $bg - -gaps inner 0 -gaps outer 0 -#smart_gaps on - -for_window [app_id=".*"] border normal diff --git a/config/sway/config.d/60-app-windows.conf b/config/sway/config.d/60-app-windows.conf deleted file mode 100644 index e5221e2..0000000 --- a/config/sway/config.d/60-app-windows.conf +++ /dev/null @@ -1,34 +0,0 @@ -for_window [class="Firefox"] mark Browser -for_window [class="Firefox" window_role="Browser"] { - border normal 0 -} -# firefox floating menus -for_window [window_role="pop-up"] floating enable -for_window [window_role="task_dialog"] floating enable -for_window [window_role="pop-up"] floating enable -for_window [window_role="bubble"] floating enable -for_window [window_role="task_dialog"] floating enable -for_window [window_role="Preferences"] floating enable -for_window [window_type="dialog"] floating enable -for_window [window_type="menu"] floating enable -for_window [title="About Mozilla Firefox"] floating enabled -for_window [title="Password Required - Mozilla Firefox"] floating enabled -for_window [app_id="pinentry-qt"] { - move position center - floating enable -} -for_window [app_id="pavucontrol"] { - move position center - floating enable -} -for_window [app_id="wdisplays"] { - floating enable -} -for_window [app_id="com.nextcloud.desktopclient.nextcloud"] { - border normal 1 - floating enable -} - -for_window [app_id="avizo-service"] border pixel 0 -for_window [app_id="avizo-service"] sticky toggle -no_focus [app_id="avizo-service"] diff --git a/config/sway/config.d/90-bindings.conf b/config/sway/config.d/90-bindings.conf deleted file mode 100644 index 51af250..0000000 --- a/config/sway/config.d/90-bindings.conf +++ /dev/null @@ -1,150 +0,0 @@ -### Key bindings -# -# Basics: -# - # start a terminal - bindsym $mod+Return exec $term - - # kill focused window - bindsym $mod+Shift+q kill - - # start your launcher - bindsym $mod+d exec $menu - - # Drag floating windows by holding down $mod and left mouse button. - # Resize them with right mouse button + $mod. - # Despite the name, also works for non-floating windows. - # Change normal to inverse to use left mouse button for resizing and right - # mouse button for dragging. - floating_modifier $mod normal - - # reload the configuration file - bindsym $mod+Shift+c reload - - # exit sway (logs you out of your Wayland session) - bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit' -# -# Moving around: -# - # Move your focus around - bindsym $mod+$left focus left - bindsym $mod+$down focus down - bindsym $mod+$up focus up - bindsym $mod+$right focus right - # or use $mod+[up|down|left|right] - bindsym $mod+Left focus left - bindsym $mod+Down focus down - bindsym $mod+Up focus up - bindsym $mod+Right focus right - - # _move_ the focused window with the same, but add Shift - bindsym $mod+Shift+$left move left - bindsym $mod+Shift+$down move down - bindsym $mod+Shift+$up move up - bindsym $mod+Shift+$right move right - # ditto, with arrow keys - bindsym $mod+Shift+Left move left - bindsym $mod+Shift+Down move down - bindsym $mod+Shift+Up move up - bindsym $mod+Shift+Right move right -# -# Workspaces: -# - # switch to workspace - bindsym $mod+1 workspace 1 - bindsym $mod+2 workspace 2 - bindsym $mod+3 workspace 3 - bindsym $mod+4 workspace 4 - bindsym $mod+5 workspace 5 - bindsym $mod+6 workspace 6 - bindsym $mod+7 workspace 7 - bindsym $mod+8 workspace 8 - bindsym $mod+9 workspace 9 - bindsym $mod+0 workspace 10 - # move focused container to workspace - bindsym $mod+Shift+1 move container to workspace 1 - bindsym $mod+Shift+2 move container to workspace 2 - bindsym $mod+Shift+3 move container to workspace 3 - bindsym $mod+Shift+4 move container to workspace 4 - bindsym $mod+Shift+5 move container to workspace 5 - bindsym $mod+Shift+6 move container to workspace 6 - bindsym $mod+Shift+7 move container to workspace 7 - bindsym $mod+Shift+8 move container to workspace 8 - bindsym $mod+Shift+9 move container to workspace 9 - bindsym $mod+Shift+0 move container to workspace 10 - # Note: workspaces can have any name you want, not just numbers. - # We just use 1-10 as the default. -# -# Layout stuff: -# - # You can "split" the current object of your focus with - # $mod+b or $mod+v, for horizontal and vertical splits - # respectively. - bindsym $mod+b splith - bindsym $mod+v splitv - - # Switch the current container between different layout styles - bindsym $mod+s layout stacking - bindsym $mod+w layout tabbed - bindsym $mod+e layout toggle split - - # Make the current focus fullscreen - bindsym $mod+f fullscreen - - # Toggle the current focus between tiling and floating mode - bindsym $mod+Shift+space floating toggle - - # Swap focus between the tiling area and the floating area - bindsym $mod+space focus mode_toggle - - # move focus to the parent container - bindsym $mod+a focus parent -# -# Scratchpad: -# - # Sway has a "scratchpad", which is a bag of holding for windows. - # You can send windows there and get them back later. - - # Move the currently focused window to the scratchpad - bindsym $mod+Shift+minus move scratchpad - - # Show the next scratchpad window or hide the focused scratchpad window. - # If there are multiple scratchpad windows, this command cycles through them. - bindsym $mod+minus scratchpad show - - - -# Lock screen -bindsym $mod+z exec swaylock -c 000000 - -# Take full screen screenshot with PrtScr -bindsym Print exec grim -t png /tmp/screen.png -# Take area screenshot with Shift+PrtScr -bindsym Shift+Print exec grim -g "$(slurp)" /tmp/screen.png - -# -# Resizing containers: -# - bindsym $mod+r mode "resize" - - mode "resize" { - # left will shrink the containers width - # right will grow the containers width - # up will shrink the containers height - # down will grow the containers height - bindsym $left resize shrink width 10px - bindsym $down resize grow height 10px - bindsym $up resize shrink height 10px - bindsym $right resize grow width 10px - - # ditto, with arrow keys - bindsym Left resize shrink width 10px - bindsym Down resize grow height 10px - bindsym Up resize shrink height 10px - bindsym Right resize grow width 10px - - # return to default mode - bindsym Return mode "default" - bindsym Escape mode "default" - } - diff --git a/config/sway/config.d/91-swaysome.conf b/config/sway/config.d/91-swaysome.conf deleted file mode 100644 index 7f5308f..0000000 --- a/config/sway/config.d/91-swaysome.conf +++ /dev/null @@ -1,52 +0,0 @@ -# Change focus between workspaces -unbindsym $mod+1 -unbindsym $mod+2 -unbindsym $mod+3 -unbindsym $mod+4 -unbindsym $mod+5 -unbindsym $mod+6 -unbindsym $mod+7 -unbindsym $mod+8 -unbindsym $mod+9 -unbindsym $mod+0 -bindsym $mod+1 exec "swaysome focus 1" -bindsym $mod+2 exec "swaysome focus 2" -bindsym $mod+3 exec "swaysome focus 3" -bindsym $mod+4 exec "swaysome focus 4" -bindsym $mod+5 exec "swaysome focus 5" -bindsym $mod+6 exec "swaysome focus 6" -bindsym $mod+7 exec "swaysome focus 7" -bindsym $mod+8 exec "swaysome focus 8" -bindsym $mod+9 exec "swaysome focus 9" -bindsym $mod+0 exec "swaysome focus 0" - -# Move containers between workspaces -unbindsym $mod+Shift+1 -unbindsym $mod+Shift+2 -unbindsym $mod+Shift+3 -unbindsym $mod+Shift+4 -unbindsym $mod+Shift+5 -unbindsym $mod+Shift+6 -unbindsym $mod+Shift+7 -unbindsym $mod+Shift+8 -unbindsym $mod+Shift+9 -unbindsym $mod+Shift+0 -bindsym $mod+Shift+1 exec "swaysome move 1" -bindsym $mod+Shift+2 exec "swaysome move 2" -bindsym $mod+Shift+3 exec "swaysome move 3" -bindsym $mod+Shift+4 exec "swaysome move 4" -bindsym $mod+Shift+5 exec "swaysome move 5" -bindsym $mod+Shift+6 exec "swaysome move 6" -bindsym $mod+Shift+7 exec "swaysome move 7" -bindsym $mod+Shift+8 exec "swaysome move 8" -bindsym $mod+Shift+9 exec "swaysome move 9" -bindsym $mod+Shift+0 exec "swaysome move 0" - -# Move focused container to next output -bindsym $mod+o exec "swaysome next_output" - -# Move focused container to previous output -bindsym $mod+Shift+o exec "swaysome prev_output" - -# Init workspaces for every screen -exec "swaysome init 1" diff --git a/config/sway/config.d/99-startup.conf b/config/sway/config.d/99-startup.conf deleted file mode 100644 index 12814dd..0000000 --- a/config/sway/config.d/99-startup.conf +++ /dev/null @@ -1,3 +0,0 @@ -exec "/usr/local/bin/keyboard-layout-per-window.py" -exec "systemctl --user start sway-session.target" -exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway diff --git a/config/systemd/sway-session.target b/config/systemd/sway-session.target new file mode 100644 index 0000000..87fe41d --- /dev/null +++ b/config/systemd/sway-session.target @@ -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 diff --git a/config/systemd/wayland-session.target b/config/systemd/wayland-session.target new file mode 100644 index 0000000..d0b2888 --- /dev/null +++ b/config/systemd/wayland-session.target @@ -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 diff --git a/config/waybar/config b/config/waybar/config index 2bc2738..8b81d45 100644 --- a/config/waybar/config +++ b/config/waybar/config @@ -1,90 +1,95 @@ { - "layer": "top", // Waybar at top layer - "position": "bottom", // Waybar position (top|bottom|left|right) - "height": 30, - "modules-left": ["sway/workspaces", "sway/mode", "sway/window"], - "modules-center": [], - "modules-right": ["temperature", "network", "battery", "pulseaudio", "backlight", "cpu", "memory", "custom/layout", "clock", "tray"], - // Module config - "sway/mode": { - "tooltip": true, - "format": "{}" - }, - "temperature": { - "thermal-zone": 1, - "hwmon-path": "/sys/class/hwmon/hwmon2/temp3_input", - "critical-threshold": 80, - "format-critical": "🌡 {temperatureC}°C", - "format": "ī‹‹ {temperatureC}°C" - }, - "custom/vpn": { - }, - "network": { - "tooltip": false, - "interface": "wlp3s0*", - "format-wifi": "ī‡Ģ {essid} ({signalStrength}%)", - "format-ethernet": "{ifname}: {ipaddr}/{cidr}", - "format-linked": "{ifname} (No IP)", - "format-alt": "{ifname}: {ipaddr}", - "format-disconnected": "No internet" - }, - "battery": { - "tooltip": false, - "states": { - "good": 95, - "warning": 30, - "critical": 15 + "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}" }, - "format": "{icon} {capacity}%", - "format-alt": "{time} {icon} {power}", - "format-charging": "ī‡Ļ {capacity}%", - "format-icons": ["đŸĒĢ", "ī‰", "🔋"], - "format-plugged": "ī‡Ļ {capacity}%" - }, - "backlight": { - "device": "amdgpu_bl0", - "format": "{icon} {percent}%", - "format-icons": ["ī„‘", "ī†…"] - }, - "pulseaudio": { - "tooltip": true, - "scroll-step": 1.0, - "format": "{icon} {volume}%", - "format-bluetooth": "ī‚ą {volume}%", - "format-muted": "🔇", - "format-source": "{volume}%", - "format-source-muted": "🔇", - "format-icons": { - "headphones": "🎧", - "handsfree": "🎧", - "headset": "🎧", - "phone": "ī‚•", - "portable": "ī‚•", - "car": "ī†š", - "default": ["🔊"] + "sway/mode": { + "format": "{}" }, - "on-click": "pavucontrol" - }, - "cpu": { - "interval": 5, - "tooltip": false, - "format": "ī„ˆ {usage}%" - }, - "memory": { - "format": "īƒ‰ {}%" - }, - "custom/layout": { - "exec": "/etc/xdg/waybar/keyboard-layout.py", - "return-type": "json", - "format": "| {}" - }, - "clock": { - "tooltip": false, - "format": "| {:%d.%m.%Y %H:%M}" - }, - "tray": { - "tooltip": false, - "icon-size": 18, - "spacing": 5 - } + "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": "ī°" + } + } } diff --git a/config/waybar/keyboard-layout.py b/config/waybar/keyboard-layout.py deleted file mode 100755 index 92f132a..0000000 --- a/config/waybar/keyboard-layout.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/python -import i3ipc -import json - - -long_to_short = { - 'English (US)': 'en', - 'Macedonian': 'mk', -} - -def print_status(keyboard): - layout = keyboard.xkb_active_layout_name - short_code = long_to_short.get(layout, layout) - output = {"text": short_code, "tooltip": layout, "class": short_code} - print(json.dumps(output), flush=True) - -def find_keyboard(sway): - # *the* keyboard is the one with more than one layout - for input_dev in sway.get_inputs(): - if input_dev.type == 'keyboard' and len(input_dev.xkb_layout_names) > 1: - return input_dev - -def on_input(sway, event): - if event.change == "xkb_layout" and \ - event.input.identifier == sway.keyboard.identifier: - print_status(event.input) - -def main(): - sway = i3ipc.Connection() - sway.keyboard = find_keyboard(sway) - print_status(sway.keyboard) - - sway.on(i3ipc.Event.INPUT, on_input) - sway.main() - -main() diff --git a/config/waybar/style.css b/config/waybar/style.css index 1bd9166..f9db8d2 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -1,13 +1,14 @@ * { border: none; border-radius: 0; - font-family: Consolas, "Material Design Icons"; - font-size: 1em; + font-family: Roboto, Helvetica, Arial, sans-serif; + font-size: 13px; min-height: 0; } window#waybar { - background-color: rgba(11, 11, 11, 0.8); + 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; @@ -17,20 +18,6 @@ window#waybar.hidden { opacity: 0.2; } -#window { - padding: 0 15px; -} - -window { - color: rgba(217, 216, 216, 1); - background: rgba(35, 31, 32, 0.00); -} - -window#waybar.solo { - color: rgba(217, 216, 216, 1); - background: rgba(35, 31, 32, 0.85); -} - /* window#waybar.empty { background-color: transparent; @@ -40,84 +27,187 @@ window#waybar.solo { } */ -/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ +window#waybar.termite { + background-color: #3F3F3F; +} + +window#waybar.chromium { + background-color: #000000; + border: none; +} + #workspaces button { padding: 0 5px; background-color: transparent; - border-bottom: 2px solid rgba(180, 14, 25, 0.5); - color: #999999; + 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 { - color: #ffffff; - background-color: #333333; - border-bottom: 2px solid #ff9600; + background-color: #64727D; + border-bottom: 3px solid #ffffff; } #workspaces button.urgent { background-color: #eb4d4b; } -#clock, -#custom-vpn, -#battery, +#mode { + background-color: #64727D; + border-bottom: 3px solid #ffffff; +} + #cpu, #memory, +#temperature, #backlight, #network, #pulseaudio, +#custom-media, #tray, -#temperature, #mode, #idle_inhibitor { - padding: 0 5px; + padding: 0 10px; margin: 0 4px; - background-color: transparent; - border-bottom: 2px solid #bdbd45; color: #ffffff; } -#temperature { - border-bottom: 2px solid #42a832; -} -#mode { - background-color: #00ff96; - color: #000000; +#clock { + padding: 0 10px; + color: #ffffff; + background-color: #64727D; } -#pulseaudio, -#clock, -#tray, -#cpu { - border-bottom: transparent; +#battery .BAT0 { + margin-left: 9px; +} +#battery .BAT1 { + margin-right: 9px; } - #battery { - border-bottom: 2px solid #bff874; + padding: 0 10px; + background-color: #ffffff; + color: #000000; } #battery.charging { - border-bottom: 2px solid #00ff96; + color: #ffffff; + background-color: #26A65B; +} + +@keyframes blink { + to { + background-color: #ffffff; + color: #000000; + } } -#custom-vpn.down, -#temperature.critical, #battery.critical:not(.charging) { - border-bottom: 2px solid #dd2241; + 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; } -#network.disconnected { - border-bottom: 2px solid #dd2241; +#cpu { + background-color: #2ecc71; + color: #000000; } -#pulseaudio.bluetooth { - border-bottom: 2px solid #1a8cff; +#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 { - border-bottom: 2px solid #fff569; + 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; +} + diff --git a/config/wldash.yaml b/config/wldash.yaml deleted file mode 100644 index 4667602..0000000 --- a/config/wldash.yaml +++ /dev/null @@ -1,82 +0,0 @@ ---- -outputMode: active -scale: 0.6 -background: - red: 0.0 - green: 0.0 - blue: 0.0 - opacity: 0.8999999761581421 -widget: - margin: - margins: - - 20 - - 20 - - 20 - - 20 - widget: - verticalLayout: - - horizontalLayout: - - margin: - margins: - - 0 - - 88 - - 0 - - 32 - widget: - verticalLayout: - - date: - font: ~ - font_size: 64.0 - - clock: - font: ~ - font_size: 256.0 - - verticalLayout: - - margin: - margins: - - 0 - - 0 - - 0 - - 8 - widget: - battery: - font: ~ - font_size: 24.0 - length: 0 - - margin: - margins: - - 0 - - 0 - - 0 - - 8 - widget: - backlight: - device: intel_backlight - font: ~ - font_size: 24.0 - length: 0 - - margin: - margins: - - 0 - - 0 - - 0 - - 8 - widget: - pulseAudio: - font: ~ - font_size: 24.0 - length: 0 - - calendar: - font_primary: ~ - font_secondary: ~ - font_size: 16.0 - sections: 3 - - launcher: - font: ~ - font_size: 32.0 - length: 0 - app_opener: "" - term_opener: "" - url_opener: "" -fonts: - sans: sans - mono: mono diff --git a/fedora-35-updates.repo b/fedora-35-updates.repo new file mode 100644 index 0000000..afcf850 --- /dev/null +++ b/fedora-35-updates.repo @@ -0,0 +1,6 @@ +[fedora-35-updates] +name=Fedora 35 $basearch Updates +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f35&arch=$basearch +enabled=0 +gpgcheck=1 +metadata_expire=1d \ No newline at end of file diff --git a/fedora-37.repo b/fedora-35.repo similarity index 58% rename from fedora-37.repo rename to fedora-35.repo index 7e41cb3..07213ca 100644 --- a/fedora-37.repo +++ b/fedora-35.repo @@ -1,6 +1,6 @@ -[fedora-37] -name=Fedora 37 $basearch -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-37&arch=$basearch -enabled=1 +[fedora-35] +name=Fedora 35 $basearch +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-35&arch=$basearch +enabled=0 gpgcheck=1 metadata_expire=1d diff --git a/fedora-37-updates.repo b/fedora-37-updates.repo deleted file mode 100644 index c5b65df..0000000 --- a/fedora-37-updates.repo +++ /dev/null @@ -1,6 +0,0 @@ -[fedora-37-updates] -name=Fedora 37 $basearch Updates -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f37&arch=$basearch -enabled=1 -gpgcheck=1 -metadata_expire=1d diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index dfa1441..f8492a7 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -54,29 +54,15 @@ packages: - firewalld - fpaste - fros-gnome - - fwupd - gamemode - glibc - glibc-all-langpacks - glx-utils - gnupg2 - google-noto-emoji-color-fonts - - google-noto-naskh-arabic-vf-fonts - - google-noto-sans-armenian-vf-fonts - - google-noto-sans-canadian-aboriginal-vf-fonts - - google-noto-sans-cherokee-vf-fonts - google-noto-sans-cjk-ttc-fonts - - google-noto-sans-ethiopic-vf-fonts - - google-noto-sans-georgian-vf-fonts - - google-noto-sans-gurmukhi-vf-fonts - - google-noto-sans-hebrew-vf-fonts - - google-noto-sans-lao-vf-fonts - - google-noto-sans-math-vf-fonts - - google-noto-sans-mono-vf-fonts + - google-noto-sans-gurmukhi-fonts - google-noto-sans-sinhala-vf-fonts - - google-noto-sans-thaana-vf-fonts - - google-noto-sans-vf-fonts - - google-noto-serif-vf-fonts - gstreamer1-plugins-bad-free - gstreamer1-plugins-good - gstreamer1-plugins-ugly-free @@ -96,6 +82,8 @@ packages: - iptables-nft - iptstate - iputils + - ipw2100-firmware + - ipw2200-firmware - iwl100-firmware - iwl1000-firmware - iwl105-firmware @@ -133,7 +121,6 @@ packages: - lohit-devanagari-fonts - lohit-gujarati-fonts - lohit-kannada-fonts - - lohit-marathi-fonts - lohit-odia-fonts - lohit-tamil-fonts - lohit-telugu-fonts @@ -144,6 +131,7 @@ packages: - mdadm - mesa-dri-drivers - mesa-vulkan-drivers + - mlocate - mpage - mtr - nfs-utils @@ -178,7 +166,6 @@ packages: - qt5-qtxmlpatterns - quota - realmd - - rit-meera-new-fonts - rootfiles - rpm - rsync @@ -186,9 +173,11 @@ packages: - selinux-policy-targeted - setup - shadow-utils + - sil-abyssinica-fonts - sil-mingzat-fonts - sil-nuosu-fonts - sil-padauk-fonts + - smc-meera-fonts - sos - spice-vdagent - sssd diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index fbda7e3..6b06e46 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -96,23 +96,3 @@ exclude-packages: - gstreamer1-plugin-openh264 - mozilla-openh264 - openh264 - -postprocess: - - | - #!/usr/bin/env bash - set -xeuo pipefail - - # Work around https://bugzilla.redhat.com/show_bug.cgi?id=1265295 - # From https://github.com/coreos/fedora-coreos-config/blob/testing-devel/overlay.d/05core/usr/lib/systemd/journald.conf.d/10-coreos-persistent.conf - install -dm0755 /usr/lib/systemd/journald.conf.d/ - echo -e "[Journal]\nStorage=persistent" > /usr/lib/systemd/journald.conf.d/10-persistent.conf - - # See: https://src.fedoraproject.org/rpms/glibc/pull-request/4 - # Basically that program handles deleting old shared library directories - # mid-transaction, which never applies to rpm-ostree. This is structured as a - # loop/glob to avoid hardcoding (or trying to match) the architecture. - for x in /usr/sbin/glibc_post_upgrade.*; do - if test -f ${x}; then - ln -srf /usr/bin/true ${x} - fi - done diff --git a/greetd-37.repo b/greetd-35.repo similarity index 90% rename from greetd-37.repo rename to greetd-35.repo index 9decc39..f78ff45 100644 --- a/greetd-37.repo +++ b/greetd-35.repo @@ -1,6 +1,6 @@ [copr:copr.fedorainfracloud.org:alebastr:sway-extras] name=Copr repo for sway-extras owned by alebastr -baseurl=https://download.copr.fedorainfracloud.org/results/alebastr/sway-extras/fedora-37-$basearch/ +baseurl=https://download.copr.fedorainfracloud.org/results/alebastr/sway-extras/fedora-35-$basearch/ type=rpm-md skip_if_unavailable=True gpgcheck=1 diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index dd697c5..6c48e82 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -6,7 +6,6 @@ packages: - breeze-icon-theme - dolphin - firewall-config - - fprintd-pam - glibc-all-langpacks - gnome-keyring-pam - initial-setup-gui diff --git a/post.sh b/post.sh index 461b514..39db86f 100755 --- a/post.sh +++ b/post.sh @@ -26,6 +26,3 @@ for x in /usr/sbin/glibc_post_upgrade.*; do ln -srf /usr/bin/true ${x} fi done - -# enable services -systemctl enable greetd diff --git a/rpmfusion-free-37.repo b/rpmfusion-free-35.repo similarity index 58% rename from rpmfusion-free-37.repo rename to rpmfusion-free-35.repo index f21c8d7..a1fb520 100644 --- a/rpmfusion-free-37.repo +++ b/rpmfusion-free-35.repo @@ -1,32 +1,33 @@ -[rpmfusion-free-37] -name=RPM Fusion for Fedora 37 - Free -#baseurl=http://download1.rpmfusion.org/free/fedora/releases/36/Everything/$basearch/os/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-37&arch=$basearch +[rpmfusion-free-35] +name=RPM Fusion for Fedora 35 - Free +#baseurl=http://download1.rpmfusion.org/free/fedora/releases/35/Everything/$basearch/os/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-35&arch=$basearch enabled=0 metadata_expire=14d type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-37 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-35 -[rpmfusion-free-debuginfo-37] -name=RPM Fusion for Fedora 37 - Free - Debug -#baseurl=http://download1.rpmfusion.org/free/fedora/releases/36/Everything/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-debug-37&arch=$basearch +[rpmfusion-free-debuginfo-35] +name=RPM Fusion for Fedora 35 - Free - Debug +#baseurl=http://download1.rpmfusion.org/free/fedora/releases/35/Everything/$basearch/debug/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-debug-35&arch=$basearch enabled=0 metadata_expire=7d type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-37 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-35 -[rpmfusion-free-source-37] -name=RPM Fusion for Fedora 37 - Free - Source -#baseurl=http://download1.rpmfusion.org/free/fedora/releases/36/Everything/source/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-source-37&arch=$basearch +[rpmfusion-free-source-35] +name=RPM Fusion for Fedora 35 - Free - Source +#baseurl=http://download1.rpmfusion.org/free/fedora/releases/35/Everything/source/SRPMS/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-source-35&arch=$basearch enabled=0 metadata_expire=7d type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-37 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-35 + diff --git a/rpmfusion-free-updates-35.repo b/rpmfusion-free-updates-35.repo new file mode 100644 index 0000000..f7553a1 --- /dev/null +++ b/rpmfusion-free-updates-35.repo @@ -0,0 +1,30 @@ +[rpmfusion-free-updates-35] +name=RPM Fusion for Fedora 35 - Free - Updates +#baseurl=http://download1.rpmfusion.org/free/fedora/updates/35/$basearch/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-35&arch=$basearch +enabled=0 +type=rpm-md +gpgcheck=1 +repo_gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-35 + +[rpmfusion-free-updates-debuginfo-35] +name=RPM Fusion for Fedora 35 - Free - Updates Debug +#baseurl=http://download1.rpmfusion.org/free/fedora/updates/35/$basearch/debug/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-debug-35&arch=$basearch +enabled=0 +type=rpm-md +gpgcheck=1 +repo_gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-35 + +[rpmfusion-free-updates-source-35] +name=RPM Fusion for Fedora 35 - Free - Updates Source +#baseurl=http://download1.rpmfusion.org/free/fedora/updates/35/SRPMS/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-source-35&arch=$basearch +enabled=0 +type=rpm-md +gpgcheck=1 +repo_gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-35 + diff --git a/rpmfusion-free-updates-37.repo b/rpmfusion-free-updates-37.repo deleted file mode 100644 index 6e1831b..0000000 --- a/rpmfusion-free-updates-37.repo +++ /dev/null @@ -1,29 +0,0 @@ -[rpmfusion-free-updates-37] -name=RPM Fusion for Fedora 37 - Free - Updates -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/36/$basearch/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-37&arch=$basearch -enabled=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-37 - -[rpmfusion-free-updates-debuginfo-37] -name=RPM Fusion for Fedora 37 - Free - Updates Debug -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/36/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-debug-37&arch=$basearch -enabled=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-37 - -[rpmfusion-free-updates-source-37] -name=RPM Fusion for Fedora 37 - Free - Updates Source -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/36/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-source-37&arch=$basearch -enabled=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-37 diff --git a/rpmfusion.repo b/rpmfusion.repo new file mode 100644 index 0000000..e826798 --- /dev/null +++ b/rpmfusion.repo @@ -0,0 +1,18 @@ +[rpmfusion-free] +name=RPM Fusion for Fedora $releasever - Free +#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-34&arch=$basearch +enabled=1 +metadata_expire=14d +type=rpm-md +gpgcheck=0 + +[rpmfusion-free-updates] +name=RPM Fusion for Fedora $releasever - Free - Updates +#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-34&arch=$basearch +enabled=1 +enabled_metadata=1 +type=rpm-md +gpgcheck=0 +repo_gpgcheck=0 diff --git a/x13-gen1-sway-desktop.yaml b/x13-gen1-sway-desktop.yaml deleted file mode 100644 index bd9e0c4..0000000 --- a/x13-gen1-sway-desktop.yaml +++ /dev/null @@ -1,368 +0,0 @@ -ref: x13-gen1-sway-desktop-37 -rojig: - name: x13-gen1-sway-desktop-37 - summary: "Thinkpad X13 Gen 1 Sway Desktop - Fedora 37" - license: MIT - -automatic_version_prefix: "37" -mutate-os-release: "37" - -repos: - - fedora-37 - - fedora-37-updates - - rpmfusion-free-37 - - rpmfusion-free-updates-37 - - copr:copr.fedorainfracloud.org:dawid:better_fonts - - copr:copr.fedorainfracloud.org:alebastr:sway-extras - -selinux: true -documentation: true -boot-location: modules -etc-group-members: - - wheel -tmp-is-dir: true - -postprocess-script: post.sh - -ignore-removed-users: - - root -ignore-removed-groups: - - root -check-passwd: - type: file - filename: passwd -check-groups: - type: file - filename: group - -default_target: graphical.target - -packages: - - lvm2 - - rpm-ostree -# Container management - - buildah - - podman - - skopeo - - toolbox -# Flatpak support - - flatpak - - xdg-desktop-portal - - glibc-devel - - kernel-devel - - elfutils-libelf-devel - - fedora-repos-ostree - - fedora-repos-archive -# boot / hardware / drivers - - efibootmgr - - fwupd - - libva-intel-driver - - libva-intel-hybrid-driver - - mcelog - - microcode_ctl - - thermald - - thinkfan -# base system - - biosdevname - - coreutils-common - - dbus-daemon - - device-mapper-multipath - - nvme-cli - - rng-tools -# diagnostic / utils - - htop - - iotop - - lm_sensors - - lshw - - net-tools - - nmap-ncat - - powertop - - wireshark -# alternative modern rust apps - - bat - - ripgrep -# networking - - bridge-utils - - dhcpcd - - iwd - - NetworkManager - - network-manager-applet - - NetworkManager-bluetooth - - NetworkManager-config-connectivity-fedora - - NetworkManager-wifi - - NetworkManager-wwan -# shell tools and development - - alacritty - - autoconf - - automake - - ctags - - emacs - - gettext-devel - - git - - intltool - - ipython3 - - libtool - - make - - neovim - - patchutils - - squashfs-tools - - strace - - systemd-container - - vim-enhanced - - w3m - - zram-generator -# fonts - - adobe-source-sans-pro-fonts - - bitstream-vera-fonts-all - - dejavu-sans-fonts - - dejavu-sans-mono-fonts - - dejavu-serif-fonts - - fontawesome-fonts - - fontawesome-fonts-web - - fontconfig - - fontconfig-enhanced-defaults - - google-noto-emoji-color-fonts - - google-noto-sans-gurmukhi-fonts - - google-noto-sans-sinhala-vf-fonts - - khmer-os-system-fonts - - langpacks-core-font-en - - liberation-mono-fonts - - liberation-sans-fonts - - liberation-serif-fonts - - lohit-assamese-fonts - - lohit-bengali-fonts - - lohit-devanagari-fonts - - lohit-gujarati-fonts - - lohit-kannada-fonts - - lohit-odia-fonts - - lohit-tamil-fonts - - lohit-telugu-fonts - - open-sans-fonts - - paktype-naskh-basic-fonts - - sil-abyssinica-fonts - - sil-mingzat-fonts - - sil-nuosu-fonts - - sil-padauk-fonts - - rit-meera-new-fonts - - terminus-fonts - - thai-scalable-waree-fonts - - ucs-miscfixed-opentype-fonts - - urw-base35-bookman-fonts - - urw-base35-c059-fonts - - urw-base35-d050000l-fonts - - urw-base35-fonts - - urw-base35-fonts-common - - urw-base35-gothic-fonts - - urw-base35-nimbus-mono-ps-fonts - - urw-base35-nimbus-roman-fonts - - urw-base35-nimbus-sans-fonts - - urw-base35-p052-fonts - - urw-base35-standard-symbols-ps-fonts - - urw-base35-z003-fonts -# audio / video - - alsa-plugins-pulseaudio - - ffmpeg - - gstreamer1-libav - - gvfs-mtp - - libavdevice - - libva - - libva-utils - - pavucontrol - - pulseaudio-utils -# misc - - feh - - okular -# sway / wayland desktop - - brightnessctl - - cage - - greetd - - greetd-gtkgreet - - grim - - i3status-rs - - kanshi - - mako - - pinentry-qt - - slurp - - sway - - swayidle - - swaylock - - waybar - - wayland-devel - - wdisplays - - wl-clipboard - - wldash - - xdg-desktop-portal-wlr -# 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 -# comps-sync - - abattis-cantarell-fonts - - acl - - alsa-sof-firmware - - alsa-ucm - - alsa-utils - - attr - - audit - - b43-fwcutter - - b43-openfwwf - - basesystem - - bash - - bash-completion - - bc - - bind-utils - - bzip2 - - colord - - compsize - - coreutils - - cpio - - cryptsetup - - curl - - dhcp-client - - dnsmasq - - e2fsprogs - - ethtool - - exfatprogs - - fedora-repos-modular - - file - - filesystem - - firefox - - firewalld - - glibc - - glibc-all-langpacks - - glx-utils - - gnupg2 - - gstreamer1-plugins-bad-free - - gstreamer1-plugins-good - - gstreamer1-plugins-ugly-free - - hostname - - hunspell - - ibus-anthy - - ibus-gtk3 - - ibus-hangul - - ibus-libpinyin - - ibus-libzhuyin - - ibus-m17n - - ibus-typing-booster - - iproute - - iptables-nft - - iptstate - - iputils - - iwl7260-firmware - - jomolhari-fonts - - kbd - - kernel - - kernel-modules-extra - - less - - libertas-sd8686-firmware - - libertas-sd8787-firmware - - libertas-usb8388-firmware - - linux-firmware - - logrotate - - lsof - - man-db - - man-pages - - mdadm - - mesa-dri-drivers - - mesa-vulkan-drivers - - mlocate - - mtr - - nfs-utils - - nss-altfiles - - nss-mdns - - opensc - - openssh-clients - - openssh-server - - pam_afs_session - - passwd - - passwdqc - - pciutils - - pinfo - - pipewire-alsa - - pipewire-gstreamer - - pipewire-pulseaudio - - pipewire-utils - - plymouth - - plymouth-system-theme - - policycoreutils - - policycoreutils-python-utils - - procps-ng - - psmisc - - qemu-guest-agent - - qt5-qtbase - - qt5-qtbase-gui - - qt5-qtdeclarative - - qt5-qtxmlpatterns - - quota - - rootfiles - - rpm - - rsync - - selinux-policy-targeted - - setup - - shadow-utils - - sos - - spice-vdagent - - sssd - - sssd-common - - sssd-kcm - - stix-fonts - - sudo - - systemd - - systemd-oomd-defaults - - systemd-resolved - - systemd-udev - - tar - - time - - tree - - unzip - - uresourced - - usb_modeswitch - - usbutils - - util-linux - - wget - - which - - wireplumber - - words - - wpa_supplicant - - zip - - zram-generator-defaults - -# Make sure the following are not pulled in when Recommended by other packages -exclude-packages: - - PackageKit - # We can not include openh264. See https://fedoraproject.org/wiki/OpenH264 - - gstreamer1-plugin-openh264 - - mozilla-openh264 - - openh264 - - xdg-desktop-portal-gtk - -add-files: - - ["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/environment.d/wayland.conf", "/etc/environment.d/wayland.conf"] - - ["config/greetd/config.toml", "/etc/greetd/config.toml"] - - ["config/sway/config", "/etc/sway/config"] - - ["config/sway/config.d/10-variables.conf", "/etc/sway/config.d/10-variables.conf"] - - ["config/sway/config.d/20-output.conf", "/etc/sway/config.d/20-output.conf"] - - ["config/sway/config.d/30-input.conf", "/etc/sway/config.d/30-input.conf"] - - ["config/sway/config.d/50-style.conf", "/etc/sway/config.d/50-style.conf"] - - ["config/sway/config.d/60-app-windows.conf", "/etc/sway/config.d/60-app-windows.conf"] - - ["config/sway/config.d/90-bindings.conf", "/etc/sway/config.d/90-bindings.conf"] - - ["config/sway/config.d/91-swaysome.conf", "/etc/sway/config.d/91-swaysome.conf"] - - ["config/sway/config.d/99-startup.conf", "/etc/sway/config.d/99-startup.conf"] - - ["config/sway/bin/keyboard-layout-per-window.py", "/usr/bin/keyboard-layout-per-window.py"] - - ["config/waybar/config", "/etc/xdg/waybar/config"] - - ["config/waybar/style.css", "/etc/xdg/waybar/style.css"] - - ["config/waybar/keyboard-layout.py", "/etc/xdg/waybar/keyboard-layout.py"] - - ["config/wldash.yaml", "/usr/share/wldash/config.yaml"]