Compare commits

..

No commits in common. "e06447440a42a260b3ce541d7ea218da8e7e2877" and "daa5b7fa5b036ff492a96ec6c69d0ce52b6b6701" have entirely different histories.

8 changed files with 22 additions and 70 deletions

View file

@ -24,11 +24,11 @@
}, },
"bleedingpkgs": { "bleedingpkgs": {
"locked": { "locked": {
"lastModified": 1724709214, "lastModified": 1724654909,
"narHash": "sha256-s94P5fVMIt8I9wYgTrQoQjvTk7jxSuvOrASgtTI9NTw=", "narHash": "sha256-otsBriUWjxgJae6DwjsEO4TUQkEhtLmXxLUlqRK1HrU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9daa847339d0f6ebff5ad3615d6d499735df3151", "rev": "a64bbc6c1b77d2012b50370bc33102cb4ed0418c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -463,11 +463,11 @@
"homebrew-cask": { "homebrew-cask": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1724706821, "lastModified": 1724652617,
"narHash": "sha256-kFXLEM6ENHr73hZPFm+CD/mjXghWV2X/cFZjDp1K718=", "narHash": "sha256-/iCv+iXkc6pnAQVb3K/ofJvAbnMz0s4Fx7bQQoMTDVs=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask", "repo": "homebrew-cask",
"rev": "298c23094c3598ed3f5a689d8451f8d350ab2edf", "rev": "05f6a38cd2c3fa5e7e6c38b573cbb8fe6615d2d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -479,11 +479,11 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1724709004, "lastModified": 1724654372,
"narHash": "sha256-nuhB4c/B+HX5ER5Qu7xTEnj40FIhLjL/EcXFYHsWFmM=", "narHash": "sha256-8kuJn915lC4NZn1q9P6x5O0oejbAQOUbkQknnaxfau8=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
"rev": "d673c4306f672267e0cc2071a13b1f4f46b02e53", "rev": "0ef0cd2c850c85d264922569d37badedcf701c9b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -678,11 +678,11 @@
}, },
"nixpkgs-unstable-small": { "nixpkgs-unstable-small": {
"locked": { "locked": {
"lastModified": 1724696583, "lastModified": 1724607561,
"narHash": "sha256-YSpKLdlUURGjeWeg7/p3nxohuDaDlRfsKlxft57uSjM=", "narHash": "sha256-7I922FoAJO9P2YRJrxQx1ufQom3wvozJNL/Ul6eEKLI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "48e00dda260902c86a948e7003fd655f22bf59f3", "rev": "8da188f8e754473cb2f5a922bef75a734bfa0fd6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -710,11 +710,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1724479785, "lastModified": 1724224976,
"narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -756,22 +756,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": {
"locked": {
"lastModified": 1724224976,
"narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"devshell": "devshell", "devshell": "devshell",
@ -889,8 +873,7 @@
"spicetify": "spicetify", "spicetify": "spicetify",
"stablepkgs": "stablepkgs", "stablepkgs": "stablepkgs",
"vesktop-bin": "vesktop-bin", "vesktop-bin": "vesktop-bin",
"wallpapers": "wallpapers", "wallpapers": "wallpapers"
"zen-browser": "zen-browser"
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -1102,24 +1085,6 @@
"type": "git", "type": "git",
"url": "https://code.youwen.dev/youwen5/wallpapers" "url": "https://code.youwen.dev/youwen5/wallpapers"
} }
},
"zen-browser": {
"inputs": {
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1724719995,
"narHash": "sha256-JBBaAYaW9g/hBH/O+sEwsH2PczaRlqiiUUOi4bopGDw=",
"owner": "youwen5",
"repo": "zen-browser-flake",
"rev": "0d391c6f3a2616e070ed5a0c808c4b07e9affe27",
"type": "github"
},
"original": {
"owner": "youwen5",
"repo": "zen-browser-flake",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -66,8 +66,6 @@
url = "git+https://code.youwen.dev/youwen5/wallpapers"; url = "git+https://code.youwen.dev/youwen5/wallpapers";
flake = false; flake = false;
}; };
zen-browser.url = "github:youwen5/zen-browser-flake";
}; };
outputs = { outputs = {

View file

@ -4,5 +4,5 @@
... ...
}: { }: {
wayland.windowManager.hyprland.settings.monitor = ["DP-1,2560x1440@165,1920x0,auto" "HDMI-A-1,1920x1080@60,0x0,1"]; wayland.windowManager.hyprland.settings.monitor = ["DP-1,2560x1440@165,1920x0,auto" "HDMI-A-1,1920x1080@60,0x0,1"];
# wayland.windowManager.hyprland.package = inputs.stablepkgs.legacyPackages.${pkgs.system}.hyprland; wayland.windowManager.hyprland.package = inputs.stablepkgs.legacyPackages.${pkgs.system}.hyprland;
} }

View file

@ -9,8 +9,8 @@
in { in {
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (self: super: {
librewolf = nixpkgs-small.librewolf;
manga-tui = bleedingpkgs.manga-tui; manga-tui = bleedingpkgs.manga-tui;
}) })
# inputs.zen-browser.overlays.default
]; ];
} }

