Switching back to ubuntu-latest to attempt to use rechunk

Reviewed-on: #47
Co-authored-by: Eriq Taing <eriq12@protonmail.com>
Co-committed-by: Eriq Taing <eriq12@protonmail.com>

.github/workflows/build-nvidia.yml

@@ -0,0 +1,30 @@
+name: bluebuild-nvidia
+on:
+  workflow_dispatch: # allow manually triggering builds
+jobs:
+  bluebuild:
+    name: Build Custom Image
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+    strategy:
+      fail-fast: false # stop GH from cancelling all matrix builds if one fails
+      matrix:
+        recipe:
+          # !! Add your recipes here
+          - recipe_nvidia.yml
+    steps:
+      # the build is fully handled by the reusable github action
+      - name: Build Custom Image
+        uses: blue-build/github-action@v1.8
+        with:
+          recipe: ${{ matrix.recipe }}
+          cosign_private_key: ${{ secrets.SIGNING_SECRET }}
+          registry: 'git.hydrosaber.com'
+          registry_token: ${{ secrets.PACKAGE_BUILDER_TOKEN }}
+          pr_event_number: ${{ github.event.number }}
+
+          # enabled by default, disable if your image is small and you want faster builds
+          maximize_build_space: true

.github/workflows/build.yml

@@ -2,18 +2,19 @@ name: bluebuild
 on:
   schedule:
     - cron:
-        "00 06 * * *" # build at 06:00 UTC every day
+        "00 06 * * *" # build at 06:00 UTC every Monday
         # (20 minutes after last ublue images start building)
   push:
+    branches:
+      - main
     paths-ignore: # don't rebuild if only documentation has changed
       - "**.md"
-
+      - ".github/workflows/build-nvidia.yml"
+      - "files/scripts/nvidia/**"
+      - "recipes/components/nvidia-module.yml"
+      - "recipes/recipe_nvidia.yml"
   pull_request:
   workflow_dispatch: # allow manually triggering builds
-concurrency:
-  # only run one build at a time
-  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
-  cancel-in-progress: true
 jobs:
   bluebuild:
     name: Build Custom Image
@@ -29,6 +30,7 @@ jobs:
           # !! Add your recipes here
           - recipe.yml
     steps:
+      
       # the build is fully handled by the reusable github action
       - name: Build Custom Image
         uses: blue-build/github-action@v1.8
@@ -41,3 +43,4 @@ jobs:
 
           # enabled by default, disable if your image is small and you want faster builds
           maximize_build_space: true
+          rechunk: true

README.md

