refactor: get rid of mdDocs usage
All checks were successful
Discord / discord commits (push) Has been skipped
All checks were successful
Discord / discord commits (push) Has been skipped
This commit is contained in:
parent
a793ff8a13
commit
27f1d01f31
11 changed files with 48 additions and 21 deletions
|
@ -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: {
|
||||
|
|
|
@ -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.
|
||||
'';
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 = {
|
||||
|
|
|
@ -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];
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -4,11 +4,7 @@
|
|||
...
|
||||
}: {
|
||||
wayland.windowManager.hyprland = {
|
||||
plugins = [
|
||||
(Hyprspace.packages.${pkgs.system}.Hyprspace.overrideAttrs {
|
||||
dontUseCmakeConfigure = true;
|
||||
})
|
||||
];
|
||||
plugins = [Hyprspace.packages.${pkgs.system}.Hyprspace];
|
||||
|
||||
settings = {
|
||||
bind = [
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
inherit (config.vars) mainUser;
|
||||
|
||||
isTouchscreen = config.hardware.sensor.iio.enable;
|
||||
|
||||
cfg =
|
||||
config
|
||||
.home-manager
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
"logitech-g502-x"
|
||||
"logitech-g502-hero-gaming-mouse"
|
||||
];
|
||||
|
||||
mkConf = name: {
|
||||
inherit name;
|
||||
sensitivity = 0;
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue