diff --git a/flake.nix b/flake.nix index f9f4a17..770fbe5 100755 --- a/flake.nix +++ b/flake.nix @@ -98,7 +98,7 @@ { overlays.default = final: prev: rec { nerdfonts = prev.nerdfonts.override { - fonts = [ "JetBrainsMono" "IBMPlexMono" ]; + fonts = [ "JetBrainsMono" ]; }; waybar = prev.waybar.overrideAttrs (old: { @@ -112,19 +112,23 @@ mesonFlags = old.mesonFlags ++ [ "-Dexperimental=true" ]; }); - xwayland = prev.xwayland.overrideAttrs (old: { - version = "git"; - - src = inputs.xorg-git; - buildInputs = old.buildInputs ++ [ - prev.udev - prev.xorg.libpciaccess - ]; - }); + # xwayland = prev.xwayland.overrideAttrs (old: { + # version = "git"; + # src = inputs.xorg-git; + # buildInputs = old.buildInputs ++ [ + # prev.udev + # prev.xorg.libpciaccess + # ]; + # }); steam = prev.steam.override { extraPkgs = pkgs: [ pkgs.gnome.zenity + pkgs.xdg-user-dirs + pkgs.gamescope + ]; + extraLibraries = pkgs: [ + pkgs.openal ]; }; diff --git a/system/configuration.nix b/system/configuration.nix index 3fb7d51..8894b27 100755 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -150,25 +150,35 @@ # $ nix search wget environment = { systemPackages = [ + pkgs.bc + pkgs.distrobox pkgs.git - pkgs.links2 - pkgs.ripgrep - pkgs.file - pkgs.fd - pkgs.htop - pkgs.openrgb - pkgs.unzip - pkgs.unrar - pkgs.p7zip + pkgs.links2 + pkgs.ripgrep + pkgs.file + pkgs.fd + pkgs.htop + pkgs.openrgb + pkgs.unzip + pkgs.unrar + pkgs.p7zip ]; binsh = "${pkgs.dash}/bin/dash"; }; + chaotic.gamescope = { + enable = true; + #capSysNice = true; + session.enable = true; + package = pkgs.gamescope-git; + }; + chaotic.linux_hdr.specialisation.enable = true; + # List services that you want to enable: programs = { dconf.enable = true; + hyprland.enable = true; fish.enable = true; - # hyprland.enable = true; kdeconnect.enable = true; ssh.startAgent = true; }; @@ -184,7 +194,7 @@ udisks2.enable = true; printing = { - enable = true; + enable = false; drivers = [ pkgs.cnijfilter2 ]; }; @@ -227,6 +237,8 @@ }; }; + virtualisation.podman.enable = true; + xdg.portal = { enable = true; xdgOpenUsePortal = true; diff --git a/user/configs/fish/default.nix b/user/configs/fish/default.nix index 025d54e..5c28ec8 100755 --- a/user/configs/fish/default.nix +++ b/user/configs/fish/default.nix @@ -62,7 +62,7 @@ nou = '' pushd . &> /dev/null cd "${config.home.homeDirectory}/.dotfiles" - nix flake lock --commit-lock-file --update-input nixpkgs --update-input home-manager + nix flake lock --commit-lock-file --update-input nixpkgs --update-input home-manager --update-input hyprland --update-input chaotic-nyx doas nixos-rebuild switch --upgrade --flake .# popd &> /dev/null ''; diff --git a/user/configs/mpd/default.nix b/user/configs/mpd/default.nix index 565e16a..a74c129 100755 --- a/user/configs/mpd/default.nix +++ b/user/configs/mpd/default.nix @@ -5,11 +5,11 @@ extraConfig = '' auto_update "yes" restore_paused "yes" + replaygain "track" audio_output { type "pipewire" name "MPD PipeWire" - replay_gain_handler "none" } audio_output { diff --git a/user/home.nix b/user/home.nix index ac2d709..0d6eda3 100755 --- a/user/home.nix +++ b/user/home.nix @@ -8,7 +8,7 @@ in ./configs/beets ./configs/cava ./configs/wayland/hyprland.nix - #./configs/wayland/sway.nix +#./configs/wayland/sway.nix ./configs/fish ./configs/mpd ./configs/mpv @@ -64,10 +64,10 @@ in home.sessionVariables = { EDITOR = "nvim"; - WINEDLLOVERRIDES = "winemenubuilder.exe=d"; - RADV_PERFTEST = "gpl"; + MESA_DISK_CACHE_SINGLE_FILE = "1"; NIXOS_OZONE_WL = "1"; - + RADV_PERFTEST = "gpl"; + WINEDLLOVERRIDES = "winemenubuilder.exe=d"; XDG_SCREENSHOTS_DIR = "~/Screenshots"; };