From f241b8b836563adb338fdb62a91be173689b495b Mon Sep 17 00:00:00 2001 From: Aditya Date: Sun, 28 Jul 2024 13:20:46 +0530 Subject: [PATCH] update flake --- flake.lock | 289 +--------------------- flake.nix | 8 +- modules/home-manager/utils/default.nix | 2 +- modules/nixos/display-manager/default.nix | 13 +- modules/nixos/hardware/default.nix | 5 +- 5 files changed, 19 insertions(+), 298 deletions(-) diff --git a/flake.lock b/flake.lock index 08a2d55..d12bd78 100644 --- a/flake.lock +++ b/flake.lock @@ -1,116 +1,5 @@ { "nodes": { - "flake-compat": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "nv", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "nv", - "nixvim", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -118,11 +7,11 @@ ] }, "locked": { - "lastModified": 1715486357, - "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", + "lastModified": 1720734513, + "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", + "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", "type": "github" }, "original": { @@ -132,28 +21,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nv", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1708988456, - "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "master": { "locked": { "lastModified": 1713766410, @@ -170,35 +37,13 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nv", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709001452, - "narHash": "sha256-FnZ54wkil54hKvr1irdKic1TE27lHQI9dKQmOJRrtlU=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "6c06334f0843c7300d1678726bb607ce526f6b36", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1715447595, - "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=", + "lastModified": 1720768451, + "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652", + "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", "type": "github" }, "original": { @@ -208,67 +53,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1708984720, - "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixvim": { - "inputs": { - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "home-manager": "home-manager_2", - "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_2", - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1709155917, - "narHash": "sha256-S4yHqDKFmJpFQExP7bkOSw+RQaSr8pdOrfSFCOv3G70=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "be87309e0c1da19d99d969625300aaed36ff1b91", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, - "nv": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], - "nixvim": "nixvim" - }, - "locked": { - "lastModified": 1712294440, - "narHash": "sha256-+4CR4U2jjp1GyyXubfvZIREgnp0kR65v3efUZciwlEo=", - "owner": "akr2002", - "repo": "nv", - "rev": "937e6141a0497b2da314d2206c6a865d078d1da6", - "type": "github" - }, - "original": { - "owner": "akr2002", - "repo": "nv", - "type": "github" - } - }, "nyaa": { "inputs": { "nixpkgs": [ @@ -289,74 +73,13 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", - "gitignore": "gitignore", - "nixpkgs": [ - "nv", - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nv", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1708018599, - "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager", "master": "master", "nixpkgs": "nixpkgs", - "nv": "nv", "nyaa": "nyaa" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index f7856c2..fb8c2ba 100644 --- a/flake.nix +++ b/flake.nix @@ -6,10 +6,10 @@ url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; - nv = { - url = "github:akr2002/nv"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + #nv = { + # url = "github:akr2002/nv"; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; nyaa = { url = "github:akr2002/nyaa"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/home-manager/utils/default.nix b/modules/home-manager/utils/default.nix index d264b4a..a44d54c 100644 --- a/modules/home-manager/utils/default.nix +++ b/modules/home-manager/utils/default.nix @@ -24,7 +24,7 @@ wget xsel yt-dlp - inputs.nv.packages.x86_64-linux.default + #inputs.nv.packages.x86_64-linux.default inputs.nyaa.packages.x86_64-linux.default ]; } diff --git a/modules/nixos/display-manager/default.nix b/modules/nixos/display-manager/default.nix index 1ac1501..5aeec98 100644 --- a/modules/nixos/display-manager/default.nix +++ b/modules/nixos/display-manager/default.nix @@ -9,16 +9,15 @@ }; config = lib.mkIf config.display-manager.enable { services = { + displayManager = { + sddm = { + enable = true; + wayland.enable = true; + }; + }; xserver = { enable = true; displayManager = { - sddm = { - enable = true; - wayland = { - enable = true; - #compositor = "kwin"; - }; - }; gdm.enable = false; }; desktopManager = { diff --git a/modules/nixos/hardware/default.nix b/modules/nixos/hardware/default.nix index 734c713..9ef1529 100644 --- a/modules/nixos/hardware/default.nix +++ b/modules/nixos/hardware/default.nix @@ -10,10 +10,9 @@ config = lib.mkIf config.hardware.enable { environment.sessionVariables = {LIBVA_DRIVER_NAME = "iHD";}; hardware = { - opengl = { + graphics = { enable = true; - driSupport = true; - driSupport32Bit = true; + enable32Bit = true; extraPackages = with pkgs; [vaapiIntel vaapiVdpau libvdpau-va-gl intel-media-driver intel-vaapi-driver]; }; };