diff --git a/flake.lock b/flake.lock index 420f84f..cd49a5f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1723685519, - "narHash": "sha256-GkXQIoZmW2zCPp1YFtAYGg/xHNyFH/Mgm79lcs81rq0=", + "lastModified": 1718846788, + "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=", "owner": "nix-community", "repo": "disko", - "rev": "276a0d055a720691912c6a34abb724e395c8e38a", + "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1718530513, + "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "type": "github" }, "original": { @@ -43,11 +43,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1723310128, - "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", + "lastModified": 1718894893, + "narHash": "sha256-hxQBUtDbFOCCW1CsFZTS9Q5Ov1ZKdJgbBZHSez1M6iA=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", + "rev": "083823b7904e43a4fc1c7229781417e875359a42", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723688146, - "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", + "lastModified": 1718717462, + "narHash": "sha256-qddfQLMaWR2gxfEzUM/zFZVK6H1kTv9WBQSBQxbP3MU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", + "rev": "938aa157bbd6e3c6fd7dcb77998b1f92c2ad1631", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1718714799, + "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", "type": "github" }, "original": { diff --git a/users/willifan/desktop/applications.nix b/users/willifan/desktop/applications.nix index 21372e4..a4af345 100644 --- a/users/willifan/desktop/applications.nix +++ b/users/willifan/desktop/applications.nix @@ -1,8 +1,7 @@ -{ pkgs, pkgs-unstable, ... }: +{ pkgs, ... }: { - environment.systemPackages = - (with pkgs; [ + environment.systemPackages = with pkgs; [ bc jq @@ -20,18 +19,12 @@ qemu libreoffice - #prusa-slicer + prusa-slicer orca-slicer gimp inkscape - ]) - ++ - (with pkgs-unstable; [ - - prusa-slicer - - ]); + ]; } diff --git a/users/willifan/desktop/hyprland/common/hyprland.nix b/users/willifan/desktop/hyprland/common/hyprland.nix index 7385f51..dd1bde4 100644 --- a/users/willifan/desktop/hyprland/common/hyprland.nix +++ b/users/willifan/desktop/hyprland/common/hyprland.nix @@ -111,6 +111,10 @@ preserve_split = "yes"; # you probably want this }; + master = { + new_is_master = true; + }; + gestures = { workspace_swipe = "on"; workspace_swipe_create_new = "false"; diff --git a/users/willifan/desktop/web/firefox.nix b/users/willifan/desktop/web/firefox.nix index fdf8663..38f61f3 100644 --- a/users/willifan/desktop/web/firefox.nix +++ b/users/willifan/desktop/web/firefox.nix @@ -25,16 +25,8 @@ }; search = { force = true; - default = "SearXNG"; - order = [ "SearXNG" "DuckDuckGo" "Google" ]; - engines = { - "SearXNG" = { - urls = [{ template = "https://search.citw.lgbt/search?q={searchTerms}"; }]; - iconUpdateURL = "https://nixos.wiki/favicon.png"; - updateInterval = 24 * 60 * 60 * 1000; # every day - definedAliases = [ "@searxng" ]; - }; - }; + default = "DuckDuckGo"; + order = [ "DuckDuckGo" "Google" ]; }; #extensions = with pkgs.nur.repos.rycee.firefox-addons; [ # ublock-origin