faukah/nichts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

whole flake: remove nixpkgs-wayland

Browse source
This commit is contained in:
Charlie Root 2024-08-21 23:11:59 +02:00
commit 1653584466
8 changed files with 19 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/programs/gui/foot.nix
View file

@ -15,7 +15,7 @@ in {
home.sessionVariables.TERM = "foot";
programs.foot = {
enable = true;
package = inputs'.nixpkgs-wayland.packages.foot;
package = pkgs.foot;
settings = {
main = {
term = "foot";

2
modules/services/dunst.nix
View file

@ -16,7 +16,7 @@ in {
home-manager.users.${username} = {
services.dunst = {
enable = true;
package = inputs'.nixpkgs-wayland.packages.dunst;
package = pkgs.dunst;
settings = {
global = {
monitor = 1;

8
modules/system/nix/module.nix
View file

@ -117,24 +117,16 @@
# Substituters to pull from.
substituters = [
"https://cache.nixos.org" # funny binary cache
"https://cache.privatevoid.net" # for nix-super
"https://nix-community.cachix.org" # nix-community cache
"https://hyprland.cachix.org" # hyprland
"https://nixpkgs-unfree.cachix.org" # unfree-package cache
"https://anyrun.cachix.org" # anyrun program launcher
"https://neovim-flake.cachix.org" # a cache for nvf
"https://cache.garnix.io" # garnix binary cache, hosts prismlauncher
"https://nixpkgs-wayland.cachix.org" # nixpkgs-wayland
];
trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"cache.privatevoid.net:SErQ8bvNWANeAvtsOESUwVYr2VJynfuc9JRwlzTTkVg="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs="
"anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
];
};
};

24
modules/wms/wayland/hypr/land.nix
View file

@ -8,12 +8,7 @@
cfg = config.modules.usrEnv.desktops.hyprland;
inherit (config.modules.other.system) username;
inherit (config.modules.style) cursor;
inherit
(inputs'.nixpkgs-wayland.packages)
foot
swww
wlsunset
;
inherit
(inputs'.split-monitor-workspaces.packages)
split-monitor-workspaces
@ -118,7 +113,6 @@ in {
# "30, monitor:DP-2"
#
# scratchpads
"special:pipewire, decorate:false"
"special:nixos, decorate:false"
"special:keepassxc, decorate:false"
];
@ -214,7 +208,7 @@ in {
# Keybinds
bind = [
"$mainMod, RETURN, exec, ${foot}/bin/foot"
"$mainMod, RETURN, exec, ${pkgs.foot}/bin/foot"
"$mainMod, Q, killactive"
"$mainMod, F, fullscreen, 0"
"$mainMod, D, exec, ${pkgs.procps}/bin/pkill fuzzel || ${pkgs.fuzzel}/bin/fuzzel"
@ -278,7 +272,6 @@ in {
"$mainMod, E, exec, ${pkgs.xfce.thunar}/bin/thunar"
# Toggle the three different special workspaces.
"$mainMod, V, togglespecialworkspace, pipewire"
"$mainMod, N, togglespecialworkspace, nixos"
"$mainMod, X, togglespecialworkspace, keepassxc"
@ -339,23 +332,16 @@ in {
"${pkgs.waybar}/bin/waybar"
# run persistent special workspace windows
"[workspace special:nixos; silent;tile] ${foot}/bin/foot -D ~/projects/nichts"
"[workspace special:nixos; silent;tile] ${pkgs.foot}/bin/foot -D ~/projects/nichts"
"[workspace special:keepassxc; silent;tile] ${pkgs.keepassxc}/bin/keepassxc"
"${swww}/bin/swww-daemon"
"${pkgs.swww}/bin/swww-daemon"
"${wlsunset}/bin/wlsunset -S 06:00 -s 20:00"
"${pkgs.wlsunset}/bin/wlsunset -S 06:00 -s 20:00"
];
exec = [
# kill (almost) everything on special workspaces
"${pkgs.procps}/bin/pkill pavucontrol"
"${pkgs.procps}/bin/pkill helvum"
# and run it all again
"[workspace special:pipewire; silent;tile] ${pkgs.helvum}/bin/helvum"
"[workspace special:pipewire; silent;tile] ${pkgs.pavucontrol}/bin/pavucontrol"
];
plugin = {