From b9c687d62ea94679a90ec01ee8cac3ad864bad31 Mon Sep 17 00:00:00 2001 From: DashieTM Date: Thu, 30 May 2024 21:34:19 +0200 Subject: [PATCH] nix: use plugin for reset --- nix/flake.lock | 173 ++++++++++++++++++++++++++++++++++------ nix/flake.nix | 1 + nix/programs/common.nix | 5 ++ nix/programs/media.nix | 2 + 4 files changed, 158 insertions(+), 23 deletions(-) diff --git a/nix/flake.lock b/nix/flake.lock index cf1f40c..0ff08ba 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -228,6 +228,27 @@ "type": "github" } }, + "flake-parts_9": { + "inputs": { + "nixpkgs-lib": [ + "reset-plugins", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715865404, + "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -336,6 +357,24 @@ "type": "github" } }, + "flake-utils_7": { + "inputs": { + "systems": "systems_8" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -343,11 +382,11 @@ ] }, "locked": { - "lastModified": 1716736760, - "narHash": "sha256-h3RmnNknKYtVA+EvUSra6QAwfZjC2q1G8YA7W0gat8Y=", + "lastModified": 1717052710, + "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=", "owner": "nix-community", "repo": "home-manager", - "rev": "5d151429e1e79107acf6d06dcc5ace4e642ec239", + "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae", "type": "github" }, "original": { @@ -414,11 +453,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1716669967, - "narHash": "sha256-wq91XpwR0tv7e7KwSp0qzvu31EMssznl8DzbNy4M4Hk=", + "lastModified": 1716968065, + "narHash": "sha256-kuVKS98JUgJ71Z3sRUo+YnQgmX8xdXoZZbBPyIZMWYs=", "ref": "refs/heads/main", - "rev": "553232a3e4c112c8511309e6b685cb614895e714", - "revCount": 4743, + "rev": "a60c7283e677ed81a466d1c0c864c8a05e192cac", + "revCount": 4750, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -514,11 +553,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1716498188, - "narHash": "sha256-tHE2jWpRUrGk0mCCeVmfL3tHa7S5RRXj/Ec3bPNZNxg=", + "lastModified": 1717013290, + "narHash": "sha256-ObYq1f7DaYaTEhujqg+nAOjoH2XgMRDrfe1dGjRofzM=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "a47ef0c763cc61811a5fb21c03669e1bf2445f98", + "rev": "b5755ef9d495bdf623965562725a7c0b1d27ea04", "type": "github" }, "original": { @@ -722,11 +761,27 @@ }, "nixpkgs_18": { "locked": { - "lastModified": 1716651315, - "narHash": "sha256-iMgzIeedMqf30TXZ439zW3Yvng1Xm9QTGO+ZwG1IWSw=", + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5187508b11177ef4278edf19616f44f21cc8c69", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_19": { + "locked": { + "lastModified": 1706487304, + "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", "type": "github" }, "original": { @@ -752,6 +807,22 @@ "type": "github" } }, + "nixpkgs_20": { + "locked": { + "lastModified": 1716651315, + "narHash": "sha256-iMgzIeedMqf30TXZ439zW3Yvng1Xm9QTGO+ZwG1IWSw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c5187508b11177ef4278edf19616f44f21cc8c69", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_3": { "locked": { "lastModified": 1716330097, @@ -800,11 +871,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1716769173, + "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=", "owner": "NixOs", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632", "type": "github" }, "original": { @@ -864,11 +935,11 @@ }, "nur": { "locked": { - "lastModified": 1716793287, - "narHash": "sha256-z6su/MUjfL+iuL2rjLnKmmAlUaYfOe5I2if26ad/4Ps=", + "lastModified": 1717054761, + "narHash": "sha256-LBrHEBC0S7C6zjQTsjahAvxxlDH3cbZmEgHiri9o4SM=", "owner": "nix-community", "repo": "nur", - "rev": "2d0c993c47deccf8aa4cf7614c397c856042816d", + "rev": "a4eff07f9bbcf74522c642c72047ed03c3831501", "type": "github" }, "original": { @@ -983,11 +1054,11 @@ "rust-overlay": "rust-overlay_6" }, "locked": { - "lastModified": 1716722679, - "narHash": "sha256-ZqjpLydOcLkCnA6MA+b59k70yv6IqCyC0xxQA76HoJc=", + "lastModified": 1717097255, + "narHash": "sha256-X6V0Pq0111uCeMn5jh/T2+hO2qz0TkF+os9X8wkKS+M=", "owner": "Xetibo", "repo": "ReSet", - "rev": "ecfaf2baddfa6da6823fb67d2fdd1db8ec0e1f21", + "rev": "40beca475ff60718308767c213b480734559a836", "type": "github" }, "original": { @@ -996,6 +1067,27 @@ "type": "github" } }, + "reset-plugins": { + "inputs": { + "flake-parts": "flake-parts_9", + "nixpkgs": "nixpkgs_18", + "rust-overlay": "rust-overlay_7" + }, + "locked": { + "lastModified": 1717092514, + "narHash": "sha256-aifR0Jdk1S9OzLYVlJEm4V+Dvm3MXpHYqRDfq2U66uQ=", + "owner": "Xetibo", + "repo": "ReSet-Plugins", + "rev": "97543b19c416578a83ac68ca010d4b032d87593a", + "type": "github" + }, + "original": { + "owner": "Xetibo", + "ref": "dashie", + "repo": "ReSet-Plugins", + "type": "github" + } + }, "root": { "inputs": { "Hyprspace": "Hyprspace", @@ -1013,6 +1105,7 @@ "oxipaste": "oxipaste", "oxishut": "oxishut", "reset": "reset", + "reset-plugins": "reset-plugins", "sops-nix": "sops-nix" } }, @@ -1133,9 +1226,28 @@ "type": "github" } }, + "rust-overlay_7": { + "inputs": { + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_19" + }, + "locked": { + "lastModified": 1717035469, + "narHash": "sha256-MzH+yjKULH3HCRj9QCTwBvqq4LZkR0ZqRE/QfGOGC2E=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "095702e63a40e86f339d11864da9dc965b70a01e", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_18", + "nixpkgs": "nixpkgs_20", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -1257,6 +1369,21 @@ "type": "github" } }, + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": "hyprland-protocols", diff --git a/nix/flake.nix b/nix/flake.nix index 669375a..efddb9d 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -36,6 +36,7 @@ oxipaste.url = "github:DashieTM/OxiPaste"; hyprdock.url = "github:DashieTM/hyprdock"; reset.url = "github:Xetibo/ReSet"; + reset-plugins.url = "github:Xetibo/ReSet-Plugins?ref=dashie"; }; outputs = { ... }@inputs: diff --git a/nix/programs/common.nix b/nix/programs/common.nix index 9f73918..d0d28b8 100644 --- a/nix/programs/common.nix +++ b/nix/programs/common.nix @@ -1,4 +1,5 @@ { pkgs +, inputs , lib , ... }: @@ -65,6 +66,10 @@ in programs.oxipaste.enable = true; programs.hyprdock.enable = true; programs.reset.enable = true; + programs.reset.config.plugins = [ + inputs.reset-plugins.packages."x86_64-linux".monitor + ]; + # inputs.reset-plugins.packages#.keyboard_plugin nixpkgs.config.allowUnfree = true; diff --git a/nix/programs/media.nix b/nix/programs/media.nix index 8f6dc12..9d01d83 100644 --- a/nix/programs/media.nix +++ b/nix/programs/media.nix @@ -24,6 +24,8 @@ inkscape gimp krita + yt-dlp + spotdl ]; programs.obs-studio.enable = true; programs.obs-studio.plugins = with pkgs; [