From 15c2b55e5c071dbf087548d47f6edae3ff23d970 Mon Sep 17 00:00:00 2001 From: voidarclabs Date: Mon, 3 Nov 2025 13:47:02 +0000 Subject: [PATCH] works now --- configuration.nix | 16 +++++++++------- flake.lock | 12 ++++++------ flake.nix | 28 +++++++++++++++++----------- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/configuration.nix b/configuration.nix index 50d3ec1..142ab13 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,18 +2,19 @@ { imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix + [ + /etc/nixos/hardware-configuration.nix ]; + # Allow Nix command and flakes (ofc) nix.settings.experimental-features = [ "nix-command" "flakes" ]; # Allow unfree packages - nixpkgs = { + nixpkgs = { config = { allowUnfree = true; packageOverrides = pkgs: { - unstable = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz") {}; + unstable = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz") {}; }; }; }; @@ -50,15 +51,15 @@ networking.hostName = "mobile02"; # Define your hostname. networking.networkmanager.enable = true; - # Enable bluetooth + # Enable bluetooth hardware.bluetooth.enable = true; # Opengl and vulkan hardware.graphics = { enable = true; extraPackages = with pkgs; [ - vaapiIntel - vaapiVdpau + intel-vaapi-driver + libva-vdpau-driver ]; }; @@ -216,6 +217,7 @@ pkgs.vscode-langservers-extracted pkgs.emmet-ls pkgs.ripgrep + pkgs.nil pkgs.typescript-language-server pkgs.tailwindcss-language-server pkgs.stylua diff --git a/flake.lock b/flake.lock index 9769642..fb1e1fa 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", - "owner": "NixOS", + "lastModified": 1761907660, + "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", + "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-24.05", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 98abacf..3465409 100644 --- a/flake.nix +++ b/flake.nix @@ -1,17 +1,23 @@ { - description = "My NixOS system configuration"; + description = "Impure NixOS flake for mobile02"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + }; - outputs = { self, nixpkgs, ... }@inputs: - { - nixosConfigurations.mobile02 = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./configuration.nix - /etc/nixos/hardware-configuration.nix - ]; - }; + outputs = { self, nixpkgs }: let + system = "x86_64-linux"; # adjust if needed + hardwareConfig = import /etc/nixos/hardware-configuration.nix; + in + { + nixosConfigurations.mobile02 = nixpkgs.lib.nixosSystem { + inherit system; + + modules = [ + ./configuration.nix + hardwareConfig + ]; }; + }; }