foodogsquared/nixos-config
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/nixos-config.git synced 2025-02-07 18:19:09 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

workflows/mosey-branch/desktop-session: 2023-08-13 -> 2023-08-21

Browse Source
This commit is contained in:
Gabriel Arazas 2023-08-21 15:44:17 +08:00
parent 68e7eb29cf
commit b80a0c50aa
No known key found for this signature in database
GPG Key ID: ADE0C41DAB221FCC
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/nixos/workflows/mosey-branch/config/desktop-session/default.nix
View File

@ -7,17 +7,16 @@
, gnome , gnome
# This is the prefix used for the installed files in the output. # This is the prefix used for the installed files in the output.
, prefix ? "one.foodogsquared.MoseyBranch" , prefix ? "one.foodogsquared.MoseyBranch."
, serviceScript ? "Hyprland" , serviceScript ? "Hyprland"
, agsScript ? "ags" , agsScript ? "ags"
, polkitScript ? "polkit" , polkitScript ? "polkit"
, ibusScript ? "ibus start"
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mosey-branch-custom-desktop-session"; pname = "mosey-branch-custom-desktop-session";
version = "2023-08-13"; version = "2023-08-21";
src = ./.; src = ./.;
nativeBuildInputs = [ nativeBuildInputs = [
@ -30,7 +29,6 @@ stdenv.mkDerivation rec {
mesonFlags = [ mesonFlags = [
"-Dservice_script=${serviceScript}" "-Dservice_script=${serviceScript}"
"-Dags_script=${agsScript}" "-Dags_script=${agsScript}"
"-Dibus_script=${ibusScript}"
"-Dpolkit_script=${polkitScript}" "-Dpolkit_script=${polkitScript}"
]; ];
@ -42,6 +40,11 @@ stdenv.mkDerivation rec {
--prefix PATH : "${lib.makeBinPath [ gnome.gnome-session ]}" --prefix PATH : "${lib.makeBinPath [ gnome.gnome-session ]}"
''; '';
postFixup = ''
mkdir -p $out/share/wayland-sessions
ln -s $out/share/applications/${prefix}desktop $out/share/wayland-sessions
'';
meta = with lib; { meta = with lib; {
description = "Custom desktop files for the custom desktop environment"; description = "Custom desktop files for the custom desktop environment";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;

14
modules/nixos/workflows/mosey-branch/config/desktop-session/meson.build
View File

@ -1,5 +1,5 @@
project('mosey-branch', project('mosey-branch',
version: '2023-08-11', version: '2023-08-21',
license: 'GPL-3.0-or-later', license: 'GPL-3.0-or-later',
meson_version: '>=0.54.0', meson_version: '>=0.54.0',
) )
@ -8,10 +8,11 @@ app_id = 'one.foodogsquared.MoseyBranch'
prefix = get_option('prefix') prefix = get_option('prefix')
bindir = join_paths(prefix, get_option('bindir')) bindir = join_paths(prefix, get_option('bindir'))
datadir = join_paths(prefix, get_option('datadir')) datadir = join_paths(prefix, get_option('datadir'))
systemddir = join_paths(prefix, 'share/systemd') systemddir = join_paths(datadir, 'systemd')
applicationsdir = join_paths(datadir, 'applications') applicationsdir = join_paths(datadir, 'applications')
systemduserdir = join_paths(systemddir, 'user') systemduserdir = join_paths(systemddir, 'user')
autostartdir = join_paths(prefix, 'etc/xdg/autostart') gsd_schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
autostartdir = join_paths(gsd_schemadir, 'etc', 'autostart')
unit_name_template = app_id + '.@0@.@1@' unit_name_template = app_id + '.@0@.@1@'
required_components = { required_components = {
@ -53,7 +54,7 @@ endforeach
# Installing the Wayland session desktop entry. # Installing the Wayland session desktop entry.
desktopentryconf = configuration_data() desktopentryconf = configuration_data()
desktopentryconf.set('session_script', get_option('session_script')) desktopentryconf.set('prefix', prefix)
configure_file( configure_file(
input: 'mosey-branch.desktop', input: 'mosey-branch.desktop',
output: 'mosey-branch.desktop', output: 'mosey-branch.desktop',
@ -73,6 +74,7 @@ configure_file(
install: true, install: true,
) )
# This is both for the systemd- and non-systemd-managed GNOME sessions.
serviceconf = configuration_data() serviceconf = configuration_data()
serviceconf.set('script', get_option('service_script')) serviceconf.set('script', get_option('service_script'))
configure_file( configure_file(
@ -94,13 +96,13 @@ configure_file(
# Setting up for installing with the core services systemd units. # Setting up for installing with the core services systemd units.
required_services = [] required_services = []
foreach name, component : required_components foreach name, component : required_components
required_services += unit_name_template.format(name, 'target') required_services += app_id + name
endforeach endforeach
gnomesessionconf = configuration_data() gnomesessionconf = configuration_data()
gnomesessionconf.set( gnomesessionconf.set(
'required_components', 'required_components',
';'.join(required_services + [ (app_id + '.target') ]) + ';' ';'.join([ app_id ] + required_services) + ';'
) )
configure_file( configure_file(
input: 'mosey-branch.session', input: 'mosey-branch.session',

1
modules/nixos/workflows/mosey-branch/config/desktop-session/mosey-branch.desktop
View File

@ -3,4 +3,3 @@ Name=Mosey Branch
Comment=foodogsquared's Hyprland-based desktop environment setup Comment=foodogsquared's Hyprland-based desktop environment setup
Exec=@prefix@/bin/mosey-branch-session Exec=@prefix@/bin/mosey-branch-session
Type=Application Type=Application
DesktopNames=Mosey Branch

2
modules/nixos/workflows/mosey-branch/config/desktop-session/mosey-branch.desktop.in
View File

@ -6,7 +6,7 @@ Exec=@script@
Categories=wlroots;Core; Categories=wlroots;Core;
OnlyShowIn=Mosey Branch; OnlyShowIn=Mosey Branch;
NoDisplay=true NoDisplay=true
X-GNOME-Autostart-Phase=DisplayServer X-GNOME-Autostart-Phase=WindowManager
X-GNOME-Provides=windowmanager; X-GNOME-Provides=windowmanager;
X-GNOME-Autostart-Notify=true X-GNOME-Autostart-Notify=true
X-GNOME-AutoRestart=false X-GNOME-AutoRestart=false