diff --git a/flake.lock b/flake.lock index 063ffbc..5086bc0 100644 --- a/flake.lock +++ b/flake.lock @@ -18,6 +18,7 @@ "original": { "owner": "ezKEa", "repo": "aagl-gtk-on-nix", + "rev": "ee7b773dd7d028ad1b185cdf72bc16ce69ac0288", "type": "github" } }, @@ -40,11 +41,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1700392353, - "narHash": "sha256-KARn8aVJu5fdW0jdJYoOQ1SPqWlNdz4l7r90NbArWSY=", + "lastModified": 1701250978, + "narHash": "sha256-ohu3cz4edjpGxs2qUTgbs0WrnewOX4crnUJNEB6Jox4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2b00bc76dc893cd996a3d76a2f059d657a5ef37a", + "rev": "8772491ed75f150f02552c60694e1beff9f46013", "type": "github" }, "original": { @@ -104,11 +105,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1700390070, - "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", + "lastModified": 1701068326, + "narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", + "rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c", "type": "github" }, "original": { @@ -119,11 +120,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1700403855, - "narHash": "sha256-Q0Uzjik9kUTN9pd/kp52XJi5kletBhy29ctBlAG+III=", + "lastModified": 1701053011, + "narHash": "sha256-8QQ7rFbKFqgKgLoaXVJRh7Ik5LtI3pyBBCfOnNOGkF0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c5678df521e1407884205fe3ce3cf1d7df297db", + "rev": "5b528f99f73c4fad127118a8c1126b5e003b01a9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d67f1e1..8c4b1c4 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; nixos-hardware.url = "nixos-hardware"; nixos-raspberrypi.url = "github:ramblurr/nixos-raspberrypi"; - aagl.url = "github:ezKEa/aagl-gtk-on-nix"; + aagl.url = "github:ezKEa/aagl-gtk-on-nix/ee7b773dd7d028ad1b185cdf72bc16ce69ac0288"; aagl.inputs.nixpkgs.follows = "nixpkgs"; # prescurve.url = "github:taotien/prescurve"; # prescurve.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/systems/BASED.nix b/systems/BASED.nix index 0b04287..d146810 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -72,7 +72,7 @@ ]; services.pipewire = { - enable = true; + enable = lib.mkDefault true; alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix index f62660b..bce33ff 100644 --- a/systems/NOcomputer.nix +++ b/systems/NOcomputer.nix @@ -77,8 +77,8 @@ # wantedBy = [ "default.target" ]; # }; - boot.kernelPackages = pkgs.linuxPackages_6_5; - # boot.kernelPackages = pkgs.unstable.linuxPackages_latest; + # boot.kernelPackages = pkgs.linuxPackages_6_5; + boot.kernelPackages = pkgs.unstable.linuxPackages_latest; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; boot.kernelModules = [ "i2c-dev" "kvm-amd" ]; boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; @@ -91,9 +91,10 @@ hardware.nvidia = { modesetting.enable = true; powerManagement.enable = true; - package = config.boot.kernelPackages.nvidiaPackages.latest; + # package = config.boot.kernelPackages.nvidiaPackages.latest; # package = pkgs.unstable.linuxPackages_latest.nvidiaPackages.vulkan_beta; # package = pkgs.unstable.linuxPackages_latest.nvidiaPackages.latest; + package = pkgs.unstable.linuxPackages_latest.nvidiaPackages.production; }; # enable core and mem freq sliders for nvidia services.xserver.deviceSection = ''