This commit is contained in:
Varris 2023-07-12 04:15:27 +02:00
parent 02d8219114
commit 4edd289bdd
6 changed files with 16 additions and 18 deletions

View File

@ -1,4 +1,4 @@
{ pkgs, lib, ... }:
{ pkgs, lib, config, inputs, ... }:
{
imports = [
./hardware-configuration.nix
@ -142,6 +142,7 @@
unrar
unzip
usbutils
ydotool
];
};
@ -233,6 +234,8 @@
experimental-features = nix-command flakes
warn-dirty = false
'';
registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
gc = {
persistent = true;
automatic = true;

View File

@ -90,11 +90,6 @@
inherit pkgs;
specialArgs = { inherit inputs; };
modules = [
{
# needed to get tools working that expect a nixpkgs channel to exist
nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
nix.registry.nixpkgs.flake = nixpkgs;
}
./configuration.nix
home-manager.nixosModules.home-manager {
home-manager = {

View File

@ -4,6 +4,10 @@
arrpc = inputs.arrpc.packages.${prev.system}.arrpc;
eww = prev.eww.override {
withWayland = true;
};
gruvbox-plus-icon-pack = prev.callPackage ./pkgs/gruvbox-plus-icon-pack { };
ncmpcpp = prev.ncmpcpp.override {

View File

@ -4,7 +4,7 @@ let
modKey = "SUPER";
leftMonitor = "HDMI-A-1";
leftMonitor = "DP-2";
rightMonitor = "DP-1";
wob-voldaemon = pkgs.writeShellScriptBin "wob-volumeindicator.sh" ''
@ -64,8 +64,8 @@ in
wayland.windowManager.hyprland = {
enable = true;
extraConfig = ''
monitor=${leftMonitor}, 1920x1080@60, 0x0, 1
monitor=${rightMonitor}, 2560x1440@144, 1920x0, 1
monitor=${leftMonitor}, 2560x1440@144, 0x0, 1
monitor=${rightMonitor}, 2560x1440@144, 2560x0, 1
workspace = 1, monitor:${rightMonitor}
workspace = 2, monitor:${rightMonitor}
@ -85,7 +85,7 @@ in
}
general {
gaps_in = 16
gaps_in = 10
border_size = 4
col.active_border = rgba(665C54ff)
col.inactive_border = rgba(282828ff)
@ -133,8 +133,7 @@ in
exec-once = ${pkgs.openrgb}/bin/openrgb --startminimized --profile autorun.orp
exec-once = ${pkgs.blueman}/bin/blueman-applet
exec-once = ${pkgs.networkmanagerapplet}/bin/nm-applet --indicator
# exec-once = ${pkgs.mullvad-vpn}/bin/mullvad-gui
exec-once = ${xwaylandSetPrimary}/bin/xwayland-setprimary.sh
# exec-once = ${xwaylandSetPrimary}/bin/xwayland-setprimary.sh
exec-once = ${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1
exec-once = ${pkgs.swww}/bin/swww-daemon
exec-once = $pkgs.arrpc}/bin/arRPC

View File

@ -32,12 +32,9 @@ in
height = 32;
modules-left = [ "wlr/workspaces" "custom/blank" "hyprland/window" ];
# modules-center = [ "wlr/workspaces" "custom/blank" ];
modules-center = [ "wireplumber" "custom/blank" "mpd" ];
modules-right = [
"custom/ds-battery"
"wireplumber"
"custom/blank"
"mpd"
"tray"
"clock"
"custom/blank"

View File

@ -22,9 +22,9 @@
home.packages = with pkgs; [
appimage-run
bc
bottles
bottom
calcurse
eww
gimp
gnome.file-roller
gnome.gnome-boxes
@ -57,7 +57,7 @@
vimv
vulkan-tools
vulkan-validation-layers
webcord-vencord
webcord
wineWowPackages.stagingFull
xdg-utils
];