diff --git a/flake.lock b/flake.lock index ee749fa..ddf7975 100644 --- a/flake.lock +++ b/flake.lock @@ -1291,6 +1291,22 @@ "type": "github" } }, + "nixpkgs-master": { + "locked": { + "lastModified": 1771439456, + "narHash": "sha256-HtQgNJrjYvZdpqpPJddF+TxGCazNyxvA8umbDcjrxT8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f84d6f6cd5f17d594439710f40349ba7d0706f4b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-staging": { "locked": { "lastModified": 1771384451, @@ -1542,6 +1558,7 @@ "nixcats": "nixcats", "nixcord": "nixcord", "nixpkgs": "nixpkgs_9", + "nixpkgs-master": "nixpkgs-master", "nixpkgs-staging": "nixpkgs-staging", "nixpkgs-unstable": "nixpkgs-unstable", "sddm-silent": "sddm-silent", diff --git a/flake.nix b/flake.nix index c356c4e..2cbefbf 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-staging.url = "github:NixOS/nixpkgs/staging-next"; + nixpkgs-master.url = "github:NixOS/nixpkgs/master"; home-manager = { url = "github:nix-community/home-manager/master"; diff --git a/homes/modules/programs/neovim/nixcats.nix b/homes/modules/programs/neovim/nixcats.nix index e81a8a0..e9061cf 100644 --- a/homes/modules/programs/neovim/nixcats.nix +++ b/homes/modules/programs/neovim/nixcats.nix @@ -1,6 +1,7 @@ { inputs, spkgs, + mpkgs, ... }: let inherit @@ -64,7 +65,7 @@ in { ]; rust = with pkgs; [ cargo - rust-analyzer + mpkgs.rust-analyzer ]; zig = with pkgs; [ spkgs.zls # FIX: using spkgs version as zls is broken rn ;-; diff --git a/homes/modules/programs/nixcord.nix b/homes/modules/programs/nixcord.nix index 7e22a19..dd55e91 100644 --- a/homes/modules/programs/nixcord.nix +++ b/homes/modules/programs/nixcord.nix @@ -104,7 +104,7 @@ }; silentTyping = { enable = true; - enabledGlobally = false; + enabledGlobally = true; }; startupTimings.enable = true; typingIndicator.enable = true; diff --git a/homes/modules/wm/hyprland/hyprland.nix b/homes/modules/wm/hyprland/hyprland.nix index aff785f..49570e5 100644 --- a/homes/modules/wm/hyprland/hyprland.nix +++ b/homes/modules/wm/hyprland/hyprland.nix @@ -25,7 +25,7 @@ # applications "$terminal" = "kitty"; "$explorer" = "kitty -e yazi"; - "$browser" = "zen"; + "$browser" = "zen-twilight"; # menu "$menu" = "rofi"; diff --git a/hosts/nixarawrui/default.nix b/hosts/nixarawrui/default.nix index 58c1c92..b07dbb5 100644 --- a/hosts/nixarawrui/default.nix +++ b/hosts/nixarawrui/default.nix @@ -19,8 +19,9 @@ efi.canTouchEfiVariables = true; }; - # kernelPackages = upkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v4; - kernelPackages = upkgs.linuxPackages_latest; + kernelPackages = upkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v4; + # TODO: idk make this a toggle or smth idfk + # kernelPackages = upkgs.linuxPackages_latest; kernelModules = ["v4l2loopback"]; extraModulePackages = with kernelPackages; [v4l2loopback]; diff --git a/nixpkgs.nix b/nixpkgs.nix index 332b14e..1470160 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -35,5 +35,14 @@ ]; config.allowUnfree = true; }; + + # nixpkgs-master + mpkgs = { + source = inputs.nixpkgs-master; + overlays = [ + (import ./overlays.nix args) + ]; + config.allowUnfree = true; + }; }; }