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 389e92b266
8 changed files with 19 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

239
flake.lock generated
View file

@ -92,21 +92,6 @@
} }
}, },
"flake-compat_2": { "flake-compat_2": {
"locked": {
"lastModified": 1717312683,
"narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
"owner": "nix-community",
"repo": "flake-compat",
"rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -182,8 +167,7 @@
"flake-parts_4": { "flake-parts_4": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"nixpkgs-wayland", "schizofox",
"nix-eval-jobs",
"nixpkgs" "nixpkgs"
] ]
}, },
@ -203,28 +187,7 @@
}, },
"flake-parts_5": { "flake-parts_5": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": "nixpkgs-lib_3"
"schizofox",
"nixpkgs"
]
},
"locked": {
"lastModified": 1722555600,
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_6": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_4"
}, },
"locked": { "locked": {
"lastModified": 1698882062, "lastModified": 1698882062,
@ -309,24 +272,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_5": {
"inputs": {
"systems": "systems_6"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": { "flakey-profile": {
"locked": { "locked": {
"lastModified": 1712898590, "lastModified": 1712898590,
@ -600,25 +545,6 @@
"type": "github" "type": "github"
} }
}, },
"lib-aggregate": {
"inputs": {
"flake-utils": "flake-utils_5",
"nixpkgs-lib": "nixpkgs-lib_3"
},
"locked": {
"lastModified": 1723378259,
"narHash": "sha256-8JZVHJAoDgbAk9nn7blBB+wnQbgCq1lIxBsyT7qgeI8=",
"owner": "nix-community",
"repo": "lib-aggregate",
"rev": "8834c9b308bf4d9d448dd73be5f9782f4635d4ca",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "lib-aggregate",
"type": "github"
}
},
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -845,27 +771,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-eval-jobs": {
"inputs": {
"flake-parts": "flake-parts_4",
"nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs_6",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1723372011,
"narHash": "sha256-zqenoufFiPfobw74idorZMG8AXG3DnFzbHplt/Nkvrg=",
"owner": "nix-community",
"repo": "nix-eval-jobs",
"rev": "8802412b8747633e9d80639897e4d58fa6290909",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-eval-jobs",
"type": "github"
}
},
"nix-filter": { "nix-filter": {
"locked": { "locked": {
"lastModified": 1693833173, "lastModified": 1693833173,
@ -881,28 +786,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-github-actions": {
"inputs": {
"nixpkgs": [
"nixpkgs-wayland",
"nix-eval-jobs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1720066371,
"narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "622f829f5fe69310a866c8a6cd07e747c44ef820",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-github-actions",
"type": "github"
}
},
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1724067415, "lastModified": 1724067415,
@ -982,21 +865,6 @@
} }
}, },
"nixpkgs-lib_3": { "nixpkgs-lib_3": {
"locked": {
"lastModified": 1723337705,
"narHash": "sha256-znSU0DeNDPt7+LMAfFkvKloMaeQ6yl/U5SqV/ktl1vA=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "ace7856d327b618d3777e31b1f224b3ab57ed71a",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-lib_4": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1698611440, "lastModified": 1698611440,
@ -1030,27 +898,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-wayland": {
"inputs": {
"flake-compat": "flake-compat_2",
"lib-aggregate": "lib-aggregate",
"nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1723573444,
"narHash": "sha256-5R7cF01OqkULUZ/qpAjgs712UGM+N0xFqOk/eYd3V+4=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "d281d56bda9456bb8c0a22a608575926fb9a656d",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1723637854, "lastModified": 1723637854,
@ -1116,38 +963,6 @@
} }
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": {
"lastModified": 1723221148,
"narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1723362943,
"narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a58bc8ad779655e790115244571758e8de055e3d",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1723637854, "lastModified": 1723637854,
"narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
@ -2812,10 +2627,9 @@
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpak": "nixpak", "nixpak": "nixpak",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"nixpkgs-wayland": "nixpkgs-wayland",
"schizofox": "schizofox", "schizofox": "schizofox",
"split-monitor-workspaces": "split-monitor-workspaces", "split-monitor-workspaces": "split-monitor-workspaces",
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix"
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -2847,8 +2661,8 @@
}, },
"schizofox": { "schizofox": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_5", "flake-parts": "flake-parts_4",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixpak": [ "nixpak": [
"nixpak" "nixpak"
@ -2857,7 +2671,7 @@
"nixpkgs" "nixpkgs"
], ],
"searx-randomizer": "searx-randomizer", "searx-randomizer": "searx-randomizer",
"systems": "systems_7" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1723400986, "lastModified": 1723400986,
@ -2876,7 +2690,7 @@
"searx-randomizer": { "searx-randomizer": {
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
"flake-parts": "flake-parts_6", "flake-parts": "flake-parts_5",
"nixpkgs": [ "nixpkgs": [
"schizofox", "schizofox",
"nixpkgs" "nixpkgs"
@ -2993,21 +2807,6 @@
} }
}, },
"systems_6": { "systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_7": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@ -3024,29 +2823,7 @@
}, },
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": "nixpkgs_6"
"nixpkgs-wayland",
"nix-eval-jobs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1723303070,
"narHash": "sha256-krGNVA30yptyRonohQ+i9cnK+CfCpedg6z3qzqVJcTs=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "14c092e0326de759e16b37535161b3cb9770cea3",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1723808491, "lastModified": 1723808491,

