diff --git a/flake.lock b/flake.lock index 205a4e41..5dc1dfab 100644 --- a/flake.lock +++ b/flake.lock @@ -277,11 +277,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1761920229, - "narHash": "sha256-KeTcNpj5UloRTq8fO43NKEFf9a7dpETQq9ynCSgUoxM=", + "lastModified": 1762101621, + "narHash": "sha256-LEzstw3bcMYdOo12SwjTmUV0jfEKGbxleHllW1yHMx4=", "owner": "helix-editor", "repo": "helix", - "rev": "5a92474bf0453715e3139eccaaccf3264bfb2001", + "rev": "7895719e5c3299a408bac461437c5040849f430b", "type": "github" }, "original": { @@ -297,11 +297,11 @@ ] }, "locked": { - "lastModified": 1761878381, - "narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=", + "lastModified": 1762178366, + "narHash": "sha256-I+8yE5HVR2SFcHnW0771psQ/zn0qVzsKHY/gUM0nEVM=", "owner": "nix-community", "repo": "home-manager", - "rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa", + "rev": "8c824254b1ed9e797f6235fc3c62f365893c561a", "type": "github" }, "original": { @@ -458,11 +458,11 @@ "nheko": { "flake": false, "locked": { - "lastModified": 1757886200, - "narHash": "sha256-FU73Pb47e6Q0qEAJcxDVhVLmL+hJ4gXvssRD9NcUNkM=", + "lastModified": 1762138523, + "narHash": "sha256-93M4T6peRRMq0uL0X955+N0KnU1t/0AAyVQ/TV2zpQs=", "owner": "Nheko-Reborn", "repo": "nheko", - "rev": "2769642d3c7bd3c0d830b2f18ef6b3bf6a710bf4", + "rev": "1bd2970c4dd69daa87d906f63d869d56cf5d4915", "type": "github" }, "original": { @@ -479,11 +479,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1761888958, - "narHash": "sha256-YgArUHI81Esn6fOCwVSrMI2G4RI3f3BPbRbPWsJubAc=", + "lastModified": 1762146685, + "narHash": "sha256-anRlNG6t7esBbF1+ALDeathVBSclA0PEL52Vo0WnN5g=", "owner": "YaLTeR", "repo": "niri", - "rev": "e2576879216a39e5c45b9d2906531bc2065e724c", + "rev": "a2ca2b3c866bc781b12c334a9f949b3db6d7c943", "type": "github" }, "original": { @@ -520,11 +520,11 @@ ] }, "locked": { - "lastModified": 1761451000, - "narHash": "sha256-qBJL6xEIjqYq9zOcG2vf2nPTeVBppNJzvO0LuQWMwMo=", + "lastModified": 1762055842, + "narHash": "sha256-Pu1v3mlFhRzZiSxVHb2/i/f5yeYyRNqr0RvEUJ4UgHo=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ed6b293161b378a7368cda38659eb8d3d9a0dac4", + "rev": "359ff6333a7b0b60819d4c20ed05a3a1f726771f", "type": "github" }, "original": { @@ -582,11 +582,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1762001846, - "narHash": "sha256-3lzK9u1Q/suUswwNSSfQbpY2dcmlVZw0AB4GWFDrxoc=", + "lastModified": 1762178406, + "narHash": "sha256-slFOJNvXh2Zx9hK2MIt1Ftv58l8CLNB3aRc7/dheECk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1cda940125aa2b345c46a5be46bc0c598f87745f", + "rev": "85707117647f95fa34842965fcd534a7e882918b", "type": "github" }, "original": { @@ -784,11 +784,11 @@ ] }, "locked": { - "lastModified": 1761964689, - "narHash": "sha256-Zo3LQQDz+64EQ9zor/WmeNTFLoZkjmhp0UY3G0D3seE=", + "lastModified": 1762137611, + "narHash": "sha256-sTqb10FR/YQCuGbw16qxliX0NFlYg6evSEjN8w+9IYE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "63d22578600f70d293aede6bc737efef60ebd97f", + "rev": "3a0ebe5d2965692f990cb27e62f501ad35e3deeb", "type": "github" }, "original": { @@ -908,11 +908,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1757278723, - "narHash": "sha256-hTMi6oGU+6VRnW9SZZ+muFcbfMEf2ajjOp7Z2KM5MMY=", + "lastModified": 1762161791, + "narHash": "sha256-J1L1yP29NVBJO04LA/JGM6kwhnjeNhEsX0tLFnuN3FI=", "owner": "terranix", "repo": "terranix", - "rev": "924573fa6587ac57b0d15037fbd2d3f0fcdf17fb", + "rev": "a79a47b4617dfb92184e2e5b8f5aa6fc06c659c8", "type": "github" }, "original": { @@ -976,11 +976,11 @@ ] }, "locked": { - "lastModified": 1761970869, - "narHash": "sha256-dlcxJTY+MwR9u3yTkBkzqfHY2+MKonDS7UzoOLlGpuw=", + "lastModified": 1762131860, + "narHash": "sha256-sIPhzkDrfe6ptthZiwoxQyO6rKd9PgJnl+LOyythQkI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5855db6427f25672d7f02e19af418a38fe82e26e", + "rev": "10e69cb268b1d3dc91135e72f5462b2acfbcc3aa", "type": "github" }, "original": { diff --git a/hm-modules/dark-theme.nix b/hm-modules/dark-theme.nix index de020bd2..880bdf86 100644 --- a/hm-modules/dark-theme.nix +++ b/hm-modules/dark-theme.nix @@ -23,10 +23,10 @@ in gtk4.extraConfig.gtk-application-prefer-dark-theme = 1; gtk3.extraConfig.gtk-application-prefer-dark-theme = 1; }; - qt = { - enable = true; - style.name = "breeze"; - }; + # qt = { + # enable = true; + # style.name = "breeze"; + # }; }; } diff --git a/hm-modules/mpv.nix b/hm-modules/mpv.nix index 852657d7..7f37504b 100644 --- a/hm-modules/mpv.nix +++ b/hm-modules/mpv.nix @@ -14,6 +14,11 @@ in programs.mpv = { enable = true; scripts = with pkgs.mpvScripts; [ mpv-webm sponsorblock ]; + config = { + profile = "gpu-hq"; + ytdl-format = "bestvideo[width<=1920]+bestaudio"; + cache-secs = 1200; + }; }; }; diff --git a/instances/theseus/configuration.nix b/instances/theseus/configuration.nix index 56a9d837..2401fbab 100644 --- a/instances/theseus/configuration.nix +++ b/instances/theseus/configuration.nix @@ -64,14 +64,15 @@ in time.timeZone = "Europe/Berlin"; - # orcaslicer networking.firewall.allowedTCPPorts = [ 1880 2021 + 4711 ]; networking.firewall.allowedUDPPorts = [ 1880 + 5353 2021 ]; diff --git a/instances/theseus/hardware-configuration.nix b/instances/theseus/hardware-configuration.nix index 8f595bdc..acfbaa6b 100644 --- a/instances/theseus/hardware-configuration.nix +++ b/instances/theseus/hardware-configuration.nix @@ -16,7 +16,7 @@ "${inputs.nixos-hardware}/framework/13-inch/7040-amd" ]; hardware.framework.laptop13.audioEnhancement.enable = true; - # hardware.framework.laptop13.audioEnhancement.hideRawDevice = false; + hardware.framework.laptop13.audioEnhancement.hideRawDevice = false; services.fwupd.enable = true; boot.initrd.availableKernelModules = [ diff --git a/modules/desktop/audio.nix b/modules/desktop/audio.nix index 76cc1351..0d4d61ba 100644 --- a/modules/desktop/audio.nix +++ b/modules/desktop/audio.nix @@ -229,9 +229,39 @@ in ]; }; }; + configPackages = [ + (pkgs.writeTextDir "share/pipewire/pipewire.conf.d/snapcast-discover.conf" '' + context.modules = [ + { + name = libpipewire-module-snapcast-discover + args = { + snapcast.discover-local = true + stream.rules = [ + { + matches = [ + { + snapcast.ip = "~.*" + } + ] + actions = { + create-stream = { + # node.name = "Snapcast" + # snapcast.stream-name = "default" + } + } + } + ] + } + } +] + + '') + + ]; wireplumber.extraConfig."98-bluetooth"."wireplumber.settings"."bluetooth.autoswitch-to-headset-profile" = false; - wireplumber.configPackages = mapAttrsToList (n: v: eqPkg v) cfg.eq; + wireplumber.configPackages = mapAttrsToList (n: v: eqPkg v) cfg.eq ++ [ + ]; }; }; diff --git a/modules/desktop/niri.nix b/modules/desktop/niri.nix index 64bdf838..4f3fbce5 100644 --- a/modules/desktop/niri.nix +++ b/modules/desktop/niri.nix @@ -118,6 +118,7 @@ in Mod+T { spawn "${cfg.term}" "tmux" "new-session" "-t" "main"; } Mod+Shift+T { spawn "${cfg.term}"; } Mod+Y { spawn "${cfg.term}" "--app-id" "floating-alacritty" "-W" "120x37" "yazi"; } + Mod+Shift+M { spawn "sh" "-c" "notify-send -t 3000 -a umpv umpv-paste $(wl-paste); umpv $(wl-paste)"; } Mod+P { spawn "keepassxc"; } Mod+S { spawn "qalculate-qt"; } Mod+Shift+N { spawn "makoctl" "dismiss" "-a"; } diff --git a/modules/presets/gui.nix b/modules/presets/gui.nix index 6aa8b62e..d57d238f 100644 --- a/modules/presets/gui.nix +++ b/modules/presets/gui.nix @@ -41,9 +41,35 @@ in qt = { enable = true; - style = "breeze"; + platformTheme = "qt5ct"; }; - environment.variables.QT_STYLE_OVERRIDE = lib.mkForce "breeze-dark"; + home-manager.sharedModules = + let + gruvboxDarkColors = pkgs.writeText "gruvbox-dark.conf" '' + [ColorScheme] + active_colors=#ffebdbb2, #ff1d2021, #ffbdae93, #ffa89984, #ff3c3836, #ff504945, #ffebdbb2, #ffebdbb2, #ffebdbb2, #ff282828, #ff1d2021, #ff504945, #ff458588, #ff282828, #ff458588, #ffcc241d, #ff282828, #ffebdbb2, #ff1d2021, #ffebdbb2, #ffbdae93 + disabled_colors=#ffbdae93, #ff1d2021, #ffbdae93, #ffa89984, #ff3c3836, #ff504945, #ffbdae93, #ffbdae93, #ffbdae93, #ff282828, #ff1d2021, #ff504945, #ff438184, #ff3c3836, #ff458588, #ffcc241d, #ff282828, #ffebdbb2, #ff1d2021, #ffebdbb2, #ffbdae93 + inactive_colors=#ffebdbb2, #ff1d2021, #ffbdae93, #ffa89984, #ff3c3836, #ff504945, #ffebdbb2, #ffebdbb2, #ffebdbb2, #ff282828, #ff1d2021, #ff504945, #ff438184, #ffa89984, #ff458588, #ffcc241d, #ff282828, #ffebdbb2, #ff1d2021, #ffebdbb2, #ffbdae93 + ''; + qt5ctConf = pkgs.writeText "qt5ct.conf" '' + [Appearance] + color_scheme_path=${gruvboxDarkColors} + custom_palette=true + icon_theme=breeze-dark + standard_dialogs=xdgdesktopportal + style=Breeze + + [Fonts] + fixed="Source Sans 3,12,-1,5,50,0,0,0,0,0" + general="Source Sans 3,12,-1,5,50,0,0,0,0,0" + ''; + in + [ + { + home.file.".config/qt5ct/qt5ct.conf".source = qt5ctConf; + home.file.".config/qt6ct/qt6ct.conf".source = qt5ctConf; + } + ]; programs.yazi = { settings.keymap.mgr.prepend_keymap = [ @@ -71,7 +97,7 @@ in # enable the gnome shit services.gnome.gnome-keyring.enable = true; services.gnome.gnome-online-accounts.enable = true; - environment.systemPackages = with pkgs;[ + environment.systemPackages = with pkgs; [ gnome-calendar gnome-clocks gnome-font-viewer @@ -92,7 +118,10 @@ in programs.thunar = { enable = true; - plugins = with pkgs.xfce; [ thunar-archive-plugin thunar-volman ]; + plugins = with pkgs.xfce; [ + thunar-archive-plugin + thunar-volman + ]; }; services.tumbler.enable = true; # thunar image preview services.gvfs.enable = true; # thunar network device mount @@ -109,29 +138,28 @@ in { pkgs, ... }: { xyno.mpv.enable = true; - # xdg.mimeApps = { - # enable = true; - # defaultApplications = { - # "x-scheme-handler/mailto" = [ "aerc.desktop" ]; - # "inode/directory" = [ "org.gnome.Nautilus.desktop" ]; - # "application/x-gnome-saved-search" = [ "org.gnome.Nautilus.desktop" ]; - # "x-scheme-handler/http" = "userapp-Zen-D2P132.desktop"; - # "x-scheme-handler/https" = "userapp-Zen-D2P132.desktop"; - # "x-scheme-handler/chrome" = "userapp-Zen-D2P132.desktop"; - # "text/html" = "userapp-Zen-D2P132.desktop"; - # "application/x-extension-htm" = "userapp-Zen-D2P132.desktop"; - # "application/x-extension-html" = "userapp-Zen-D2P132.desktop"; - # "application/x-extension-shtml" = "userapp-Zen-D2P132.desktop"; - # "application/xhtml+xml" = "userapp-Zen-D2P132.desktop"; - # "application/x-extension-xhtml" = "userapp-Zen-D2P132.desktop"; - # "application/x-extension-xht" = "userapp-Zen-D2P132.desktop"; - # "application/pdf" = "org.gnome.Evince.desktop"; + # xdg.mimeApps = { + # enable = true; + # defaultApplications = { + # "x-scheme-handler/mailto" = [ "aerc.desktop" ]; + # "inode/directory" = [ "org.gnome.Nautilus.desktop" ]; + # "application/x-gnome-saved-search" = [ "org.gnome.Nautilus.desktop" ]; + # "x-scheme-handler/http" = "userapp-Zen-D2P132.desktop"; + # "x-scheme-handler/https" = "userapp-Zen-D2P132.desktop"; + # "x-scheme-handler/chrome" = "userapp-Zen-D2P132.desktop"; + # "text/html" = "userapp-Zen-D2P132.desktop"; + # "application/x-extension-htm" = "userapp-Zen-D2P132.desktop"; + # "application/x-extension-html" = "userapp-Zen-D2P132.desktop"; + # "application/x-extension-shtml" = "userapp-Zen-D2P132.desktop"; + # "application/xhtml+xml" = "userapp-Zen-D2P132.desktop"; + # "application/x-extension-xhtml" = "userapp-Zen-D2P132.desktop"; + # "application/x-extension-xht" = "userapp-Zen-D2P132.desktop"; + # "application/pdf" = "org.gnome.Evince.desktop"; - # }; - # }; + # }; + # }; }; - # fonts fonts.fontconfig.defaultFonts = { sansSerif = [