@@ -26,4 +26,9 @@ To rebase an existing atomic Fedora installation to the latest build:
   systemctl reboot
   ```
 
-The `latest` tag will automatically point to the latest build. That build will still always use the Fedora version specified in `recipe.yml`, so you won't get accidentally updated to the next major version.
+The `latest` tag will automatically point to the latest build. That build will still always use the Fedora version specified in `recipe.yml`, so you won't get accidentally updated to the next major version.
+
+
+# Attribution
+
+Thanks to [Wayblue](https://github.com/wayblueorg/wayblue) for how to get around some issues with sddm on an atomic distribution and how to create a working distro from the base Fedora image.

files/dnf/codium.repo

@@ -0,0 +1,8 @@
+[gitlab.com_paulcarroty_vscodium_repo]
+name=download.vscodium.com
+baseurl=https://download.vscodium.com/rpms/
+enabled=1
+gpgcheck=1
+repo_gpgcheck=1
+gpgkey=https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/-/raw/master/pub.gpg
+metadata_expire=1h

files/gschema-overrides/zz1-hydro-os-theming.gschema.override

@@ -0,0 +1,4 @@
+[org.gnome.desktop.interface]
+gtk-theme='Adwaita-dark' 
+color-scheme='prefer-dark'
+icon-theme='Papirus'

files/scripts/addimageinfo.sh

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+# This file includes code from Universal Blue which is licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS"
+# BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
+# governing permissions and limitations under the License.
+
+IMAGE_PRETTY_NAME="hydro-os"
+IMAGE_LIKE="fedora"
+HOME_URL="https://git.hydrosaber.com/eriq12/hydro-os"
+DOCUMENTATION_URL="https://git.hydrosaber.com/eriq12/hydro-os"
+SUPPORT_URL="https://git.hydrosaber.com/eriq12/hydro-os/issues"
+BUG_SUPPORT_URL="https://git.hydrosaber.com/eriq12/hydro-os/issues"
+
+if grep -q "VARIANT_ID" /usr/lib/os-release; then
+    sed -i "s/^VARIANT_ID=.*/VARIANT_ID=$IMAGE_NAME/" /usr/lib/os-release
+else
+    echo "VARIANT_ID=$IMAGE_NAME" >> /usr/lib/os-release
+fi
+sed -i "s/^PRETTY_NAME=.*/PRETTY_NAME=\"${IMAGE_PRETTY_NAME} (powered by Fedora Atomic)\"/" /usr/lib/os-release
+sed -i "s/^NAME=.*/NAME=\"$IMAGE_PRETTY_NAME\"/" /usr/lib/os-release
+sed -i "s|^HOME_URL=.*|HOME_URL=\"$HOME_URL\"|" /usr/lib/os-release
+sed -i "s|^DOCUMENTATION_URL=.*|DOCUMENTATION_URL=\"$DOCUMENTATION_URL\"|" /usr/lib/os-release
+sed -i "s|^SUPPORT_URL=.*|SUPPORT_URL=\"$SUPPORT_URL\"|" /usr/lib/os-release
+sed -i "s|^BUG_REPORT_URL=.*|BUG_REPORT_URL=\"$BUG_SUPPORT_URL\"|" /usr/lib/os-release
+sed -i "s|^CPE_NAME=\"cpe:/o:fedoraproject:fedora|CPE_NAME=\"cpe:/o:wayblue:${IMAGE_PRETTY_NAME,}|" /usr/lib/os-release
+sed -i "s/^DEFAULT_HOSTNAME=.*/DEFAULT_HOSTNAME=\"${IMAGE_PRETTY_NAME,}\"/" /usr/lib/os-release
+sed -i "s/^ID=fedora/ID=\"${IMAGE_LIKE,}\"\nID_LIKE=\"${IMAGE_PRETTY_NAME,}\"/" /usr/lib/os-release
+sed -i "/^REDHAT_BUGZILLA_PRODUCT=/d; /^REDHAT_BUGZILLA_PRODUCT_VERSION=/d; /^REDHAT_SUPPORT_PRODUCT=/d; /^REDHAT_SUPPORT_PRODUCT_VERSION=/d" /usr/lib/os-release
+
+# Fix issues caused by ID no longer being fedora
+sed -i "s/^EFIDIR=.*/EFIDIR=\"fedora\"/" /usr/sbin/grub2-switch-to-blscfg

files/scripts/example.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-# Tell this script to exit if there are any errors.
-# You should have this in every custom script, to ensure that your completed
-# builds actually ran successfully without any errors!
-set -oue pipefail
-
-# Your code goes here.
-echo 'This is an example shell script'
-echo 'Scripts here will run during build if specified in recipe.yml'

files/scripts/installdkmsmodules.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+echo "INFO: grab kernel module"
+KERNEL_VER=$(ls /lib/modules | head -n 1)
+echo $KERNEL_VER
+
+echo "INFO: list all modules"
+ls /usr/src
+
+echo "INFO: grab xpad modules"
+XPAD_MODULE_VER=$(ls /usr/src | grep xpadneo |  sed 's/-/\//')
+echo $XPAD_MODULE_VER
+
+echo "INFO: grab open razer modules"
+RAZER_MODULE_VER=$(ls /usr/src | grep razer | sed -E 's/(.*)-/\1\//')
+echo $RAZER_MODULE_VER
+
+echo "INFO: build and install xpadneo"
+sudo dkms build -m $XPAD_MODULE_VER -k $KERNEL_VER
+sudo dkms install -m $XPAD_MODULE_VER -k $KERNEL_VER
+
+echo "INFO: build and install openrazer"
+sudo dkms build -m $RAZER_MODULE_VER -k $KERNEL_VER
+sudo dkms install -m $RAZER_MODULE_VER -k $KERNEL_VER

files/scripts/installohmyzsh.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+git clone https://github.com/ohmyzsh/ohmyzsh.git /usr/share/ohmyzsh

files/scripts/nvidia/installtoolkitpolicy.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+semodule --verbose --install /usr/share/selinux/packages/nvidia-container.pp

files/scripts/nvidia/removeunusedrepos.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+rm -f /etc/yum.repos.d/negativo17-fedora-nvidia.repo
+rm -f /etc/yum.repos.d/negativo17-fedora-multimedia.repo
+rm -f /etc/yum.repos.d/eyecantcu-supergfxctl.repo
+rm -f /etc/yum.repos.d/_copr_ublue-os-akmods.repo
+rm -f /etc/yum.repos.d/nvidia-container-toolkit.repo

files/scripts/nvidia/setdrmvariables.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+
+echo '
+
+# Nvidia modesetting support. Set to 0 or comment to disable kernel modesetting
+# support. This must be disabled in case of SLI Mosaic.
+
+options nvidia-drm modeset=1 fbdev=1
+
+' > /usr/lib/modprobe.d/nvidia-modeset.conf
+
+cp /usr/lib/modprobe.d/nvidia-modeset.conf /etc/modprobe.d/nvidia-modeset.conf

files/scripts/nvidia/setearlyloading.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+sed -i 's@omit_drivers@force_drivers@g' /usr/lib/dracut/dracut.conf.d/99-nvidia.conf
+sed -i 's@ nvidia @ i915 amdgpu nvidia @g' /usr/lib/dracut/dracut.conf.d/99-nvidia.conf

files/scripts/setsddmtheming.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+sed -i 's/color: "black"/color: "white"/' /usr/share/sddm/themes/maldives/Main.qml
+sed -i 's/id: lblPassword/id: lblPassword\ncolor: "white"/' /usr/share/sddm/themes/maldives/Main.qml
+sed -i 's/id: lblName/id: lblName\ncolor: "white"/' /usr/share/sddm/themes/maldives/Main.qml
+sed -i 's/id: lblSession/id: lblSession\ncolor: "white"/' /usr/share/sddm/themes/maldives/Main.qml
+sed -i 's/id: lblLayout/id: lblLayout\ncolor: "white"/' /usr/share/sddm/themes/maldives/Main.qml
+sed -i 's/id: errorMessage/id: errorMessage\ncolor: "white"/' /usr/share/sddm/themes/maldives/Main.qml

files/scripts/setupchezmoiskel.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+git clone https://git.hydrosaber.com/eriq12/dotfiles /etc/skel/.local/share/chezmoi
+
+cp /etc/skel/.local/share/chezmoi/dot_bashrc /etc/skel/.bashrc
+cp /etc/skel/.local/share/chezmoi/dot_zshrc /etc/skel/.zshrc
+cp -r /etc/skel/.local/share/chezmoi/dot_config /etc/skel/.config

files/system/etc/.gitkeep

@@ -1 +0,0 @@
-

files/system/etc/default/useradd

@@ -0,0 +1,8 @@
+# useradd defaults file
+GROUP=100
+HOME=/home
+INACTIVE=-1
+EXPIRE=
+SHELL=/bin/zsh
+SKEL=/etc/skel
+CREATE_MAIL_SPOOL=yes

files/system/etc/environment.d/theme.conf

@@ -0,0 +1,2 @@
+QT_QPA_PLATFORMTHEME=qt6ct
+QT_QUICK_CONTROLS_STYLE=org.hyprland.style

files/system/etc/firewalld/services/grayjay.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<service>
+  <port port="12315" protocol="tcp"/>
+</service>

files/system/etc/firewalld/services/localsend.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<service>
+  <port port="53317" protocol="tcp"/>
+  <port port="53317" protocol="udp"/>
+</service>

files/system/etc/modules-load.d/asus-sensor.conf

@@ -0,0 +1 @@
+nct6775

files/system/etc/modules-load.d/ntsync.conf

@@ -0,0 +1 @@
+ntsync

files/system/etc/pipewire/105-add-discord-name.conf

@@ -0,0 +1,26 @@
+# ~/.config/pipewire/pipewire.conf.d/104-group-game-audio-to-node.conf
+
+node.rules = [
+  {
+    matches = [
+      {
+        application.process.binary = "equibop.bin"
+      }
+      {
+        pipewire.access.portal.app_id = "io.github.equicord.equibop"
+      }
+      {
+        pipewire.access.portal.app_id = "com.discordapp.Discord"
+      }
+      {
+        pipewire.access.portal.app_id = "com.discordapp.DiscordCanary"
+      }
+    ]
+    actions = {
+      update-props = {
+        application.name = "Discord"
+        node.name = "Discord"
+      }
+    }
+  }
+]

files/system/etc/pipewire/109-add-freetube-name.conf

@@ -0,0 +1,17 @@
+# ~/.config/pipewire/pipewire.conf.d/104-group-game-audio-to-node.conf
+
+node.rules = [
+  {
+    matches = [
+      {
+        pipewire.access.portal.app_id = "io.github.equicord.equibop"
+      }
+    ]
+    actions = {
+      update-props = {
+        application.name = "Freetube"
+        node.name = "Freetube"
+      }
+    }
+  }
+]

files/system/etc/sddm/sddm-useradd

@@ -0,0 +1,4 @@
+#!/usr/bin/sh
+
+getent group sddm > /dev/null || groupadd -r sddm
+getent passwd sddm > /dev/null || useradd -r -g sddm -c "SDDM Greeter Account" -d /var/lib/sddm -s /usr/sbin/nologin sddm

files/system/etc/skel/.config/hypr/hyprland.conf.d/monitors.conf

@@ -0,0 +1,4 @@
+# monitors.conf
+
+# See https://wiki.hyprland.org/Configuring/Monitors/
+monitor=,preferred,auto,auto

files/system/etc/skel/.config/nvim/init.lua

@@ -1,4 +0,0 @@
-#!/usr/bin/env lua
-require("options")
-require("keymaps")
-require("config.lazy")

files/system/etc/skel/.config/nvim/lua/config/lazy.lua

@@ -1,34 +0,0 @@
--- Bootstrap lazy.nvim
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not (vim.uv or vim.loop).fs_stat(lazypath) then
-	local lazyrepo = "https://github.com/folke/lazy.nvim.git"
-	local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
-	if vim.v.shell_error ~= 0 then
-		vim.api.nvim_echo({
-			{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
-			{ out, "WarningMsg" },
-			{ "\nPress any key to exit..." },
-		}, true, {})
-		vim.fn.getchar()
-		os.exit(1)
-	end
-end
-vim.opt.rtp:prepend(lazypath)
-
--- Make sure to setup `mapleader` and `maplocalleader` before
--- loading lazy.nvim so that mappings are correct.
--- This is also a good place to setup other settings (vim.opt)
-vim.g.mapleader = " "
-vim.g.maplocalleader = "\\"
-
--- Setup lazy.nvim
-require("lazy").setup({
-	spec = {
-		-- import your plugins
-		{ import = "plugins" },
-	},
-	-- Configure any other settings here. See the documentation for more details.
-	-- colorscheme that will be used when installing plugins.
-	-- automatically check for plugin updates
-	checker = { enabled = true },
-})

files/system/etc/skel/.config/nvim/lua/keymaps.lua

@@ -1,31 +0,0 @@
--- define comon options
-local opts = {
-    noremap = true,         -- non-recursive
-    silent = true,          -- do not show message
-}
-
------------------
--- Normal mode --
------------------
-
--- check `:h vim.map.set()` to get better idea of what this does
--- Better window navigation
-vim.keymap.set('n', '<C-h>', '<C-w>h', opts)
-vim.keymap.set('n', '<C-j>', '<C-w>j', opts)
-vim.keymap.set('n', '<C-k>', '<C-w>k', opts)
-vim.keymap.set('n', '<C-l>', '<C-w>l', opts)
-
--- Resize with arrows
--- delta: 2 lines
-vim.keymap.set('n', '<C-Up>', ':resize -2<CR>', opts)
-vim.keymap.set('n', '<C-Down>', ':resize +2<CR>', opts)
-vim.keymap.set('n', '<C-Left>', ':vertical resize -2<CR>', opts)
-vim.keymap.set('n', '<C-Right>', ':vertical resize +2<CR>', opts)
-
------------------
--- Visual mode --
------------------
-
--- start visual mode with same area as previous area and same mode
-vim.keymap.set('v', '<', '<gv', opts)
-vim.keymap.set('v', '>', '>gv', opts)

files/system/etc/skel/.config/nvim/lua/options.lua

@@ -1,25 +0,0 @@
--- use `:h <option>` to figure out meaning
-vim.opt.clipboard = "unnamedplus" -- use system keyboard
-vim.opt.completeopt = { "menu", "noinsert", "noselect" }
-vim.opt.mouse = "a" -- supposedly to allow the mouse to be used in nvim
-
--- Tab settings
-vim.opt.tabstop = 4 -- set number of visual spaces per \t (Tab)
-vim.opt.softtabstop = 4 -- set number of space in tab when editing
-vim.opt.shiftwidth = 4 -- insert 4 spaces on a tab
-vim.opt.expandtab = false -- for python apparently, treat tabs as spaces
-
--- UI config
-vim.opt.number = true -- show the absolute number
-vim.opt.relativenumber = true -- to add numbers to each line on the left side (line numbers?)
-vim.opt.cursorline = true -- highlights the line where the cursor is
-vim.opt.splitbelow = true -- sets new splits to be opened below
-vim.opt.splitright = true -- sets new splits to be opened to the right
-vim.opt.termguicolors = true -- enables 24-bit RGB color in Terminal UI
--- vim.opt.showmode = false		-- removes the --INSERT-- like UI at the bottom
-
--- Search settings
-vim.opt.incsearch = true -- search as characters are entered
---vim.opt.hlsearch = false		-- do not highlight matches
-vim.opt.ignorecase = true -- ignore cases by default
-vim.opt.smartcase = true -- when capitalized, be case sensitive

files/system/etc/skel/.config/nvim/lua/plugins/init.lua

@@ -1,24 +0,0 @@
-return {
-	{
-		"LazyVim/LazyVim",
-		import = "lazyvim.plugins",
-		opts = {
-			colorscheme = function()
-				local tokyonight = require("tokyonight")
-				tokyonight.setup({
-					style = "night",
-					on_highlights = function(hl)
-						hl.LineNrAbove = {
-							fg = "#6ab8ff",
-						}
-						hl.LineNrBelow = {
-							fg = "#ff6188",
-						}
-					end,
-					on_colors = function() end,
-				})
-				tokyonight.load()
-			end,
-		},
-	},
-}

files/system/etc/skel/.config/nvim/lua/plugins/neo-tree.lua

@@ -1,12 +0,0 @@
-return {
-	{
-		"nvim-neo-tree/neo-tree.nvim",
-		branch = "v3.x",
-		dependencies = {
-			"nvim-lua/plenary.nvim",
-			"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
-			"MunifTanjim/nui.nvim",
-			-- {"3rd/image.nvim", opts = {}}, -- Optional image support in preview window: See `# Preview Mode` for more information
-		},
-	},
-}