5
flake.nix
View file

@ -20,10 +20,7 @@
# Unstable nixpkgs baby! # Unstable nixpkgs baby!
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
# nixpkgs for wayland # Sandboxing
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
# # Sandboxing
nixpak = { nixpak = {
url = "github:nixpak/nixpak"; url = "github:nixpak/nixpak";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

3
hosts/vali/hermit/programs.nix
View file

@ -3,7 +3,6 @@
pkgs, pkgs,
... ...
}: let }: let
nixpkgs-wayland = inputs'.nixpkgs-wayland.packages;
in { in {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
alejandra alejandra
@ -61,7 +60,7 @@ in {
nicotine-plus nicotine-plus
nil nil
nitch nitch
nixpkgs-wayland.swww swww
nmap nmap
notesnook notesnook
obsidian obsidian

9
hosts/vali/temperance/programs.nix
View file

@ -1,9 +1,4 @@
{ {pkgs, ...}: let
inputs',
pkgs,
...
}: let
nixpkgs-wayland = inputs'.nixpkgs-wayland.packages;
in { in {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
alsa-utils alsa-utils
@ -64,7 +59,7 @@ in {
nicotine-plus nicotine-plus
nil nil
nitch nitch
nixpkgs-wayland.swww swww
nmap nmap
nodejs_20 nodejs_20
obsidian obsidian

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

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

2
modules/services/dunst.nix
View file

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

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

@ -117,24 +117,16 @@
# Substituters to pull from. # Substituters to pull from.
substituters = [ substituters = [
"https://cache.nixos.org" # funny binary cache "https://cache.nixos.org" # funny binary cache
"https://cache.privatevoid.net" # for nix-super
"https://nix-community.cachix.org" # nix-community cache "https://nix-community.cachix.org" # nix-community cache
"https://hyprland.cachix.org" # hyprland "https://hyprland.cachix.org" # hyprland
"https://nixpkgs-unfree.cachix.org" # unfree-package cache "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://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 = [ trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"cache.privatevoid.net:SErQ8bvNWANeAvtsOESUwVYr2VJynfuc9JRwlzTTkVg="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "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; cfg = config.modules.usrEnv.desktops.hyprland;
inherit (config.modules.other.system) username; inherit (config.modules.other.system) username;
inherit (config.modules.style) cursor; inherit (config.modules.style) cursor;
inherit
(inputs'.nixpkgs-wayland.packages)
foot
swww
wlsunset
;
inherit inherit
(inputs'.split-monitor-workspaces.packages) (inputs'.split-monitor-workspaces.packages)
split-monitor-workspaces split-monitor-workspaces
@ -118,7 +113,6 @@ in {
# "30, monitor:DP-2" # "30, monitor:DP-2"
# #
# scratchpads # scratchpads
"special:pipewire, decorate:false"
"special:nixos, decorate:false" "special:nixos, decorate:false"
"special:keepassxc, decorate:false" "special:keepassxc, decorate:false"
]; ];
@ -214,7 +208,7 @@ in {
# Keybinds # Keybinds
bind = [ bind = [
"$mainMod, RETURN, exec, ${foot}/bin/foot" "$mainMod, RETURN, exec, ${pkgs.foot}/bin/foot"
"$mainMod, Q, killactive" "$mainMod, Q, killactive"
"$mainMod, F, fullscreen, 0" "$mainMod, F, fullscreen, 0"
"$mainMod, D, exec, ${pkgs.procps}/bin/pkill fuzzel || ${pkgs.fuzzel}/bin/fuzzel" "$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" "$mainMod, E, exec, ${pkgs.xfce.thunar}/bin/thunar"
# Toggle the three different special workspaces. # Toggle the three different special workspaces.
"$mainMod, V, togglespecialworkspace, pipewire"
"$mainMod, N, togglespecialworkspace, nixos" "$mainMod, N, togglespecialworkspace, nixos"
"$mainMod, X, togglespecialworkspace, keepassxc" "$mainMod, X, togglespecialworkspace, keepassxc"
@ -339,23 +332,16 @@ in {
"${pkgs.waybar}/bin/waybar" "${pkgs.waybar}/bin/waybar"
# run persistent special workspace windows # 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" "[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 = [ 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 = { plugin = {