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
@@ -123,16 +122,18 @@
pkgs.libheif.out pkgs.libheif.out
]; ];
pathsToLink = [ "share/thumbnailers" ]; pathsToLink = ["share/thumbnailers"];
}; };
hardware = { hardware = {
bluetooth = { bluetooth = {
enable = true; enable = true;
package = pkgs.bluez.overrideAttrs (old: { package = pkgs.bluez.overrideAttrs (old: {
configureFlags = old.configureFlags ++ [ configureFlags =
"--enable-sixaxis" old.configureFlags
]; ++ [
"--enable-sixaxis"
];
}); });
powerOnBoot = true; powerOnBoot = true;

View File

@@ -14,72 +14,68 @@
}; };
}; };
outputs = outputs = {
{ self,
self, nixpkgs,
nixpkgs, czkawka-src,
czkawka-src, naersk,
naersk, }: let
}: system = "x86_64-linux";
let pkgs = import nixpkgs {inherit system;};
system = "x86_64-linux"; naersk-lib = pkgs.callPackage naersk {};
pkgs = import nixpkgs { inherit system; };
naersk-lib = pkgs.callPackage naersk { };
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
cargo cargo
cmake cmake
makeWrapper makeWrapper
pkg-config pkg-config
rustc rustc
]; ];
runtimeLibs = with pkgs; [ runtimeLibs = with pkgs; [
fontconfig fontconfig
libglvnd libglvnd
libX11 libX11
libXcursor libXcursor
libXi libXi
libxkbcommon libxkbcommon
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"; src = czkawka-src;
src = czkawka-src;
nativeBuildInputs = nativeBuildInputs; nativeBuildInputs = nativeBuildInputs;
buildInputs = runtimeLibs; buildInputs = runtimeLibs;
cargoBuildOptions = cargoBuildOptions = x:
x: x
x ++ [
++ [ "-p"
"-p" "krokiet"
"krokiet"
];
buildAndCheckFeatures = [
"winit_wayland"
"winit_x11"
]; ];
RUSTFLAGS = "-C target-cpu=native"; buildAndCheckFeatures = [
NIX_CFLAGS_COMPILE = "-march=native -mtune=native"; "winit_wayland"
"winit_x11"
];
postInstall = '' RUSTFLAGS = "-C target-cpu=native";
wrapProgram $out/bin/krokiet \ NIX_CFLAGS_COMPILE = "-march=native -mtune=native";
--prefix LD_LIBRARY_PATH : ${pkgs.lib.makeLibraryPath runtimeLibs}
install -Dm444 -t $out/share/applications data/io.github.qarmin.krokiet.desktop postInstall = ''
wrapProgram $out/bin/krokiet \
--prefix LD_LIBRARY_PATH : ${pkgs.lib.makeLibraryPath runtimeLibs}
install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/io.github.qarmin.krokiet.svg \ install -Dm444 -t $out/share/applications data/io.github.qarmin.krokiet.desktop
install -Dm444 -t $out/share/metainfo data/io.github.qarmin.krokiet.metainfo.xml install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/io.github.qarmin.krokiet.svg \
'';
}; install -Dm444 -t $out/share/metainfo data/io.github.qarmin.krokiet.metainfo.xml
'';
}; };
};
} }

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,9 +1,8 @@
{ lib, ... }: {lib, ...}: {
{
dconf.settings = { dconf.settings = {
"org/virt-manager/virt-manager/connections" = { "org/virt-manager/virt-manager/connections" = {
autoconnect = [ "qemu:///system" ]; autoconnect = ["qemu:///system"];
uris = [ "qemu:///system" ]; uris = ["qemu:///system"];
}; };
"org/gnome/Console" = { "org/gnome/Console" = {

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";
@@ -109,7 +108,7 @@
blur = false; blur = false;
brightness = 1.0; brightness = 1.0;
opacity = 217; opacity = 217;
whitelist = [ "org.gnome.Console" ]; whitelist = ["org.gnome.Console"];
}; };
"org/gnome/shell/extensions/blur-my-shell/coverflow-alt-tab" = { "org/gnome/shell/extensions/blur-my-shell/coverflow-alt-tab" = {

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";
@@ -33,13 +32,13 @@
}; };
"org/gnome/desktop/wm/keybindings" = { "org/gnome/desktop/wm/keybindings" = {
move-to-workspace-left = [ "<Shift><Control><Super>Left" ]; move-to-workspace-left = ["<Shift><Control><Super>Left"];
move-to-workspace-right = [ "<Shift><Control><Super>Right" ]; move-to-workspace-right = ["<Shift><Control><Super>Right"];
switch-to-workspace-left = [ "<Control><Super>Left" ]; switch-to-workspace-left = ["<Control><Super>Left"];
switch-to-workspace-right = [ "<Control><Super>Right" ]; switch-to-workspace-right = ["<Control><Super>Right"];
switch-windows = [ "<Alt>Tab" ]; switch-windows = ["<Alt>Tab"];
switch-windows-backward = [ "<Shift><Alt>Tab" ]; switch-windows-backward = ["<Shift><Alt>Tab"];
toggle-fullscreen = [ "<Super>F11" ]; toggle-fullscreen = ["<Super>F11"];
}; };
"org/gnome/desktop/wm/preferences" = { "org/gnome/desktop/wm/preferences" = {
@@ -89,7 +88,7 @@
}; };
"org/gnome/desktop/app-folders" = { "org/gnome/desktop/app-folders" = {
folder-children = [ ]; folder-children = [];
}; };
"org/gnome/desktop/datetime" = { "org/gnome/desktop/datetime" = {

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,12 +152,13 @@
vkbasalt vkbasalt
vlc vlc
(vscode.fhsWithPackages ( (vscode.fhsWithPackages (
ps: with ps; [ ps:
python3 with ps; [
zlib python3
gcc zlib
gnumake gcc
] gnumake
]
)) ))
webp-pixbuf-loader webp-pixbuf-loader
wev wev

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
programs = { programs = {
dconf.profiles.gdm.databases = [ dconf.profiles.gdm.databases = [
{ {
@@ -79,7 +78,7 @@
nix-ld = { nix-ld = {
enable = true; enable = true;
libraries = with pkgs; [ ]; libraries = with pkgs; [];
}; };
steam = { steam = {

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,15 +7,14 @@
pkgs, pkgs,
modulesPath, modulesPath,
... ...
}: }: {
{
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot = { boot = {
initrd = { initrd = {
kernelModules = [ ]; kernelModules = [];
verbose = false; verbose = false;
availableKernelModules = [ availableKernelModules = [
"nvme" "nvme"
@@ -36,7 +35,7 @@
pkgs.linuxKernel.packages.linux_xanmod_latest.zenpower pkgs.linuxKernel.packages.linux_xanmod_latest.zenpower
]; ];
blacklistedKernelModules = [ "k10temp" ]; blacklistedKernelModules = ["k10temp"];
kernelParams = [ kernelParams = [
"amdgpu.seamless=1" "amdgpu.seamless=1"
@@ -180,7 +179,7 @@
]; ];
}; };
swapDevices = [ ]; swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

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;

107
flake.nix
View File

@@ -11,65 +11,62 @@
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: let
}@inputs: specialArgs = {inherit (inputs) czkawka-master fet;};
let in {
specialArgs = { inherit (inputs) czkawka-master fet; }; nixosConfigurations = {
in epiquev2 = nixpkgs.lib.nixosSystem {
{ inherit specialArgs;
nixosConfigurations = { system = "x86_64-linux";
epiquev2 = nixpkgs.lib.nixosSystem { modules = [
inherit specialArgs; ./common
system = "x86_64-linux"; ./desktop
modules = [ nix-flatpak.nixosModules.nix-flatpak
./common
./desktop
nix-flatpak.nixosModules.nix-flatpak
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users.jax = { users.jax = {
imports = [ imports = [
./common/modules/home ./common/modules/home
./desktop/modules/home ./desktop/modules/home
]; ];
};
}; };
} };
]; }
}; ];
};
dalaptop = nixpkgs.lib.nixosSystem { dalaptop = nixpkgs.lib.nixosSystem {
inherit specialArgs; inherit specialArgs;
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./common ./common
./laptop ./laptop
nix-flatpak.nixosModules.nix-flatpak nix-flatpak.nixosModules.nix-flatpak
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users.jax = { users.jax = {
imports = [ imports = [
./common/modules/home ./common/modules/home
./laptop/modules/home ./laptop/modules/home
]; ];
};
}; };
} };
]; }
}; ];
}; };
}; };
};
} }

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")
]; ];
@@ -23,11 +22,11 @@
"sd_mod" "sd_mod"
]; ];
kernelModules = [ ]; kernelModules = [];
}; };
kernelModules = [ "kvm-intel" ]; kernelModules = ["kvm-intel"];
extraModulePackages = [ ]; extraModulePackages = [];
resumeDevice = "/dev/disk/by-uuid/bea07563-dc23-415b-b12f-ba53138bd492"; resumeDevice = "/dev/disk/by-uuid/bea07563-dc23-415b-b12f-ba53138bd492";
kernelParams = [ kernelParams = [

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 = {
@@ -42,7 +41,7 @@
systemd.services.disable-problematic-wakeup = { systemd.services.disable-problematic-wakeup = {
description = "Disable only specific noisy wakeup sources"; description = "Disable only specific noisy wakeup sources";
wantedBy = [ "multi-user.target" ]; wantedBy = ["multi-user.target"];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";