files/system/etc/skel/.config/nvim/lua/plugins/remove-bufferline.lua

@@ -1,14 +0,0 @@
-return {
-	{
-		{
-			"akinsho/bufferline.nvim",
-			version = "*",
-			dependencies = "nvim-tree/nvim-web-devicons",
-			opts = {
-				options = {
-					mode = "tabs",
-				},
-			},
-		},
-	},
-}

files/system/etc/skel/.config/nvim/lua/plugins/treesitter.lua

@@ -1,18 +0,0 @@
-local plugin = {
-	"nvim-treesitter/nvim-treesitter",
-	build = function()
-		require("nvim-treesitter.install").update({ with_sync = true })()
-	end,
-    config = function()
-        local configs = require("nvim-treesitter.configs")
-
-        configs.setup({
-            ensure_installed = { "c", "lua", "vim", "vimdoc", "query", "elixir", "heex", "javascript", "html" },
-            sync_install = false,
-            highlight = { enable = true },
-            indent = { enable = true },
-        })
-    end,
-}
-
-return { plugin }

files/system/etc/xdg/autostart/kitty.desktop

@@ -0,0 +1,16 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=kitty
+GenericName=Terminal emulator
+Comment=Fast, feature-rich, GPU based terminal
+TryExec=kitty
+StartupNotify=true
+Exec=/usr/bin/hyprctl dispatch exec [workspace special:terminal silent] /usr/bin/kitty
+Icon=kitty
+Categories=System;TerminalEmulator;
+X-TerminalArgExec=--
+X-TerminalArgTitle=--title
+X-TerminalArgAppId=--class
+X-TerminalArgDir=--working-directory
+X-TerminalArgHold=--hold

files/system/etc/xdg/waybar/config.jsonc

