From 90d53f13f4fd1738eec9a43f84acd7a7fc1c3afe Mon Sep 17 00:00:00 2001 From: twoneis Date: Sun, 19 Nov 2023 22:28:13 +0100 Subject: [PATCH] changed inputs --- flake.lock | 192 ++++++++++++++++++++++++++++++++-- flake.nix | 4 +- modules/niri/default.nix | 9 +- modules/niri/niri/default.nix | 1 + 4 files changed, 193 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 54f31ed..ab8f53e 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,24 @@ "type": "github" } }, + "crane_2": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1699548976, + "narHash": "sha256-xnpxms0koM8mQpxIup9JnT0F7GrKdvv0QvtxvRuOYR4=", + "owner": "ipetkov", + "repo": "crane", + "rev": "6849911446e18e520970cc6b7a691e64ee90d649", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -39,6 +57,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -46,11 +82,11 @@ ] }, "locked": { - "lastModified": 1700386809, - "narHash": "sha256-2IPxWo0Yplv+70EueZVLTwRAijax0tirYp5Jh0QV1A4=", + "lastModified": 1700419052, + "narHash": "sha256-U6a5f9ynbzcp8PMIHULbHPkbwp7YfPKOYmTcLqlalD4=", "owner": "nix-community", "repo": "home-manager", - "rev": "9a4725afa67db35cdf7be89f30527d745194cafa", + "rev": "993fb02d20760067b8ee19c713d94cee07037759", "type": "github" }, "original": { @@ -70,11 +106,11 @@ "rust": "rust" }, "locked": { - "lastModified": 1700406443, - "narHash": "sha256-Bb6cKBVMJHg9U/x8JjFgqhM/zrzdTg5fBoFp/UTTru8=", + "lastModified": 1700427651, + "narHash": "sha256-9DuupHqIMZScOQqZv3lU5c0yggxiEjtt/AxfNrcUoSI=", "owner": "twoneis", "repo": "niri", - "rev": "ead740c9518d34b4f542df0c188e70527801fd54", + "rev": "905fdf56d91144eb03b47a0310f6786577f5f820", "type": "github" }, "original": { @@ -98,6 +134,21 @@ "type": "github" } }, + "nix-filter_2": { + "locked": { + "lastModified": 1694857738, + "narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "41fd48e00c22b4ced525af521ead8792402de0ea", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1700392353, @@ -130,6 +181,56 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1698931758, + "narHash": "sha256-pwl9xS9JFMXXR1lUP/QOqO9hiZKukEcVUU1A0DKQwi4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b644d97bda6dae837d577e28383c10aa51e5e2d2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1681358109, + "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "parts": { "inputs": { "nixpkgs-lib": [ @@ -151,12 +252,31 @@ "type": "github" } }, + "parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", "niri": "niri", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "strata": "strata" } }, "rust": { @@ -181,6 +301,49 @@ "type": "github" } }, + "rust_2": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1699755324, + "narHash": "sha256-DJBtQB5VIUXJZwVrhgkKOH8g2wTJFHe+5Dc2oJjpcNs=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "d15b1b2be8daba77c80ee6716616e5c841d3ab14", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "strata": { + "inputs": { + "crane": "crane_2", + "nix-filter": "nix-filter_2", + "nixpkgs": [ + "nixpkgs" + ], + "parts": "parts_2", + "rust": "rust_2" + }, + "locked": { + "lastModified": 1699790243, + "narHash": "sha256-cYmECyLm1veuxAaDfcun4ACDo5UQflKKW3mhaq+ZSzA=", + "owner": "stratawm", + "repo": "strata", + "rev": "14b230a8011b461c7515e6c5847c636d056f41a4", + "type": "github" + }, + "original": { + "owner": "stratawm", + "repo": "strata", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -195,6 +358,21 @@ "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 260c4a6..d164300 100644 --- a/flake.nix +++ b/flake.nix @@ -16,12 +16,12 @@ }; niri = { - url = "github:twoneis/niri"; + url = "github:pop-os/cosmic-comp"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, home-manager, nixos-hardware, ... }@inputs: + outputs = { self, nixpkgs, home-manager, nixos-hardware, niri, ... }@inputs: let x86 = "x86_64-linux"; common = ./modules/system; diff --git a/modules/niri/default.nix b/modules/niri/default.nix index c4dba41..c2d5629 100644 --- a/modules/niri/default.nix +++ b/modules/niri/default.nix @@ -1,8 +1,9 @@ -{ inputs, ... }: { - environment.systemPackages = [ inputs.niri.packages.x86_64-linux.niri ]; - /* +{ inputs, ... }: +let + niri = inputs.niri.packages.x86_64-linux.default; +in{ + environment.systemPackages = [ niri ]; services.xserver.displayManager.sessionPackages = [ niri ]; - */ } diff --git a/modules/niri/niri/default.nix b/modules/niri/niri/default.nix index 50661da..2c363cb 100644 --- a/modules/niri/niri/default.nix +++ b/modules/niri/niri/default.nix @@ -43,6 +43,7 @@ rustPlatform.buildRustPackage { runtimeDependencies = with pkgs; [ libglvnd + mesa ]; RUSTFLAGS = map (a: "-C link-arg=${a}") [