Have running also with hyprland to some extent
This commit is contained in:
+1
-1
Submodule azos-core updated: dae1dacb51...ad540f77dd
Generated
+3
-3
@@ -71,11 +71,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768364046,
|
"lastModified": 1768395095,
|
||||||
"narHash": "sha256-PDFfpswLiuG/DcadTBb7dEfO3jX1fcGlCD4ZKSkC0M8=",
|
"narHash": "sha256-ZhuYJbwbZT32QA95tSkXd9zXHcdZj90EzHpEXBMabaw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ea30586ee015f37f38783006a9bc9e4aa64d7d61",
|
"rev": "13868c071cc73a5e9f610c47d7bb08e5da64fdd5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -18,5 +18,6 @@
|
|||||||
./gimp.nix
|
./gimp.nix
|
||||||
# ./printing.nix
|
# ./printing.nix
|
||||||
./libreoffice.nix
|
./libreoffice.nix
|
||||||
|
./hyprland-suite.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,59 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
options,
|
||||||
|
azos-utils,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
isEnabled =
|
||||||
|
config.azos.suites.hyprland.enable;
|
||||||
|
in {
|
||||||
|
options.azos.suites.hyprland.enable = lib.mkOption {
|
||||||
|
default = false;
|
||||||
|
example = true;
|
||||||
|
type = lib.types.bool;
|
||||||
|
};
|
||||||
|
|
||||||
|
#TODO shutdown reboot commands
|
||||||
|
config = lib.mkIf isEnabled {
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
hyprland
|
||||||
|
waybar # status bar
|
||||||
|
wofi # application launcher
|
||||||
|
kitty
|
||||||
|
grim # screenshot utility
|
||||||
|
slurp # region selector
|
||||||
|
swappy # screenshot editor
|
||||||
|
networkmanagerapplet
|
||||||
|
xwayland
|
||||||
|
];
|
||||||
|
|
||||||
|
azos.emacs.enabledSuites = ["azos-emacs-hyprland"];
|
||||||
|
azos.emacs.pkgs = [pkgs.azos-emacs-hyprland];
|
||||||
|
azos.emacs.emacspkg = pkgs.emacs-pgtk;
|
||||||
|
|
||||||
|
home.file.".login.sh" = {
|
||||||
|
text = ''
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
${pkgs.hyprland}/bin/Hyprland
|
||||||
|
'';
|
||||||
|
#Make executable
|
||||||
|
executable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# systemd.user.services.xwayland = {
|
||||||
|
# Unit.Description = "XWayland server";
|
||||||
|
# Install.WantedBy = [ "default.target" ];
|
||||||
|
# Service = {
|
||||||
|
# ExecStart = "${pkgs.xwayland}/bin/Xwayland :0 -rootless -terminate -listen tcp";
|
||||||
|
# Restart = "on-failure";
|
||||||
|
# RestartSec = "1s";
|
||||||
|
# StandardInput = "null";
|
||||||
|
# StandardOutput = "null";
|
||||||
|
# StandardError = "journal";
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -92,6 +92,20 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Specializations
|
||||||
|
specialisation = {
|
||||||
|
hyprland = {
|
||||||
|
configuration = {
|
||||||
|
# Override home‑manager options for this specialization
|
||||||
|
home-manager.users.aner = { pkgs, ... }: {
|
||||||
|
azos.suites.exwm.enable = lib.mkForce false;
|
||||||
|
azos.suites.hyprland.enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
# List packages installed in system profile. To search, run:
|
# List packages installed in system profile. To search, run:
|
||||||
# $ nix search wget
|
# $ nix search wget
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
|||||||
Executable
+13
@@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
orgTrivialBuild,
|
||||||
|
epkgs,
|
||||||
|
pkgs,
|
||||||
|
}:
|
||||||
|
orgTrivialBuild {
|
||||||
|
pname = "azos-emacs-hyprland";
|
||||||
|
version = "0.1.6";
|
||||||
|
src = ./elisp/azos-emacs-hyprland.org;
|
||||||
|
packageRequires = with epkgs; [
|
||||||
|
pkgs.azos-emacs-base
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -3,4 +3,5 @@
|
|||||||
localEmacsPkg = pkgs.localEmacsPkg;
|
localEmacsPkg = pkgs.localEmacsPkg;
|
||||||
in {
|
in {
|
||||||
azos-emacs-lauretta = localEmacsPkg ./azos-emacs-lauretta.nix;
|
azos-emacs-lauretta = localEmacsPkg ./azos-emacs-lauretta.nix;
|
||||||
|
azos-emacs-hyprland = localEmacsPkg ./azos-emacs-hyprland.nix;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
#+title: Aner's Emacs Hyprland Configuration
|
||||||
|
#+property: header-args :results silent
|
||||||
|
|
||||||
|
* Base setup
|
||||||
|
** Require
|
||||||
|
|
||||||
|
#+begin_src emacs-lisp
|
||||||
|
(require 'azos-emacs-base)
|
||||||
|
#+end_src
|
||||||
|
|
||||||
|
* Hyprland Specific
|
||||||
|
|
||||||
|
* Provide
|
||||||
|
|
||||||
|
#+begin_src emacs-lisp
|
||||||
|
(provide 'azos-emacs-hyprland)
|
||||||
|
#+end_src
|
||||||
@@ -48,11 +48,14 @@
|
|||||||
** Tab bar setup
|
** Tab bar setup
|
||||||
|
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(azos/bat/enable-tab-display)
|
(when (fboundp #'azos/bat/enable-tab-display)
|
||||||
|
(azos/bat/enable-tab-display))
|
||||||
|
|
||||||
(azos/network/enable-tab-display)
|
(when (fboundp #'azos/network/enable-tab-display)
|
||||||
|
(azos/network/enable-tab-display))
|
||||||
|
|
||||||
(azos/audio/enable-tab-display)
|
(when (fboundp #'azos/audio/enable-tab-display)
|
||||||
|
(azos/audio/enable-tab-display))
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
* Provide
|
* Provide
|
||||||
|
|||||||
Reference in New Issue
Block a user