@@ -1,100 +0,0 @@
-// -*- mode: jsonc -*-
-{
-    "layer": "top", // Waybar at top layer
-    // "position": "bottom", // Waybar position (top|bottom|left|right)
-    "height": 52, // Waybar height (to be removed for auto height)
-    // "width": 1280, // Waybar width
-    "spacing": 0, // Gaps between modules (4px)
-    // Choose the order of the modules
-    "modules-left": [
-	    "cpu",
-	    "memory",
-        "hyprland/workspaces",
-        "hyprland/window"
-    ],
-    "modules-center": [
-        "mpris"
-    ],
-    "modules-right": [
-        "tray",
-        "gamemode",
-        "wireplumber",
-        "custom/notification",
-        "clock"
-    ],
-    //"reload_style_on_change": true,
-    "hyprland/window":{
-      "separate-outputs": true,
-      "hide-empty-text": true,
-    },
-    "tray": {
-        // "icon-size": 21,
-        "spacing": 10
-    },
-    "clock": {
-        // "timezone": "America/New_York",
-	      "format": "{:%I : %M %p %Y-%m-%d}",
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
-    },
-    "cpu": {
-        "format": "{usage}% ",
-        "tooltip": false
-    },
-    "memory": {
-        "format": "{}% "
-    },
-    "temperature": {
-        // "thermal-zone": 2,
-        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
-        "critical-threshold": 80,
-        // "format-critical": "{temperatureC}°C {icon}",
-        "format": "{temperatureC}°C {icon}",
-        "format-icons": ["", "", ""]
-    },
-    "network": {
-        // "interface": "wlp2*", // (Optional) To force the use of this interface
-        "format-wifi": "{essid} ({signalStrength}%) ",
-        "format-ethernet": "{ipaddr}/{cidr} ",
-        "tooltip-format": "{ifname} via {gwaddr} ",
-        "format-linked": "{ifname} (No IP) ",
-        "format-disconnected": "Disconnected ⚠",
-        "format-alt": "{ifname}: {ipaddr}/{cidr}"
-    },
-    "wireplumber": {
-      "format": "{node_name} {volume}% {icon}",
-      "format-muted": "{node_name} ",
-      "on-click": "hyprctl dispatch -- exec flatpak run com.saivert.pwvucontrol",
-      "format-icons": ["", "", ""]
-    },
-    "custom/notification": {
-      "tooltip": false,
-      "format": "{} {icon}",
-      "format-icons": {
-        "notification": "",
-        "none": "",
-        "dnd-notification": "",
-        "dnd-none": "",
-        "inhibited-notification": "",
-        "inhibited-none": "",
-        "dnd-inhibited-notification": "",
-        "dnd-inhibited-none": ""
-      },
-      "return-type": "json",
-      "exec-if": "which swaync-client",
-      "exec": "swaync-client -swb",
-      "on-click": "swaync-client -t -sw",
-      "on-click-right": "swaync-client -d -sw",
-      "escape": true
-    },
-    "mpris": {
-        "format": "{player_icon} {title} - {artist}",
-        "format-paused": "{status_icon} {title} - {artist}",
-        "player-icons": {
-            "default": "▶",
-            "mpv": "🎵"
-        },
-        "status-icons": {
-            "paused": "⏸"
-        }
-	},
-}

files/system/etc/xdg/waybar/style.css

@@ -1,129 +0,0 @@
-@import "tokyonight.css";
-
-* {
-  font-family: JetBrains Mono;
-  font-size: 17px;
-  min-height: 0;
-}
-
-window#waybar {
-  background-color: @transparent;
-  color: @theme_text_color;
-  margin: 0rem 0rem 0rem 0rem;
-}
-
-#workspaces button {
-  color: @lavender;
-  border-radius: 1.5rem;
-  padding: 0rem 0.5rem;
-}
-
-#workspaces button.active {
-  color: @sky;
-  border-radius: 1.5rem;
-}
-
-#workspaces button:hover {
-  color: @sapphire;
-  border-radius: 1.5rem;
-}
-
-#cpu,
-#memory,
-#custom-weather,
-#wireplumber,
-#custom-notification,
-#custom-music,
-#custom-edit-config,
-#tray,
-#backlight,
-#clock,
-#battery,
-#pulseaudio,
-#custom-lock,
-#powermenu,
-#window,
-#workspaces,
-#gamemode,
-#mpris {
-  background-color: @theme_bg_color;
-  padding: 0.5rem 0.75rem;
-  margin: 0.75rem 0.25rem 0rem 0.25rem;
-  border-radius: 1.5rem;
-  border: 2px solid;
-}
-
-window#waybar.empty #window {
-    background-color: transparent;
-    border: 0px
-}
-
-/* left side margin */
-#cpu {
-    margin-left: 1rem;
-}
-
-/* right side margin */
-#clock {
-    margin-right: 1rem;
-}
-
-#cpu {
-  color: @green;
-}
-
-#memory {
-  color: @magenta;
-}
-
-#clock {
-  color: @blue;
-}
-
-#battery {
-  color: @green;
-}
-
-#battery.charging {
-  color: @green;
-}
-
-#battery.warning:not(.charging) {
-  color: @red;
-}
-
-#backlight {
-  color: @yellow;
-}
-
-#pulseaudio {
-  color: @maroon;
-}
-
-#custom-music {
-  color: @mauve;
-}
-
-#custom-lock {
-    color: @magenta;
-}
-
-#custom-power {
-    color: @red;
-}
-
-#wireplumber {
-  color: @red;
-}
-
-#custom-notification {
-  color: @rosewater;
-}
-
-#custom-notification.notification {
-  color: @red;
-}
-
-#custom-notification.dnd-notification {
-  color: @maroon;
-}

files/system/etc/xdg/waybar/tokyonight.css

@@ -1,15 +0,0 @@
-@define-color foreground #313244;
-@define-color background #1a1b26;
-@define-color text #a9b1d6;
-@define-color black #414868;
-@define-color red #f7768e;
-@define-color green #73daca;
-@define-color yellow #e0af68;
-@define-color blue #7aa2f7;
-@define-color magenta #bb9af7;
-@define-color cyan #7dcfff;
-@define-color white #c0caf5;
-@define-color sky #89dceb;
-@define-color sapphire #74c7ec;
-@define-color rosewater #f5e0dc;
-@define-color flamingo #f2cdcd;

files/system/sddm.conf.d/theme.conf

@@ -0,0 +1,2 @@
+[Theme]
+Current=maldives

files/system/usr/share/applications/codium.desktop

@@ -0,0 +1,27 @@
+[Desktop Entry]
+Name=VSCodium
+Comment=Code Editing. Redefined.
+GenericName=Text Editor
+Exec=/usr/share/codium/codium --ozone-platform=wayland %F
+Icon=vscodium
+Type=Application
+StartupNotify=false
+StartupWMClass=VSCodium
+Categories=TextEditor;Development;IDE;
+MimeType=text/plain;inode/directory;application/x-codium-workspace;
+Actions=new-empty-window;
+Keywords=vscodium;codium;vscode;
+
+[Desktop Action new-empty-window]
+Name=New Empty Window
+Name[de]=Neues leeres Fenster
+Name[es]=Nueva ventana vacía
+Name[fr]=Nouvelle fenêtre vide
+Name[it]=Nuova finestra vuota
+Name[ja]=新しい空のウィンドウ
+Name[ko]=새 빈 창
+Name[ru]=Новое пустое окно
+Name[zh_CN]=新建空窗口
+Name[zh_TW]=開新空視窗
+Exec=/usr/share/codium/codium --new-window %F
+Icon=vscodium

files/system/usr/share/hypr-hydro-os/hyprland.conf

