From 7d06c6ce45e3bc6721e34c035d13f395de901371 Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Tue, 15 Oct 2024 20:54:36 +0200 Subject: [PATCH] Trying to add intel-unite 2 & update --- flake.lock | 20 ++++++------- flake.nix | 4 +-- general/configuration.nix | 50 ++++++++++++++++---------------- general/networking.nix | 8 ++--- general/user/packages.nix | 1 + pkgs/ens-intel-unite/default.nix | 2 ++ 6 files changed, 44 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index 454ce3c..da33b6d 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1728903686, + "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727665282, - "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=", + "lastModified": 1728729581, + "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5", + "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", "type": "github" }, "original": { @@ -54,16 +54,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727785055, - "narHash": "sha256-+BT8r1gbFaRAKkl/OFaCFDu1e0Km4UkPt6xZ7wa4B1M=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d77326fb9ba777e918d8c8dfb930c1771db2c4f2", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "gnome", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 03640d7..44da8d4 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,9 @@ description = "NixOS Configuration"; inputs = { - # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # nixpkgs.url = "github:NixOS/nixpkgs/?ref=e7f16004a749b67628898c1eda4beee6ef84f4c0"; - nixpkgs.url = "github:NixOS/nixpkgs/gnome"; + # nixpkgs.url = "github:NixOS/nixpkgs/gnome"; # nixpkgs.url = "github:LyesSaadi/nixpkgs/unstablegnome47"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/general/configuration.nix b/general/configuration.nix index a1b0a13..7137f85 100644 --- a/general/configuration.nix +++ b/general/configuration.nix @@ -35,31 +35,31 @@ options = "--delete-older-than 30d"; }; - programs.nix-ld = { - enable = true; - libraries = with pkgs; [ - glib - nss - nspr - cups - dbus - expat - xorg.libxcb - libxkbcommon - cairo - pango - at-spi2-atk - libdrm - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - mesa - alsa-lib - ]; - }; + # programs.nix-ld = { + # enable = true; + # libraries = with pkgs; [ + # glib + # nss + # nspr + # cups + # dbus + # expat + # xorg.libxcb + # libxkbcommon + # cairo + # pango + # at-spi2-atk + # libdrm + # xorg.libX11 + # xorg.libXcomposite + # xorg.libXdamage + # xorg.libXext + # xorg.libXfixes + # xorg.libXrandr + # mesa + # alsa-lib + # ]; + # }; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/general/networking.nix b/general/networking.nix index a1b92be..388af46 100644 --- a/general/networking.nix +++ b/general/networking.nix @@ -5,10 +5,10 @@ networking.networkmanager.enable = true; networking.nameservers = [ - "1.1.1.1#one.one.one.one" - "1.0.0.1#one.one.one.one" "9.9.9.9" "149.112.112.112" + "1.1.1.1#one.one.one.one" + "1.0.0.1#one.one.one.one" "2620:fe::fe" "2620:fe::9" ]; @@ -18,10 +18,10 @@ dnssec = "true"; domains = [ "~." ]; fallbackDns = [ - "1.1.1.1#one.one.one.one" - "1.0.0.1#one.one.one.one" "9.9.9.9" "149.112.112.112" + "1.1.1.1#one.one.one.one" + "1.0.0.1#one.one.one.one" "2620:fe::fe" "2620:fe::9" ]; diff --git a/general/user/packages.nix b/general/user/packages.nix index 6d0af07..356024c 100644 --- a/general/user/packages.nix +++ b/general/user/packages.nix @@ -145,6 +145,7 @@ in { typst typst-live tinymist + zotero # Multimedia pipewire.dev diff --git a/pkgs/ens-intel-unite/default.nix b/pkgs/ens-intel-unite/default.nix index 6c245e6..cdfbf72 100644 --- a/pkgs/ens-intel-unite/default.nix +++ b/pkgs/ens-intel-unite/default.nix @@ -20,6 +20,7 @@ let installPhase = '' mkdir -p $out/opt + rm -rf lib/ mv * $out/opt/ ''; @@ -44,6 +45,7 @@ let libdrm mesa alsa-lib + swiftshader ]) ++ (with pkgs.xorg; [ libxcb libX11