diff --git a/flake.lock b/flake.lock index ac3c0c2b..35d6eab1 100644 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1758874004, - "narHash": "sha256-+RUCBtT01Z595NpGc6Tvms+dJ/C/cn1zdjT9+gE6dbU=", + "lastModified": 1760083914, + "narHash": "sha256-I9IMO9d+z71oeqOz6gOre07tK2Du3vp2FcOW3x4FDXw=", "owner": "anyrun-org", "repo": "anyrun", - "rev": "3c571bc1514c4211d1d6c011a1d482f97efd9c5f", + "rev": "3050aa30e25957bbb9e1ac91a44d3979eccadf59", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1759745865, - "narHash": "sha256-zpCNJykHhWZQmwXe37XlT+gnYL/ME9ynwzRbi04UP04=", + "lastModified": 1760148209, + "narHash": "sha256-ssMUeLk1cmLqzNMW6l9dgGoLtOY9F9dEGplJlWJmNis=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "5c7bb56b67db86460e96b4da7bee8304383d88a9", + "rev": "b51bb724939dbfa264f08522efffce2bb47b6135", "type": "github" }, "original": { @@ -212,11 +212,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1759732757, - "narHash": "sha256-RUR2yXYbKSoDvI/JdH0AvojFjhCfxBXOA/BtGUpaoR0=", + "lastModified": 1760164678, + "narHash": "sha256-yxcfwZCysR6zPaFv7is3/FWd1h0h6kXME0vueSwTBhU=", "owner": "nix-community", "repo": "fenix", - "rev": "1d3600dda5c27ddbc9c424bb4edae744bdb9b14d", + "rev": "2579f163559b902959cc420a6d3bfbd98c46a323", "type": "github" }, "original": { @@ -571,11 +571,11 @@ }, "hardware": { "locked": { - "lastModified": 1759582739, - "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=", + "lastModified": 1760106635, + "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "3441b5242af7577230a78ffb03542add264179ab", + "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", "type": "github" }, "original": { @@ -590,11 +590,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1759759529, - "narHash": "sha256-t+fUXdpBv3r/nhciqJpkALCWdXGIeGfUshm1KfC69KM=", + "lastModified": 1759850138, + "narHash": "sha256-fYHIxjTvVIAEDWzenUROuzDPxy1rBCXZNPgh4b1dfgo=", "owner": "helix-editor", "repo": "helix", - "rev": "c599e4e7ee5222692c6c2a2de1edc1994afb39ee", + "rev": "5b0563419eeeaf0595c848865c46be4abad246a7", "type": "github" }, "original": { @@ -610,11 +610,11 @@ ] }, "locked": { - "lastModified": 1759761710, - "narHash": "sha256-6ZG7VZZsbg39gtziGSvCJKurhIahIuiCn+W6TGB5kOU=", + "lastModified": 1760130406, + "narHash": "sha256-GKMwBaFRw/C1p1VtjDz4DyhyzjKUWyi1K50bh8lgA2E=", "owner": "nix-community", "repo": "home-manager", - "rev": "929535c3082afdf0b18afec5ea1ef14d7689ff1c", + "rev": "d305eece827a3fe317a2d70138f53feccaf890a1", "type": "github" }, "original": { @@ -652,11 +652,11 @@ ] }, "locked": { - "lastModified": 1759711004, - "narHash": "sha256-B39NxeKCnK3DJlmJKIts6njcXcVVASLUChDNmRl4dxQ=", + "lastModified": 1760061988, + "narHash": "sha256-CeuMo7fjWm3XaoK+b1PGyaVIlE1GHudoxk9jrJFvfbY=", "owner": "nix-community", "repo": "home-manager", - "rev": "6f4021da5d2bb5ea7cb782ff413ecb7062066820", + "rev": "c7f4214faca2f196c551b767c12a70bfa0614510", "type": "github" }, "original": { @@ -739,11 +739,11 @@ ] }, "locked": { - "lastModified": 1750621377, - "narHash": "sha256-8u6b5oAdX0rCuoR8wFenajBRmI+mzbpNig6hSCuWUzE=", + "lastModified": 1759490292, + "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "b3d628d01693fb9bb0a6690cd4e7b80abda04310", + "rev": "9431db625cd9bb66ac55525479dce694101d6d7a", "type": "github" }, "original": { @@ -803,11 +803,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1759749604, - "narHash": "sha256-IF5RWz8v+L+YD0oaX3SHWeSOQ5rzC5wBQUtp9cw0wEE=", + "lastModified": 1760143218, + "narHash": "sha256-OhJPROcRcwBkjOKkXr/f3/7wuSjhAIqr8WfmEUF9Uuo=", "owner": "hyprwm", "repo": "hyprland", - "rev": "17e77e0407bebd5d24521012ee1d04b156d6b9f4", + "rev": "d599513d4a72d66ac62ffdedc41d6653fa81b39e", "type": "github" }, "original": { @@ -1006,11 +1006,11 @@ ] }, "locked": { - "lastModified": 1759572448, - "narHash": "sha256-o+r44fqPQM+/hQdjFy9qV9C51Jhty6M4icFVYocyJfA=", + "lastModified": 1760023949, + "narHash": "sha256-fu0B4duamVdbkPio/czu1XhsPLRXUJpZLDrSk3nih4U=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "c8a6768dca626cf7d7cbc333095f048bc007b6d9", + "rev": "36ec73f166d9434a3f27c96c575198906f77644a", "type": "github" }, "original": { @@ -1044,11 +1044,11 @@ ] }, "locked": { - "lastModified": 1754481642, - "narHash": "sha256-e1phd6KwtUsS9C2ShD+fQvfk2Dgr2JQi+rTDQUW15iE=", + "lastModified": 1760120448, + "narHash": "sha256-l/OxM4q/nLVv47OuS4bG2J7k0m+G7/3AMtvrV64XLb0=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "bcb1ffa322369c4898347ab5a7399a3d18494c8f", + "rev": "1733e0025b194c9bc083f4cd8782c5f151858a58", "type": "github" }, "original": { @@ -1069,11 +1069,11 @@ ] }, "locked": { - "lastModified": 1759490926, - "narHash": "sha256-7IbZGJ5qAAfZsGhBHIsP8MBsfuFYS0hsxYHVkkeDG5Q=", + "lastModified": 1759619523, + "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "94cce794344538c4d865e38682684ec2bbdb2ef3", + "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef", "type": "github" }, "original": { @@ -1144,11 +1144,11 @@ ] }, "locked": { - "lastModified": 1750371869, - "narHash": "sha256-lGk4gLjgZQ/rndUkzmPYcgbHr8gKU5u71vyrjnwfpB4=", + "lastModified": 1755184602, + "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "aa38edd6e3e277ae6a97ea83a69261a5c3aab9fd", + "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", "type": "github" }, "original": { @@ -1191,11 +1191,11 @@ ] }, "locked": { - "lastModified": 1759387127, - "narHash": "sha256-uuwJAP92SkHmnI1zo7rrK/gEuHtb97vFZcMa5w+0SZA=", + "lastModified": 1759815224, + "narHash": "sha256-HbdOyjqHm38j6o5mV24i0bn+r5ykS+VJBnWJuZ0fE+A=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "0cc290e05882745060fccfe6d7d073f913e0cce7", + "rev": "ee974f496a080c61b3164992c850f43741edcc52", "type": "github" }, "original": { @@ -1278,11 +1278,11 @@ ] }, "locked": { - "lastModified": 1759692973, - "narHash": "sha256-5evwJEYP5clwnDy+vX4MfAnGepxi0NaHjka7igXDU94=", + "lastModified": 1760146997, + "narHash": "sha256-x2sF8Q4tWz3DI166s+KFDXySrK+cN+/YEd3DfhnhBLQ=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "5958a54eed219604b8a0ddeef6ab48fe4029f083", + "rev": "ad505387568d024654da88fef03d9c5319cba92f", "type": "github" }, "original": { @@ -1363,11 +1363,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1759147044, - "narHash": "sha256-3ZPFytJOcLjTChljeaGgoaNj+tOqzgEpqZAvRe3bU90=", - "owner": "PedroHLC", + "lastModified": 1760038930, + "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "18e83bbe13aa50992777832b52bd0e0d8585fb3b", + "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", "type": "github" }, "original": { @@ -1443,11 +1443,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1760038930, + "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", "type": "github" }, "original": { @@ -1482,11 +1482,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1759469269, - "narHash": "sha256-DP833ejGUNRRHsJOB3WRTaWWXLNucaDga2ju/fGe+sc=", + "lastModified": 1760153667, + "narHash": "sha256-F7KmXT/Izse6Q6CkD5GCImoGPaDJxl03Kd7eD+eY/bU=", "owner": "notashelf", "repo": "nvf", - "rev": "e48638aef3a95377689de0ef940443c64f870a09", + "rev": "9df9d51fd9fc8f9a8fc377f984ea3b7ae796172d", "type": "github" }, "original": { @@ -1626,11 +1626,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1759691178, - "narHash": "sha256-O11yp/in47Ef1jLsEgNACXuziuRSSV4RAuxIWTdKI9w=", + "lastModified": 1760090851, + "narHash": "sha256-XGkBjf4Dzg6tXd0KGgKzeW4oVX/iLzLhD3rQ1cATpqM=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "f0b496cbc774f589de0d46bb9c291ff7ff0329da", + "rev": "b93180b4f2cb3c81ac7f17f46e3dfcb30ecc7843", "type": "github" }, "original": { @@ -1648,11 +1648,11 @@ ] }, "locked": { - "lastModified": 1759631821, - "narHash": "sha256-V8A1L0FaU/aSXZ1QNJScxC12uP4hANeRBgI4YdhHeRM=", + "lastModified": 1760063676, + "narHash": "sha256-s5Fjh43skH2L+avOGioLmEHoYZffDbg3abV5h0gjeew=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1d7cbdaad90f8a5255a89a6eddd8af24dc89cafe", + "rev": "897deed0923cc5a1d560c5176abe0d172ec9716d", "type": "github" }, "original": { @@ -1815,11 +1815,11 @@ ] }, "locked": { - "lastModified": 1758728421, - "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=", + "lastModified": 1760120816, + "narHash": "sha256-gq9rdocpmRZCwLS5vsHozwB6b5nrOBDNc2kkEaTXHfg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1", + "rev": "761ae7aff00907b607125b2f57338b74177697ed", "type": "github" }, "original": { @@ -1923,11 +1923,11 @@ ] }, "locked": { - "lastModified": 1759590499, - "narHash": "sha256-EBToRzqe5WMz4DQyxOp9/CP+rWjdaZ2EUwbItfNf3VI=", + "lastModified": 1759969704, + "narHash": "sha256-T7f/invcFIKHrBqD+FLf/C/HOGmpYfbZUzTDxFscpOA=", "ref": "refs/heads/main", - "rev": "6e606c8bfa6a88209488790388b1005bc489fa66", - "revCount": 136, + "rev": "1173c777dc8daddcc4959260a7b00fd8abc884c5", + "revCount": 137, "type": "git", "url": "https://git.sr.ht/~canasta/zen-browser-flake" }, diff --git a/modules/home/programs/pkgs/default.nix b/modules/home/programs/pkgs/default.nix index ce067d67..4b9dd956 100644 --- a/modules/home/programs/pkgs/default.nix +++ b/modules/home/programs/pkgs/default.nix @@ -88,7 +88,7 @@ in hyprpicker libnotify pamixer - oculante + loupe adwaita-icon-theme qt5.qtwayland qt6.qtwayland diff --git a/modules/home/services/xdg/default.nix b/modules/home/services/xdg/default.nix index 7e7d0692..2443ef3a 100644 --- a/modules/home/services/xdg/default.nix +++ b/modules/home/services/xdg/default.nix @@ -84,15 +84,15 @@ in "application/pdf" = "org.pwmt.zathura-pdf-mupdf.desktop"; "inode/directory" = "thunar.desktop"; - "image/apng" = "oculante.desktop"; - "image/avif" = "oculante.desktop"; - "image/bmp" = "oculante.desktop"; - "image/gif" = "oculante.desktop"; - "image/jpeg" = "oculante.desktop"; - "image/png" = "oculante.desktop"; - "image/svg+xml" = "oculante.desktop"; - "image/tiff" = "oculante.desktop"; - "image/webp" = "oculante.desktop"; + "image/apng" = "feh.desktop"; + "image/avif" = "feh.desktop"; + "image/bmp" = "feh.desktop"; + "image/gif" = "feh.desktop"; + "image/jpeg" = "feh.desktop"; + "image/png" = "feh.desktop"; + "image/svg+xml" = "feh.desktop"; + "image/tiff" = "feh.desktop"; + "image/webp" = "feh.desktop"; "video/H264" = [ "mpv.desktop" diff --git a/modules/nixos/programs/pkgs/default.nix b/modules/nixos/programs/pkgs/default.nix index b7e4db41..020e0472 100644 --- a/modules/nixos/programs/pkgs/default.nix +++ b/modules/nixos/programs/pkgs/default.nix @@ -3,16 +3,17 @@ config, lib, ... -}: let - inherit - (lib) +}: +let + inherit (lib) mkIf mkOption mkMerge types ; cfg = config.nixos.programs.pkgs; -in { +in +{ options = { nixos.programs.pkgs = { enable = mkOption { @@ -50,7 +51,8 @@ in { }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; + environment.systemPackages = + with pkgs; mkMerge [ [ pciutils @@ -143,7 +145,6 @@ in { prettierd # php84Packages.php-cs-fixer shfmt - luaformatter black ]) ]; diff --git a/modules/nixos/system/devpkgs/default.nix b/modules/nixos/system/devpkgs/default.nix index c9a83fe6..f44ff7c8 100644 --- a/modules/nixos/system/devpkgs/default.nix +++ b/modules/nixos/system/devpkgs/default.nix @@ -45,7 +45,6 @@ in # nodePackages_latest.sql-formatter prettierd shfmt - luaformatter black ]; };