diff --git a/flake.lock b/flake.lock index 61037d8..6de4fad 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,24 @@ { "nodes": { + "envfetch": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1756331205, + "narHash": "sha256-zbqFaQ5cfnjurlTu+HxDlAbS3E6lDu7pIhDQkg1CEvw=", + "owner": "MeexReay", + "repo": "envfetch", + "rev": "f923953a6c1c927a8a3b6c2107ec11c0281ff3c1", + "type": "github" + }, + "original": { + "owner": "MeexReay", + "repo": "envfetch", + "type": "github" + } + }, "flake-compat": { "locked": { "lastModified": 1696426674, @@ -32,6 +51,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "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" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -72,7 +109,7 @@ "inputs": { "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1753108595, @@ -91,18 +128,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752866191, - "narHash": "sha256-NV4S2Lf2hYmZQ3Qf4t/YyyBaJNuxLPyjzvDma0zPp/M=", + "lastModified": 1756256966, + "narHash": "sha256-sSVfAOlYIK01ptcDImwkyDVfhGPy/muVa4e7xxbhgho=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f01fe91b0108a7aff99c99f2e9abbc45db0adc2a", + "rev": "4c202d26483c5ccf3cb95e0053163facde9f047e", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs-lib": { @@ -121,6 +156,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1752866191, + "narHash": "sha256-NV4S2Lf2hYmZQ3Qf4t/YyyBaJNuxLPyjzvDma0zPp/M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f01fe91b0108a7aff99c99f2e9abbc45db0adc2a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1750622754, "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", @@ -138,10 +189,26 @@ }, "root": { "inputs": { + "envfetch": "envfetch", "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixcord": "nixcord", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 6e71801..866621f 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,7 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; nixcord.url = "github:KaylorBen/nixcord/411d48a6"; nix-flatpak.url = "github:gmodena/nix-flatpak"; + envfetch.url = "github:MeexReay/envfetch"; }; outputs = inputs@{ nixpkgs, home-manager, ... }: { @@ -20,7 +21,8 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - + home-manager.extraSpecialArgs = { inherit inputs; }; + home-manager.users.user = import ./modules; home-manager.sharedModules = [ diff --git a/modules/packages/default.nix b/modules/packages/default.nix index 431bcf0..5f0433b 100644 --- a/modules/packages/default.nix +++ b/modules/packages/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: { imports = [ @@ -55,7 +55,8 @@ pfetch neofetch fastfetch # i use nixos btw! librespeed-cli - + inputs.envfetch.packages.x86_64-linux.default + (yt-dlp.overrideAttrs (oldAttrs: { buildInputs = oldAttrs.buildInputs or [] ++ [ pkgs.makeWrapper ]; postInstall = oldAttrs.postInstall or "" + '' @@ -88,7 +89,6 @@ ddnet easyeffects kdePackages.kdeconnect-kde - waydroid gnome-text-editor baobab gnome-system-monitor diff --git a/modules/packages/discord.nix b/modules/packages/discord.nix index 560168b..b105a99 100644 --- a/modules/packages/discord.nix +++ b/modules/packages/discord.nix @@ -112,6 +112,7 @@ voiceDownload.enable = true; voiceMessages.enable = true; volumeBooster.enable = true; + translate.enable = true; }; }; }; diff --git a/system/default.nix b/system/default.nix index e5f571d..2866730 100644 --- a/system/default.nix +++ b/system/default.nix @@ -60,8 +60,8 @@ ]; kernelModules = [ - "v4l2loopback" # for virtual camera in obs - "snd-aloop" # for sound tricks + # "v4l2loopback" # for virtual camera in obs + # "snd-aloop" # for sound tricks ]; kernel.sysctl = { # disable ipv6 @@ -237,6 +237,9 @@ enable = false; # enable if you need rootless docker setSocketVariable = true; }; + + # waydroid + virtualisation.waydroid.enable = true; system.stateVersion = "25.05"; }