From b1199a7edae6bdf01392b38621423c1e6a833114 Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 20 Feb 2025 12:35:36 +0000 Subject: [PATCH] remove stevenblack as it caused issues with aspire; lock nix vdcode as it had a bad commit; more aggresively gc; add openrgb; add wifi kernel options (not sure this even helps); add kodi to tux --- configuration/base.nix | 5 ++-- configuration/base/nix-settings.nix | 2 +- devices/tuxedo/configuration.nix | 8 +++++-- devices/tuxedo/home.nix | 5 ++++ flake.lock | 37 +++++++++++++++-------------- flake.nix | 2 +- 6 files changed, 35 insertions(+), 24 deletions(-) diff --git a/configuration/base.nix b/configuration/base.nix index 689aa7a..5a3a523 100644 --- a/configuration/base.nix +++ b/configuration/base.nix @@ -15,7 +15,7 @@ # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - boot.kernelPackages = pkgs.linuxPackages_zen; + boot.kernelPackages = pkgs.linuxPackages_latest; swapDevices = [{ device = "/var/lib/swapfile"; @@ -23,6 +23,7 @@ }]; hardware.bluetooth.enable = true; + hardware.enableRedistributableFirmware = true; hardware.enableAllFirmware = true; # networking.hostName = "nixos"; # Define your hostname. @@ -105,7 +106,7 @@ # networking.firewall.enable = false; # Block list - networking.stevenblack.enable = true; + # networking.stevenblack.enable = true; # Copy the NixOS configuration file and link it from the resulting system # (/run/current-system/configuration.nix). This is useful in case you diff --git a/configuration/base/nix-settings.nix b/configuration/base/nix-settings.nix index a01764c..06109e6 100644 --- a/configuration/base/nix-settings.nix +++ b/configuration/base/nix-settings.nix @@ -5,7 +5,7 @@ nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.auto-optimise-store = true; nix.gc.automatic = true; - nix.gc.options = "--delete-older-than 30d"; + nix.gc.options = "--delete-older-than 7d"; # programs.nix-ld = { # enable = true; diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix index 8775fdd..1d5203b 100644 --- a/devices/tuxedo/configuration.nix +++ b/devices/tuxedo/configuration.nix @@ -21,9 +21,12 @@ networking.hostName = "tuxedo"; # Define your hostname. boot.extraModprobeConfig = '' - options iwlwifi 11n_disable=1 + options iwlwifi 11n_disable=8 power_save=0 + options iwlmvm power_scheme=1 ''; + services.hardware.openrgb.enable = true; + fileSystems."/mnt/HDD1" = { #device = "/dev/disk/by-uuid/35763dc3-c736-4714-ade7-40bf49ad50dd"; fsType = "ext4"; @@ -38,7 +41,8 @@ }; hardware.tuxedo-drivers.enable = true; - programs.gpu-screen-recorder.enable = true; + + programs.nix-ld.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. users.users.worble = { diff --git a/devices/tuxedo/home.nix b/devices/tuxedo/home.nix index b4ccc2c..b3d71a9 100644 --- a/devices/tuxedo/home.nix +++ b/devices/tuxedo/home.nix @@ -91,6 +91,11 @@ preset = 1; }; }; + + kodi = { + enable = true; + package = pkgs.kodi.withPackages (exts: [ exts.pvr-iptvsimple ]); + }; }; systemd.user = { diff --git a/flake.lock b/flake.lock index 7714924..12c1304 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1739353546, - "narHash": "sha256-YTqXhBZvCdZLMBupWlCDvRFaTEhaHa2/Xc/p1sUdSZU=", + "lastModified": 1739841949, + "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", "owner": "nix-community", "repo": "disko", - "rev": "26ade1005191e0602a78b0f141970648445bafd9", + "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", "type": "github" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1736373539, - "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "lastModified": 1739757849, + "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "type": "github" }, "original": { @@ -82,26 +82,27 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1739411363, - "narHash": "sha256-QAXvfAXyBtMOdBAz+ivmVVk9V7/d3nSgFprH4C0XOr0=", + "lastModified": 1739976069, + "narHash": "sha256-vIO9uus9qQ/k5w0iPjOwNLHPL9vIx/YG8GLxfC5yr3M=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "142aabf9bb589535f150afff4a439f39bd04c21e", + "rev": "a81daa13ca23440d8ae219d765140769c4d2f117", "type": "github" }, "original": { "owner": "nix-community", "repo": "nix-vscode-extensions", + "rev": "a81daa13ca23440d8ae219d765140769c4d2f117", "type": "github" } }, "nixos-hardware": { "locked": { - "lastModified": 1738816619, - "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", + "lastModified": 1739798439, + "narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", + "rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371", "type": "github" }, "original": { @@ -129,11 +130,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "nixos", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { @@ -145,11 +146,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1739357830, - "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", + "lastModified": 1739758141, + "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", + "rev": "c618e28f70257593de75a7044438efc1c1fc0791", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1c35996..2ac147a 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; + nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions?rev=a81daa13ca23440d8ae219d765140769c4d2f117"; }; outputs = { self, nixpkgs, nixos-hardware, home-manager, ... }@inputs: