diff --git a/flake.lock b/flake.lock index 7d54e29..b9819d9 100644 --- a/flake.lock +++ b/flake.lock @@ -87,28 +87,6 @@ "type": "github" } }, - "chaotic": { - "inputs": { - "fenix": "fenix", - "flake-schemas": "flake-schemas", - "home-manager": "home-manager", - "jovian": "jovian", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1749570083, - "narHash": "sha256-/y7EWrwsK/fOHYL4aGqGpU/2E4lzePLBtmcpbXH1D7I=", - "owner": "chaotic-cx", - "repo": "nyx", - "rev": "ca879d7ff778aad35626c67219e532e0d034181b", - "type": "github" - }, - "original": { - "owner": "chaotic-cx", - "repo": "nyx", - "type": "github" - } - }, "dae": { "inputs": { "flake-parts": [ @@ -176,28 +154,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1749451322, - "narHash": "sha256-t53R3kSDl4Jie+Ooxi/aQFN2ODRp1tXQSJBevOt3IkQ=", - "owner": "nix-community", - "repo": "fenix", - "rev": "77de5067629e201436c76f14f96614a19368c4ae", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -279,20 +235,6 @@ "type": "github" } }, - "flake-schemas": { - "locked": { - "lastModified": 1721999734, - "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", - "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", - "revCount": 75, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -430,27 +372,6 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1749526396, - "narHash": "sha256-UL9F76abAk87llXOrcQRjhd5OaOclUd6MIltsqcUZmo=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "427c96044f11a5da50faf6adaf38c9fa47e6d044", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -470,28 +391,6 @@ "type": "github" } }, - "jovian": { - "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1749495634, - "narHash": "sha256-NPifVq2XZGRCsLBoUt6M5YUTiIh23+ubq57w7mSODt8=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "c40d2f31f92571bf341497884174a132829ef0fc", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, "lix": { "flake": false, "locked": { @@ -590,33 +489,10 @@ "type": "github" } }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "chaotic", - "jovian", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729697500, - "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", - "owner": "zhaofengli", - "repo": "nix-github-actions", - "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "matrix-name", - "repo": "nix-github-actions", - "type": "github" - } - }, "nixos-cosmic": { "inputs": { "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable_2", "rust-overlay": "rust-overlay_2" }, @@ -652,11 +528,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749285348, - "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", + "lastModified": 1749143949, + "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", + "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", "type": "github" }, "original": { @@ -714,22 +590,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1749143949, - "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1749285348, "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", @@ -745,7 +605,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1747958103, "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", @@ -807,42 +667,24 @@ "root": { "inputs": { "betterfox-nix": "betterfox-nix", - "chaotic": "chaotic", "dae": "dae", "deploy-rs": "deploy-rs", "disko": "disko", "flake-parts": "flake-parts", "flake-utils": "flake-utils", "helix": "helix", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "lix-module": "lix-module", "niri-flake": "niri-flake", "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nur-rycee": "nur-rycee", "sops-nix": "sops-nix", "stylix": "stylix", "treefmt-nix": "treefmt-nix_2" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1749419176, - "narHash": "sha256-Hs0vidgwvBiBuqNjR5oCQMMGUfUYwwnyxLShg3yzhWU=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "9fc1b9076cf49c7f54497df9cfa4485a63f14d3e", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -1081,7 +923,7 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1749194973, diff --git a/flake.nix b/flake.nix index d492e89..3dc6cb9 100644 --- a/flake.nix +++ b/flake.nix @@ -170,11 +170,5 @@ owner = "numtide"; repo = "treefmt-nix"; }; - - chaotic = { - type = "github"; - owner = "chaotic-cx"; - repo = "nyx"; - }; }; } diff --git a/home/extra/default.nix b/home/extra/default.nix index 6b11455..1b62274 100644 --- a/home/extra/default.nix +++ b/home/extra/default.nix @@ -3,7 +3,6 @@ (with inputs; [ niri-flake.homeModules.niri stylix.homeManagerModules.stylix - chaotic.homeManagerModules.default ]) ++ [ ./nix.nix diff --git a/nixos/configurations/Akun/default.nix b/nixos/configurations/Akun/default.nix index c205080..3e6644c 100644 --- a/nixos/configurations/Akun/default.nix +++ b/nixos/configurations/Akun/default.nix @@ -63,10 +63,9 @@ environment.variables.EDITOR = "hx"; services.dbus.implementation = "broker"; - services.scx.enable = true; boot = { - kernelPackages = pkgs.linuxPackages_cachyos-lto; + kernelPackages = pkgs.linuxPackages_zen; loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; }; diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index 16f9b93..830d150 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -97,10 +97,9 @@ environment.variables.EDITOR = "hx"; services.dbus.implementation = "broker"; - services.scx.enable = true; boot = { - kernelPackages = pkgs.linuxPackages_cachyos-lto; + kernelPackages = pkgs.linuxPackages_zen; loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; initrd.systemd.enable = true; diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index 8147afe..d10b841 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -14,7 +14,6 @@ stylix.nixosModules.stylix disko.nixosModules.disko lix-module.nixosModules.default - chaotic.nixosModules.default ]) ++ [ ./containers diff --git a/nixos/modules/programs/rustypaste/default.nix b/nixos/modules/programs/rustypaste/default.nix index f18fbfc..dd7536c 100644 --- a/nixos/modules/programs/rustypaste/default.nix +++ b/nixos/modules/programs/rustypaste/default.nix @@ -72,6 +72,36 @@ in { "application/java-archive" "application/java-vm" ]; + mine_override = [ + { + mime = "image/jpeg"; + regex = "^.*\\.jpg$"; + } + { + mime = "image/png"; + regex = "^.*\\.png$"; + } + { + mime = "image/svg+xml"; + regex = "^.*\\.svg$"; + } + { + mime = "video/webm"; + regex = "^.*\\.webm$"; + } + { + mime = "video/x-matroska"; + regex = "^.*\\.mkv$"; + } + { + mime = "application/octet-stream"; + regex = "^.*\\.bin$"; + } + { + mime = "text/plain"; + regex = "^.*\\.(log|txt|diff|sh|rs|toml|py|json|yaml|yml|ts|js|go|c|C|c++|cpp|cxx|patch|toml|bash|fish)$"; + } + ]; }; landing_page = { content_type = "text/plain; charset=utf-8";