diff --git a/flake.lock b/flake.lock index 549fbf7..fc0c1a4 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1759499898, - "narHash": "sha256-UNzYHLWfkSzLHDep5Ckb5tXc0fdxwPIrT+MY4kpQttM=", + "lastModified": 1760101617, + "narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "655e067f96fd44b3f5685e17f566b0e4d535d798", + "rev": "1826a9923881320306231b1c2090379ebf9fa4f8", "type": "github" }, "original": { @@ -33,6 +33,73 @@ "type": "github" } }, + "dankMaterialShell": { + "inputs": { + "dgop": [ + "dgop" + ], + "dms-cli": [ + "dms-cli" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1761484058, + "narHash": "sha256-1sSwP+wRGRRgBoi+FwOMVVP49RNux8KUgi/usb8n/z4=", + "owner": "AvengeMedia", + "repo": "DankMaterialShell", + "rev": "c6efccd61c5e8e3e790f9545f55d354566a3929f", + "type": "github" + }, + "original": { + "owner": "AvengeMedia", + "repo": "DankMaterialShell", + "type": "github" + } + }, + "dgop": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1760238269, + "narHash": "sha256-7CeGZM/Z/5Qt3AYByCRohGYGR1MRuXYzTTbkV/JxyAs=", + "owner": "AvengeMedia", + "repo": "dgop", + "rev": "95acdfce2d323e28fa8f5a4f345160962034f2b5", + "type": "github" + }, + "original": { + "owner": "AvengeMedia", + "repo": "dgop", + "type": "github" + } + }, + "dms-cli": { + "inputs": { + "gomod2nix": "gomod2nix", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1761431120, + "narHash": "sha256-TT1KN727ZWlmd4atpXTeWDx0Wk+YqlS1PbZWUf4CibY=", + "owner": "AvengeMedia", + "repo": "danklinux", + "rev": "a14e9a868bfbc861ab45a38e512715e8e12a2ef6", + "type": "github" + }, + "original": { + "owner": "AvengeMedia", + "repo": "danklinux", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -70,11 +137,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -101,20 +168,38 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "ghostty": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs", "zig": "zig", "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1760128918, - "narHash": "sha256-2BAJkbGXebSCxbe4KHdtpH4optMmptw7Ibw1Bs23TPc=", + "lastModified": 1761452766, + "narHash": "sha256-Ez5UlTWtGNTkhii1ZIMPWxW6SlsUp7YSm+gTI1v9F8o=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "c5ad7563f92656ec02bd08856b46431f2e222e69", + "rev": "a82ad89ef3a0cb773eb649435b0d2ba59b5957aa", "type": "github" }, "original": { @@ -145,10 +230,33 @@ "type": "github" } }, + "gomod2nix": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "dms-cli", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1756047880, + "narHash": "sha256-JeuGh9kA1SPL70fnvpLxkIkCWpTjtoPaus3jzvdna0k=", + "owner": "nix-community", + "repo": "gomod2nix", + "rev": "47d628dc3b506bd28632e47280c6b89d3496909d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "v1.7.0", + "repo": "gomod2nix", + "type": "github" + } + }, "grim-hyprland": { "inputs": { "nixpkgs": "nixpkgs_3", - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1741705247, @@ -248,11 +356,11 @@ ] }, "locked": { - "lastModified": 1759490292, - "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=", + "lastModified": 1760445448, + "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "9431db625cd9bb66ac55525479dce694101d6d7a", + "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757", "type": "github" }, "original": { @@ -273,15 +381,15 @@ "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_5", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_3", + "systems": "systems_4", "xdph": "xdph" }, "locked": { - "lastModified": 1760143218, - "narHash": "sha256-OhJPROcRcwBkjOKkXr/f3/7wuSjhAIqr8WfmEUF9Uuo=", + "lastModified": 1761482075, + "narHash": "sha256-bg63CfWgmKMCcabeIsz/5/E2Q1uhKzpbbL4u/ENRRZQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "d599513d4a72d66ac62ffdedc41d6653fa81b39e", + "rev": "748d2f656ee4952090eb4ce8702ee05c82d228cb", "type": "github" }, "original": { @@ -318,11 +426,11 @@ ] }, "locked": { - "lastModified": 1749046714, - "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=", + "lastModified": 1759610243, + "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330", + "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622", "type": "github" }, "original": { @@ -428,28 +536,6 @@ "type": "github" } }, - "hyprspace": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "systems": "systems_4" - }, - "locked": { - "lastModified": 1758823594, - "narHash": "sha256-QhcOFLJYC9CiSVPkci62ghMEAJChzl+L98To1pKvnRQ=", - "owner": "KZDKM", - "repo": "Hyprspace", - "rev": "7a3adf698e5e6b091300c14bd726f55442844d66", - "type": "github" - }, - "original": { - "owner": "KZDKM", - "ref": "7a3adf6", - "repo": "Hyprspace", - "type": "github" - } - }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -508,11 +594,11 @@ ] }, "locked": { - "lastModified": 1760146997, - "narHash": "sha256-x2sF8Q4tWz3DI166s+KFDXySrK+cN+/YEd3DfhnhBLQ=", + "lastModified": 1761443969, + "narHash": "sha256-iK8EZX+0I8nRhNRCEkmYmh2pifNTXhpcRsiUkObUK8c=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "ad505387568d024654da88fef03d9c5319cba92f", + "rev": "5e6ced46102b654619d0b60356b1268511053cba", "type": "github" }, "original": { @@ -524,10 +610,10 @@ "nixpkgs": { "locked": { "lastModified": 315532800, - "narHash": "sha256-YwoXN6fthkakCFD7nXPcUK+rkNr6ZTNTuF8zdGaxZo0=", - "rev": "dc704e6102e76aad573f63b74c742cd96f8f1e6c", + "narHash": "sha256-sV6pJNzFkiPc6j9Bi9JuHBnWdVhtKB/mHgVmMPvDFlk=", + "rev": "82c2e0d6dde50b17ae366d2aa36f224dc19af469", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre870318.dc704e6102e7/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre877938.82c2e0d6dde5/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -596,11 +682,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1761114652, + "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", "type": "github" }, "original": { @@ -612,11 +698,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1759994382, - "narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=", + "lastModified": 1761173472, + "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7", + "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", "type": "github" }, "original": { @@ -642,6 +728,26 @@ "type": "github" } }, + "pinix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1755156568, + "narHash": "sha256-fuLOLww23Y+aDu2a4zKYfnP+ufN4azTvWtr6P1rTOj8=", + "owner": "remi-dupre", + "repo": "pinix", + "rev": "94b12321b32e8b4788d6e3ae91f514ef0285e6bc", + "type": "github" + }, + "original": { + "owner": "remi-dupre", + "repo": "pinix", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -652,11 +758,11 @@ ] }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1760663237, + "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", "type": "github" }, "original": { @@ -672,11 +778,11 @@ ] }, "locked": { - "lastModified": 1759997568, - "narHash": "sha256-xQyzPkgpgjAceJKwZhLU2//Y1jAmvPGOq80svqkWFhQ=", + "lastModified": 1760822546, + "narHash": "sha256-cy3wJQQzQbZ/EYUfTDuMiP/haPOjkqGgWOPPl7K9oiM=", "ref": "refs/heads/master", - "rev": "3e32ae595f97bd2d2e5ed4512fb4bb25edb4eae6", - "revCount": 691, + "rev": "3e2ce40b18af943f9ba370ed73565e9f487663ef", + "revCount": 697, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -687,16 +793,19 @@ }, "root": { "inputs": { + "dankMaterialShell": "dankMaterialShell", + "dgop": "dgop", + "dms-cli": "dms-cli", "ghostty": "ghostty", "grim-hyprland": "grim-hyprland", "home-manager": "home-manager", "hu-tao-cursor": "hu-tao-cursor", "hyprland": "hyprland", "hyprland-dots": "hyprland-dots", - "hyprspace": "hyprspace", "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs_6", "nvim-dots": "nvim-dots", + "pinix": "pinix", "quickshell": "quickshell", "unstable": "unstable" } @@ -718,16 +827,16 @@ }, "systems_2": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -763,11 +872,11 @@ }, "unstable": { "locked": { - "lastModified": 1759977445, - "narHash": "sha256-LYr4IDfuihCkFAkSYz5//gT2r1ewcWBYgd5AxPzPLIo=", + "lastModified": 1761349956, + "narHash": "sha256-tH3wHnOJms+U4k/rK2Nn1RfBrhffX92jLP/2VndSn0w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2dad7af78a183b6c486702c18af8a9544f298377", + "rev": "02f2cb8e0feb4596d20cc52fda73ccee960e3538", "type": "github" }, "original": { @@ -805,11 +914,11 @@ ] }, "locked": { - "lastModified": 1755354946, - "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=", + "lastModified": 1760713634, + "narHash": "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0", + "rev": "753bbbdf6a052994da94062e5b753288cef28dfb", "type": "github" }, "original": { @@ -834,11 +943,11 @@ ] }, "locked": { - "lastModified": 1759192380, - "narHash": "sha256-0BWJgt4OSzxCESij5oo8WLWrPZ+1qLp8KUQe32QeV4Q=", + "lastModified": 1760401936, + "narHash": "sha256-/zj5GYO5PKhBWGzbHbqT+ehY8EghuABdQ2WGfCwZpCQ=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "0bcd1401ed43d10f10cbded49624206553e92f57", + "rev": "365085b6652259753b598d43b723858184980bbe", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c4a1b27..d68fb33 100644 --- a/flake.nix +++ b/flake.nix @@ -18,11 +18,33 @@ url = "github:NixOS/nixpkgs/nixpkgs-unstable"; }; + pinix = { + url = "github:remi-dupre/pinix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + quickshell = { url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; inputs.nixpkgs.follows = "nixpkgs"; }; + dgop = { + url = "github:AvengeMedia/dgop"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + dms-cli = { + url = "github:AvengeMedia/danklinux"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + dankMaterialShell = { + url = "github:AvengeMedia/DankMaterialShell"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.dgop.follows = "dgop"; + inputs.dms-cli.follows = "dms-cli"; + }; + nvim-dots = { url = "github:alsaiduq-lab/nvim-dotfiles"; flake = false; @@ -68,6 +90,9 @@ unstable, ghostty, hu-tao-cursor, + dgop, + dankMaterialShell, + pinix, #sops-nix, ... } @ inputs: let @@ -106,11 +131,14 @@ overlays = [ (final: prev: { ollama = unstablePkgs.ollama-cuda; - rpcs3 = unstablePkgs.rpcs3; + # broken atm + # rpcs3 = unstablePkgs.rpcs3; quickshell = unstable.legacyPackages.${system}.quickshell; ghostty = inputs.ghostty.packages.${system}.default; hu-tao-animated-cursor = inputs.hu-tao-cursor.packages.${system}.default; grim-hyprland = inputs.grim-hyprland.packages.${system}.default; + dgop = inputs.dgop.packages.${system}.default; + pinix = inputs.pinix.packages.${system}.default; }) (final: prev: { inherit @@ -119,6 +147,7 @@ binary-font minijinja-cli thorium + voicevox ; }) @@ -145,5 +174,48 @@ } ]; }; + + nixosConfigurations.magus = nixpkgs.lib.nixosSystem { + inherit system; + specialArgs = { + inherit inputs; + }; + modules = [ + { + nixpkgs = { + config = { + allowUnfree = true; + allowAliases = true; + }; + hostPlatform = system; + overlays = [ + (final: prev: { + inherit + (customPkgs) + minijinja-cli + voicevox + ; + }) + (final: prev: { + clear-sans = prev.clear-sans.clear-sans; + binary-font = prev.binary-font.binary-clock-font; + }) + ]; + }; + } + ./hosts/magus.nix + home-manager.nixosModules.home-manager + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = { + inherit inputs; + nvimDotfiles = inputs.nvim-dots; + }; + }; + } + ]; + }; }; } diff --git a/home-manager/cobray.nix b/home-manager/cobray.nix index 14f4e19..3d02869 100644 --- a/home-manager/cobray.nix +++ b/home-manager/cobray.nix @@ -4,6 +4,7 @@ lib, hyprlanddots, nvimDotfiles, + inputs, ... }: { imports = [ @@ -26,7 +27,6 @@ ./modules/quickshell.nix #./modules/hyprspace.nix ./modules/cava.nix - ./modules/matugen.nix ./modules/rgb.nix ./modules/anyrun.nix ]; @@ -38,11 +38,11 @@ home.enableNixpkgsReleaseCheck = false; xdg.mime.enable = false; - # TODO: move these somewhere else; undecided home.packages = with pkgs; [ btop nvtopPackages.full kdePackages.dolphin + voicevox ]; } diff --git a/home-manager/init.nix b/home-manager/init.nix index d1e916f..e1cca4c 100644 --- a/home-manager/init.nix +++ b/home-manager/init.nix @@ -29,7 +29,6 @@ copy_dir "$repo/fish" "${config.xdg.configHome}/fish" copy_dir "$repo/hypr" "${config.xdg.configHome}/hypr" - copy_dir "$repo/quickshell" "${config.xdg.configHome}/quickshell" copy_dir "$repo/cava" "${config.xdg.configHome}/cava" copy_dir "$nvimrepo" "${config.xdg.configHome}/nvim" diff --git a/home-manager/modules/ani-cli.nix b/home-manager/modules/ani-cli.nix index 794287f..b7989a7 100644 --- a/home-manager/modules/ani-cli.nix +++ b/home-manager/modules/ani-cli.nix @@ -2,5 +2,6 @@ home.packages = with pkgs; [ ani-cli aria2 + yt-dlp ]; } diff --git a/home-manager/modules/mpv.nix b/home-manager/modules/mpv.nix index d7d05af..8cd5042 100644 --- a/home-manager/modules/mpv.nix +++ b/home-manager/modules/mpv.nix @@ -3,17 +3,21 @@ url = "https://raw.githubusercontent.com/cyl0/ModernX/0.6.1/modernx.lua"; sha256 = "11n7qqaj2f3l53wg7vqdf007zky45nkviwy10xmb9kxwddnpmxsm"; }; - modernxFont = pkgs.fetchurl { url = "https://raw.githubusercontent.com/cyl0/ModernX/0.6.1/Material-Design-Iconic-Font.ttf"; sha256 = "06nsghfgsvhqfcvfd9k1dp3mvh5xz0cz5k5vqcby4v5nxki5p90q"; }; + anime4k = pkgs.fetchFromGitHub { + owner = "bloc97"; + repo = "Anime4K"; + rev = "v4.0.1"; + sha256 = "sha256-OQWJWcDpwmnJJ/kc4uEReaO74dYFlxNQwf33E5Oagb0="; + }; in { home.packages = with pkgs; [ mpv mpvScripts.thumbfast ]; - home.file.".config/mpv/mpv.conf".text = '' profile=gpu-hq osc=no @@ -23,15 +27,18 @@ in { script-opts=modernx-theme=Nordic sub-font="Noto Sans" sub-font-size=40 + hwdec=nvdec + hwdec-codecs=all + glsl-shaders="~~/shaders/Restore/Anime4K_Clamp_Highlights.glsl:~~/shaders/Restore/Anime4K_Restore_CNN_VL.glsl:~~/shaders/Upscale/Anime4K_Upscale_CNN_x2_VL.glsl:~~/shaders/Upscale/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Upscale/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Upscale/Anime4K_Upscale_CNN_x2_M.glsl" ''; - - home.file.".config/mpv/scripts/modernx.lua".source = - modernx; - + home.file.".config/mpv/input.conf".text = '' + CTRL+0 no-osd change-list glsl-shaders clr ""; show-text "Shaders cleared" + CTRL+1 no-osd change-list glsl-shaders set "~~/shaders/Restore/Anime4K_Clamp_Highlights.glsl:~~/shaders/Restore/Anime4K_Restore_CNN_VL.glsl:~~/shaders/Upscale/Anime4K_Upscale_CNN_x2_VL.glsl:~~/shaders/Upscale/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Upscale/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Upscale/Anime4K_Upscale_CNN_x2_M.glsl"; show-text "Anime4K: Mode A (HQ)" + CTRL+2 no-osd change-list glsl-shaders set "~~/shaders/Restore/Anime4K_Clamp_Highlights.glsl:~~/shaders/Upscale+Denoise/Anime4K_Upscale_Denoise_CNN_x2_VL.glsl:~~/shaders/Upscale/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Upscale/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Upscale/Anime4K_Upscale_CNN_x2_M.glsl"; show-text "Anime4K: Mode B (Denoise - for artifact-heavy anime)" + ''; + home.file.".config/mpv/scripts/modernx.lua".source = modernx; home.file.".config/mpv/scripts/thumbfast.lua".source = "${pkgs.mpvScripts.thumbfast}/share/mpv/scripts/thumbfast.lua"; - home.file.".config/mpv/script-opts/thumbfast.conf".source = "${pkgs.mpvScripts.thumbfast}/share/mpv/script-opts/thumbfast.conf"; - - home.file.".config/mpv/fonts/Material-Design-Iconic-Font.ttf".source = - modernxFont; + home.file.".config/mpv/fonts/Material-Design-Iconic-Font.ttf".source = modernxFont; + home.file.".config/mpv/shaders".source = "${anime4k}/glsl"; } diff --git a/home-manager/modules/quickshell.nix b/home-manager/modules/quickshell.nix index eac9e06..dedf0f9 100644 --- a/home-manager/modules/quickshell.nix +++ b/home-manager/modules/quickshell.nix @@ -1,6 +1,16 @@ -{pkgs, ...}: { +{ + pkgs, + inputs, + lib, + ... +}: { + home.packages = with pkgs; [ quickshell + dgop + ddcutil + accountsservice + cliphist ]; home.sessionPath = ["${pkgs.quickshell}/bin"]; } diff --git a/hosts/configuration.nix b/hosts/configuration.nix index 0f31194..69c5f7b 100644 --- a/hosts/configuration.nix +++ b/hosts/configuration.nix @@ -19,6 +19,11 @@ warn-dirty = false; }; + # I swear I hate nix sometimes + nixpkgs.config.permittedInsecurePackages = [ + "mbedtls-2.28.10" + ]; + # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It's perfectly fine and recommended to leave diff --git a/hosts/modules/core.nix b/hosts/modules/core.nix index 6ce2c60..be5ecbe 100644 --- a/hosts/modules/core.nix +++ b/hosts/modules/core.nix @@ -22,8 +22,8 @@ icu libclang argc - appimage-run clang openssl + pinix ]; } diff --git a/hosts/modules/fonts.nix b/hosts/modules/fonts.nix index 9709b3c..b63692a 100644 --- a/hosts/modules/fonts.nix +++ b/hosts/modules/fonts.nix @@ -8,6 +8,7 @@ nerd-fonts._0xproto nerd-fonts.noto nerd-fonts.symbols-only + material-symbols ipafont kochi-substitute clear-sans diff --git a/hosts/modules/hyprland.nix b/hosts/modules/hyprland.nix index 1ce6cb0..c4b4752 100644 --- a/hosts/modules/hyprland.nix +++ b/hosts/modules/hyprland.nix @@ -11,15 +11,6 @@ xwayland.enable = true; }; - services.greetd = { - enable = true; - package = pkgs.greetd.tuigreet; - settings.default_session = { - user = "greeter"; - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --cmd ${pkgs.hyprland}/bin/Hyprland"; - }; - }; - xdg.portal = { enable = true; extraPortals = with pkgs; [xdg-desktop-portal-hyprland xdg-desktop-portal-gtk]; @@ -57,5 +48,7 @@ gsimplecal # hyprspace kdePackages.xwaylandvideobridge + matugen + brightnessctl ]; } diff --git a/hosts/modules/net.nix b/hosts/modules/net.nix index b3b0bd1..1e3c9eb 100644 --- a/hosts/modules/net.nix +++ b/hosts/modules/net.nix @@ -8,6 +8,7 @@ nmap httpie socat + posting ]; networking.firewall.allowedTCPPorts = [57621]; diff --git a/hosts/modules/python.nix b/hosts/modules/python.nix index ec6af10..e8462a9 100644 --- a/hosts/modules/python.nix +++ b/hosts/modules/python.nix @@ -19,6 +19,7 @@ debugpy pynvim pkginfo + pypresence ])) isort uv diff --git a/hosts/modules/qt.nix b/hosts/modules/qt.nix index 188d40f..102c708 100644 --- a/hosts/modules/qt.nix +++ b/hosts/modules/qt.nix @@ -1,5 +1,10 @@ {pkgs, ...}: { environment.systemPackages = with pkgs; [ qt6.qtdeclarative + qt6.qtwayland + qt6.qtsvg + qt6.qtmultimedia + qt6.qtimageformats + qt5.qtwayland ]; } diff --git a/hosts/modules/steam.nix b/hosts/modules/steam.nix index 354e09e..76ca67a 100644 --- a/hosts/modules/steam.nix +++ b/hosts/modules/steam.nix @@ -7,6 +7,10 @@ pkgs.proton-ge-bin ]; }; + programs.gamemode = { + enable = true; + enableRenice = true; + }; hardware.graphics = { enable = true; enable32Bit = true; diff --git a/hosts/modules/udiskie.nix b/hosts/modules/udiskie.nix index bf29279..df96ec8 100644 --- a/hosts/modules/udiskie.nix +++ b/hosts/modules/udiskie.nix @@ -1,3 +1,4 @@ +# TODO: figure out why this isnt working on wayland { config, pkgs, diff --git a/hosts/system-packages.nix b/hosts/system-packages.nix index 6012c08..3625302 100644 --- a/hosts/system-packages.nix +++ b/hosts/system-packages.nix @@ -30,6 +30,8 @@ ./modules/nano.nix ./modules/qt.nix ./modules/udiskie.nix + ./modules/appimage.nix + ./modules/greeter.nix ]; npm.enable = true; services.udisks2.enable = true; diff --git a/pkgs/default.nix b/pkgs/default.nix index 107e04e..b9fa319 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -6,4 +6,5 @@ binary-font = pkgs.callPackage ./binary-font {}; minijinja-cli = pkgs.callPackage ./minijinja-cli {}; thorium = pkgs.callPackage ./thorium {}; + voicevox = pkgs.callPackage ./voicevox {}; }