packages.nix: add Blueman

- enable autohide-in-fullscreen

.gitignore

@@ -0,0 +1,2 @@
+result
+*.qcow2

Justfile

@@ -0,0 +1,32 @@
+default: switch build-laptop upload clean
+
+vm-desktop:
+    nix build .#nixosConfigurations.epiquev2.config.system.build.vm
+    ./result/bin/run-epiquev2-vm
+
+vm-laptop:
+    nix build .#nixosConfigurations.dalaptop.config.system.build.vm
+    ./result/bin/run-dalaptop-vm
+
+build-laptop:
+    nix build .#nixosConfigurations.dalaptop.config.system.build.toplevel --log-format internal-json |& nom --json
+
+upload:
+    attic push my-config result
+    attic push my-config /run/current-system
+
+clean:
+    rm -rf result
+    rm -rf *.qcow2
+
+format:
+    treefmt .
+
+switch:
+    nh os switch
+
+switch_update:
+    nh os switch --refresh --update
+
+help:
+    @just --list

common/default.nix

@@ -3,14 +3,14 @@
   pkgs,
   lib,
   ...
-}:
+}: {
-
-{
   imports = [
     ./modules
     ./hardware-configuration.nix
   ];
 
+  documentation.nixos.enable = false;
+
   boot = {
     loader = {
       efi.canTouchEfiVariables = true;
@@ -18,12 +18,19 @@
         enable = true;
       };
     };
+
     consoleLogLevel = 3;
     plymouth.enable = true;
   };
 
   networking = {
-    networkmanager.enable = true;
+    networkmanager = {
+      enable = true;
+      plugins = with pkgs; [
+        networkmanager-openconnect
+      ];
+    };
+
     firewall.enable = false;
   };
 
@@ -54,6 +61,7 @@
     sudo.extraConfig = ''
       Defaults insults
     '';
+
     polkit.extraConfig = ''
       polkit.addRule(function(action, subject) {
           if (action.id == "org.libvirt.unix.manage" &&
@@ -71,6 +79,7 @@
       storageDriver = "btrfs";
       enableOnBoot = true;
     };
+
     libvirtd = {
       enable = true;
       extraConfig = ''
@@ -79,6 +88,7 @@
 
       onBoot = "ignore";
     };
+
     spiceUSBRedirection.enable = true;
   };
 
@@ -94,7 +104,9 @@
       "video"
       "render"
       "input"
+      "dialout"
     ];
+
     shell = pkgs.zsh;
     #packages = with pkgs; [ ];
   };
@@ -104,10 +116,12 @@
       NIXOS_OZONE_WL = "1";
       LIBVIRT_DEFAULT_URI = "qemu:///system";
     };
+
     systemPackages = [
       pkgs.libheif
       pkgs.libheif.out
     ];
+
     pathsToLink = ["share/thumbnailers"];
   };
 
@@ -115,7 +129,9 @@
     bluetooth = {
       enable = true;
       package = pkgs.bluez.overrideAttrs (old: {
-        configureFlags = old.configureFlags ++ [
+        configureFlags =
+          old.configureFlags
+          ++ [
             "--enable-sixaxis"
           ];
       });
@@ -154,6 +170,7 @@
       "flakes"
       "nix-command"
     ];
+
     warn-dirty = false;
   };
 

common/flakes/czkawka-master/flake.nix

@@ -7,45 +7,42 @@
       url = "github:qarmin/czkawka";
       flake = false;
     };