@@ -1,149 +0,0 @@
-# hyprland.conf
-
-# See https://wiki.hyprland.org/Configuring/Monitors/
-monitor=,preferred,auto,auto
-
-# Sources
-source = /usr/share/hypr-hydro-os/hyprland.conf.d/env_vars.conf
-source = /usr/share/hypr-hydro-os/hyprland.conf.d/game_workspace.conf
-source = /usr/share/hypr-hydro-os/hyprland.conf.d/discord_workspace.conf
-source = /usr/share/hypr-hydro-os/hyprland.conf.d/terminal.conf
-source = /usr/share/hypr-hydro-os/hyprland.conf.d/keybinds.conf
-source = /usr/share/hypr-hydro-os/hyprland.conf.d/browser.conf
-source = /usr/share/hypr-hydro-os/hyprland.conf.d/keybinds.conf.d/arrow_move_window.conf
-source = /usr/share/hypr-hydro-os/hyprland.conf.d/keybinds.conf.d/workspace_binds.conf
-source = /usr/share/hypr-hydro-os/hyprland.conf.d/keybinds.conf.d/media_binds.conf
-source = /usr/share/hypr-hydro-os/hyprland.conf.d/misc_apps.conf
-source = /usr/share/hypr-hydro-os/hyprland.conf.d/devices.conf
-
-# See https://wiki.hyprland.org/Configuring/Keywords/ for more
-
-# workspaces
-workspace = 1, persistent:true, default:true
-workspace = 2
-workspace = 3
-workspace = 4
-workspace = 5, persistent:true, border:false, rounding:false
-workspace = 6
-workspace = 7
-workspace = 8
-workspace = 9
-workspace = 10
-workspace = special:magic
-
-# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
-input {
-    kb_layout = us
-    kb_variant =
-    kb_model =
-    kb_options =
-    kb_rules =
-
-    follow_mouse = 1
-
-    touchpad {
-        natural_scroll = no
-    }
-
-    sensitivity = 0 # -1.0 to 1.0, 0 means no modification.
-}
-
-general {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
-
-    gaps_in = 5
-    gaps_out = 10
-    border_size = 2
-    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
-    col.inactive_border = rgba(595959aa)
-
-    layout = dwindle
-
-    # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
-    allow_tearing = false
-}
-
-#xwayland {
-#  force_zero_scaling = true
-#}
-
-decoration {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
-    
-    blur {
-        enabled = true
-        size = 3
-        passes = 1
-    }
-
-    shadow {
-        enabled = yes
-        range = 4
-        render_power = 3
-        color = rgba(1a1a1aee)
-    }
-
-    rounding = 15
-}
-
-animations {
-    enabled = yes
-
-    # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
-
-    bezier = myBezier, 0.05, 0.9, 0.1, 1.05
-
-    animation = windows, 1, 7, myBezier
-    animation = windowsOut, 1, 7, default, popin 80%
-    animation = border, 1, 10, default
-    animation = borderangle, 1, 8, default
-    animation = fade, 1, 7, default
-    animation = workspaces, 1, 6, default
-    animation = specialWorkspace, 1, 3, default, slidefadevert -50%
-}
-
-dwindle {
-    # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
-    pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-    preserve_split = yes # you probably want this
-}
-
-master {
-    # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-    new_status = slave
-}
-
-gestures {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
-    workspace_swipe = off
-}
-
-misc {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
-    force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers
-    disable_splash_rendering = true
-}
-
-# Example per-device config
-# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
-device {
-    name = epic-mouse-v1
-    sensitivity = -0.5
-}
-
-debug {
-   disable_logs = false 
-}
-
-experimental {
-  #hdr = true
-  #xx_color_management_v4 = true
-}
-
-# Example windowrule v1
-# windowrule = float, ^(kitty)$
-# Example windowrule v2
-# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
-# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.
-#windowrulev2 = workspace special, class:(scratchy)

files/system/usr/share/hypr-hydro-os/hyprland.conf.d/browser.conf

@@ -1,11 +0,0 @@
-# browser.conf
-
-# floorp
-$browser = uwsm app -- one.ablaze.floorp.desktop
-$mainMod = SUPER
-
-## autostart
-exec-once = [workspace 1 silent] $browser
-
-## keybind
-bind = $mainMod, F, exec, $browser

files/system/usr/share/hypr-hydro-os/hyprland.conf.d/discord_workspace.conf

@@ -1,26 +0,0 @@
-# discord_workspace.conf
-
-$discord = uwsm app -- com.discordapp.Discord.desktop
-
-$discord_class = class:^(vesktop)$|^(discord)$|^(com.discord.app.Discord)$|^(WebCord)$|^(equibop)$
-
-# workspace
-workspace = special:discord
-
-# window rule
-windowrule = workspace special:discord silent, $discord_class
-#windowrule = workspace special:discord silent, class:^(discord)$
-#windowrule = opacity 0.9 0.9, $discord_class
-windowrule = allowsinput on, $discord_class
-
-# key binds
-$mainMod = SUPER
-#bind = $mainMod, D, focuswindow, vesktop
-bind = $mainMod, D, togglespecialworkspace, discord
-bind = $mainMod SHIFT, D, movetoworkspace, special:discord
-
-# discord overlay
-#exec-once = discover-overlay
-
-# launch discord
-exec-once = $discord

files/system/usr/share/hypr-hydro-os/hyprland.conf.d/env_vars.conf

@@ -1,31 +0,0 @@
-# env_vars.conf
-
-# hyprcursor
-env = HYPRCURSOR_THEME,Bibata-Modern-Classic
-env = HYPRCURSOR_SIZE,24
-
-# Some default env vars.
-env = XCURSOR_THEME,Bibata-Modern-Classic
-env = XCURSOR_SIZE,24
-# Toolkit Backend Vars
-env = CLUTTER_BACKEND,wayland
-# QT Variables
-env = QT_QPA_PLATFORMTHEME,kde
-env = QT_AUTO_SCREEN_SCALE_FACTOR,1
-env = QT_QPA_PLATFORM,wayland
-env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
-# XDG specs vars
-env = XDG_CURRENT_DESKTOP,Hyprland
-env = XDG_SESSION_TYPE,wayland
-env = XDG_SESSION_DESKTOP,Hyprland
-# set gtk-theme
-env = QT_QUICK_CONTROLS_STYLE,org.kde.desktop
-
-# copy some environments into systemctl
-exec = /usr/bin/systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP QT_QPA_PLATFORMTHEME
-
-# set default editor
-env = EDITOR,/usr/bin/nvim
-
-# for hdr games
-env = DXVK_HDR,1

files/system/usr/share/hypr-hydro-os/hyprland.conf.d/game_workspace.conf

@@ -1,41 +0,0 @@
-# game_workspace.conf
-
-# workspace number
-$game-workspace-number = 5
-
-exec-once = uwsm app -- steam.desktop
-
-# window rules
-windowrule = workspace 9 silent, title:^(Steam)$
-
-# key binds
-$mainMod = SUPER
-bind = $mainMod, G, focuswindow, class:^(gamescope|steam)
-
-# To put the window rules for the game workspace
-
-# steam apps
-windowrule = workspace $game-workspace-number silent, class:^steam_app_\d+$
-
-# gamescope
-windowrule = fullscreen, class:^(gamescope)$
-windowrule = workspace $game-workspace-number silent, class:^(gamescope)$
-
-# Minecraft
-windowrule = workspace $game-workspace-number, class:^Minecraft.*
-
-# factorio
-windowrule = workspace $game-workspace-number, class:^(factorio)$
-
-# RetroArch flatpak
-windowrule = workspace $game-workspace-number, class:^(org.libretro.RetroArch)$
-
-# dolphin emulator
-windowrule = workspace $game-workspace-number, class:^(dolphin-emu)$
-
-# Slay the Spire
-windowrule = workspace $game-workspace-number, class:^(Slay the Spire)$
-
-# Terraria
-windowrule = workspace $game-workspace-number, class:^(dotnet)$
-windowrule = fullscreen, class:^(dotnet)$

files/system/usr/share/hypr-hydro-os/hyprland.conf.d/keybinds.conf

