properly reformat all files

This commit is contained in:
Franek 2025-05-03 09:25:00 +02:00
parent 635ef052e7
commit 5948c1db1c
18 changed files with 324 additions and 287 deletions

View File

@ -19,7 +19,13 @@
ags.inputs.nixpkgs.follows = "nixpkgs"; ags.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = { self, nixpkgs, android-nixpkgs, ... }: outputs =
{
self,
nixpkgs,
android-nixpkgs,
...
}:
let let
forAllSystems = nixpkgs.lib.genAttrs [ forAllSystems = nixpkgs.lib.genAttrs [
"aarch64-linux" "aarch64-linux"
@ -29,12 +35,16 @@
in in
{ {
nixosConfigurations = import ./hosts { inherit self; }; nixosConfigurations = import ./hosts { inherit self; };
devShells = forAllSystems (system: devShells = forAllSystems (
let pkgs = nixpkgs.legacyPackages.${system}; system:
in { let
pkgs = nixpkgs.legacyPackages.${system};
in
{
ddt4all = import ./shells/ddt4all.nix { inherit pkgs; }; ddt4all = import ./shells/ddt4all.nix { inherit pkgs; };
android = import ./shells/android.nix { inherit pkgs android-nixpkgs; }; android = import ./shells/android.nix { inherit pkgs android-nixpkgs; };
rust = import ./shells/rust.nix { inherit pkgs; }; rust = import ./shells/rust.nix { inherit pkgs; };
}); }
);
}; };
} }

View File

@ -12,7 +12,8 @@ let
hostname, hostname,
useHomeManager ? true, useHomeManager ? true,
modules ? [ ], modules ? [ ],
}: lib.nixosSystem { }:
lib.nixosSystem {
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = modules =
[ [

View File

@ -9,7 +9,10 @@
]; ];
nix.settings = { nix.settings = {
experimental-features = [ "nix-command" "flakes" ]; experimental-features = [
"nix-command"
"flakes"
];
auto-optimise-store = true; auto-optimise-store = true;
}; };

View File

@ -1,37 +1,14 @@
{ config, pkgs, lib, inputs, ... }:
{ {
options.modules.ags = { config,
enable = lib.mkEnableOption "Aylur's GTK Shell with optional Stylix support"; pkgs,
full = lib.mkOption { lib,
type = lib.types.bool; inputs,
default = false; ...
description = "Enable all components (AstalBattery, AstalPowerProfiles etc.)"; }:
};
};
config = lib.mkIf config.modules.ags.enable { let
programs.ags = { generate-colors =
enable = true; colors: with colors; ''
extraPackages = if config.modules.ags.full then
with inputs.ags.packages.${pkgs.system};
[
apps
battery
bluetooth
greet
hyprland
mpris
network
notifd
powerprofiles
tray
wireplumber
] else [];
};
home.file.".config/theme_colors.scss".text = if config.modules.stylix.enable
then with config.lib.stylix.colors; ''
$base00: #${base00}; $base00: #${base00};
$base01: #${base01}; $base01: #${base01};
$base02: #${base02}; $base02: #${base02};
@ -48,6 +25,42 @@
$base0D: #${base0D}; $base0D: #${base0D};
$base0E: #${base0E}; $base0E: #${base0E};
$base0F: #${base0F}; $base0F: #${base0F};
'' else null; '';
in
{
options.modules.ags = {
enable = lib.mkEnableOption "Aylur's GTK Shell with optional Stylix support";
full = lib.mkOption {
type = lib.types.bool;
default = false;
description = "Enable all components (AstalBattery, AstalPowerProfiles etc.)";
};
};
config = lib.mkIf config.modules.ags.enable {
programs.ags = {
enable = true;
extraPackages =
if config.modules.ags.full then
with inputs.ags.packages.${pkgs.system};
[
apps
battery
bluetooth
greet
hyprland
mpris
network
notifd
powerprofiles
tray
wireplumber
]
else
[ ];
};
home.file.".config/theme_colors.scss".text =
if config.modules.stylix.enable then generate-colors config.lib.stylix.colors else null;
}; };
} }

View File

@ -27,7 +27,8 @@ let
''; '';
switch-theme = theme: "$(${find-generation})/${theme}/activate"; switch-theme = theme: "$(${find-generation})/${theme}/activate";
in { in
{
options.modules.darkman = { options.modules.darkman = {
enable = lib.mkEnableOption "Darkman service and integration"; enable = lib.mkEnableOption "Darkman service and integration";
customLightModeScript = lib.mkOption { customLightModeScript = lib.mkOption {
@ -46,15 +47,19 @@ in {
config = lib.mkIf config.modules.darkman.enable { config = lib.mkIf config.modules.darkman.enable {
services.darkman = { services.darkman = {
enable = true; enable = true;
darkModeScripts = optionalAttrs (config.modules.darkman.customDarkModeScript != null) { darkModeScripts =
optionalAttrs (config.modules.darkman.customDarkModeScript != null) {
custom = config.modules.darkman.customDarkModeScript; custom = config.modules.darkman.customDarkModeScript;
} // optionalAttrs (config.modules.stylix.enable) { }
// optionalAttrs (config.modules.stylix.enable) {
stylix = switch-theme "dark"; stylix = switch-theme "dark";
}; };
lightModeScripts = optionalAttrs (config.modules.darkman.customLightModeScript != null) { lightModeScripts =
optionalAttrs (config.modules.darkman.customLightModeScript != null) {
custom = config.modules.darkman.customLightModeScript; custom = config.modules.darkman.customLightModeScript;
} // optionalAttrs (config.modules.stylix.enable) { }
// optionalAttrs (config.modules.stylix.enable) {
stylix = switch-theme "light"; stylix = switch-theme "light";
}; };

View File

@ -8,7 +8,8 @@
let let
module = inputs.fingerprint-sensor.nixosModules."06cb-009a-fingerprint-sensor"; module = inputs.fingerprint-sensor.nixosModules."06cb-009a-fingerprint-sensor";
in { in
{
options.modules.fingerprint-fix = { options.modules.fingerprint-fix = {
enable = lib.mkEnableOption "Enable support for fingerprint for P51S-like ThinkPads."; enable = lib.mkEnableOption "Enable support for fingerprint for P51S-like ThinkPads.";
calibDataFile = lib.mkOption { calibDataFile = lib.mkOption {

View File

@ -1,7 +1,7 @@
{ {
webcopy = '' webcopy = ''
set -l domain (string trim $argv) set -l domain (string trim $argv)
get --recursive \ wget --recursive \
--level 5 \ --level 5 \
--no-clobber \ --no-clobber \
--page-requisites \ --page-requisites \

View File

@ -1,6 +1,7 @@
{ pkgs, inputs, ... }: { pkgs, inputs, ... }:
with pkgs; [ with pkgs;
[
(python3.withPackages ( (python3.withPackages (
py: with py; [ py: with py; [
pywayland pywayland

View File

@ -2,14 +2,17 @@
let let
android = pkgs.callPackage android-nixpkgs { }; android = pkgs.callPackage android-nixpkgs { };
androidSdk = android.sdk (sdkPkgs: with sdkPkgs; [ androidSdk = android.sdk (
sdkPkgs: with sdkPkgs; [
cmdline-tools-latest cmdline-tools-latest
build-tools-35-0-0 build-tools-35-0-0
platform-tools platform-tools
platforms-android-35 platforms-android-35
]); ]
);
in pkgs.mkShell rec { in
pkgs.mkShell rec {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
androidSdk androidSdk
jdk17 jdk17