+
     naersk = {
       url = "github:nix-community/naersk";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
-  outputs =
+  outputs = {
-    {
     self,
     nixpkgs,
     czkawka-src,
     naersk,
-    }:
+  }: let
-    let
     system = "x86_64-linux";
     pkgs = import nixpkgs {inherit system;};
     naersk-lib = pkgs.callPackage naersk {};
 
     nativeBuildInputs = with pkgs; [
-        pkg-config
+      cargo
       cmake
       makeWrapper
-        cargo
+      pkg-config
       rustc
     ];
 
     runtimeLibs = with pkgs; [
-        wayland
-        libxkbcommon
-        libglvnd
       fontconfig
+      libglvnd
       libX11
       libXcursor
       libXi
+      libxkbcommon
       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,37 +6,34 @@
     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.7.6";
+          version = "7.8.1";
 
           src = pkgs.fetchurl {
             url = "https://lalescu.ro/liviu/fet/download/fet-${version}.tar.xz";
-            sha256 = "06vvxxl5kza3a2v0fkw6bylavpickk8a5ybgabbhylmi59c1q1ns";
+            sha256 = "0b0g20mgawpv6pp6b1vh0vhz6rr0193g2irqiclnxxlnf174bcfr";
           };
 
           enableParallelBuilding = true;
 
-          nativeBuildInputs = [
+          nativeBuildInputs = with pkgs; [
-            pkgs.qt6.qmake
+            copyDesktopItems
-            pkgs.qt6.wrapQtAppsHook
+            qt6.qmake
-            pkgs.copyDesktopItems
+            qt6.wrapQtAppsHook
           ];
 
-          buildInputs = [
+          buildInputs = with pkgs; [
-            pkgs.qt6.qtbase
+            qt6.qtbase
           ];
 
           configurePhase = ''

common/flakes/solaar-master/flake.nix

@@ -1,70 +0,0 @@
-{
-  description = "Solaar built from GitHub master branch";
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
-
-    solaar-src = {
-      url = "github:pwr-Solaar/Solaar/master";
-      flake = false;
-    };
-  };
-
-  outputs =
-    {
-      self,
-      nixpkgs,
-      flake-utils,
-      solaar-src,
-    }:
-    flake-utils.lib.eachDefaultSystem (
-      system:
-      let
-        pkgs = nixpkgs.legacyPackages.${system};
-        pythonPackages = pkgs.python3Packages;
-      in
-      {
-        packages.default = pythonPackages.buildPythonApplication rec {
-          pname = "solaar";
-          version = "master-${solaar-src.shortRev or "dirty"}";
-          src = solaar-src;
-          pyproject = true;
-
-          nativeBuildInputs =
-            with pkgs;
-            [
-              gobject-introspection
-              wrapGAppsHook3
-              pkg-config
-            ]
-            ++ (with pythonPackages; [
-              setuptools
-              wheel
-            ]);
-
-          propagatedBuildInputs = with pythonPackages; [
-            pyudev
-            psutil
-            xlib
-            pyyaml
-            evdev
-            dbus-python
-            pygobject3
-            typing-extensions
-
-            pkgs.gtk3
-            pkgs.libnotify
-            pkgs.libayatana-appindicator
-          ];
-
-          postInstall = ''
-            install -Dm644 rules.d/42-logitech-unify-permissions.rules \
-              $out/lib/udev/rules.d/42-logitech-unify-permissions.rules
-          '';
-
-          doCheck = false;
-        };
-      }
-    );
-}

common/hardware-configuration.nix

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

common/modules/attic.nix

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

common/modules/default.nix

@@ -1,7 +1,6 @@
-{ ... }:
+{...}: {
-
-{
   imports = [
+    ./attic.nix
     ./flatpak.nix
     ./gnome.nix
     ./packages.nix

common/modules/flatpak.nix

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

common/modules/gnome.nix

@@ -3,9 +3,7 @@
   pkgs,
   lib,
   ...
-}:
+}: {
-
-{
   environment = {
     gnome.excludePackages = with pkgs; [
       decibels
@@ -18,6 +16,7 @@
       gnome-music
       gnome-software
       gnome-system-monitor
+      showtime
       snapshot
       totem
       yelp
@@ -26,17 +25,20 @@
     systemPackages = with pkgs.gnomeExtensions; [
       alphabetical-app-grid
       appindicator
+      bluetooth-quick-connect
       blur-my-shell
-      control-monitor-brightness-and-volume-with-ddcutil
       bubblemail
+      caffeine
       color-picker
       dash-to-dock
-      # favorites-to-applications-grid
       middle-click-to-close-in-overview
+      quick-settings-audio-panel
+      solaar-extension
       undecorate
       user-themes
       window-is-ready-remover
-      solaar-extension
     ];
   };
+
+  services.gnome.gnome-keyring.enable = true;
 }

common/modules/home/dconf/apps.nix

@@ -0,0 +1,27 @@
+{lib, ...}: {
+  dconf.settings = {
+    "org/virt-manager/virt-manager/connections" = {
+      autoconnect = ["qemu:///system"];
+      uris = ["qemu:///system"];
+    };
+
+    "org/gnome/Console" = {
+      custom-font = lib.mkDefault "FiraCode Nerd Font 11";
+      use-system-font = false;
+    };
+
+    "org/gnome/TextEditor" = {
+      custom-font = lib.mkDefault "Fira Code Nerd Font weight=450 11";
+      use-system-font = false;
+    };
+
+    "org/gnome/nautilus/preferences" = {
+      default-folder-viewer = "icon-view";
+      migrated-gtk-settings = true;
+      recursive-search = "always";
+      search-filter-time-type = "last_modified";
+      show-directory-item-counts = "always";
+      show-image-thumbnails = "always";
+    };
+  };
+}

common/modules/home/dconf/default.nix

@@ -0,0 +1,13 @@
+{...}: {
+  imports = [
+    ./apps.nix
+    ./extensions.nix
+    ./gnome.nix
+  ];
+
+  dconf.settings = {
+    "system/locale" = {
+      region = "cs_CZ.UTF-8";
+    };
+  };
+}

common/modules/home/dconf/extensions.nix

@@ -0,0 +1,167 @@
+{lib, ...}: {
+  dconf.settings = {
+    "org/gnome/shell/extensions/user-theme" = {
+      name = "Flat-Remix-Darkest-fullPanel";
+    };
+
+    "org/gnome/shell/extensions/thanatophobia" = {
+      year = 2004;
+      month = 11;
+      day = 23;
+      hour = 12;
+      minute = 0;
+      sex = 1;
+      expectancy = 74.11;
+      rounding = 7;
+      country = "CZE";
+      countdown = 0;
+    };
+
+    "org/gnome/shell/extensions/appindicator" = {
+      icon-brightness = 0.0;
+      icon-contrast = 0.0;
+      icon-opacity = 240;
+      icon-saturation = 0.0;
+      icon-size = 0;
+      legacy-tray-enabled = true;
+    };
+
+    "org/gnome/shell/extensions/dash-to-dock" = {
+      apply-custom-theme = false;
+      autohide-in-fullscreen = true;
+      background-color = "rgb(0,0,0)";
+      background-opacity = 0.8;
+      click-action = "skip";
+      custom-background-color = true;
+      custom-theme-shrink = true;
+      customize-alphas = true;
+      dash-max-icon-size = 28;
+      dock-fixed = false;
+      dock-position = "BOTTOM";
+      extend-height = false;
+      height-fraction = 0.9;
+      hide-tooltip = false;
+      intellihide-mode = "ALL_WINDOWS";
+      isolate-workspaces = true;
+      max-alpha = 0.4;
+      middle-click-action = "launch";
+      min-alpha = 0.05;
+      preferred-monitor = -2;
+      preview-size-scale = 0.5;
+      running-indicator-style = "DOTS";
+      scroll-action = "cycle-windows";
+      shift-click-action = "minimize";
+      shift-middle-click-action = "launch";
+      show-apps-at-top = true;
+      show-mounts-network = true;
+      transparency-mode = "DYNAMIC";
+    };
+
+    "org/gnome/shell/extensions/bluetooth-quick-connect" = {
+      show-battery-value-on = true;
+    };
+
+    "org/gnome/shell/extensions/blur-my-shell" = {
+      settings-version = 2;
+      pipelines = lib.hm.gvariant.mkValue ''
+        {
+          'pipeline_default': {
+            'name': <'Default'>,
+            'effects': <[
+              {
+                'type': <'native_static_gaussian_blur'>,
+                'id': <'effect_27049338116840'>,
+                'params': <@a{sv} {}>
+              },
+              {
+                'type': <'noise'>,
+                'id': <'effect_90950561821691'>,
+                'params': <{'lightness': <0.64>, 'noise': <0.25>}>
+              }
+            ]>
+          },
+          'pipeline_default_rounded': {
+            'name': <'Default rounded'>,
+            'effects': <[
+              {
+                'type': <'native_static_gaussian_blur'>,
+                'id': <'effect_000000000001'>,
+                'params': <{'radius': <30>, 'brightness': <0.6>}>
+              },
+              {
+                'type': <'corner'>,
+                'id': <'effect_000000000002'>,
+                'params': <{'radius': <24>}>
+              }
+            ]>
+          }
+        }
+      '';
+    };
+
+    "org/gnome/shell/extensions/blur-my-shell/appfolder" = {
+      brightness = 0.6;
+      sigma = 30;
+    };
+
+    "org/gnome/shell/extensions/blur-my-shell/applications" = {
+      blur = false;
+      brightness = 1.0;
+      opacity = 217;
+      whitelist = ["org.gnome.Console"];
+    };
+
+    "org/gnome/shell/extensions/blur-my-shell/coverflow-alt-tab" = {
+      blur = false;
+      pipeline = "pipeline_default";
+    };
+
+    "org/gnome/shell/extensions/blur-my-shell/dash-to-dock" = {
+      blur = false;
+      brightness = 0.6;
+      pipeline = "pipeline_default_rounded";
+      sigma = 30;
+      static-blur = false;
+      style-dash-to-dock = 0;
+    };
+
+    "org/gnome/shell/extensions/blur-my-shell/lockscreen" = {
+      pipeline = "pipeline_default";
+    };
+
+    "org/gnome/shell/extensions/blur-my-shell/overview" = {
+      pipeline = "pipeline_default";
+      style-components = 2;
+    };
+
+    "org/gnome/shell/extensions/blur-my-shell/panel" = {
+      brightness = 0.6;
+      force-light-text = false;
+      pipeline = "pipeline_default";
+      sigma = 30;
+      static-blur = false;
+    };
+
+    "org/gnome/shell/extensions/blur-my-shell/screenshot" = {
+      pipeline = "pipeline_default";
+    };
+
+    "org/gnome/shell/extensions/blur-my-shell/window-list" = {
+      brightness = 0.6;
+      sigma = 30;
+    };
+
+    "org/gnome/shell/extensions/bubblemail" = {
+      newest-first = true;
+    };
+
+    "org/gnome/shell/extensions/quick-settings-audio-panel" = {
+      create-applications-volume-sliders = true;
+      create-balance-slider = false;
+      create-mpris-controllers = false;
+      create-perdevice-volume-sliders = false;
+      group-applications-volume-sliders = true;
+      panel-type = "merged-panel";
+    };
+  };
+}

common/modules/home/dconf/gnome.nix

@@ -0,0 +1,102 @@
+{lib, ...}: {
+  dconf.settings = {
+    "org/gnome/desktop/interface" = {
+      accent-color = "red";
+      clock-format = "24h";
+      clock-show-seconds = true;
+      color-scheme = "prefer-dark";
+      cursor-size = 24;
+      cursor-theme = "Bibata-Modern-Classic";
+      font-antialiasing = "grayscale";
+      font-hinting = "slight";
+      gtk-theme = "Flat-Remix-GTK-Red-Darkest";
+      icon-theme = "Papirus-Dark";
+      show-battery-percentage = true;
+      toolkit-accessibility = true;
+      overlay-scrolling = true;
+    };
+
+    "org/gnome/desktop/peripherals/mouse" = {
+      accel-profile = "flat";
+      natural-scroll = false;
+    };
+
+    "org/gnome/desktop/peripherals/keyboard" = {
+      numlock-state = true;
+    };
+
+    "org/gnome/desktop/background" = {
+      picture-options = "zoom";
+      picture-uri = "file:///home/jax/.config/background";
+      picture-uri-dark = "file:///home/jax/.config/background";
+    };
+
+    "org/gnome/desktop/wm/keybindings" = {
+      move-to-workspace-left = ["<Shift><Control><Super>Left"];
+      move-to-workspace-right = ["<Shift><Control><Super>Right"];
+      switch-to-workspace-left = ["<Control><Super>Left"];
+      switch-to-workspace-right = ["<Control><Super>Right"];
+      switch-windows = ["<Alt>Tab"];
+      switch-windows-backward = ["<Shift><Alt>Tab"];
+      toggle-fullscreen = ["<Super>F11"];
+    };
+
+    "org/gnome/desktop/wm/preferences" = {
+      button-layout = "appmenu:minimize,close";
+    };
+
+    "org/gnome/settings-daemon/plugins/media-keys" = {
+      custom-keybindings = lib.mkBefore [
+        "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
+        "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/"
+      ];
+    };
+
+    "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
+      binding = "<Control><Alt>t";
+      command = "kgx";
+      name = "Terminal";
+    };
+
+    "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = {
+      binding = "<Super>e";
+      command = "nautilus";
+      name = "Filus Managus";
+    };
+
+    "org/gnome/mutter" = {
+      attach-modal-dialogs = false;
+      experimental-features = [
+        "scale-monitor-framebuffer"
+        "variable-refresh-rate"
+        "xwayland-native-scaling"
+      ];
+    };
+
+    "org/gnome/shell" = {
+      disable-user-extensions = false;
+      favorite-apps = [
+        "vesktop.desktop"
+        "org.gnome.Nautilus.desktop"
+        "steam.desktop"
+        "firefox.desktop"
+        "org.telegram.desktop.desktop"
+        "org.gnome.Console.desktop"
+        "io.missioncenter.MissionCenter.desktop"
+        "tidal-hifi.desktop"
+      ];
+    };
+
+    "org/gnome/desktop/app-folders" = {
+      folder-children = [];
+    };
+
+    "org/gnome/desktop/datetime" = {
+      automatic-timezone = true;
+    };
+
+    "org/gnome/system/location" = {
+      enabled = true;
+    };
+  };
+}

common/modules/home/default.nix

@@ -0,0 +1,12 @@
+{...}: {
+  imports = [
+    ./dconf
+    ./desktop-files.nix
+    ./starship.nix
+    ./zsh.nix
+  ];
+
+  xdg.enable = true;
+
+  home.stateVersion = "25.05";
+}

common/modules/home/desktop-files.nix

@@ -0,0 +1,31 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  xdg.dataFile."applications/clion.desktop".text = ''
+    [Desktop Entry]
+    Type=Application
+    Name=CLion (Nix Shell)
+    GenericName=C/C++ IDE from JetBrains
+    Exec=sh -c "nix develop ${config.xdg.configHome}/nix-shells/cpp -c clion %f"
+    Icon=clion
+    Terminal=false
+    Categories=Development;IDE;
+    StartupWMClass=jetbrains-clion
+    MimeType=text/x-c++src;text/x-c++hdr;text/x-csrc;text/x-chdr;
+  '';
+
+  xdg.dataFile."applications/cisco-packet-tracer-9.desktop".text = ''
+    [Desktop Entry]
+    StartupWMClass=PacketTracer
+    Name=Cisco Packet Tracer 9.0.0
+    Type=Application
+    Categories=Education;
+    Exec=env QT_STYLE_OVERRIDE=adwaita packettracer9 %f
+    Icon=cisco-packet-tracer-9
+    Terminal=false
+    StartupNotify=true
+    MimeType=application/x-pkt;application/x-pka;application/x-pkz;application/x-pks;application/x-pksz;
+  '';
+}

common/modules/home/starship.nix

@@ -0,0 +1,102 @@
+{lib, ...}: {
+  programs.starship = {
+    enable = true;
+    settings = {
+      format = lib.concatStrings [
+        "$hostname"
+        "\${custom.distrobox}"
+        "$nix_shell"
+        "$python"
+        "$nodejs"
+        "$rust"
+        "$golang"
+        "$php"
+        "[](fg:#000000)"
+        "[░▒▓](#FFFFFF)"
+        "[ 🐺 ](bg:#FFFFFF fg:#1E91D6)"
+        "[](bg:#0072BB fg:#FFFFFF)"
+        "$directory"
+        "[](fg:#0072BB bg:#E18335)"
+        "$git_branch"
+        "$git_status"
+        "[](fg:#E18335 bg:#061A40)"
+        "$time"
+        "[ ](fg:#061A40)"
+        "\n$character"
+      ];
+
+      hostname = {
+        ssh_only = true;
+        format = "[](fg:#1E91D6)[󰒍 $hostname](bg:#1E91D6 fg:#FFFFFF)[](fg:#1E91D6) ";
+      };
+
+      custom.distrobox = {
+        when = "printenv CONTAINER_ID";
+        command = "echo $CONTAINER_ID";
+        symbol = "󰙀";
+        format = "[](fg:#FF5F00)[$symbol $output](bg:#FF5F00 fg:#FFFFFF)[](fg:#FF5F00) ";
+      };
+
+      nix_shell = {
+        symbol = "";
+        format = "[](fg:#7EBAE4)[$symbol $state](bg:#7EBAE4 fg:#061A40)[](fg:#7EBAE4) ";
+      };
+
+      python = {
+        symbol = "󰌠";
+        format = "[](fg:#4B8BBE)[$symbol $virtualenv $version](bg:#4B8BBE fg:#FFFFFF)[](fg:#4B8BBE) ";
+      };
+
+      nodejs = {
+        symbol = "󰎙";
+        format = "[](fg:#68A063)[$symbol $version](bg:#68A063 fg:#FFFFFF)[](fg:#68A063) ";
+      };
+
+      rust = {
+        symbol = "";
+        format = "[](fg:#CE412B)[$symbol $version](bg:#CE412B fg:#FFFFFF)[](fg:#CE412B) ";
+      };
+
+      golang = {
+        symbol = "󰟓";
+        format = "[](fg:#00ADD8)[$symbol $version](bg:#00ADD8 fg:#FFFFFF)[](fg:#00ADD8) ";
+      };
+
+      php = {
+        symbol = "󰌟";
+        format = "[](fg:#8892BF)[$symbol $version](bg:#8892BF fg:#FFFFFF)[](fg:#8892BF) ";
+      };
+
+      directory = {
+        style = "fg:#e3e5e5 bg:#0072BB";
+        format = "[ $path ]($style)";
+        truncation_length = 3;
+        substitutions = {
+          "Documents" = "󰈙 ";
+          "Downloads" = "󰇚 ";
+          "Music" = "󰝚 ";
+          "Pictures" = "󰙏 ";
+        };
+      };
+
+      git_branch = {
+        symbol = "󰊢";
+        format = "[ $symbol $branch ](fg:#0072BB bg:#E18335)";
+      };
+
+      git_status = {
+        format = "[ $all_status$ahead_behind ](fg:#0072BB bg:#E18335)";
+      };
+
+      time = {
+        disabled = false;
+        format = "[ 󰥔 $time ](fg:#a0a9cb bg:#061A40)";
+      };
+
+      character = {
+        success_symbol = "[❯](bold green)";
+        error_symbol = "[❯](bold red)";
+      };
+    };
+  };
+}

common/modules/home/zsh.nix

@@ -0,0 +1,85 @@
+{config, ...}: {
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
+    dotDir = "${config.xdg.configHome}/zsh";
+
+    oh-my-zsh = {
+      enable = true;
+      theme = "robbyrussell";
+      plugins = [
+        "git"
+        "docker"
+        "docker-compose"
+        "sudo"
+        "vscode"
+        "z"
+        "colorize"
+      ];
+    };
+
+    shellAliases = {
+      adbauto = "adbauto_";
+      adbpair = "adbpair_";
+    };
+
+    sessionVariables = {
+      LIBVIRT_DEFAULT_URI = "qemu:///system";
+      ZSH_AUTOSUGGEST_STRATEGY = [
+        "history"
+        "completion"
+      ];
+    };
+
+    initContent = ''
+      zstyle ':completion:*' completer _complete _match _approximate
+      zstyle ':completion:*:approximate:*' max-errors 1 numeric
+
+      zstyle ':completion:*' menu select
+
+      zstyle ':completion:*' list-colors "''${(s.:.)LS_COLORS}"
+      zstyle ':completion:*:(scp|rsync):*' tag-order ' hosts:-ipaddr:ip\ address hosts:-host:host files'
+      zstyle ':completion:*:(ssh|scp|rsync):*:hosts-host' ignored-patterns '*(.|:)*' loopback ip6-loopback localhost ip6-localhost broadcasthost
+      zstyle ':completion:*:(ssh|scp|rsync):*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|::)([[:xdigit:].]##:(#c,2))##(|%*))' '127.0.0.<->' '255.255.255.255' '::1' 'fe80::*'
+      zstyle ':completion:*' matcher-list "" 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' '+l:|?=** r:|?=**'
+
+      # Path Management
+      export PATH="$HOME/.local/bin:/usr/local/LinkServer/:$PATH"
+
+      # Dart Completion
+      [[ -f /home/jax/.dart-cli-completion/zsh-config.zsh ]] && . /home/jax/.dart-cli-completion/zsh-config.zsh || true
+
+      if command -v nix-your-shell > /dev/null; then
+        nix-your-shell zsh | source /dev/stdin
+      fi
+
+      adbauto_() {
+        local PORT=$(avahi-browse -rt _adb-tls-connect._tcp -p | grep '^=' | cut -d';' -f8,9 | head -n 1 | sed 's/;/ /' | awk '{print $2}')
+        local IP=$(avahi-browse -rt _adb-tls-connect._tcp -p | grep '^=' | cut -d';' -f8,9 | head -n 1 | sed 's/;/ /' | awk '{print $1}')
+        if [ -z "$PORT" ]; then
+          echo "No Wireless ADB service found. Is Wireless Debugging on?"
+        else
+          echo "Connecting to $IP:$PORT..."
+          adb connect $IP:$PORT
+        fi
+      }
+
+      adbpair_() {
+        echo "Looking for Android pairing service..."
+        local SERVICE=$(avahi-browse -rt _adb-tls-pairing._tcp -p | grep '^=' | head -n 1)
+        if [ -z "$SERVICE" ]; then
+          echo "Error: Pairing service not found. Make sure 'Pair device with pairing code' is open on your phone."
+          return 1
+        fi
+        local IP=$(echo "$SERVICE" | cut -d';' -f8)
+        local PORT=$(echo "$SERVICE" | cut -d';' -f9)
+        echo "Found device at $IP:$PORT"
+        adb pair "$IP:$PORT"
+      }
+    '';
+  };
+
+  programs.starship.enable = true;
+}

common/modules/packages.nix

@@ -6,14 +6,13 @@
   solaar-master,
   fet,
   ...
-}:
+}: {
-
-{
   nixpkgs = {
     config = {
       allowUnfree = true;
       permittedInsecurePackages = [
         "ventoy-gtk3-1.1.10"
+        "cisco-packet-tracer_9"
       ];
     };
     overlays = [
@@ -22,25 +21,19 @@
           buildInputs =
             nprev.buildInputs
             ++ (with pkgs.gst_all_1; [
-              gst-plugins-good
               gst-plugins-bad
-              gst-plugins-ugly
               gst-plugins-base
+              gst-plugins-good
+              gst-plugins-ugly
             ]);
         });
       })