@@ -1,38 +0,0 @@
-# key_binds.conf
-
-# Set programs that you use
-$fileManager = uwsm app -- org.kde.dolphin.desktop
-$menu = uwsm app -- $(wofi --show drun --define=drun-print_desktop_file=true)
-#$menu = ags request -i launcher show
-$screenshot = hyprshot -m region --clipboard-only
-$powermenu = /usr/share/hypr-hydro-os/scripts/local-lua /usr/share/hypr-hydro-os/scripts/powermenu.lua
-
-# See https://wiki.hyprland.org/Configuring/Keywords/ for more
-$mainMod = SUPER
-
-# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod SHIFT, C, killactive,
-bind = $mainMod, M, exec, $powermenu
-bind = $mainMod, E, exec, $fileManager
-bind = $mainMod, V, togglefloating,
-bind = $mainMod, R, exec, $menu
-bind = $mainMod, P, pseudo, # dwindle
-bind = $mainMod, J, togglesplit, # dwindle
-bind = $mainMod SHIFT, F, fullscreen
-
-# screenshots and screen recorder aylur dot files
-bind = $mainMod SHIFT, Print, exec, $screenshot
-
-# Move focus with mainMod + arrow keys
-bind = $mainMod, left, movefocus, l
-bind = $mainMod, right, movefocus, r
-bind = $mainMod, up, movefocus, u
-bind = $mainMod, down, movefocus, d
-
-# Move/resize windows with mainMod + LMB/RMB and dragging
-bindm = $mainMod SHIFT, mouse:272, movewindow
-bindm = $mainMod SHIFT, mouse:273, resizewindow
-
-# global hotkeys
-# discord mute
-bind = CTRL SHIFT, M, pass, initialclass:^(discord)$

files/system/usr/share/hypr-hydro-os/hyprland.conf.d/keybinds.conf.d/arrow_move_window.conf

@@ -1,7 +0,0 @@
-# arrow_move_window.conf
-
-# Move window with mainMod + Shift + arrow kyes
-bind = $mainMod SHIFT, left, movewindow, l
-bind = $mainMod SHIFT, right, movewindow, r
-bind = $mainMod SHIFT, up, movewindow, u
-bind = $mainMod SHIFT, down, movewindow, d

files/system/usr/share/hypr-hydro-os/hyprland.conf.d/keybinds.conf.d/media_binds.conf

@@ -1,16 +0,0 @@
-# media_binds.conf
-$mainMod = SUPER
-
-# media play-pause toggle
-bind = , XF86AudioPlay, exec, playerctl play-pause
-
-# media volume up/down
-bind = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%-
-bind = , XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 1%+
-
-# media volume up/down
-bind = $mainMod, XF86AudioLowerVolume, exec, playerctl position 5-
-bind = $mainMod, XF86AudioRaiseVolume, exec, playerctl position 5+
-
-# media pause
-bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle

files/system/usr/share/hypr-hydro-os/hyprland.conf.d/keybinds.conf.d/workspace_binds.conf

@@ -1,34 +0,0 @@
-# workspace_binds.conf
-$mainMod = SUPER
-
-# Switch workspaces with mainMod + [0-9]
-bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9
-bind = $mainMod, 0, workspace, 10
-
-# Move active window to a workspace with mainMod + SHIFT + [0-9]
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10
-
-# Example special workspace (scratchpad)
-bind = $mainMod, S, togglespecialworkspace, magic
-bind = $mainMod SHIFT, S, movetoworkspace, special:magic
-
-# Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1

files/system/usr/share/hypr-hydro-os/hyprland.conf.d/terminal.conf

@@ -1,13 +0,0 @@
-# terminal.conf
-$terminal = kitty
-
-# workspace
-workspace = special:terminal
-
-# launch a terminal
-exec-once = [workspace special:terminal silent] $terminal
-
-# key binds
-$mainMod = SUPER
-bind = $mainMod, T, togglespecialworkspace, terminal
-bind = $mainMod SHIFT, T, movetoworkspace, special:terminal

files/system/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_close_clients

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-HYPRCMDS=$(hyprctl -j clients | jq -j '.[] | "dispatch closewindow address:\(.address); "')
-hyprctl --batch "$HYPRCMDS" >>/tmp/hyprexitwithgrace.log 2>&1
-
-notify-send "power controls" "Closing Applications..."
-
-sleep 2
-
-COUNT=$(hyprctl clients | grep "class:" | wc -l)
-
-if [ "$COUNT" -eq "0" ]; then
-  notify-send "power controls" "Closed Applications."
-  return
-else
-  notify-send "power controls" "Some apps didn't close. Not shutting down."
-  exit 1
-fi

files/system/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_logout

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_close_clients
-
-hyprctl dispatch exit

files/system/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_reboot

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_close_clients
-
-systemctl reboot

files/system/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_shutdown

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_close_clients
-
-systemctl poweroff

files/system/usr/share/hypr-hydro-os/scripts/load-kwallet-apps.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-# nextcloud desktop
-sleep 15 && flatpak run --branch=stable --arch=x86_64 --command=nextcloud --file-forwarding com.nextcloud.desktopclient.nextcloud

files/system/usr/share/hypr-hydro-os/scripts/load-kwallet.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-kwalletmanager5 &
-sleep 1 && exec --no-startup-id /usr/lib/pam_kwallet_init
-notify-send -e --expire-time=2000 'Kwallet has been loaded. Loading dependent apps...'
-sleep 2 && hyprctl dispatch closewindow class:org.kde.kwalletmanager

files/system/usr/share/hypr-hydro-os/scripts/local-lua

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-BIN_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
-
-LUA_PATH="${BIN_DIR}/?.lua;;" lua $1

files/system/usr/share/hypr-hydro-os/scripts/menu.lua

@@ -1,27 +0,0 @@
-#!/usr/bin/env lua
-local menu = {}
-
-function menu:clean_string(str)
-	str = string.gsub(str, "^%s+", "")
-	str = string.gsub(str, "%s+$", "")
-	return string.gsub(str, "[\n]+", " ")
-end
-
-function menu:bring_menu(prompt, options)
-	local options_string = ""
-	local length = 1
-	for _, value in pairs(options) do
-		options_string = options_string .. value .. "\n"
-		length = length + 1
-	end
-
-	options_string = options_string:sub(1, -2)
-
-	local command = "echo -e '" .. options_string .. "' | rofi -dmenu -i -p '" .. prompt .. "'"
-	local f = assert(io.popen(command, "r"))
-	local s = menu:clean_string(assert(f:read("*a")))
-	f:close()
-	return s
-end
-
-return menu

files/system/usr/share/hypr-hydro-os/scripts/powermenu.lua

@@ -1,14 +0,0 @@
-#!/usr/bin/env lua
-local menu = require("menu")
-local executable = {
-	["Shutdown"] = "/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_shutdown",
-	["Reboot"] = "/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_reboot",
-	["Log out"] = "/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_logout",
-	["Cancel"] = "",
-}
-
-local options = { "Shutdown", "Reboot", "Log out", "Cancel" }
-
-local s = menu:bring_menu("Power menu", options)
-
-os.execute(executable[s])

files/system/usr/share/wayland-sessions/hyprland-hydro-os-uwsm.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Hyprland Hydro-os (uwsm managed)
-Comment=An intelligent dynamic tiling Wayland compositor, with Hydro-os configuration.
-Exec=uwsm start -- hyprland-hydro-os.desktop
-Type=Application
-DesktopNames=Hyprland
-Keywords=tiling;wayland;compositor;

files/system/usr/share/wayland-sessions/hyprland-hydro-os.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Hyprland Hydro-os
-Comment=An intelligent dynamic tiling Wayland compositor, with Hydro-os configuration.
-Exec=Hyprland --config /usr/share/hypr-hydro-os/hyprland.conf
-Type=Application
-DesktopNames=Hyprland
-Keywords=tiling;wayland;compositor;

files/system/usr/share/wayland-sessions/steam-big-picture.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
 Name=Steam Big Picture Mode
 Comment=Start Steam in Big Picture Mode