View file

@ -38,15 +38,12 @@
"XCURSOR_SIZE,26" "XCURSOR_SIZE,26"
]; ];
bind = [ bind = [
# External reserved keys: SUPER + Z and SUPER + X for zen-browser.
# Application Keybinds # Application Keybinds
"$mod, F, exec, zen-bin || librewolf" "$mod, F, exec, librewolf"
"$mod, T, exec, kitty" "$mod, T, exec, kitty"
"$mod, E, exec, dolphin" "$mod, E, exec, dolphin"
"$mod, R, exec, pavucontrol" "$mod, R, exec, pavucontrol"
"$mod, M, exec, thunderbird" "$mod, M, exec, thunderbird"
"$mod, B, exec, waypaper"
# Window actions # Window actions
"$mod, Q, killactive" "$mod, Q, killactive"
@ -119,6 +116,8 @@
bindm = [ bindm = [
"$mod, mouse:272, movewindow" "$mod, mouse:272, movewindow"
"$mod, mouse:273, resizewindow" "$mod, mouse:273, resizewindow"
"$mod, Z, movewindow"
"$mod, X, resizewindow"
]; ];
bindel = [ bindel = [
",XF86MonBrightnessDown, exec, brightnessctl set 5%-" ",XF86MonBrightnessDown, exec, brightnessctl set 5%-"
@ -135,7 +134,6 @@
]; ];
windowrulev2 = [ windowrulev2 = [
"opacity 0.90 0.90,class:^(librewolf)$" "opacity 0.90 0.90,class:^(librewolf)$"
"opacity 0.90 0.90,class:^(zen-alpha)$"
"opacity 0.90 0.90,class:^(Brave-browser)$" "opacity 0.90 0.90,class:^(Brave-browser)$"
"opacity 0.80 0.80,class:^(Steam)$" "opacity 0.80 0.80,class:^(Steam)$"
"opacity 0.80 0.80,class:^(steam)$" "opacity 0.80 0.80,class:^(steam)$"
@ -185,8 +183,6 @@
"float,class:^(org.kde.dolphin)$,title:^(Copying Dolphin)$" "float,class:^(org.kde.dolphin)$,title:^(Copying Dolphin)$"
"float,title:^(Picture-in-Picture)$" "float,title:^(Picture-in-Picture)$"
"float,class:^(librewolf)$,title:^(Library)$" "float,class:^(librewolf)$,title:^(Library)$"
"float,class:^(zen-alpha)$,title:^(Library)$"
"float,title:^(Extension: (Bitwarden Password Manager))$"
"float,class:^(vlc)$" "float,class:^(vlc)$"
"float,class:^(kvantummanager)$" "float,class:^(kvantummanager)$"
"float,class:^(qt5ct)$" "float,class:^(qt5ct)$"

View file

@ -1,8 +1,4 @@
{ {pkgs, ...}: let
pkgs,
inputs,
...
}: let
createCommon = import ../common-packages.nix; createCommon = import ../common-packages.nix;
in { in {
home.packages = home.packages =
@ -14,6 +10,5 @@ in {
wine wine
sbctl sbctl
r2modman r2modman
inputs.zen-browser.packages.${pkgs.system}.specific
]); ]);
} }

View file

@ -132,7 +132,6 @@
max-length = 50; max-length = 50;
rewrite = { rewrite = {
"(.*) LibreWolf" = "$1"; "(.*) LibreWolf" = "$1";
"(.*) Zen Browser" = "$1";
"^$" = "👾"; "^$" = "👾";
}; };
}; };

View file

@ -131,7 +131,6 @@
max-length = 50; max-length = 50;
rewrite = { rewrite = {
"(.*) LibreWolf" = "$1"; "(.*) LibreWolf" = "$1";
"(.*) Zen Browser" = "$1";
"^$" = "👾"; "^$" = "👾";
}; };
}; };