This commit is contained in:
Varris 2024-03-11 18:22:04 +01:00
parent 72e40f977b
commit 19f322e430
9 changed files with 42 additions and 36 deletions

View File

@ -47,18 +47,14 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nix-flatpak = {
url = "github:gmodena/nix-flatpak";
};
nix-flatpak.url = "github:gmodena/nix-flatpak";
nix-ld-rs = {
url = "github:nix-community/nix-ld-rs";
inputs.nixpkgs.follows = "nixpkgs";
};
nur = {
url = "github:nix-community/NUR";
};
nur.url = "github:nix-community/NUR";
#--- non-flakes

View File

@ -4,6 +4,8 @@
eww-hyprland-activewindow = prev.callPackage ./pkgs/eww-hyprland-activewindow {};
eww-hyprland-workspaces = prev.callPackage ./pkgs/eww-hyprland-workspaces {};
# eww = final.callPackage ./pkgs/eww-systray {inherit inputs;};
ncmpcpp = prev.ncmpcpp.override {
visualizerSupport = true;
};
@ -16,19 +18,19 @@
patches = [./pkgs/gruvbox-gtk-theme/silence-warnings.patch];
};
mygui-openmw = prev.mygui.overrideAttrs (old: {
mygui-openmw = prev.mygui.overrideAttrs (oldAttrs: {
version = "3.4.3";
src = inputs.mygui-git;
patches = [];
cmakeFlags = old.cmakeFlags ++ ["-DMYGUI_DONT_USE_OBSOLETE=ON"]; #fix openmw link error
cmakeFlags = oldAttrs.cmakeFlags ++ ["-DMYGUI_DONT_USE_OBSOLETE=ON"]; #fix openmw link error
});
openmw = prev.openmw.overrideAttrs (old: {
openmw = prev.openmw.overrideAttrs (oldAttrs: {
version = "9999";
src = inputs.openmw-git;
buildInputs = (prev.lib.lists.remove prev.mygui old.buildInputs) ++ [prev.libyamlcpp prev.luajit prev.collada-dom prev.libsForQt5.qt5.qttools final.mygui-openmw];
buildInputs = (prev.lib.lists.remove prev.mygui oldAttrs.buildInputs) ++ [prev.libyamlcpp prev.luajit prev.collada-dom prev.libsForQt5.qt5.qttools final.mygui-openmw];
cmakeFlags =
old.cmakeFlags
oldAttrs.cmakeFlags
++ [
"-DBUILD_BSATOOL=OFF"
"-DBUILD_BULLETOBJECTTOOL=OFF"

View File

@ -45,12 +45,12 @@
};
grub = {
enable = true;
efiSupport = true;
device = "nodev";
};
enable = true;
efiSupport = true;
device = "nodev";
};
timeout = 0;
timeout = 10;
};
};
@ -64,7 +64,7 @@
192.168.0.18 steam.deck
127.0.0.1 modules-cdn.eac-prod.on.epicgames.com
'';
nameservers = ["94.16.114.254" "94.247.43.254"]; #OpenNIC
# nameservers = ["94.16.114.254" "94.247.43.254"]; #OpenNIC
};
# Set your time zone.
@ -102,8 +102,10 @@
extraRules = [
{
users = ["${userName}"];
keepEnv = true;
# keepEnv = true;
persist = true;
#silence a warning about missing locales
setEnv = ["LOCALE_ARCHIVE"];
}
];
};
@ -145,6 +147,7 @@
openrgb
p7zip
pciutils
pv
sassc
socat
ripgrep
@ -210,5 +213,5 @@
};
};
system.stateVersion = "23.05";
system.stateVersion = "23.11";
}

View File

@ -4,7 +4,6 @@
extraPackages = [pkgs.libvdpau-va-gl];
driSupport32Bit = true;
};
# chaotic.mesa-git.enable = true;
hardware.steam-hardware.enable = true;

View File

@ -41,7 +41,7 @@
:halign "end"
:space-evenly false
; (widget_systray :monitor monitor)
(widget_systray :monitor monitor)
(widget_time :monitor monitor)
)
)
@ -78,15 +78,15 @@
)
)
; (defwidget widget_systray [monitor]
; (box
; :class "widget-systray"
; (systray
; :pack-direction "rtl"
; :icon-size 26
; )
; )
; )
(defwidget widget_systray [monitor]
(box
:class "widget-systray"
(systray
:pack-direction "rtl"
:icon-size 26
)
)
)
(defwidget widget_time [monitor]
(box

View File

@ -5,7 +5,7 @@
}: {
programs.eww = {
enable = true;
# package = inputs.eww-systray.packages.${pkgs.system}.eww-wayland;
package = inputs.eww-systray.packages.${pkgs.system}.eww-wayland;
configDir = ./config;
};

View File

@ -98,6 +98,7 @@
};
exec-once = [
"${pkgs.systemd}/bin/systemctl --user import-environment PATH"
"${pkgs.networkmanagerapplet}/bin/nm-applet"
"${pkgs.openrgb}/bin/openrgb --startminimized --profile autorun.orp"
"${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"

View File

@ -45,13 +45,11 @@
gnome.gvfs
gnome.seahorse
gnome.simple-scan
# imv
jq
libsForQt5.ark
libsForQt5.dolphin
libsForQt5.dolphin-plugins
libnotify
lutris
mangohud
mesa-demos
nerdfonts
@ -214,5 +212,14 @@
programs.home-manager.enable = true;
home.stateVersion = "23.05";
nixpkgs.config = {
permittedInsecurePackages = [
"nix-2.16.2" # TODO: Delete after finding out what keeps pulling this in
];
allowUnfree = true;
allowUnfreePredicate = true;
};
home.stateVersion = "23.11";
}

View File

@ -6,8 +6,6 @@
}: let
cfg = config.services.mpd-notification;
in {
meta.maintainers = ["Varris"];
options.services.mpd-notification = {
package = lib.mkPackageOption pkgs "mpd-notification" {};
enable = lib.mkEnableOption "the mpd-notification service";