-Exec=/usr/bin/gamescope -H 1080 -r 60 --force-composition -fe -- /usr/bin/steam -tenfoot
+Exec=/usr/bin/gamescope -H 1080 -r 60 --force-composition --mangoapp -fe -- /usr/bin/steam -tenfoot %U
 Type=Application

files/systemd/system/bootc-fetch-updates.service

@@ -0,0 +1,8 @@
+[Unit]
+Description=Download bootc updates
+Documentation=man:bootc(8)
+ConditionPathExists=/run/ostree-booted
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/bootc update --quiet

files/systemd/system/bootc-fetch-updates.timer

@@ -0,0 +1,12 @@
+[Unit]
+Description=Download bootc updates
+Documentation=man:bootc(8)
+ConditionPathExists=/run/ostree-booted
+
+[Timer]
+OnBootSec=15min
+OnUnitInactiveSec=8h
+RandomizedDelaySec=2h
+
+[Install]
+WantedBy=timers.target

files/systemd/system/flatpak-system-update.service

@@ -0,0 +1,5 @@
+[Unit]
+Description=Update flatpaks
+
+[Service]
+ExecStart=flatpak update --noninteractive

files/systemd/system/flatpak-system-update.timer

@@ -0,0 +1,9 @@
+[Unit]
+Description=Update flatpak
+
+[Timer]
+OnBootSec=15min
+OnCalendar=daily
+
+[Install]
+WantedBy=timers.target

files/systemd/user/flatpak-user-update.service

@@ -0,0 +1,5 @@
+[Unit]
+Description=Update flatpaks
+
+[Service]
+ExecStart=flatpak update --noninteractive

files/systemd/user/flatpak-user-update.timer

@@ -0,0 +1,9 @@
+[Unit]
+Description=Update flatpak
+
+[Timer]
+OnBootSec=15min
+OnCalendar=daily
+
+[Install]
+WantedBy=timers.target

files/systemd/user/hyprpanel.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=Highly customizable Wayland bar for Sway and Wlroots based compositors.
+Description=A panel bar branched from AGS maintained by Hyprland devs.
 Documentation=man:waybar(5)
 # order startup after WM
 After=graphical-session.target
@@ -8,8 +8,7 @@ After=graphical-session.target
 Type=exec
 # Repurpose XDG Autostart filtering
 ExecCondition=/lib/systemd/systemd-xdg-autostart-condition "wlroots:sway:Wayfire:labwc:Hyprland" ""
-ExecStart=/usr/bin/waybar
-ExecReload=kill -SIGUSR2 $MAINPID
+ExecStart=/usr/bin/hyprpanel
 Restart=on-failure
 Slice=app-graphical.slice
 

files/systemd/user/swww.service

@@ -1,6 +1,5 @@
 [Unit]
-Description=A simple notification daemon with a GTK gui for notifications and the control center.
-Documentation=man:swaync(1)
+Description=Background service
 # order startup after WM
 After=graphical-session.target
 
@@ -8,7 +7,7 @@ After=graphical-session.target
 Type=exec
 # Repurpose XDG Autostart filtering
 ExecCondition=/lib/systemd/systemd-xdg-autostart-condition "wlroots:sway:Wayfire:labwc:Hyprland" ""
-ExecStart=/usr/bin/swaync
+ExecStart=/usr/bin/swww-daemon
 Restart=on-failure
 Slice=app-graphical.slice
 

recipes/components/chezmoi-module.yml

@@ -0,0 +1,7 @@
+modules:
+  - type: chezmoi
+    repository: "https://git.hydrosaber.com/eriq12/dotfiles"
+
+  - type: script
+    scripts:
+      - setupchezmoiskel.sh

recipes/components/default-flatpak.yml

@@ -0,0 +1,19 @@
+modules:
+  - type: default-flatpaks
+    configurations:
+      - scope: user
+        repo:
+          title: Flathub (user)
+        install:
+          - one.ablaze.floorp
+          - io.github.equicord.equibop
+      - scope: system
+        repo:
+          title: Flathub
+        notify: true
+        install:
+          - com.github.tchx84.Flatseal
+          - io.missioncenter.MissionCenter
+          - io.github.flattool.Ignition
+          - net.davidotek.pupgui2
+          - org.gnome.Loupe

recipes/components/dnf-module.yml

@@ -0,0 +1,8 @@
+modules:
+  - from-file: dnf/multimedia.yml
+  - from-file: dnf/sddm.yml
+  - from-file: dnf/hyprland.yml
+  - from-file: dnf/environment.yml
+  - from-file: dnf/applications.yml
+  - from-file: dnf/themes.yml
+  - from-file: dnf/drivers.yml

recipes/components/gschema-module.yml

@@ -0,0 +1,4 @@
+modules:
+  - type: gschema-overrides
+    include:
+      - zz1-hydro-os-theming.gschema.override

recipes/components/nvidia-module.yml

@@ -0,0 +1,16 @@
+modules:
+  - type: containerfile
+    snippets:
+      - COPY --from=ghcr.io/ublue-os/akmods-nvidia:main-42 /rpms/ /tmp/rpms
+      - RUN find /tmp/rpms
+      - RUN rpm-ostree install /tmp/rpms/ublue-os/ublue-os-nvidia*.rpm
+      - RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/nvidia-container-toolkit.repo
+      - RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1\npriority=90/}' /etc/yum.repos.d/negativo17-fedora-nvidia.repo   
+      - RUN rpm-ostree install /tmp/rpms/kmods/kmod-nvidia*.rpm libnvidia-fbc libva-nvidia-driver nvidia-driver nvidia-modprobe nvidia-persistenced nvidia-settings nvidia-container-toolkit 
+    
+  - type: script
+    scripts:
+      - nvidia/installtoolkitpolicy.sh
+      - nvidia/removeunusedrepos.sh
+      - nvidia/setearlyloading.sh
+      - nvidia/setdrmvariables.sh

recipes/components/script-module.yml

@@ -0,0 +1,5 @@
+modules:
+  - type: script
+    scripts:
+      - addimageinfo.sh
+      - installohmyzsh.sh

recipes/components/sys-files-module.yml

@@ -0,0 +1,5 @@
+modules:
+  - type: files
+    files:
+      - source: system
+        destination: / # copies files/system/* (* means everything inside it) into your image's root folder /

recipes/components/systemd-module.yml

@@ -0,0 +1,12 @@
+modules:
+  - type: systemd
+    system:
+      enabled:
+        - bootc-fetch-updates.timer
+        - flatpak-system-update.timer
+    user:
+      enabled:
+        - flatpak-user-update.timer
+        - swww.service
+        - hyprpanel.service
+        - hyprpolkitagent.service

recipes/dnf/applications.yml

@@ -0,0 +1,71 @@
+modules:
+  - type: dnf
+    repos:
+      nonfree: rpmfusion
+      files:
+        - codium.repo
+        - https://openrazer.github.io/hardware:razer.repo
+      copr:
+        - mavit/discover-overlay
+      keys:
+        - https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/-/raw/master/pub.gpg
+    install:
+      packages:
+      # applications
+        # fuzzy finder
+        - fzf
+      
+        # dmenu runner
+        - fuzzel
+      
+        # file manager
+        - nautilus
+        - file-roller
+        - file-roller-nautilus
+
+        - ffmpegthumbnailer
+
+        # text editor
+        - neovim
+        - codium
+      
+        # software store
+        - gnome-software
+
+        # disk management
+        - gnome-disk-utility
+
+        # kdeconnect
+        - kde-connect
+
+        # discord overlay
+        - discover-overlay
+      
+      # settings apps
+        # qt
+        - qt5ct
+        - qt6ct
+
+        # gtk
+        - nwg-look
+
+      # zsh
+        - zsh
+        # zoxide for z stuff
+        - zoxide
+
+      # steam
+        - steam
+        # for game mode and big picture mode
+        - gamescope
+        # for performance view
+        - mangohud
+      
+      # simple editing softare
+        - avidemux
+  
+    remove:
+      packages:
+        # remove firefox
+        - firefox
+        - firefox-langpacks

