From 84bb8ad29ee04a1c3386f8ec04ce991486d12fab Mon Sep 17 00:00:00 2001 From: Nydragon Date: Fri, 17 Jan 2025 14:05:55 +0100 Subject: [PATCH] chore: update rustypaste flake input --- flake.lock | 121 ++++++++++++++++---------------------- flake.nix | 4 +- hosts/brontes/default.nix | 5 -- hosts/brontes/home.nix | 1 + hosts/raptus/default.nix | 2 + modules/nix/overlays.nix | 1 - 6 files changed, 57 insertions(+), 77 deletions(-) diff --git a/flake.lock b/flake.lock index f05ce9a..a55aef3 100644 --- a/flake.lock +++ b/flake.lock @@ -85,6 +85,24 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -105,24 +123,6 @@ "type": "github" } }, - "naersk": { - "inputs": { - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1721727458, - "narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=", - "owner": "nix-community", - "repo": "naersk", - "rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1733861262, @@ -155,6 +155,18 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1735774519, + "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1733759999, @@ -171,18 +183,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 0, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", - "path": "/nix/store/lryfc8mhk1czqsa421di2y5nzz5c3b8m-source", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nysh": { "inputs": { "nixpkgs": [ @@ -204,6 +204,27 @@ "url": "https://git.ccnlc.eu/nydragon/nysh.git" } }, + "packages": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1736286786, + "narHash": "sha256-OXG6hpb7cu182+/5N9B34Kk10+2r89/XIjn4NW/pgI8=", + "ref": "refs/heads/master", + "rev": "9208515d0f98f26291a023c4b5ca6e546784da74", + "revCount": 3, + "type": "git", + "url": "https://git.ccnlc.eu/Nydragon/packages.git" + }, + "original": { + "type": "git", + "url": "https://git.ccnlc.eu/Nydragon/packages.git" + } + }, "quickshell": { "inputs": { "nixpkgs": [ @@ -234,45 +255,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "nysh": "nysh", - "rustypaste": "rustypaste" - } - }, - "rustypaste": { - "inputs": { - "naersk": "naersk", - "nixpkgs": [ - "nixpkgs" - ], - "rustypasteRepo": "rustypasteRepo" - }, - "locked": { - "lastModified": 1728862246, - "narHash": "sha256-O+1deQAXm5cMg8y+v7jjfTyrdKDlmk8fbwfz1w5BEU8=", - "ref": "refs/heads/master", - "rev": "78dda5354d93432e92733d862beb6d406d0e0a2a", - "revCount": 1, - "type": "git", - "url": "https://git.ccnlc.eu/Nydragon/flakey-rustypaste.git" - }, - "original": { - "type": "git", - "url": "https://git.ccnlc.eu/Nydragon/flakey-rustypaste.git" - } - }, - "rustypasteRepo": { - "flake": false, - "locked": { - "lastModified": 1728306155, - "narHash": "sha256-mgB/arakSQu7mC/n7Oal/rsHdVxCD4NEgX7TAsCrCMI=", - "owner": "orhun", - "repo": "rustypaste", - "rev": "561025fca47e63a4356cf8e41669ab823f033717", - "type": "github" - }, - "original": { - "owner": "orhun", - "repo": "rustypaste", - "type": "github" + "packages": "packages" } }, "systems": { diff --git a/flake.nix b/flake.nix index 5b9e473..ac88030 100644 --- a/flake.nix +++ b/flake.nix @@ -31,8 +31,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - rustypaste = { - url = "git+https://git.ccnlc.eu/Nydragon/flakey-rustypaste.git"; + packages = { + url = "git+https://git.ccnlc.eu/Nydragon/packages.git"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/hosts/brontes/default.nix b/hosts/brontes/default.nix index 6083500..c456a0d 100644 --- a/hosts/brontes/default.nix +++ b/hosts/brontes/default.nix @@ -94,11 +94,6 @@ thunderbird.enable = true; sway.enable = true; hyprland.enable = true; - - appimage = { - enable = true; - binfmt = true; - }; }; security.polkit.enable = true; diff --git a/hosts/brontes/home.nix b/hosts/brontes/home.nix index 8dcd56c..a3c750c 100644 --- a/hosts/brontes/home.nix +++ b/hosts/brontes/home.nix @@ -54,6 +54,7 @@ signal-desktop tagger prismlauncher + orca-slicer kid3 soundconverter diff --git a/hosts/raptus/default.nix b/hosts/raptus/default.nix index 0635d14..84e60b8 100644 --- a/hosts/raptus/default.nix +++ b/hosts/raptus/default.nix @@ -3,6 +3,7 @@ lib, pkgs, config, + inputs', ... }: let @@ -34,6 +35,7 @@ in modules = { server.rustypaste = { enable = true; + package = inputs'.packages.packages.rustypaste; authTokenFile = config.age.secrets.rustypaste.path; settings = { server = { diff --git a/modules/nix/overlays.nix b/modules/nix/overlays.nix index 1208097..200e206 100644 --- a/modules/nix/overlays.nix +++ b/modules/nix/overlays.nix @@ -30,6 +30,5 @@ nysh = inputs'.nysh.packages.nysh; }) - inputs.rustypaste.overlays.default ]; }