diff --git a/configuration/main/configuration.nix b/configuration/main/configuration.nix index d0c4f4f..664fd70 100644 --- a/configuration/main/configuration.nix +++ b/configuration/main/configuration.nix @@ -8,20 +8,22 @@ ./verbatim.nix ./500G-disk.nix - ../modules/graphics.nix - ../modules/boot.nix - ../modules/networking.nix - ../modules/xdg-settings.nix - ../modules/window-manager.nix - ../modules/sddm.nix - ../modules/main-user.nix - ../modules/programs.nix - ../modules/ssh.nix - ../modules/sound.nix - ../modules/printing.nix - ../modules/input-handle.nix - ../modules/keyboard.nix - ../modules/locale.nix + ../modules/system/graphics.nix + ../modules/system/boot.nix + ../modules/system/networking.nix + ../modules/system/xdg-settings.nix + ../modules/system/window-manager.nix + ../modules/system/sddm.nix + ../modules/system/main-user.nix + ../modules/system/programs.nix + ../modules/system/ssh.nix + ../modules/system/sound.nix + ../modules/system/printing.nix + ../modules/system/input-handle.nix + ../modules/system/keyboard.nix + ../modules/system/locale.nix + + ../modules/dots/quick_shell/settings.nix ]; programs.niri.enable = true; diff --git a/configuration/modules/dots/quick_shell/quick_config/config/shell.qml b/configuration/modules/dots/quick_shell/quick_config/config/shell.qml new file mode 100644 index 0000000..28a1a61 --- /dev/null +++ b/configuration/modules/dots/quick_shell/quick_config/config/shell.qml @@ -0,0 +1,24 @@ +import Quickshell +import Quickshell.Widgets +import QtQuick +import QtQuick.Controls + +ShellRoot { + PanelWindow { + anchors { + top: true + left: true + right: true + } + + height: 32 + color: "#1e1e2e" + + Text { + anchors.centerIn: parent + text: "hello from quickshell" + color: "#cdd6f4" + font.pixelSize: 14 + } + } +} diff --git a/configuration/modules/dots/quick_shell/quick_config/quick.nix b/configuration/modules/dots/quick_shell/quick_config/quick.nix new file mode 100644 index 0000000..f165079 --- /dev/null +++ b/configuration/modules/dots/quick_shell/quick_config/quick.nix @@ -0,0 +1,9 @@ +{stdenv}: +stdenv.mkDerivation { + pname = "quick_shell"; + version = "stable"; + src = ./config; + installPhase = '' + cp -r . $out + ''; +} diff --git a/configuration/modules/dots/quick_shell/settings.nix b/configuration/modules/dots/quick_shell/settings.nix new file mode 100644 index 0000000..d7c99d6 --- /dev/null +++ b/configuration/modules/dots/quick_shell/settings.nix @@ -0,0 +1,26 @@ +{ + pkgs, + inputs, + ... +}: let + qs_config = pkgs.callPackage ./quick_config/quick.nix {}; + quick_shell = inputs.quickshell.packages.${pkgs.system}.default; +in { + environment.systemPackages = [quick_shell]; + + systemd.user.services.quickshell = { + Unit = { + Description = "quickshell desktop shell"; + After = ["graphical-session.target"]; + PartOf = ["graphical-session.target"]; + }; + Install = { + WantedBy = ["graphical-session.target"]; + }; + Service = { + ExecStart = "${quick_shell}/bin/qs -c ${qs_config}/shell.qml"; + Restart = "on-failure"; + RestartSec = 3; + }; + }; +} diff --git a/configuration/modules/boot.nix b/configuration/modules/system/boot.nix similarity index 100% rename from configuration/modules/boot.nix rename to configuration/modules/system/boot.nix diff --git a/configuration/modules/graphics.nix b/configuration/modules/system/graphics.nix similarity index 100% rename from configuration/modules/graphics.nix rename to configuration/modules/system/graphics.nix diff --git a/configuration/modules/input-handle.nix b/configuration/modules/system/input-handle.nix similarity index 100% rename from configuration/modules/input-handle.nix rename to configuration/modules/system/input-handle.nix diff --git a/configuration/modules/keyboard.nix b/configuration/modules/system/keyboard.nix similarity index 100% rename from configuration/modules/keyboard.nix rename to configuration/modules/system/keyboard.nix diff --git a/configuration/modules/locale.nix b/configuration/modules/system/locale.nix similarity index 100% rename from configuration/modules/locale.nix rename to configuration/modules/system/locale.nix diff --git a/configuration/modules/main-user.nix b/configuration/modules/system/main-user.nix similarity index 100% rename from configuration/modules/main-user.nix rename to configuration/modules/system/main-user.nix diff --git a/configuration/modules/networking.nix b/configuration/modules/system/networking.nix similarity index 100% rename from configuration/modules/networking.nix rename to configuration/modules/system/networking.nix diff --git a/configuration/modules/printing.nix b/configuration/modules/system/printing.nix similarity index 100% rename from configuration/modules/printing.nix rename to configuration/modules/system/printing.nix diff --git a/configuration/modules/programs.nix b/configuration/modules/system/programs.nix similarity index 100% rename from configuration/modules/programs.nix rename to configuration/modules/system/programs.nix diff --git a/configuration/modules/sddm.nix b/configuration/modules/system/sddm.nix similarity index 100% rename from configuration/modules/sddm.nix rename to configuration/modules/system/sddm.nix diff --git a/configuration/modules/sound.nix b/configuration/modules/system/sound.nix similarity index 100% rename from configuration/modules/sound.nix rename to configuration/modules/system/sound.nix diff --git a/configuration/modules/ssh.nix b/configuration/modules/system/ssh.nix similarity index 100% rename from configuration/modules/ssh.nix rename to configuration/modules/system/ssh.nix diff --git a/configuration/modules/window-manager.nix b/configuration/modules/system/window-manager.nix similarity index 100% rename from configuration/modules/window-manager.nix rename to configuration/modules/system/window-manager.nix diff --git a/configuration/modules/xdg-settings.nix b/configuration/modules/system/xdg-settings.nix similarity index 100% rename from configuration/modules/xdg-settings.nix rename to configuration/modules/system/xdg-settings.nix