recipes/dnf/drivers.yml

@@ -0,0 +1,17 @@
+modules:
+  - type: dnf
+    repos:
+      files:
+        - https://negativo17.org/repos/fedora-steam.repo
+        - https://openrazer.github.io/hardware:razer.repo
+    install:
+      packages:
+        - dkms
+        - openrazer-meta
+        - repo: fedora-steam
+          packages:
+            - dkms-xpadneo
+
+  - type: script
+    scripts:
+      - installdkmsmodules.sh

recipes/dnf/environment.yml

@@ -0,0 +1,47 @@
+modules:
+  - type: dnf
+    repos:
+      files:
+        - codium.repo
+      copr:
+        - ublue-os/packages
+    install:
+      packages:
+      # ublue udev rules and signing
+        - ublue-os-udev-rules
+        - ublue-os-signing
+      
+      # environment
+        # xwayland
+        - xorg-x11-server-Xwayland
+        # headset control
+        - headsetcontrol
+        # media related
+        - mediainfo
+        - playerctl
+        - alsa-firmware
+        # zip utilities
+        - p7zip
+        # qt libraries
+        - qt5-qtwayland
+        - qt6-qtwayland
+        # vulkan
+        - vulkan-tools
+        - vulkan-validation-layers
+        # xdg-desktop-portals
+        - xdg-desktop-portal
+        - xdg-desktop-portal-gtk
+        - xdg-desktop-portal-gnome
+
+        # polkit
+        - polkit
+      
+        # sound
+        - wireplumber
+        - pipewire
+        - headsetcontrol
+      
+        # networking
+        - bluez
+        - bluez-tools
+        - firewall-config

recipes/dnf/hyprland.yml

@@ -0,0 +1,15 @@
+modules:
+  - type: dnf
+    repos:
+      copr:
+        - solopasha/hyprland
+    install:
+      packages:
+        - aquamarine
+        - hyprland-git
+        - hyprpanel
+        - hyprpolkitagent
+        - hyprshot
+        - hyprland-qt-support
+        - hyprland-qtutils
+        - xdg-desktop-portal-hyprland

recipes/dnf/multimedia.yml

@@ -0,0 +1,38 @@
+modules:
+  - type: dnf
+    repos:
+      nonfree: rpmfusion
+    install:
+      packages:
+      # other multimedia
+        - gstreamer1-plugin-libav
+        - gstreamer1-plugins-bad-free-extras
+        - gstreamer1-plugins-bad-freeworld
+        - gstreamer1-plugins-ugly
+        - gstreamer1-vaapi
+  
+    remove:
+      packages:
+        # old codecs
+        - fdk-aac-free
+        - libavcodec-free
+        - libavdevice-free
+        - libavfilter-free
+        - libavformat-free
+        - libavutil-free
+        - libpostproc-free
+        - libswresample-free
+        - libswscale-free 
+        - ffmpeg-free
+
+    replace:
+      - from-repo: rpmfusion-free-updates
+        packages:
+          - old: mesa-va-drivers
+            new: mesa-va-drivers-freeworld
+    
+  - type: dnf
+    install:
+      packages:
+        - ffmpeg
+        - mesa-vdpau-drivers-freeworld

recipes/dnf/sddm.yml

@@ -0,0 +1,15 @@
+modules:
+  - type: dnf
+    install:
+      packages:
+      # sddm
+        - sddm
+        - sddm-themes
+        - qt5-qtgraphicaleffects
+        - qt5-qtquickcontrols2
+        - qt5-qtsvg
+
+      # password keeper
+        - kf6-kwallet
+        - kwalletmanager
+        - pam-kwallet

recipes/dnf/themes.yml

@@ -0,0 +1,16 @@
+modules:
+  - type: dnf
+    repos:
+      copr:
+        - peterwu/rendezvous
+    install:
+      packages:
+      # Themes and fonts
+        # emoji fonts
+        - google-noto-emoji-fonts
+      
+        # theme and GUI
+        - fontawesome-fonts-all
+        - gnome-themes-extra
+        - papirus-icon-theme
+        - bibata-cursor-themes

recipes/recipe.yml

@@ -6,43 +6,18 @@ name: hydro-os
 description: This is my personal OS image.
 
 # the base image to build on top of (FROM) and the version tag to use
-base-image: ghcr.io/ublue-os/bazzite-asus-nvidia
-image-version: latest # latest is also supported if you want new updates ASAP
+base-image: quay.io/fedora-ostree-desktops/base-atomic
+image-version: 42 # latest is also supported if you want new updates ASAP
 
 # module configuration, executed in order
 # you can include multiple instances of the same module
 modules:
-  - type: files
-    files:
-      - source: system
-        destination: / # copies files/system/* (* means everything inside it) into your image's root folder /
+  - from-file: components/dnf-module.yml
+  - from-file: components/script-module.yml
+  - from-file: components/sys-files-module.yml
+  - from-file: components/systemd-module.yml
+  - from-file: components/default-flatpak.yml
+  - from-file: components/chezmoi-module.yml
 
-  - type: rpm-ostree
-    repos:
-      - https://copr.fedorainfracloud.org/coprs/solopasha/hyprland/repo/fedora-%OS_VERSION%/solopasha-hyprland-fedora-%OS_VERSION%.repo
-      - https://copr.fedorainfracloud.org/coprs/erikreider/SwayNotificationCenter/repo/fedora-%OS_VERSION%/erikreider-SwayNotificationCenter-fedora-%OS_VERSION%.repo
-    install:
-      - hyprland-git
-      - waybar
-      - neovim
-      - SwayNotificationCenter
-      - hyprpolkitagent
-      - hyprshot
-
-  - type: default-flatpaks
-    notify: true # Send notification after install/uninstall is finished (true/false)
-    system:
-      # If no repo information is specified, Flathub will be used by default
-      install:
-        - one.ablaze.floorp
-        - com.discordapp.Discord
-    user: {} # Also add Flathub user repo, but no user packages
-
-  - type: systemd
-    user:
-      enabled:
-        - waybar.service
-        - hyprpolkitagent.service
-
-  - type: signing # this sets up the proper policy & signing files for signed images to work fully
+  - type: signing
 

recipes/recipe_nvidia.yml

@@ -0,0 +1,25 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
+# image will be published to ghcr.io/<user>/<name>
+name: hydro-os-nvidia
+# description will be included in the image's metadata
+description: This is my personal OS image.
+
+# the base image to build on top of (FROM) and the version tag to use
+base-image: quay.io/fedora-ostree-desktops/base-atomic
+image-version: 42 # latest is also supported if you want new updates ASAP
+
+# module configuration, executed in order
+# you can include multiple instances of the same module
+modules:
+  - from-file: components/dnf-module.yml
+  - from-file: components/script-module.yml
+  - from-file: components/sys-files-module.yml
+  - from-file: components/systemd-module.yml
+  - from-file: components/nvidia-module.yml
+  - from-file: components/default-flatpak.yml
+  - from-file: components/chezmoi-module.yml
+  - type: initramfs
+
+  - type: signing
+