diff --git a/flake.lock b/flake.lock index 08290c6..e25aeff 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1696727917, - "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", + "lastModified": 1720809814, + "narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", + "rev": "34f41987bec14c0f3f6b2155c19787b1f6489625", "type": "github" }, "original": { @@ -101,15 +101,15 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1663659192, - "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", - "owner": "chriskempson", + "lastModified": 1716150083, + "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "owner": "tinted-theming", "repo": "base16-vim", - "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", + "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", "type": "github" }, "original": { - "owner": "chriskempson", + "owner": "tinted-theming", "repo": "base16-vim", "type": "github" } @@ -142,11 +142,11 @@ ] }, "locked": { - "lastModified": 1727872461, - "narHash": "sha256-4Pw3fVhN6xey5+2gUBm9nQJAjBqivffr+a5ZsXYjzJ8=", + "lastModified": 1726730453, + "narHash": "sha256-Kdi7liMdbr1/uyMhMDl19O5b9LESxcnYgBRZblrJi9E=", "owner": "nix-community", "repo": "disko", - "rev": "568727a884ae7cd9f266bd19aea655def8cafd78", + "rev": "a31fe5ef162f2f963308289e6e27d37e3948a983", "type": "github" }, "original": { @@ -193,11 +193,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -211,11 +211,32 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": [ + "stylix", + "systems" + ] + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -257,11 +278,11 @@ ] }, "locked": { - "lastModified": 1727805723, - "narHash": "sha256-b8flytpuc4Ey/g3mcvpS/ICORcD4h56QDZeP5LogevY=", + "lastModified": 1725513492, + "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "2f5ae3fc91db865eff2c5a418da85a0fbe6238a3", + "rev": "7570de7b9b504cfe92025dd1be797bf546f66528", "type": "github" }, "original": { @@ -316,11 +337,11 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1726592409, + "narHash": "sha256-2Y6CDvD/BD43WLS77PHu6dUHbdUfFhuzkY8oJAecD/U=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594", "type": "github" }, "original": { @@ -338,11 +359,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1726825546, + "narHash": "sha256-HiBzfzgqojA9OjPB+vdi2o+gy4Zw/MEipuGopgGsZEw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "0b052dd8119005c6ba819db48bcc657e48f401b7", "type": "github" }, "original": { @@ -359,11 +380,11 @@ ] }, "locked": { - "lastModified": 1714981474, - "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -380,11 +401,11 @@ ] }, "locked": { - "lastModified": 1727707210, - "narHash": "sha256-8XZp5XO2FC6INZEZ2WlwErtvFVpl45ACn8CJ2hfTA0Y=", + "lastModified": 1726188813, + "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "f61d5f2051a387a15817007220e9fb3bbead57b3", + "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80", "type": "github" }, "original": { @@ -395,11 +416,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727665282, - "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=", + "lastModified": 1726724509, + "narHash": "sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5", + "rev": "10d5e0ecc32984c1bf1a9a46586be3451c42fd94", "type": "github" }, "original": { @@ -410,11 +431,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727672256, - "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", + "lastModified": 1726447378, + "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", + "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", "type": "github" }, "original": { @@ -426,11 +447,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1726463316, + "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", "type": "github" }, "original": { @@ -442,11 +463,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1714912032, - "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", + "lastModified": 1725194671, + "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d", + "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", "type": "github" }, "original": { @@ -471,11 +492,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1727871072, - "narHash": "sha256-t+YLQwBB1soQnVjT6d7nQq4Tidaw7tpB8i6Zvpc+Zbs=", + "lastModified": 1726846628, + "narHash": "sha256-0CH44sEwiljiN2q7eIFCvabyUm1WeEiF8ofP/z5ca0Q=", "owner": "nix-community", "repo": "nixvim", - "rev": "0ca98d02104f7f0a703787a7a080a570b7f1bedd", + "rev": "3211ce356be612ae89a38c60799992bde8a47127", "type": "github" }, "original": { @@ -493,11 +514,11 @@ ] }, "locked": { - "lastModified": 1727599661, - "narHash": "sha256-0R+1ih0Rfqrz/lcduvpNSnUw3uthUHiaGh0aWPyIqeQ=", + "lastModified": 1726816132, + "narHash": "sha256-AbB0lgc0IbzLIxj1O3cosiMNAVQak4KJtvq9q8MjHhs=", "owner": "NuschtOS", "repo": "search", - "rev": "c3c3928b8de7d300c34e9d90fdc19febd1a32062", + "rev": "7733a39a1321057172d87e6251ded7cdeb67171e", "type": "github" }, "original": { @@ -528,21 +549,22 @@ "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "systems": "systems_2" }, "locked": { - "lastModified": 1718122552, - "narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=", + "lastModified": 1726497442, + "narHash": "sha256-fieyqmLEJQqqnuJcg2CAnQ8kHapXHhg9rL48NNWjnPw=", "owner": "danth", "repo": "stylix", - "rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7", + "rev": "149b313ddf91c3cc94309170498b162cec666675", "type": "github" }, "original": { "owner": "danth", - "ref": "release-24.05", "repo": "stylix", "type": "github" } @@ -562,6 +584,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -570,11 +607,11 @@ ] }, "locked": { - "lastModified": 1727431250, - "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=", + "lastModified": 1725271838, + "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754", + "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd", "type": "github" }, "original": { @@ -590,11 +627,11 @@ ] }, "locked": { - "lastModified": 1727721329, - "narHash": "sha256-QYlWZwUSwrM7BuO+dXclZIwoPvBIuJr6GpFKv9XKFPI=", + "lastModified": 1727287465, + "narHash": "sha256-XQAf5M593WmxgaXagtkci/H9DA3jSVx1TJk6F3X5VQo=", "owner": "MarceColl", "repo": "zen-browser-flake", - "rev": "e6ab73f405e9a2896cce5956c549a9cc359e5fcc", + "rev": "96f1b5d80bf7360cb77c9b521f388324f18383a0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7766961..bfa028d 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - stylix.url = "github:danth/stylix/release-24.05"; + stylix.url = "github:danth/stylix"; nixvim = { url = "github:nix-community/nixvim"; diff --git a/hosts/common/default.nix b/hosts/common/default.nix index ac51384..0f5cce8 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -4,7 +4,6 @@ ./autoupdate.nix ./garbage-collect.nix ./keyd.nix - ./mimetype.nix ./optimise.nix ]; diff --git a/hosts/common/mimetype.nix b/hosts/common/mimetype.nix deleted file mode 100644 index a0efe6f..0000000 --- a/hosts/common/mimetype.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ ... }: -{ - - xdg.mime.defaultApplications = { - "application/pdf" = "zen.desktop"; - "text/html" = "zen.desktop"; - "x-scheme-handler/http" = "zen.desktop"; - "x-scheme-handler/https" = "zen.desktop"; - "x-scheme-handler/about" = "zen.desktop"; - "x-scheme-handler/unknown" = "zen.desktop"; - }; - - environment.sessionVariables.DEFAULT_BROWSER = "zen"; - -} diff --git a/users/willifan/common/nixvim/default.nix b/users/willifan/common/nixvim/default.nix index 56892c6..91ab42a 100644 --- a/users/willifan/common/nixvim/default.nix +++ b/users/willifan/common/nixvim/default.nix @@ -3,7 +3,6 @@ programs.nixvim = { enable = true; - defaultEditor = true; }; imports = [ diff --git a/users/willifan/common/utils/default.nix b/users/willifan/common/utils/default.nix index 13bcbe4..13ff42d 100644 --- a/users/willifan/common/utils/default.nix +++ b/users/willifan/common/utils/default.nix @@ -6,6 +6,7 @@ services.avizo.enable = true; programs.bat.enable = true; programs.btop.enable = true; + programs.fuzzel.enable = true; programs.yazi.enable = true; programs.nushell.enable = true; }; diff --git a/users/willifan/desktop/hyprland/common/default.nix b/users/willifan/desktop/hyprland/common/default.nix index e6bedc1..eaf6aa8 100644 --- a/users/willifan/desktop/hyprland/common/default.nix +++ b/users/willifan/desktop/hyprland/common/default.nix @@ -3,7 +3,6 @@ { programs.hyprland.enable = true; imports = [ - ./fuzzel.nix ./hyprland.nix ./hyprpaper.nix ./mako.nix @@ -11,6 +10,7 @@ ./polkit.nix ./utils.nix ./wlogout.nix + ./wofi.nix ]; diff --git a/users/willifan/desktop/hyprland/common/hyprland.nix b/users/willifan/desktop/hyprland/common/hyprland.nix index 53080fc..035d72b 100644 --- a/users/willifan/desktop/hyprland/common/hyprland.nix +++ b/users/willifan/desktop/hyprland/common/hyprland.nix @@ -24,7 +24,7 @@ # Execute your favorite apps at launch exec-once = [ ''hyprctl dispatch exec "[workspace 1 silent] kitty"'' - ''hyprctl dispatch exec "[workspace 2 silent] zen"'' + ''hyprctl dispatch exec "[workspace 2 silent] firefox"'' #''hyprctl dispatch exec "[workspace 3 silent] "'' #''hyprctl dispatch exec "[workspace 4 silent] "'' #''hyprctl dispatch exec "[workspace 8 silent] "'' @@ -155,7 +155,7 @@ ''$mainMod, M, exit, '' ''$mainMod, E, exec, thunar'' ''$mainMod, V, togglefloating, '' - ''$mainMod, R, exec, fuzzel'' + ''$mainMod, R, exec, wofi --show drun'' ''$mainMod, J, togglesplit, # dwindle'' ''$mainMod, P, exec, Enpass'' ''$mainMod, T, exec, hyprctl dispatch exec "[float; pin; size 40% 40%; move 100%-41% 40] kitty btop -b proc"'' diff --git a/users/willifan/desktop/hyprland/common/fuzzel.nix b/users/willifan/desktop/hyprland/common/wofi.nix similarity index 50% rename from users/willifan/desktop/hyprland/common/fuzzel.nix rename to users/willifan/desktop/hyprland/common/wofi.nix index 518fabd..e9c2ef8 100644 --- a/users/willifan/desktop/hyprland/common/fuzzel.nix +++ b/users/willifan/desktop/hyprland/common/wofi.nix @@ -1,14 +1,13 @@ { ... }: { home-manager.users.willifan = { - programs.fuzzel = { + programs.wofi = { enable = true; settings = { - main = { - lines = 12; - width = 45; - line-height = 20; - }; + normal_window = false; + allow_images = true; + halign = "fill"; + }; }; };