From 27f1d01f31a74e193b4c266d2fa73d63cedf8468 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Mon, 24 Jun 2024 12:30:49 -0400
Subject: [PATCH] refactor: get rid of mdDocs usage
---
home/theme/gradience.nix | 6 +-----
modules/ags/default.nix | 4 ++--
modules/arion/default.nix | 6 +++---
modules/greetd/astal.nix | 11 ++++++++++-
modules/greetd/default.nix | 10 +++++++++-
modules/greetd/hyprland.nix | 9 ++++++++-
modules/greetd/setupMonitors.nix | 11 ++++++++++-
modules/hyprland/Hyprspace.nix | 6 +-----
modules/hyprland/default.nix | 1 +
modules/hyprland/inputs.nix | 1 +
modules/nvidia.nix | 4 ++--
11 files changed, 48 insertions(+), 21 deletions(-)
diff --git a/home/theme/gradience.nix b/home/theme/gradience.nix
index ff878565..60488b4d 100644
--- a/home/theme/gradience.nix
+++ b/home/theme/gradience.nix
@@ -1,8 +1,4 @@
-{
- pkgs,
- lib,
- ...
-}: {
+{pkgs, ...}: {
gradience = rec {
# https://github.com/V-Mann-Nick/nix-home-manager/blob/main/gnome/theme.nix
package = pkgs.gradience.overrideAttrs (old: {
diff --git a/modules/ags/default.nix b/modules/ags/default.nix
index 12ef08c9..5bffc872 100644
--- a/modules/ags/default.nix
+++ b/modules/ags/default.nix
@@ -31,7 +31,7 @@ in {
...
}: let
symlink = config.lib.file.mkOutOfStoreSymlink;
- inherit (lib) hasPrefix mdDoc optionals removePrefix;
+ inherit (lib) hasPrefix optionals removePrefix;
configJs =
# javascript
@@ -46,7 +46,7 @@ in {
assertions = [
{
assertion = hasPrefix "/home/${mainUser}/" flakeDir;
- message = mdDoc ''
+ message = ''
Your $FLAKE environment variable needs to point to a directory in
the main users' home to use the AGS module.
'';
diff --git a/modules/arion/default.nix b/modules/arion/default.nix
index c132960d..9e683e26 100644
--- a/modules/arion/default.nix
+++ b/modules/arion/default.nix
@@ -25,19 +25,19 @@ in {
imports = [arion.nixosModules.arion];
options.arion = {
- enable = mkEnableOption (lib.mdDoc "My custom arion config layer module");
+ enable = mkEnableOption "My custom arion config layer module";
rwDataDir = mkOption {
default = "/var/lib/arion";
type = types.str;
- description = lib.mdDoc ''
+ description = ''
Directory to place persistent data in
'';
};
projects = mkOption {
default = {};
- description = lib.mdDoc ''
+ description = ''
Declarative specification of docker-compose in nix.
'';
type = types.attrs;
diff --git a/modules/greetd/astal.nix b/modules/greetd/astal.nix
index 75482357..2d6b97f8 100644
--- a/modules/greetd/astal.nix
+++ b/modules/greetd/astal.nix
@@ -5,7 +5,16 @@
...
}: let
inherit (config.vars) mainUser;
- hyprland = config.home-manager.users.${mainUser}.wayland.windowManager.hyprland.finalPackage;
+
+ hyprland =
+ config
+ .home-manager
+ .users
+ .${mainUser}
+ .wayland
+ .windowManager
+ .hyprland
+ .finalPackage;
in {
# Add home folder for home-manager to work
users.users.greeter = {
diff --git a/modules/greetd/default.nix b/modules/greetd/default.nix
index cd889ad6..4b12bb96 100644
--- a/modules/greetd/default.nix
+++ b/modules/greetd/default.nix
@@ -8,7 +8,15 @@
inherit (import ./hyprland.nix {inherit config lib pkgs;}) hyprConf;
# Nix stuff
- hyprland = config.home-manager.users.${mainUser}.wayland.windowManager.hyprland.finalPackage;
+ hyprland =
+ config
+ .home-manager
+ .users
+ .${mainUser}
+ .wayland
+ .windowManager
+ .hyprland
+ .finalPackage;
in {
imports = [./astal.nix];
diff --git a/modules/greetd/hyprland.nix b/modules/greetd/hyprland.nix
index f3e08abc..5524abbe 100644
--- a/modules/greetd/hyprland.nix
+++ b/modules/greetd/hyprland.nix
@@ -20,7 +20,14 @@
inherit (import ./setupMonitors.nix {inherit config pkgs;}) setupMonitors;
# Nix stuff
- cfgHypr = config.home-manager.users.${mainUser}.wayland.windowManager.hyprland;
+ cfgHypr =
+ config
+ .home-manager
+ .users
+ .${mainUser}
+ .wayland
+ .windowManager
+ .hyprland;
devices = filterAttrs (n: v: hasPrefix "device:" n) cfgHypr.settings;
monitors = cfgHypr.settings.monitor;
diff --git a/modules/greetd/setupMonitors.nix b/modules/greetd/setupMonitors.nix
index 4654ee2b..a485eed2 100644
--- a/modules/greetd/setupMonitors.nix
+++ b/modules/greetd/setupMonitors.nix
@@ -4,7 +4,16 @@
...
}: let
inherit (config.vars) mainUser greetdDupe mainMonitor;
- hyprland = config.home-manager.users.${mainUser}.wayland.windowManager.hyprland.finalPackage;
+
+ hyprland =
+ config
+ .home-manager
+ .users
+ .${mainUser}
+ .wayland
+ .windowManager
+ .hyprland
+ .finalPackage;
# Show Regreet on all monitors
dupeMonitors = pkgs.writeShellApplication {
diff --git a/modules/hyprland/Hyprspace.nix b/modules/hyprland/Hyprspace.nix
index ae71fb1b..93009601 100644
--- a/modules/hyprland/Hyprspace.nix
+++ b/modules/hyprland/Hyprspace.nix
@@ -4,11 +4,7 @@
...
}: {
wayland.windowManager.hyprland = {
- plugins = [
- (Hyprspace.packages.${pkgs.system}.Hyprspace.overrideAttrs {
- dontUseCmakeConfigure = true;
- })
- ];
+ plugins = [Hyprspace.packages.${pkgs.system}.Hyprspace];
settings = {
bind = [
diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix
index 48093950..3a1f934b 100644
--- a/modules/hyprland/default.nix
+++ b/modules/hyprland/default.nix
@@ -9,6 +9,7 @@
inherit (config.vars) mainUser;
isTouchscreen = config.hardware.sensor.iio.enable;
+
cfg =
config
.home-manager
diff --git a/modules/hyprland/inputs.nix b/modules/hyprland/inputs.nix
index a1f54720..07c46fa8 100644
--- a/modules/hyprland/inputs.nix
+++ b/modules/hyprland/inputs.nix
@@ -6,6 +6,7 @@
"logitech-g502-x"
"logitech-g502-hero-gaming-mouse"
];
+
mkConf = name: {
inherit name;
sensitivity = 0;
diff --git a/modules/nvidia.nix b/modules/nvidia.nix
index 3f3df64a..7d1c8c93 100644
--- a/modules/nvidia.nix
+++ b/modules/nvidia.nix
@@ -4,12 +4,12 @@
pkgs,
...
}: let
- inherit (lib) mdDoc mkIf mkEnableOption mkOption optionals types;
+ inherit (lib) mkIf mkEnableOption mkOption optionals types;
cfg = config.nvidia;
in {
options.nvidia = {
- enable = mkEnableOption (mdDoc "nvidia");
+ enable = mkEnableOption "nvidia";
enableNvidiaSettings = mkOption {
type = types.bool;