From 1ed2b9c1303160717c6635d202f8c82a214afcd7 Mon Sep 17 00:00:00 2001 From: Andreas Schaafsma Date: Thu, 12 Feb 2026 20:14:32 +0100 Subject: [PATCH] clean up --- flake.nix | 8 +--- modules/home/gnome-customizations/default.nix | 3 +- modules/nixos/performance-tuning/default.nix | 2 +- .../drivebystation-nix/configuration.nix | 3 +- .../drivebystation-nix/default.nix | 42 +++++++++++-------- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/flake.nix b/flake.nix index 1e500d1..9dea05c 100644 --- a/flake.nix +++ b/flake.nix @@ -94,12 +94,6 @@ # Use the exact kernel versions as defined in this repo. # Guarantees you have binary cache. nix-cachyos-kernel.overlays.pinned - - # Alternatively, build the kernels on top of nixpkgs version in your flake. - # This might cause version mismatch/build failures! - # nix-cachyos-kernel.overlays.default - - # Only use one of the two overlays! ]; nixos = with inputs; [ @@ -109,7 +103,7 @@ home-manager.nixosModules.home-manager { home-manager = { - useGlobalPkgs = true; + useGlobalPkgs = false; # Disabled to allow system-level overlays to work useUserPackages = true; }; } diff --git a/modules/home/gnome-customizations/default.nix b/modules/home/gnome-customizations/default.nix index 0e42be7..22d6ab7 100644 --- a/modules/home/gnome-customizations/default.nix +++ b/modules/home/gnome-customizations/default.nix @@ -1,5 +1,4 @@ -{ pkgs -, config +{ config , lib , ... }: diff --git a/modules/nixos/performance-tuning/default.nix b/modules/nixos/performance-tuning/default.nix index ac2ae65..acc2f50 100644 --- a/modules/nixos/performance-tuning/default.nix +++ b/modules/nixos/performance-tuning/default.nix @@ -3,7 +3,7 @@ let cfg = config.${namespace}.performance-tuning; in { - options.${namespace}.performance-tuning.enable = lib.mkEnableOption "XFCE desktop environment"; + options.${namespace}.performance-tuning.enable = lib.mkEnableOption "performance tuning settings for gaming and general use"; config = lib.mkIf cfg.enable { boot.kernelParams = [ "nvme_core.default_ps_max_latency_us=0" diff --git a/systems/x86_64-linux/drivebystation-nix/configuration.nix b/systems/x86_64-linux/drivebystation-nix/configuration.nix index dd1dfa3..408ff70 100644 --- a/systems/x86_64-linux/drivebystation-nix/configuration.nix +++ b/systems/x86_64-linux/drivebystation-nix/configuration.nix @@ -13,9 +13,8 @@ ./hardware/hardware-configuration.nix ]; - # Bootloader. - boot.loader.systemd-boot.enable = true; + # boot.loader.systemd-boot.enable = true; # managed by lanzaboote boot.loader.efi.canTouchEfiVariables = true; nix.settings.experimental-features = [ "nix-command" "flakes" ]; networking.hostName = "drivebystation-nix"; # Define your hostname. diff --git a/systems/x86_64-linux/drivebystation-nix/default.nix b/systems/x86_64-linux/drivebystation-nix/default.nix index ba96178..66249e7 100644 --- a/systems/x86_64-linux/drivebystation-nix/default.nix +++ b/systems/x86_64-linux/drivebystation-nix/default.nix @@ -10,23 +10,23 @@ inputs, # Additional metadata is provided by Snowfall Lib. # The namespace used for your flake, defaulting to "internal" if not set. - namespace, + # namespace, # The system architecture for this host (eg. `x86_64-linux`). - system, + # system, # The Snowfall Lib target for this system (eg. `x86_64-iso`). - target, + # target, # A normalized name for the system target (eg. `iso`). - format, + # format, # A boolean to determine whether this system is a virtual target using nixos-generators. - virtual, + # virtual, # An attribute map of your defined hosts. - systems, + # systems, # All other arguments come from the system system. - config -, ... + # config, + ... }: let - inherit (lib.my-namespace) enabled; + # inherit (lib.my-namespace) systemPackages; inherit pkgs; installedPackages = lib.my-namespace.mkPackages pkgs; in @@ -47,6 +47,7 @@ in my-namespace.desktop-environment.kde.enable = true; my-namespace.desktop-environment.cosmic.enable = true; my-namespace.performance-tuning.enable = true; + my-namespace.file-organization.enable = true; # GNOME-keyring my-namespace.gnome-keyring.enable = true; @@ -62,7 +63,7 @@ in "gamemode" ]; packages = with pkgs; [ - # Packages from inputs + # Packages from inputsq inputs.game-of-life.packages.x86_64-linux.default inputs.zen-browser.packages.x86_64-linux.default inputs.trilium-next-pr.legacyPackages.x86_64-linux.trilium-next-desktop @@ -79,8 +80,10 @@ in trilium-desktop terraform virt-manager + nil # thunderbird ]; + }; programs.anime-game-launcher.enable = true; # Adds launcher and /etc/hosts rules @@ -133,26 +136,30 @@ in # End the session cleanly loginctl terminate-session "$XDG_SESSION_ID" '') + (pkgs.writeShellScriptBin "steamos-session-select" '' #!/bin/sh exec switch-to-desktop '') + # Vulkan packages for Steam - pkgs.mesa - pkgs.vulkan-loader - pkgs.vulkan-validation-layers - pkgs.vulkan-extension-layer - pkgs.vulkan-tools - pkgs.libva - pkgs.libva-utils + mesa + vulkan-loader + vulkan-validation-layers + vulkan-extension-layer + vulkan-tools + libva + libva-utils # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # wget ] ++ installedPackages.packages; + programs.nix-ld = { enable = true; package = pkgs.nix-ld; #replaces nix-ld-rs }; + services.flatpak.enable = true; systemd.services.flatpak-repo = { wantedBy = [ "multi-user.target" ]; @@ -180,6 +187,7 @@ in # Disable the GNOME3/GDM auto-suspend feature that cannot be disabled in GUI! # If no user is logged in, the machine will power down after 20 minutes. + systemd.targets.sleep.enable = false; systemd.targets.suspend.enable = false; systemd.targets.hibernate.enable = false;