Remove eww remains, and fully switch to lazygit
This commit is contained in:
parent
a789b7ca25
commit
497511a4e9
8 changed files with 14 additions and 347 deletions
modules
|
@ -23,7 +23,10 @@ This directory contains custom module definitions used throughout my config.
|
|||
|
||||
## Nixos modules
|
||||
|
||||
There are no nixos modules at the moment!
|
||||
| Name | Attribute | Description | Dependencies |
|
||||
| ---------------------------- | ----------------- | ---------------------------------------- | ------------ |
|
||||
| [pounce](./nixos/pounce.nix) | `services.pounce` | Module for pounce & calico configuration | |
|
||||
| [nginx](./nixos/nginx.nix) | `satellite.proxy` | Helpers for nginx configuration | |
|
||||
|
||||
## Home-manager modules
|
||||
|
||||
|
@ -31,7 +34,6 @@ There are no nixos modules at the moment!
|
|||
| ------------------------------------------------- | ----------------------- | --------------------------------------------------------------------------------- | ------------------------------------------------------------- |
|
||||
| [discord](./home-manager/discord.nix) | `programs.discord` | Additional discord options | |
|
||||
| [firefox](./home-manager/firefox) | `programs.firefox.apps` | Hacky system for wrapping websites into desktop apps by hiding the firefox tabbar | |
|
||||
| [eww-hyprland](./home-manager/eww-hyprland.nix) | `programs.eww-hyprland` | `eww` service for `hyprland` | |
|
||||
| [hyprpaper](./home-manager/hyprpaper.nix) | `services.hyprpaper` | Wallpaper service for `hyprland` | |
|
||||
| [monitors](./home-manager/monitors.nix) | `satellite.monitors` | WM generic monitor configuration | |
|
||||
| [persistence](./home-manager/persistence.nix) | `satellite.persistence` | Syntactic wrapper around impermanence | [impermanence](https://github.com/nix-community/impermanence) |
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
monitors = import ./monitors.nix;
|
||||
satellite-dev = import ./satellite-dev.nix;
|
||||
satellite-persistence = import ./persistence.nix;
|
||||
eww-hyprland = import ./eww-hyprland.nix;
|
||||
|
||||
# Should upstream
|
||||
discord = import ./discord.nix;
|
||||
|
|
|
@ -1,70 +0,0 @@
|
|||
# A big chunk of this was taken from fuxefan's config:
|
||||
# https://github.com/fufexan/dotfiles/blob/main/home/programs/eww/default.nix
|
||||
{ config
|
||||
, pkgs
|
||||
, lib
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
reloadScript = pkgs.writeShellScript "reload_eww" ''
|
||||
${pkgs.systemd}/bin/systemctl
|
||||
'';
|
||||
|
||||
cfg = config.programs.eww-hyprland;
|
||||
in
|
||||
{
|
||||
options.programs.eww-hyprland = {
|
||||
enable = lib.mkEnableOption "eww Hyprland config";
|
||||
|
||||
package = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.package;
|
||||
default = pkgs.eww-wayland;
|
||||
defaultText = lib.literalExpression "pkgs.eww-wayland";
|
||||
description = "Eww package to use.";
|
||||
};
|
||||
|
||||
autoReload = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
defaultText = lib.literalExpression "false";
|
||||
description = "Whether to restart the eww daemon and windows on change.";
|
||||
};
|
||||
|
||||
dependencies = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.package;
|
||||
default = [ ];
|
||||
defaultText = lib.literalExpression "[]";
|
||||
description = "Extra packages eww should have access to.";
|
||||
};
|
||||
|
||||
extraConfig = lib.mkOption {
|
||||
type = lib.types.lines;
|
||||
default = null;
|
||||
description = "Extra configuration for eww.";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
home.packages = [ cfg.package ];
|
||||
|
||||
# remove nix files
|
||||
xdg.configFile."eww/eww.yuck" = {
|
||||
text = cfg.extraConfig or "";
|
||||
|
||||
onChange = lib.mkIf cfg.autoReload reloadScript.outPath;
|
||||
};
|
||||
|
||||
systemd.user.services.eww = {
|
||||
Unit = {
|
||||
Description = "Eww Daemon";
|
||||
PartOf = [ "graphical-session.target" ];
|
||||
};
|
||||
Service = {
|
||||
Environment = "PATH=/run/wrappers/bin:${lib.makeBinPath cfg.dependencies}";
|
||||
ExecStart = "${cfg.package}/bin/eww daemon --no-daemonize";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
Install.WantedBy = [ "graphical-session.target" ];
|
||||
};
|
||||
};
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue