From 8d07c29d661ee629c4ff00efdf347aa926f467ce Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Fri, 25 Feb 2022 20:01:43 +0300 Subject: [PATCH] ayo --- flake.lock | 47 ++++++++++++++++++++++++------------ flake.nix | 2 +- overlays/vscode-wayland.nix | 18 +++----------- secrets/secrets.nix | Bin 289 -> 289 bytes users/patriot/default.nix | 5 +++- 5 files changed, 40 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index 9badba7..149b7bc 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1645204343, - "narHash": "sha256-h/R5uZwiCPh/i8eOcGgAD1hRFF6gHvD1GYZxkKYXTaQ=", + "lastModified": 1645729578, + "narHash": "sha256-SQEbg+hHG2Q1zU/Oqjj5LK2X/lmjJoBprm4eYORk0UU=", "owner": "kamadorueda", "repo": "alejandra", - "rev": "4a7a938e8d29a9a3b7f45660f0f7a3f6247965bf", + "rev": "08627c847e250b3eb654c6febeffaa0626fa8473", "type": "github" }, "original": { @@ -139,6 +139,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1641205782, + "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1638122382, @@ -195,11 +211,11 @@ ] }, "locked": { - "lastModified": 1645140957, - "narHash": "sha256-WTJzLSCDLBI537o2L/3kRyqEV5YRT7+1QSGryeKReHE=", + "lastModified": 1645746341, + "narHash": "sha256-j4fTWByYMGSSl0P7HEJQmbU/ifJtW25n/SoF6hgXN8c=", "owner": "nix-community", "repo": "home-manager", - "rev": "4f4165a8b9108818ab0193bbd1a252106870b2a2", + "rev": "650cfe60f31f3d27ba869bf7db12ca8ded5f1d74", "type": "github" }, "original": { @@ -262,11 +278,11 @@ }, "nixos": { "locked": { - "lastModified": 1644525281, - "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", + "lastModified": 1645433236, + "narHash": "sha256-4va4MvJ076XyPp5h8sm5eMQvCrJ6yZAbBmyw95dGyw4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", + "rev": "7f9b6e2babf232412682c09e57ed666d8f84ac2d", "type": "github" }, "original": { @@ -300,11 +316,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1644870092, - "narHash": "sha256-RLPD92lqXW98LDIbbwYqwAbt3R4iD1V1PiylfgBq5cU=", + "lastModified": 1645346782, + "narHash": "sha256-3qd0cu+2kapIP7cdHW9n8zh1wCvRGg83K7/cCj5Xv+A=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "10eab1c4cd8e715c0b41d32c28af2b89fc67bed0", + "rev": "1ccfe243aa6e94bf80f2a66f6be41d086d37fc87", "type": "github" }, "original": { @@ -331,16 +347,17 @@ "nixpkgsWayland": { "inputs": { "cachix": "cachix", + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixos" ] }, "locked": { - "lastModified": 1643841979, - "narHash": "sha256-/TNrk/59NpBADaHzFVraQQlHLfIgAPCgoR3F3vIw0EA=", + "lastModified": 1645727284, + "narHash": "sha256-xwi46ruR5z4THe967gzW74dQhPmlS5FWSiWuo9aYquY=", "owner": "colemickens", "repo": "nixpkgs-wayland", - "rev": "da0699ec283382fcc018072bafd573b4d7257d0e", + "rev": "ddd6f194eed2779df5730e702cecda28bd8938df", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b05fc48..f0e8192 100644 --- a/flake.nix +++ b/flake.nix @@ -56,7 +56,7 @@ nixos = { imports = [(digga.lib.importOverlays ./overlays)]; overlays = [ - #nixpkgsWayland.overlay + nixpkgsWayland.overlay ( _: prev: { #helix = helix.packages.${prev.system}.helix; diff --git a/overlays/vscode-wayland.nix b/overlays/vscode-wayland.nix index cf172b9..bbc8657 100644 --- a/overlays/vscode-wayland.nix +++ b/overlays/vscode-wayland.nix @@ -5,10 +5,9 @@ _: prev: let let flags = [ "--flag-switches-begin" - "--enable-features=UseOzonePlatform,WebRTCPipeWireCapturer,IgnoreGPUBlocklist" + "--enable-features=UseOzonePlatform,IgnoreGPUBlocklist" "--flag-switches-end" "--ozone-platform=wayland" - "--enable-webrtc-pipewire-capturer" "--ignore-gpu-blocklist" "--enable-gpu-rasterization" "--enable-zero-copy" @@ -19,7 +18,7 @@ _: prev: let "vscode-wayland" '' #!${pkgs.stdenv.shell} - ${pkgs.vscode}/bin/code ${lib.concatStringsSep " " flags} + ${pkgs.vscodium}/bin/codium ${lib.concatStringsSep " " flags} ''; in { vscodeWayland = @@ -41,24 +40,13 @@ in { inherit pname; version = pkgs.vscode.version; nativeBuildInputs = [pkgs.makeWrapper]; - phases = [ - "installPhase" - /* - "fixupPhase" - */ - ]; + phases = ["installPhase"]; installPhase = '' mkdir -p $out/bin install -m755 ${vscodeWayland}/bin/${pname}-wayland $out/bin/${pname} cp -r ${desktop}/share $out/share ''; - /* - fixupPhase = '' - wrapProgram $out/bin/${pname} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath (with pkgs; [ vulkan-loader vulkan-extension-layer libGL ])} - ''; - */ } ); } diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 460f579d39e1818ee5c8a57fdf2785a4da36bae9..ed1a48a4267fae41e8d55f6e8642e0015b093afd 100644 GIT binary patch literal 289 zcmV++0p9)qM@dveQdv+`0EUqKcp_zcV3}2zXv7|u?X10GeisoG#LAR{|M>8i-2fh( zSn%6pXg;wTB{*7|t{5?!z+A#zC)XD4!LwKBv4u|u?7I#fJ2)^Te5Qy8O!$RtFCUS| zGZWH$LszQ)?ab$?7P=VWBKB1zI5z)Hz!ks5a=R5c`L6~md~{rGQ7RLTt__fU$y2Dz z-Gk!y$d;mS@syJ-dNDPah#af@u?PDz9IssU9_^YoS8F`Kki5Ye3`Vww;~C nNG%`D0dGe_q#9A^0QKLyjNCInofWzR7ca4jJWvYjBYG7x8?%hE literal 289 zcmV++0p9)qM@dveQdv+`0Q1#`y_egP1`f;tEKj(( z!Mdr?4<`Qa>di`r-w0f&n30MZ$SzW|`j#Ep`ItfNo9o6%1)Keq>lNMXy=-$g>Ordh zFQj72aRpF3-|-PtJWtD~#Rp@l=x<9rGqFo*-vM n#h$G|dH$$~5cN%Mm0g