From 2d3c5644d17e8f90b734e80ac252e24f25a7dace Mon Sep 17 00:00:00 2001 From: insert Date: Wed, 5 Jun 2024 10:27:32 -0400 Subject: [PATCH] remove nvidia override, remove waybar override --- configuration.nix | 6 +++--- flake.nix | 3 --- special/insertpclinux.nix | 18 +++++++++--------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/configuration.nix b/configuration.nix index 5642fe8..38bd272 100644 --- a/configuration.nix +++ b/configuration.nix @@ -129,9 +129,9 @@ programs.waybar = { enable = true; - package = pkgs.waybar.overrideAttrs (oldAttrs: { - mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; - }); + #package = pkgs.waybar.overrideAttrs (oldAttrs: { + # mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; + #}); #config = { # modules = [{module = "wlr/workspace"};]; #}; diff --git a/flake.nix b/flake.nix index bde2d69..fb88ed6 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,8 @@ inputs = { # ... nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nvidia-beta.url = "github:NixOS/nixpkgs/d5c3f1ef368b44fa63ff2a5b79578b9acbbb40db"; flatpaks.url = "github:GermanBread/declarative-flatpak/dev"; flatpaks.inputs.nixpkgs.follows = "nixpkgs"; - #hyprland.url = "github:hyprwm/Hyprland"; - #hyprland.inputs.nixpkgs.follows = "nixpkgs"; agenix.url = "github:ryantm/agenix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; home-manager = { diff --git a/special/insertpclinux.nix b/special/insertpclinux.nix index 278ae16..8b0fab6 100644 --- a/special/insertpclinux.nix +++ b/special/insertpclinux.nix @@ -3,15 +3,15 @@ environment.etc.nixpkgs.source = inputs.nixpkgs; networking.hostName = "insertpclinux"; services.xserver.videoDrivers = ["nvidia"]; - nixpkgs.overlays = [ (self: super: (let - patched_pkgs = import inputs.nvidia-beta { - inherit (self) system; - config.allowUnfree = true; - }; - in { - linuxPackages = patched_pkgs.linuxPackages; - })) ]; - boot.kernelPackages = pkgs.linuxPackages; + #nixpkgs.overlays = [ (self: super: (let + # patched_pkgs = import inputs.nvidia-beta { + # inherit (self) system; + # config.allowUnfree = true; + # }; + # in { + # linuxPackages = patched_pkgs.linuxPackages; + # })) ]; + #boot.kernelPackages = pkgs.linuxPackages; services.sunshine = { enable = true;