-      (final: prev: {
-        zenmonitor = prev.zenmonitor.overrideAttrs (oldAttrs: {
-          env = (oldAttrs.env or { }) // {
-            NIX_CFLAGS_COMPILE = "-std=gnu17";
-          };
-        });
-      })
     ];
   };
 
   environment.systemPackages = with pkgs; [
     abootimg
+    alejandra
     android-tools
     anki
     appstream
@@ -56,21 +49,20 @@
     btrfs-progs
     bubblemail
     bzip2
+    cisco-packet-tracer_9
     curl
-    fet.packages.${pkgs.stdenv.hostPlatform.system}.default
     ddcutil
     discord
     distrobox
     docker-buildx
     docker-compose
-    dog
     element-desktop
     eza
+    fet.packages.${pkgs.stdenv.hostPlatform.system}.default
     ffmpeg-full
     ffmpegthumbnailer
     file
     file-roller
-    firmware-manager
     flat-remix-gnome
     flat-remix-gtk
     flatpak-xdg-utils
@@ -78,6 +70,7 @@
     fuse
     fuse3
     fwupd
+    gemini-cli
     gimp
     gnome-tweaks
     gnome.gvfs
@@ -98,16 +91,17 @@
     iftop
     inkscape
     iotop
+    jetbrains.clion
     jq
+    just
     killall
-    kooha
-    krita
     libgsf
     libnotify
-    libreoffice
+    libreoffice-fresh
     libsForQt5.qtstyleplugins
     linux-firmware
     lm_sensors
+    logitech-udev-rules
     lrzip
     lsof
     lz4
@@ -117,12 +111,13 @@
     mesa-demos
     mission-center
     ncdu
+    networkmanager-openconnect
     nil
-    nixfmt
+    nix-output-monitor
+    nix-your-shell
     ntfs3g
     nufraw-thumbnailer
     obsidian
-    openrgb-with-all-plugins
     papirus-icon-theme
     pbzip2
     pciutils
@@ -131,15 +126,14 @@
     poppler-utils
     prismlauncher-unwrapped
     protonup-qt
+    pulseaudio
     rquickshare
     saber
-    solaar-master.packages.${pkgs.stdenv.hostPlatform.system}.default
-    logitech-udev-rules
     scrcpy
     screen
     seafile-client
     smartmontools
-    starship
+    solaar
     sushi
     telegram-desktop
     testdisk
@@ -148,6 +142,8 @@
     tldr
     trash-cli
     tree
+    treefmt
+    tumbler
     unrar
     unzip
     usbutils
@@ -155,26 +151,29 @@
     vesktop
     vkbasalt
     vlc
-    vscode-fhs
+    (vscode.fhsWithPackages (
+      ps:
+        with ps; [
+          python3
+          zlib
+          gcc
+          gnumake
+        ]
+    ))
     webp-pixbuf-loader
     wev
     wget
     which
-    wine
+    wineWow64Packages.waylandFull
     wireshark
-    tumbler
     xz
     yt-dlp
     zip
     zram-generator
-    zsh-autosuggestions
-    zsh-completions
-    zsh-history-substring-search
-    zsh-syntax-highlighting
     zstd
     zulu
-    zulu8
     zulu17
+    zulu8
   ];
 
   fonts = {

common/modules/programs.nix

@@ -3,13 +3,47 @@
   pkgs,
   lib,
   ...
-}:
+}: {
-
-{
   programs = {
-    bat.enable = true;
+    dconf.profiles.gdm.databases = [
+      {
+        settings = {
+          "org/gnome/desktop/peripherals/keyboard" = {
+            numlock-state = true;
+            remember-numlock-state = true;
+          };
+
+          "org/gnome/desktop/peripherals/mouse" = {
+            speed-profile = "flat";
+          };
+
+          "org/gnome/desktop/interface" = {
+            color-scheme = "prefer-dark";
+            gtk-theme = "Flat-Remix-GTK-Red-Darkest";
+            icon-theme = "Papirus-Dark";
+            cursor-theme = "Bibata-Modern-Classic";
+            clock-format = "24h";
+          };
+
+          "org/gnome/shell/portal" = {
+            color-scheme = "prefer-dark";
+          };
+        };
+      }
+    ];
+
+    appimage = {
+      enable = true;
+      binfmt = true;
+    };
+
+    fuse = {
+      enable = true;
+    };
+
     zsh.enable = true;
     gamemode.enable = true;
+
     firefox = {
       enable = true;
       languagePacks = [
@@ -19,8 +53,14 @@
       ];
     };
 
+    direnv = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+
     weylus.enable = true;
     gamescope.enable = true;
+    virt-manager.enable = true;
 
     git = {
       enable = true;

common/modules/services.nix

@@ -3,14 +3,16 @@
   pkgs,
   lib,
   ...
-}:
+}: {
-
-{
   services = {
     sshd.enable = true;
     displayManager.gdm.enable = true;
     desktopManager.gnome.enable = true;
 
+    blueman.enable = true;
+
+    geoclue2.enable = true;
+
     xserver = {
       enable = true;
       excludePackages = with pkgs; [
@@ -67,7 +69,7 @@
 
     btrfs = {
       autoScrub = {
-        enable = true;
+        enable = lib.any (fs: fs.fsType == "btrfs") (lib.attrValues config.fileSystems);
         interval = "monthly";
       };
     };
@@ -78,5 +80,10 @@
     };
 
     fwupd.enable = true;
+
+    udev.packages = with pkgs; [
+      platformio-core.udev
+      openocd
+    ];
   };
 }

desktop/default.nix

@@ -3,9 +3,7 @@
   pkgs,
   lib,
   ...
-}:
+}: {
-
-{
   imports = [
     ./hardware-configuration.nix
     ./modules
@@ -65,6 +63,4 @@
 
     amdgpu.opencl.enable = true;
   };
-
-  system.stateVersion = "25.05";
 }

desktop/hardware-configuration.nix

@@ -7,9 +7,7 @@
   pkgs,
   modulesPath,
   ...
-}:
+}: {
-
-{
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
@@ -38,6 +36,7 @@
     ];
 
     blacklistedKernelModules = ["k10temp"];
+
     kernelParams = [
       "amdgpu.seamless=1"
       "rd.udev.log_priority=3"
@@ -95,7 +94,6 @@
       "compress=zstd:10"
       "autodefrag"
     ];
-
   };
 
   fileSystems."/var" = {

desktop/modules/default.nix

@@ -1,10 +1,11 @@
-{ ... }:
+{...}: {
-
-{
   imports = [
+    ./flatpak.nix
     ./gdm-monitors.nix
+    ./gnome.nix
     ./packages.nix
     ./programs.nix
     ./services.nix
+    ./vm.nix
   ];
 }

desktop/modules/flatpak.nix

@@ -0,0 +1,7 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+}

desktop/modules/gdm-monitors.nix

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

desktop/modules/gnome.nix

@@ -0,0 +1,12 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  environment = {
+    systemPackages = with pkgs.gnomeExtensions; [
+      control-monitor-brightness-and-volume-with-ddcutil
+    ];
+  };
+}

desktop/modules/home/dconf/apps.nix

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

desktop/modules/home/dconf/default.nix

@@ -0,0 +1,7 @@
+{...}: {
+  imports = [
+    ./apps.nix
+    ./extensions.nix
+    ./gnome.nix
+  ];
+}

desktop/modules/home/dconf/extensions.nix

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

desktop/modules/home/dconf/gnome.nix

@@ -0,0 +1,22 @@
+{lib, ...}: {
+  dconf.settings = {
+    "org/gnome/settings-daemon/plugins/media-keys" = {
+      custom-keybindings = lib.mkAfter [
+        "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2/"
+        "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom3/"
+      ];
+    };
+
+    "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2" = {
+      binding = "<Shift><Control><Alt>Home";
+      command = "ddcutil setvcp 10 + 10";
+      name = "Bright Up";
+    };
+
+    "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom3" = {
+      binding = "<Shift><Control><Alt>End";
+      command = "ddcutil setvcp 10 - 10";
+      name = "Bright Down";
+    };
+  };
+}

desktop/modules/home/default.nix

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

desktop/modules/packages.nix

@@ -3,12 +3,8 @@
   pkgs,
   lib,
   czkawka-master,
-  solaar-master,
-  fet,
   ...
-}:
+}: {
-
-{
   environment.systemPackages = with pkgs; [
     amdgpu_top
     arch-install-scripts
@@ -17,25 +13,11 @@
     fahclient
     lact
     nvtopPackages.amd
+    openrgb-with-all-plugins
     radeontop
     rocmPackages.rocm-smi
     rocmPackages.rocminfo
     swtpm
     zenmonitor
   ];
-
-  fonts = {
-    packages = with pkgs; [
-      fira-code
-      font-awesome
-      nerd-fonts.fira-code
-      nerd-fonts.fira-mono
-      nerd-fonts.symbols-only
-      nerd-fonts.ubuntu-mono
-      noto-fonts
-      noto-fonts-cjk-sans
-      noto-fonts-color-emoji
-      ubuntu-classic
-    ];
-  };
 }

desktop/modules/programs.nix

@@ -3,45 +3,8 @@
   pkgs,
   lib,
   ...
-}:
+}: {
-
-{
   programs = {
-    dconf.profiles.gdm.databases = [
-      {
-        settings = {
-          "org/gnome/desktop/peripherals/keyboard" = {
-            numlock-state = true;
-            remember-numlock-state = true;
-          };
-
-          "org/gnome/desktop/peripherals/mouse" = {
-            speed-profile = "flat";
-            speed = -0.5;
-          };
-
-          "org/gnome/desktop/peripherals/touchpad" = {
-            speed-profile = "flat";
-            speed = -0.5;
-          };
-
-          "org/gnome/desktop/interface" = {
-            color-scheme = "prefer-dark";
-            gtk-theme = "Flat-Remix-GTK-Red-Darkest";
-            icon-theme = "Papirus-Dark";
-            cursor-theme = "Bibata-Modern-Classic";
-            clock-format = "24h";
-          };
-
-          "org/gnome/shell/portal" = {
-            color-scheme = "prefer-dark";
-          };
-        };
-      }
-    ];
-
-    virt-manager.enable = true;
-
     ccache = {
       enable = true;
       cacheDir = "/media/data/.ccache";
@@ -50,12 +13,12 @@
     obs-studio = {
       enable = true;
       plugins = with pkgs.obs-studio-plugins; [
-        wlrobs
         obs-backgroundremoval
+        obs-gstreamer
         obs-pipewire-audio-capture
         obs-vaapi
-        obs-gstreamer
         obs-vkcapture
+        wlrobs
       ];
     };
   };

desktop/modules/services.nix

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

desktop/modules/vm.nix

@@ -0,0 +1,21 @@
+{lib, ...}: {
+  virtualisation.vmVariant = {
+    virtualisation = {
+      memorySize = 8192;
+      cores = 4;
+      graphics = true;
+      diskSize = 20 * 1024;
+      qemu.options = [
+        "-device virtio-vga-gl"
+        "-display gtk,gl=on"
+        "-cpu host"
+      ];
+    };
+
+    users.users.jax.password = "nixos";
+    services.displayManager.autoLogin = {
+      enable = true;
+      user = "jax";
+    };
+  };
+}

flake.lock

@@ -19,11 +19,11 @@
     "czkawka-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1771313751,
+        "lastModified": 1774297847,
-        "narHash": "sha256-0mqQAmaa7N7NgOKUgstRed5Ss6PcbfJzh/vOsS9Dg6c=",
+        "narHash": "sha256-iEgM0Wjhyy2H6HxnqY7YDAHiuDIUaw5rmsE1Zsij/nk=",
         "owner": "qarmin",
         "repo": "czkawka",
-        "rev": "f665807d2e06b72950e0c0f1857ab9efefc32ac6",
+        "rev": "7680c07130f7bbfb5019e328362eaaebdce7aece",
         "type": "github"
       },
       "original": {
@@ -88,21 +88,23 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
+    "home-manager": {
       "inputs": {
-        "systems": "systems_2"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1731533236,
+        "lastModified": 1774371786,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "narHash": "sha256-ag1HUJv0SDBqKAYxwWlvAE2gBsEk3XYFvWtmdAHFz7E=",
-        "owner": "numtide",
+        "owner": "nix-community",
-        "repo": "flake-utils",
+        "repo": "home-manager",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "b8cb89f2c4f7006b17b4aa5d8b39b95b93b559d8",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
+        "owner": "nix-community",
-        "repo": "flake-utils",
+        "repo": "home-manager",
         "type": "github"
       }
     },
@@ -145,11 +147,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1771008912,
+        "lastModified": 1774106199,
-        "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
+        "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
+        "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
         "type": "github"
       },
       "original": {
@@ -161,11 +163,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1771008912,
+        "lastModified": 1774106199,
-        "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
+        "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
+        "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
         "type": "github"
       },
       "original": {
@@ -177,11 +179,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1771353015,
+        "lastModified": 1774321912,
-        "narHash": "sha256-gvMwFEdFCM2zFxLVDaAbhV2N9zK0IW/RceBundHUdZs=",
+        "narHash": "sha256-Nna0UkHU2xmhyx0VAel4DDdwpAlA70ZgzAtOD4m3Pc8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "931ef4db402cdab9dfe66fe4a2b01d50f6fe435d",
+        "rev": "b0d3faa43b2bd4cc22fdf98ee00cac4f2f47ac8a",
         "type": "github"
       },
       "original": {
@@ -191,29 +193,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1771008912,
-        "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "czkawka-master": "czkawka-master",
         "fet": "fet",
+        "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_3"
-        "solaar-master": "solaar-master"
       }
     },
     "rust-analyzer-src": {
@@ -233,39 +219,6 @@
         "type": "github"
       }
     },
-    "solaar-master": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_4",
-        "solaar-src": "solaar-src"
-      },
-      "locked": {
-        "path": "./common/flakes/solaar-master",
-        "type": "path"
-      },
-      "original": {
-        "path": "./common/flakes/solaar-master",
-        "type": "path"
-      },
-      "parent": []
-    },
-    "solaar-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1770306649,
-        "narHash": "sha256-IEGTggLf2UzXAqCZQm4R0ogohQJHm+sKXEnJJVhM1r8=",
-        "owner": "pwr-Solaar",
-        "repo": "Solaar",
-        "rev": "42e0e391b525695a3c959351df48c92e8171585c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "pwr-Solaar",
-        "ref": "master",
-        "repo": "Solaar",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -280,21 +233,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -2,22 +2,24 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
     nix-flatpak.url = "github:gmodena/nix-flatpak";
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     czkawka-master.url = "path:./common/flakes/czkawka-master";
-    solaar-master.url = "path:./common/flakes/solaar-master";
     fet.url = "path:./common/flakes/fet";
   };
 
-  outputs =
+  outputs = {
-    {
     self,
     nixpkgs,
     nix-flatpak,
+    home-manager,
     ...
-    }@inputs:
+  } @ inputs: let
-    let
+    specialArgs = {inherit (inputs) czkawka-master fet;};
-      specialArgs = { inherit (inputs) czkawka-master solaar-master fet; };
+  in {
-    in
-    {
     nixosConfigurations = {
       epiquev2 = nixpkgs.lib.nixosSystem {
         inherit specialArgs;
@@ -26,6 +28,20 @@
           ./common
           ./desktop
           nix-flatpak.nixosModules.nix-flatpak
+
+          home-manager.nixosModules.home-manager
+          {
+            home-manager = {
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              users.jax = {
+                imports = [
+                  ./common/modules/home
+                  ./desktop/modules/home
+                ];
+              };
+            };
+          }
         ];
       };
 
@@ -36,6 +52,19 @@
           ./common
           ./laptop
           nix-flatpak.nixosModules.nix-flatpak
+          home-manager.nixosModules.home-manager
+          {
+            home-manager = {
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              users.jax = {
+                imports = [
+                  ./common/modules/home
+                  ./laptop/modules/home
+                ];
+              };
+            };
+          }
         ];
       };
     };

