From 8bf191eefc0f78900e234553bc4b0ebddbf31c34 Mon Sep 17 00:00:00 2001 From: Joshua Elmasri Date: Mon, 15 Dec 2025 12:45:40 -0600 Subject: [PATCH] yeyeyeyeyye --- flake.lock | 219 +++++++++++--------------------- flake.nix | 2 +- hosts/desktop/configuration.nix | 36 +++--- modules/hypr/default.nix | 2 +- modules/stylix.nix | 17 ++- modules/zen/default.nix | 1 + 6 files changed, 109 insertions(+), 168 deletions(-) diff --git a/flake.lock b/flake.lock index f5f2bd8..4260417 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1762527355, - "narHash": "sha256-d5zsOdWeHZFP5Pc/QkgsX3UKkVDmcwY8nSJJJszMwVM=", + "lastModified": 1764173295, + "narHash": "sha256-Jh4VtPcK2Ov+RTcV9FtyQRsxiJmXFQGfqX6jjM7/mgc=", "owner": "aylur", "repo": "astal", - "rev": "5baeb660214bcafc9ae0b733a1bc84f5fa6078f4", + "rev": "7d1fac8a4b2a14954843a978d2ddde86168c75ef", "type": "github" }, "original": { @@ -41,28 +41,28 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1754405784, - "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" } }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1752979451, - "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -91,11 +91,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1758112371, - "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", + "lastModified": 1764724327, + "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", + "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", "type": "github" }, "original": { @@ -127,11 +127,11 @@ ] }, "locked": { - "lastModified": 1762980239, - "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", + "lastModified": 1765495779, + "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", + "rev": "5635c32d666a59ec9a55cab87e898889869f7b71", "type": "github" }, "original": { @@ -148,11 +148,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -161,24 +161,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "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" - } - }, "fromYaml": { "flake": false, "locked": { @@ -199,11 +181,11 @@ "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1762869044, - "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=", + "lastModified": 1764524476, + "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad", + "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", "type": "gitlab" }, "original": { @@ -221,11 +203,11 @@ ] }, "locked": { - "lastModified": 1763416652, - "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", + "lastModified": 1765823531, + "narHash": "sha256-tyNJjd48hfgsyEfsq1Ueufg4oJv6b8xBA6NYRJrLPyg=", "owner": "nix-community", "repo": "home-manager", - "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", + "rev": "8315c1544f383b791a3115c9959d1f27920e8320", "type": "github" }, "original": { @@ -234,41 +216,13 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754860581, - "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.1.1", - "repo": "ixx", - "type": "github" - } - }, "master": { "locked": { - "lastModified": 1763589965, - "narHash": "sha256-0qOjIJ4Ryb0Le8BCHQz0MD8hM6YiTFG6hqECrI5hOag=", + "lastModified": 1765823699, + "narHash": "sha256-BdYVSKAvhBxGA4xO8UWKHg4IlqD88HeGIKLGof60OXk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5be29d57cf172299d57cac5d2107ddfe2278aaca", + "rev": "ef3ade20ba7bfbcbf6bcd83eccf75e0fd5082c7a", "type": "github" }, "original": { @@ -286,11 +240,11 @@ ] }, "locked": { - "lastModified": 1763329080, - "narHash": "sha256-S6eZaiRZPvSWv9d2kZO+HrYTelWqn++vsC/bUwOSQ7I=", + "lastModified": 1765528634, + "narHash": "sha256-uIavvJkDwTZD1QY/oSkDtPN9xwkLwQayoZ5xOni4SBY=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "bc52b0623f4367447347cbcc88522ec64486d710", + "rev": "fc1440d6e6adb24d9b2650670744bae35654c867", "type": "github" }, "original": { @@ -301,11 +255,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1765472234, + "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", "type": "github" }, "original": { @@ -314,21 +268,34 @@ "type": "indirect" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1765644376, + "narHash": "sha256-yqHBL2wYGwjGL2GUF2w3tofWl8qO9tZEuI4wSqbCrtE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "23735a82a828372c4ef92c660864e82fbe2f5fbe", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_2" + "nixpkgs": "nixpkgs_2", + "systems": "systems" }, "locked": { - "lastModified": 1763565747, - "narHash": "sha256-FgCL7pEFgZjaYoiDbY+f9fAwHqgVNSZEkcLUvTnhwHw=", + "lastModified": 1765796308, + "narHash": "sha256-szKgoF0JbDUvWkqjB2AyyFagmsF5ZFEjajZRUiUV9mU=", "owner": "nix-community", "repo": "nixvim", - "rev": "82bc02466cccb7594aef296aea128b9b59621efe", + "rev": "12a76dd12beccd8d18249b05d10d6acda4e722e0", "type": "github" }, "original": { @@ -349,11 +316,11 @@ ] }, "locked": { - "lastModified": 1758998580, - "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", + "lastModified": 1764773531, + "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", "owner": "nix-community", "repo": "NUR", - "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", + "rev": "1d9616689e98beded059ad0384b9951e967a17fa", "type": "github" }, "original": { @@ -362,29 +329,6 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1761730856, - "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", - "owner": "NuschtOS", - "repo": "search", - "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "root": { "inputs": { "astal": "astal", @@ -410,7 +354,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_3", + "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -418,11 +362,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1763590746, - "narHash": "sha256-bsEu7Ohdo2OEudXdQzk+jc9fiO0rNMGaH+Wee7FXxNc=", + "lastModified": 1765812876, + "narHash": "sha256-mML2DlWmvwPOzn8K9QEsiKGdt67iHW/LaK6Xw+ZENMk=", "owner": "danth", "repo": "stylix", - "rev": "3013f98e28e52b3bd3859b0c454554aae54d5060", + "rev": "9ba353558a288eb9d6fc3057bb418509dd8b4c01", "type": "github" }, "original": { @@ -461,21 +405,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -512,11 +441,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1757716333, - "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", + "lastModified": 1763914658, + "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", "owner": "tinted-theming", "repo": "schemes", - "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", + "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", "type": "github" }, "original": { @@ -528,11 +457,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1757811970, - "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", + "lastModified": 1764465359, + "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", + "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", "type": "github" }, "original": { @@ -544,11 +473,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1757811247, - "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", + "lastModified": 1764464512, + "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", + "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", "type": "github" }, "original": { @@ -567,11 +496,11 @@ ] }, "locked": { - "lastModified": 1763521945, - "narHash": "sha256-Zcrafbe4niRJMbzaVOwg7+iedJhwBFttre2DpyCC6qA=", + "lastModified": 1765764138, + "narHash": "sha256-Nb5y5xSDQLMeUYiA1bQkbmHffGm0d/XXWoJjFu8ovw0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "24d7381b9231c23daceec5d372cc28e877f7785d", + "rev": "bd8815d0a686267386268e7cc70315124e21362b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7c1360c..e1305ba 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ home-manager.url = "github:nix-community/home-manager"; nixvim = { url = "github:nix-community/nixvim"; - inputs.nixpkgs.follows = "nixpkgs"; + #inputs.nixpkgs.follows = "nixpkgs"; }; nixos-apple-silicon = { url = "github:tpwrules/nixos-apple-silicon"; diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 67d3b42..8c2de77 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -1,4 +1,4 @@ -# Edit this configuration file to define what should be installed on +#Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). @@ -17,7 +17,6 @@ boot.loader.grub.efiSupport = true; boot.initrd.systemd.enable = true; boot.loader.efi.canTouchEfiVariables = true; - boot.loader.grub.timeoutStyle = "hidden"; services.avahi = { enable = true; nssmdns4 = true; @@ -44,6 +43,7 @@ boot = { consoleLogLevel = 0; initrd.verbose = false; kernelPackages = pkgs.linuxPackages_zen; + kernelModules = [ "amdgpu" ]; kernelPatches = [ /*{ name = "dsc"; @@ -67,10 +67,13 @@ boot = { "rd.udev.log_level=3" "udev.log_priority=3" ]; + extraModprobeConfig = '' + options bluetooth disable_ertm=Y + ''; # Hide the OS choice for bootloaders. # It's still possible to open the bootloader list by pressing any key # It will just not appear on screen unless a key is pressed - loader.timeout = 0; + loader.timeout = 5; }; @@ -79,7 +82,7 @@ boot = { ACTION=="add", KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="35bd", ATTRS{idProduct}=="0101", TAG+="uaccess", MODE="0660" ''; - boot.extraModulePackages = with config.boot.kernelPackages; [ hid-tmff2 ]; + boot.extraModulePackages = with config.boot.kernelPackages; [ hid-tmff2 xpadneo ]; networking.hostName = "nixos"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. @@ -93,7 +96,8 @@ boot = { hardware.bluetooth.enable = true; - hardware.bluetooth.package = pkgs.bluez; + + hardware.xpadneo.enable = true; nixpkgs.config.permittedInsecurePackages = [ "electron-31.7.7" @@ -251,16 +255,16 @@ boot = { { name = "libpipewire-module-protocol-pulse"; args = { - pulse.min.req = "32/48000"; - pulse.default.req = "32/48000"; - pulse.max.req = "32/48000"; - pulse.min.quantum = "32/48000"; - pulse.max.quantum = "32/48000"; + pulse.min.req = "128/48000"; + pulse.default.req = "128/48000"; + pulse.max.req = "128/48000"; + pulse.min.quantum = "128/48000"; + pulse.max.quantum = "128/48000"; }; } ]; stream.properties = { - node.latency = "32/48000"; + node.latency = "128/48000"; resample.quality = 1; }; }; @@ -362,12 +366,12 @@ services.pulseaudio.extraConfig = '' killall usbutils mangohud + ffmpeg oversteer # cemu broken with latest update oterm wget wlx-overlay-s - labymod-launcher unzip winetricks cowsay @@ -406,7 +410,7 @@ services.pulseaudio.extraConfig = '' services.flatpak.enable = true; - + services.xserver.enableTCP = true; services.sunshine = { enable = true; autoStart = false; @@ -433,7 +437,7 @@ services.pulseaudio.extraConfig = '' XRT_COMPOSITOR_COMPUTE = "1"; WMR_HANDTRACKING = "0"; }; - programs.alvr.enable = false; + programs.alvr.enable = true; programs.alvr.openFirewall = true; @@ -479,8 +483,8 @@ services.pulseaudio.extraConfig = '' services.openssh.settings.PasswordAuthentication = true; # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [ 7860 3042 3246 9943 9944 7801 11434 47990 48010 5001 ]; - networking.firewall.allowedUDPPorts = [ 7860 9943 9944 3042 47990 3246 11434 7801 4800 48010 ]; + networking.firewall.allowedTCPPorts = [ 7860 3042 3246 9943 9944 7801 11434 47990 48010 5001 8188 ]; + networking.firewall.allowedUDPPorts = [ 7860 8188 9943 9944 3042 47990 3246 11434 7801 4800 48010 ]; # Or disable the firewall altogether. # networking.firewall.enable = false; diff --git a/modules/hypr/default.nix b/modules/hypr/default.nix index 565e096..fcad5f5 100644 --- a/modules/hypr/default.nix +++ b/modules/hypr/default.nix @@ -10,7 +10,7 @@ # See https://wiki.hyprland.org/Configuring/Monitors/ -monitor = HDMI-A-1, 3840x2160@60, 0x0, 1, bitdepth, 10, sdrsaturation, 1.2, sdrbrightness, 1 +monitor = HDMI-A-1, 3840x2160@120, 0x0, auto, bitdepth, 10, sdrsaturation, 1, sdrbrightness, 1 #monitor = HDMI-A-1, disable #monitor = sunshine, highres@highrr, 0x0, 1 monitor = DP-1, highres@highrr, 0x0, 1 diff --git a/modules/stylix.nix b/modules/stylix.nix index 458dfc5..93bddf4 100644 --- a/modules/stylix.nix +++ b/modules/stylix.nix @@ -5,7 +5,7 @@ #stylix.targets.plymouth.enable = false; stylix.targets.kitty.enable = true; stylix.targets.hyprpaper.enable = true; - stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml"; + stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/everforest.yaml"; stylix.targets.zen-browser.profileNames = [ "default" ]; stylix.targets.zen-browser.enable = true; # blue aura house @@ -19,9 +19,16 @@ hash = "sha256-SNsauGNVU7p+FfZPJ97GQDz5roRfy82WbAuLmLl7iVs="; };*/ - stylix.image = pkgs.fetchurl { - url = "https://gitea.base.jeditemple.com/joshuaelm/Wallpapers/raw/branch/main/schemes/nord/wallhaven-731kr3_3840x2160.png"; - hash = "sha256-DHEib1bgtOvNp+wo3+L5PiEbKfZkHgR3vhs4YIouKes="; - }; + # Docks + /*stylix.image = pkgs.fetchurl { + url = "https://gitea.base.jeditemple.com/joshuaelm/Wallpapers/raw/branch/main/generic/a_deck_with_trees_and_a_railing.jpg"; + hash = "sha256-axG9MALOe5cNfySA29DP15YXLp1V1mcHbezPvq4J3sA="; + };*/ + + # Mountain Range with tree vignette + stylix.image = pkgs.fetchurl { + url = "https://gitea.base.jeditemple.com/joshuaelm/Wallpapers/raw/branch/main/generic/wallhaven-21yp59.jpg"; + hash = "sha256-INsc8Zx+Slmcyd/tNekuZ0LhNSlvNLy7TNFLdnJD78Q="; + }; } diff --git a/modules/zen/default.nix b/modules/zen/default.nix index e138b9e..c382b50 100644 --- a/modules/zen/default.nix +++ b/modules/zen/default.nix @@ -37,6 +37,7 @@ "search@kagi.com" = "kagi-search-for-firefox"; #"adnauseam@rednoise.org" = "adnauseam"; "{446900e4-71c2-419f-a6a7-df9c091e268b}" = "bitwarden-password-manager"; + "{7be2ba16-0f1e-4d93-9ebc-5164397477a9}" = "videospeed"; }; DisableTelemetry = true; };