diff --git a/flake.lock b/flake.lock index a68e418..d59d580 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1754433428, - "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", + "lastModified": 1760836749, + "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", "owner": "ryantm", "repo": "agenix", - "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", + "rev": "2f0f812f69f3eb4140157fe15e12739adf82e32a", "type": "github" }, "original": { @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1758287904, - "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", + "lastModified": 1760701190, + "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=", "owner": "nix-community", "repo": "disko", - "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", + "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5", "type": "github" }, "original": { @@ -168,11 +168,11 @@ ] }, "locked": { - "lastModified": 1759573136, - "narHash": "sha256-ILSPD0Dm8p0w0fCVzOx98ZH8yFDrR75GmwmH3fS2VnE=", + "lastModified": 1761584077, + "narHash": "sha256-dISPEZahlfs5K6d58zR4akRRyogfE9P4WSyPPNT7HiE=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f06ceafc6c9b773a776b9195c3f47bbe1defa43", + "rev": "e82585308aef3d4cc2c36c7b6946051c8cdf24ef", "type": "github" }, "original": { @@ -249,11 +249,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1759661061, - "narHash": "sha256-LAd1fNNIL19HrOm1cVeoKP5v8si932HsX1ZDwJh9O8o=", + "lastModified": 1760467504, + "narHash": "sha256-KzUZPZxIF6FmQW/Zpt8NtbPQ4lnkj/jdBYqBw5xE1L0=", "ref": "refs/heads/master", - "rev": "27d92a238ba9b9df117680c2080e082a2732bfc5", - "revCount": 7, + "rev": "a5f30c83b37d3171d5a8c1d2daf2c46829e04803", + "revCount": 9, "type": "git", "url": "https://code.m3ta.dev/m3tam3re/nixpkgs" }, @@ -269,11 +269,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1759662326, - "narHash": "sha256-DlLJ95u+Y+dQUgYXK9w4+oXEN1tAoBTuOBbROkJFw5Y=", + "lastModified": 1761575150, + "narHash": "sha256-/fAwaniaOKJPs74KB0L2RjitKb2Z5gT2ZmGG76rlEg4=", "owner": "numtide", "repo": "nix-ai-tools", - "rev": "f9b693bea48cea1dbe1f1b4471f546fe1e7a0c29", + "rev": "359cccc552cb0aa263fa00859ef7f0bb90db025e", "type": "github" }, "original": { @@ -416,11 +416,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1759661032, - "narHash": "sha256-cqZAN2FmnUX/M42m1T9/glzcp8C+66bV/25xUB7TbAw=", + "lastModified": 1761585705, + "narHash": "sha256-pYeomKfED+SCPevjt1qDCTso5xHUpggR/Fc6C3NxZRE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b7ffd1a8c2550781d74d6a2b48dc6bcd9da29996", + "rev": "894253673805c00029f32940ef056645095e36b2", "type": "github" }, "original": { @@ -432,11 +432,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1759580034, - "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", + "lastModified": 1761468971, + "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", + "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e", "type": "github" }, "original": { @@ -480,11 +480,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1761373498, + "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "type": "github" }, "original": { @@ -512,11 +512,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1761373498, + "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "type": "github" }, "original": { @@ -550,11 +550,11 @@ ] }, "locked": { - "lastModified": 1759659817, - "narHash": "sha256-S26D4k/9He1tLCn5ARx+3BNzK7IKBLBJWUqx9GF8X7s=", + "lastModified": 1761583596, + "narHash": "sha256-vgspmzDr0FZW0ed8aJJ9VYF4bzTYbfzyHPCXgGDUwsQ=", "owner": "nix-community", "repo": "NUR", - "rev": "df8713776e7e236129f7c260017e770393b4f278", + "rev": "35df45088e74e0d752d0167655250f5ecb78185d", "type": "github" }, "original": { @@ -686,11 +686,11 @@ ] }, "locked": { - "lastModified": 1758728421, - "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=", + "lastModified": 1761311587, + "narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1", + "rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc", "type": "github" }, "original": { diff --git a/home/features/desktop/hyprland.nix b/home/features/desktop/hyprland.nix index 55a7b0d..9150a49 100644 --- a/home/features/desktop/hyprland.nix +++ b/home/features/desktop/hyprland.nix @@ -23,7 +23,6 @@ in { "hypridle" "wl-paste --type text --watch cliphist store" # Stores only text data "wl-paste --type image --watch cliphist store" # Stores only image data "wl-paste -p -t text --watch clipman store -P --histpath=\"~/.local/share/clipman-primary.json\"" - "xwaylandvideobridge" ]; env = [ @@ -144,12 +143,6 @@ in { "noborder, initialTitle:.*streamlabs.com.*" "noshadow, initialTitle:.*streamlabs.com.*" "noblur, initialTitle:.*streamlabs.com.*" - "opacity 0.0 override, class:^(xwaylandvideobridge)$" - "noanim, class:^(xwaylandvideobridge)$" - "noinitialfocus, class:^(xwaylandvideobridge)$" - "maxsize 1 1, class:^(xwaylandvideobridge)$" - "noblur, class:^(xwaylandvideobridge)$" - "nofocus, class:^(xwaylandvideobridge)$" ]; "$mainMod" = "SUPER"; "$terminal" = "kitty"; diff --git a/home/features/desktop/media.nix b/home/features/desktop/media.nix index 33d5176..d189635 100644 --- a/home/features/desktop/media.nix +++ b/home/features/desktop/media.nix @@ -31,7 +31,7 @@ in { pavucontrol qpwgraph v4l-utils - plexamp + #plexamp webcord # uxplay # vlc diff --git a/home/features/desktop/wayland.nix b/home/features/desktop/wayland.nix index e53502a..506b182 100644 --- a/home/features/desktop/wayland.nix +++ b/home/features/desktop/wayland.nix @@ -12,7 +12,6 @@ in { config = mkIf cfg.enable { home.packages = with pkgs; [ grim - kdePackages.xwaylandvideobridge hyprcursor hyprlock hyprpaper diff --git a/home/m3tam3re/home.nix b/home/m3tam3re/home.nix index 89abbfd..1a072f1 100644 --- a/home/m3tam3re/home.nix +++ b/home/m3tam3re/home.nix @@ -87,19 +87,22 @@ programs.git = { enable = true; - difftastic.enable = true; - userName = "m3tam3re"; - userEmail = "m@m3tam3re.com"; aliases = { st = "status"; logd = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"; }; - extraConfig = { + settings = { + user = { + name = "m3tm3re"; + email = "p@m3ta.dev"; + }; core.excludesfile = "~/.gitignore_global"; init.defaultBranch = "master"; }; }; + programs.difftastic.enable = true; + programs.jujutsu = { enable = true; settings = { diff --git a/hosts/common/extraServices/virtualisation.nix b/hosts/common/extraServices/virtualisation.nix index 2f65858..b9adada 100644 --- a/hosts/common/extraServices/virtualisation.nix +++ b/hosts/common/extraServices/virtualisation.nix @@ -17,16 +17,6 @@ in { package = pkgs.qemu_kvm; runAsRoot = true; swtpm.enable = true; - ovmf = { - enable = true; - packages = [ - (pkgs.locked.OVMF.override { - secureBoot = true; - tpmSupport = true; - }) - .fd - ]; - }; }; }; };