laptop/default.nix

@@ -3,9 +3,7 @@
   pkgs,
   lib,
   ...
-}:
+}: {
-
-{
   imports = [
     ./hardware-configuration.nix
     ./modules
@@ -26,7 +24,13 @@
         };
       };
     };
-  };
 
-  system.stateVersion = "25.05";
+    graphics = {
+      enable = true;
+      extraPackages = with pkgs; [
+        vaapi-intel-hybrid
+        vpl-gpu-rt
+      ];
+    };
+  };
 }

laptop/hardware-configuration.nix

@@ -7,9 +7,7 @@
   pkgs,
   modulesPath,
   ...
-}:
+}: {
-
-{
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
@@ -23,11 +21,13 @@
         "uas"
         "sd_mod"
       ];
+
       kernelModules = [];
     };
 
     kernelModules = ["kvm-intel"];
     extraModulePackages = [];
+    resumeDevice = "/dev/disk/by-uuid/bea07563-dc23-415b-b12f-ba53138bd492";
 
     kernelParams = [
       "snd_hda_intel.power_save=1"
@@ -109,7 +109,6 @@
       options = [
         "defaults"
       ];
-
     }
   ];
 

laptop/modules/default.nix

@@ -1,8 +1,7 @@
-{ ... }:
+{...}: {
-
-{
   imports = [
-    ./attic.nix
+    ./flatpak.nix
+    ./gnome.nix
     ./packages.nix
     ./programs.nix
     ./services.nix

laptop/modules/flatpak.nix

@@ -0,0 +1,7 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+}

laptop/modules/gnome.nix

@@ -0,0 +1,11 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  environment = {
+    systemPackages = with pkgs.gnomeExtensions; [
+    ];
+  };
+}

laptop/modules/home/dconf/apps.nix

@@ -0,0 +1,13 @@
+{...}: {
+  dconf.settings = {
+    "org/gnome/Console" = {
+      custom-font = "FiraCode Nerd Font Mono 11";
+      use-system-font = false;
+    };
+
+    "org/gnome/TextEditor" = {
+      custom-font = "Fira Code weight=450 11";
+      use-system-font = false;
+    };
+  };
+}

laptop/modules/home/dconf/default.nix

@@ -0,0 +1,7 @@
+{...}: {
+  imports = [
+    ./apps.nix
+    ./extensions.nix
+    ./gnome.nix
+  ];
+}

laptop/modules/home/dconf/extensions.nix

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

laptop/modules/home/dconf/gnome.nix

@@ -0,0 +1,10 @@
+{...}: {
+  dconf.settings = {
+    "org/gnome/desktop/peripherals/touchpad" = {
+      click-method = "areas";
+      disable-while-typing = true;
+      speed = 0.19548872180451138;
+      two-finger-scrolling-enabled = true;
+    };
+  };
+}

laptop/modules/home/default.nix

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

laptop/modules/packages.nix

@@ -1,6 +1,13 @@
 {
+  config,
+  pkgs,
+  lib,
   ...
-}:
+}: {
-{
+  environment.systemPackages = with pkgs; [
-
+    btop
+    gnome-power-manager
+    intel-gpu-tools
+    nvtopPackages.intel
+  ];
 }

laptop/modules/programs.nix

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

laptop/modules/services.nix

@@ -1,18 +1,51 @@
-{
+{pkgs, ...}: {
-  ...
+  services.thermald.enable = true;
-}:
-{
-  services.thermald.enable = true; # Prevents overheating/throttling
   services.power-profiles-daemon.enable = false;
   services.tlp = {
     enable = true;
+    pd.enable = true;
+
     settings = {
+      TLP_AUTO_SWITCH = 1;
+
+      CPU_DRIVER_OPMODE_ON_AC = "active";
+      CPU_DRIVER_OPMODE_ON_BAT = "active";
+      CPU_DRIVER_OPMODE_ON_SAV = "active";
       CPU_SCALING_GOVERNOR_ON_AC = "performance";
       CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
       CPU_ENERGY_PERF_POLICY_ON_BAT = "balance_power";
       CPU_ENERGY_PERF_POLICY_ON_AC = "balance_performance";
-      CPU_MIN_PERF_ON_BAT = 0;
+      CPU_MIN_PERF_ON_BAT = 15;
       CPU_MAX_PERF_ON_BAT = 80;
+
+      WIFI_PWR_ON_AC = "off";
+      WIFI_PWR_ON_BAT = "on";
+
+      MEM_SLEEP_ON_BAT = "deep";
+    };
+  };
+
+  services.logind = {
+    settings = {
+      Login = {
+        HandleLidSwitch = "suspend-then-hibernate";
+        HandleLidSwitchExternalPower = "suspend";
+        HandleLidSwitchDocked = "ignore";
+      };
+    };
+  };
+
+  systemd.sleep.settings.Sleep = {
+    HibernateDelaySec = "5min";
+  };
+
+  systemd.services.disable-problematic-wakeup = {
+    description = "Disable only specific noisy wakeup sources";
+    wantedBy = ["multi-user.target"];
+
+    serviceConfig = {
+      Type = "oneshot";
+      ExecStart = "${pkgs.bash}/bin/bash -c 'for device in XHC RP09 RP10 RP13; do if grep -q \"$device.*enabled\" /proc/acpi/wakeup; then echo $device > /proc/acpi/wakeup; fi; done'";
     };
   };
 }

treefmt.toml

@@ -0,0 +1,3 @@
+[formatter.nix]
+command = "alejandra"
+includes = ["*.nix"]