packages.nix: add Blueman

- enable autohide-in-fullscreen

common/default.nix

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

common/flakes/czkawka-master/flake.nix

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

common/flakes/fet/flake.nix

@@ -6,25 +6,22 @@
     flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs =
+  outputs = {
-    {
     self,
     nixpkgs,
     flake-utils,
   }:
     flake-utils.lib.eachDefaultSystem (
-      system:
+      system: let
-      let
         pkgs = nixpkgs.legacyPackages.${system};
-      in
+      in {
-      {
         packages.default = pkgs.stdenv.mkDerivation rec {
           pname = "fet";
-          version = "7.8.0";
+          version = "7.8.1";
 
           src = pkgs.fetchurl {
             url = "https://lalescu.ro/liviu/fet/download/fet-${version}.tar.xz";
-            sha256 = "01hr3digrg2qs5wh10qzpgwi4clqmzd46d099r0yrx3278qvz9wj";
+            sha256 = "0b0g20mgawpv6pp6b1vh0vhz6rr0193g2irqiclnxxlnf174bcfr";
           };
 
           enableParallelBuilding = true;

common/hardware-configuration.nix

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

common/modules/attic.nix

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

common/modules/default.nix

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

common/modules/flatpak.nix

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

common/modules/gnome.nix

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

common/modules/home/dconf/apps.nix

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

common/modules/home/dconf/default.nix

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

common/modules/home/dconf/extensions.nix

@@ -1,5 +1,4 @@
-{ lib, ... }:
+{lib, ...}: {
-{
   dconf.settings = {
     "org/gnome/shell/extensions/user-theme" = {
       name = "Flat-Remix-Darkest-fullPanel";
@@ -29,7 +28,7 @@
 
     "org/gnome/shell/extensions/dash-to-dock" = {
       apply-custom-theme = false;
-      autohide-in-fullscreen = false;
+      autohide-in-fullscreen = true;
       background-color = "rgb(0,0,0)";
       background-opacity = 0.8;
       click-action = "skip";

common/modules/home/dconf/gnome.nix

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

common/modules/home/default.nix

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

common/modules/home/desktop-files.nix

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

common/modules/home/starship.nix

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

common/modules/home/zsh.nix

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

common/modules/packages.nix

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

common/modules/programs.nix

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

common/modules/services.nix

@@ -3,13 +3,14 @@
   pkgs,
   lib,
   ...
-}:
+}: {
-{
   services = {
     sshd.enable = true;
     displayManager.gdm.enable = true;
     desktopManager.gnome.enable = true;
 
+    blueman.enable = true;
+
     geoclue2.enable = true;
 
     xserver = {

desktop/default.nix

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

desktop/hardware-configuration.nix

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

desktop/modules/default.nix

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

desktop/modules/flatpak.nix

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

desktop/modules/gdm-monitors.nix

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

desktop/modules/gnome.nix

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

desktop/modules/home/dconf/apps.nix

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

desktop/modules/home/dconf/default.nix

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

desktop/modules/home/dconf/extensions.nix

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

desktop/modules/home/dconf/gnome.nix

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

desktop/modules/home/default.nix

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

desktop/modules/packages.nix

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

desktop/modules/programs.nix

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

desktop/modules/services.nix

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

desktop/modules/vm.nix

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

flake.lock

@@ -19,11 +19,11 @@
     "czkawka-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1773724747,
+        "lastModified": 1774297847,
-        "narHash": "sha256-wXiP4t5fQlAVrpZyJcIhUJ1Mdjn94eUaAOR4b08cWAI=",
+        "narHash": "sha256-iEgM0Wjhyy2H6HxnqY7YDAHiuDIUaw5rmsE1Zsij/nk=",
         "owner": "qarmin",
         "repo": "czkawka",
-        "rev": "28ae8bae1ebe9858b395364386aefba6bcd40c45",
+        "rev": "7680c07130f7bbfb5019e328362eaaebdce7aece",
         "type": "github"
       },
       "original": {
@@ -95,11 +95,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774210133,
+        "lastModified": 1774371786,
-        "narHash": "sha256-yeiWCY9aAUUJ3ebMVjs0UZXRnT5x90MCtpbpOWiXrvM=",
+        "narHash": "sha256-ag1HUJv0SDBqKAYxwWlvAE2gBsEk3XYFvWtmdAHFz7E=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c6fe2944ad9f2444b2d767c4a5edee7c166e8a95",
+        "rev": "b8cb89f2c4f7006b17b4aa5d8b39b95b93b559d8",
         "type": "github"
       },
       "original": {
@@ -147,11 +147,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1773821835,
+        "lastModified": 1774106199,
-        "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
+        "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
+        "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
         "type": "github"
       },
       "original": {
@@ -163,11 +163,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1773821835,
+        "lastModified": 1774106199,
-        "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
+        "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
+        "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
         "type": "github"
       },
       "original": {
@@ -179,11 +179,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1774235121,
+        "lastModified": 1774321912,
-        "narHash": "sha256-CzpSER+YKq4yD+RPom6Su9c/4FutF+sD4rEnls+4MyM=",
+        "narHash": "sha256-Nna0UkHU2xmhyx0VAel4DDdwpAlA70ZgzAtOD4m3Pc8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1116aed2cee959f7d054a462458513ad323b710a",
+        "rev": "b0d3faa43b2bd4cc22fdf98ee00cac4f2f47ac8a",
         "type": "github"
       },
       "original": {

flake.nix

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

laptop/default.nix

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

laptop/hardware-configuration.nix

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

laptop/modules/default.nix

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

laptop/modules/flatpak.nix

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

laptop/modules/gnome.nix

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

laptop/modules/home/dconf/apps.nix

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

laptop/modules/home/dconf/default.nix

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

laptop/modules/home/dconf/extensions.nix

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

laptop/modules/home/dconf/gnome.nix

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

laptop/modules/home/default.nix

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

laptop/modules/packages.nix

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

laptop/modules/programs.nix

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

laptop/modules/services.nix

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