From 1767332757f38074a41b86a5451dc478bb2cf569 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Wed, 8 Jan 2025 13:36:28 +0300 Subject: [PATCH] Add back software --- flake.lock | 225 ++++++++++++++++++++++++++++++++++++++++++- flake.nix | 16 +-- modules/packages.nix | 19 ++-- 3 files changed, 241 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 1601482..9cd9a05 100644 --- a/flake.lock +++ b/flake.lock @@ -118,6 +118,92 @@ "type": "github" } }, + "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-compat_3": { + "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-utils": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_7" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "github2forgejo": { "inputs": { "nixpkgs": [ @@ -139,6 +225,27 @@ "type": "github" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "zls", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "hardware": { "locked": { "lastModified": 1720372297, @@ -454,7 +561,9 @@ "hyprpicker": "hyprpicker", "nixpkgs": "nixpkgs_4", "simpleMail": "simpleMail", - "themes": "themes" + "themes": "themes", + "zig": "zig", + "zls": "zls" } }, "rust-analyzer-src": { @@ -557,6 +666,51 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "themes": { "locked": { "lastModified": 1715166503, @@ -619,6 +773,75 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } + }, + "zig": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1736296210, + "narHash": "sha256-42BdYJGisKlTqytOjyWE7NiUdugqwCalRfvTZcs4Fxw=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "01d48fd326de9ad92c1af9d6deb67c41049f0d39", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } + }, + "zig-overlay": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "zls", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735086567, + "narHash": "sha256-I+ORk8or5eEBdK/2VEL2jDqBmV/sWaRsHTqr+DrEvdI=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "bc4fd6e14e166769839bc0085803b8c21771750d", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } + }, + "zls": { + "inputs": { + "flake-utils": "flake-utils_2", + "gitignore": "gitignore", + "nixpkgs": [ + "nixpkgs" + ], + "zig-overlay": "zig-overlay" + }, + "locked": { + "lastModified": 1736162732, + "narHash": "sha256-uLiFdBqRiz08OiVRweadaF3Kc7+HEwCjdW7nCDz9sWg=", + "owner": "zigtools", + "repo": "zls", + "rev": "f961c8b2d0276d5df93da910c55f0ab5b09c2053", + "type": "github" + }, + "original": { + "owner": "zigtools", + "ref": "master", + "repo": "zls", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 298c878..d890ba9 100644 --- a/flake.nix +++ b/flake.nix @@ -63,17 +63,17 @@ fenix.url = "github:nix-community/fenix"; - # zig = { - # url = "github:mitchellh/zig-overlay"; + zig = { + url = "github:mitchellh/zig-overlay"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + inputs.nixpkgs.follows = "nixpkgs"; + }; - # zls = { - # url = "github:zigtools/zls/master"; + zls = { + url = "github:zigtools/zls/master"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + inputs.nixpkgs.follows = "nixpkgs"; + }; themes.url = "github:RGBCube/ThemeNix"; }; diff --git a/modules/packages.nix b/modules/packages.nix index f8a3556..1ad0757 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -26,16 +26,15 @@ ])) (desktopSystemPackages (with pkgs; [ - # clang_16 - # clang-tools_16 + clang_16 + clang-tools_16 deno gh - # go - # jdk + go + jdk lld - # maven - # vlang - # zig + maven + zig # wine ])) @@ -53,7 +52,7 @@ # krita obs-studio - # libreoffice - # hunspellDicts.en_US - # hunspellDicts.en_GB-ize + libreoffice + hunspellDicts.en_US + hunspellDicts.en_GB-ize ]))