Reformat with alejandra

This commit is contained in:
2026-03-23 21:24:20 +01:00
parent 463ce1c6f9
commit a4c34f9857
48 changed files with 193 additions and 246 deletions

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
imports = [ imports = [
./modules ./modules
./hardware-configuration.nix ./hardware-configuration.nix
@@ -130,7 +129,9 @@
bluetooth = { bluetooth = {
enable = true; enable = true;
package = pkgs.bluez.overrideAttrs (old: { package = pkgs.bluez.overrideAttrs (old: {
configureFlags = old.configureFlags ++ [ configureFlags =
old.configureFlags
++ [
"--enable-sixaxis" "--enable-sixaxis"
]; ];
}); });

View File

@@ -14,14 +14,12 @@
}; };
}; };
outputs = outputs = {
{
self, self,
nixpkgs, nixpkgs,
czkawka-src, czkawka-src,
naersk, naersk,
}: }: let
let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs {inherit system;}; pkgs = import nixpkgs {inherit system;};
naersk-lib = pkgs.callPackage naersk {}; naersk-lib = pkgs.callPackage naersk {};
@@ -44,8 +42,7 @@
libXrandr libXrandr
wayland wayland
]; ];
in in {
{
packages.${system}.default = naersk-lib.buildPackage { packages.${system}.default = naersk-lib.buildPackage {
pname = "krokiet"; pname = "krokiet";
version = "master"; version = "master";
@@ -54,8 +51,7 @@
nativeBuildInputs = nativeBuildInputs; nativeBuildInputs = nativeBuildInputs;
buildInputs = runtimeLibs; buildInputs = runtimeLibs;
cargoBuildOptions = cargoBuildOptions = x:
x:
x x
++ [ ++ [
"-p" "-p"

View File

@@ -6,18 +6,15 @@
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };
outputs = outputs = {
{
self, self,
nixpkgs, nixpkgs,
flake-utils, flake-utils,
}: }:
flake-utils.lib.eachDefaultSystem ( flake-utils.lib.eachDefaultSystem (
system: system: let
let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
in in {
{
packages.default = pkgs.stdenv.mkDerivation rec { packages.default = pkgs.stdenv.mkDerivation rec {
pname = "fet"; pname = "fet";
version = "7.8.0"; version = "7.8.0";

View File

@@ -1,5 +1,4 @@
{ pkgs, ... }: {pkgs, ...}: {
{
boot = { boot = {
kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest; kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest;

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
nix.settings = { nix.settings = {
substituters = [ substituters = [
"https://attic.awroo.fun/my-config" "https://attic.awroo.fun/my-config"

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
imports = [ imports = [
./attic.nix ./attic.nix
./flatpak.nix ./flatpak.nix

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
services.flatpak = { services.flatpak = {
enable = true; enable = true;
update.auto.enable = true; update.auto.enable = true;

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
environment = { environment = {
gnome.excludePackages = with pkgs; [ gnome.excludePackages = with pkgs; [
decibels decibels

View File

@@ -1,5 +1,4 @@
{ lib, ... }: {lib, ...}: {
{
dconf.settings = { dconf.settings = {
"org/virt-manager/virt-manager/connections" = { "org/virt-manager/virt-manager/connections" = {
autoconnect = ["qemu:///system"]; autoconnect = ["qemu:///system"];

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
imports = [ imports = [
./apps.nix ./apps.nix
./extensions.nix ./extensions.nix

View File

@@ -1,5 +1,4 @@
{ lib, ... }: {lib, ...}: {
{
dconf.settings = { dconf.settings = {
"org/gnome/shell/extensions/user-theme" = { "org/gnome/shell/extensions/user-theme" = {
name = "Flat-Remix-Darkest-fullPanel"; name = "Flat-Remix-Darkest-fullPanel";

View File

@@ -1,5 +1,4 @@
{ lib, ... }: {lib, ...}: {
{
dconf.settings = { dconf.settings = {
"org/gnome/desktop/interface" = { "org/gnome/desktop/interface" = {
accent-color = "red"; accent-color = "red";

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
imports = [ imports = [
./dconf ./dconf
./desktop-files.nix ./desktop-files.nix

View File

@@ -2,8 +2,7 @@
config, config,
pkgs, pkgs,
... ...
}: }: {
{
xdg.dataFile."applications/clion.desktop".text = '' xdg.dataFile."applications/clion.desktop".text = ''
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application

View File

@@ -1,5 +1,4 @@
{ lib, ... }: {lib, ...}: {
{
programs.starship = { programs.starship = {
enable = true; enable = true;
settings = { settings = {

View File

@@ -1,5 +1,4 @@
{ config, ... }: {config, ...}: {
{
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;

View File

@@ -6,8 +6,7 @@
solaar-master, solaar-master,
fet, fet,
... ...
}: }: {
{
nixpkgs = { nixpkgs = {
config = { config = {
allowUnfree = true; allowUnfree = true;
@@ -153,7 +152,8 @@
vkbasalt vkbasalt
vlc vlc
(vscode.fhsWithPackages ( (vscode.fhsWithPackages (
ps: with ps; [ ps:
with ps; [
python3 python3
zlib zlib
gcc gcc

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
programs = { programs = {
dconf.profiles.gdm.databases = [ dconf.profiles.gdm.databases = [
{ {

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
services = { services = {
sshd.enable = true; sshd.enable = true;
displayManager.gdm.enable = true; displayManager.gdm.enable = true;

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./modules ./modules

View File

@@ -7,8 +7,7 @@
pkgs, pkgs,
modulesPath, modulesPath,
... ...
}: }: {
{
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
imports = [ imports = [
./flatpak.nix ./flatpak.nix
./gdm-monitors.nix ./gdm-monitors.nix

View File

@@ -3,6 +3,5 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
} }

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: let
let
gdmMonitorsXml = pkgs.writeText "gdm-monitor.xml" '' gdmMonitorsXml = pkgs.writeText "gdm-monitor.xml" ''
<monitors version="2"> <monitors version="2">
<configuration> <configuration>
@@ -291,8 +290,7 @@ let
</configuration> </configuration>
</monitors> </monitors>
''; '';
in in {
{
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"L+ /run/gdm/.config/monitors.xml - - - - ${gdmMonitorsXml}" "L+ /run/gdm/.config/monitors.xml - - - - ${gdmMonitorsXml}"
]; ];

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
environment = { environment = {
systemPackages = with pkgs.gnomeExtensions; [ systemPackages = with pkgs.gnomeExtensions; [
control-monitor-brightness-and-volume-with-ddcutil control-monitor-brightness-and-volume-with-ddcutil

View File

@@ -1,4 +1,3 @@
{ ... }: {...}: {
{
dconf.settings = {}; dconf.settings = {};
} }

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
imports = [ imports = [
./apps.nix ./apps.nix
./extensions.nix ./extensions.nix

View File

@@ -1,4 +1,3 @@
{ ... }: {...}: {
{
dconf.settings = {}; dconf.settings = {};
} }

View File

@@ -1,5 +1,4 @@
{ lib, ... }: {lib, ...}: {
{
dconf.settings = { dconf.settings = {
"org/gnome/settings-daemon/plugins/media-keys" = { "org/gnome/settings-daemon/plugins/media-keys" = {
custom-keybindings = lib.mkAfter [ custom-keybindings = lib.mkAfter [

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
imports = [ imports = [
./dconf ./dconf
]; ];

View File

@@ -4,8 +4,7 @@
lib, lib,
czkawka-master, czkawka-master,
... ...
}: }: {
{
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
amdgpu_top amdgpu_top
arch-install-scripts arch-install-scripts

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
programs = { programs = {
ccache = { ccache = {
enable = true; enable = true;

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
zram-generator zram-generator
]; ];

View File

@@ -1,5 +1,4 @@
{ lib, ... }: {lib, ...}: {
{
virtualisation.vmVariant = { virtualisation.vmVariant = {
virtualisation = { virtualisation = {
memorySize = 8192; memorySize = 8192;

View File

@@ -11,18 +11,15 @@
fet.url = "path:./common/flakes/fet"; fet.url = "path:./common/flakes/fet";
}; };
outputs = outputs = {
{
self, self,
nixpkgs, nixpkgs,
nix-flatpak, nix-flatpak,
home-manager, home-manager,
... ...
}@inputs: } @ inputs: let
let
specialArgs = {inherit (inputs) czkawka-master fet;}; specialArgs = {inherit (inputs) czkawka-master fet;};
in in {
{
nixosConfigurations = { nixosConfigurations = {
epiquev2 = nixpkgs.lib.nixosSystem { epiquev2 = nixpkgs.lib.nixosSystem {
inherit specialArgs; inherit specialArgs;

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./modules ./modules

View File

@@ -7,8 +7,7 @@
pkgs, pkgs,
modulesPath, modulesPath,
... ...
}: }: {
{
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
imports = [ imports = [
./flatpak.nix ./flatpak.nix
./gnome.nix ./gnome.nix

View File

@@ -3,6 +3,5 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
} }

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
environment = { environment = {
systemPackages = with pkgs.gnomeExtensions; [ systemPackages = with pkgs.gnomeExtensions; [
]; ];

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
dconf.settings = { dconf.settings = {
"org/gnome/Console" = { "org/gnome/Console" = {
custom-font = "FiraCode Nerd Font Mono 11"; custom-font = "FiraCode Nerd Font Mono 11";

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
imports = [ imports = [
./apps.nix ./apps.nix
./extensions.nix ./extensions.nix

View File

@@ -1,4 +1,3 @@
{ ... }: {...}: {
{
dconf.settings = {}; dconf.settings = {};
} }

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
dconf.settings = { dconf.settings = {
"org/gnome/desktop/peripherals/touchpad" = { "org/gnome/desktop/peripherals/touchpad" = {
click-method = "areas"; click-method = "areas";

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
imports = [ imports = [
./dconf ./dconf
]; ];

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
btop btop
gnome-power-manager gnome-power-manager

View File

@@ -1,3 +1,2 @@
{ ... }: {...}: {
{
} }

View File

@@ -1,5 +1,4 @@
{ pkgs, ... }: {pkgs, ...}: {
{
services.thermald.enable = true; services.thermald.enable = true;
services.power-profiles-daemon.enable = false; services.power-profiles-daemon.enable = false;
services.tlp = { services.tlp = {