diff --git a/config/hosts/aspects/doloro-laptop/home.nix b/config/hosts/aspects/doloro-laptop/home.nix index 788676d..479d450 100644 --- a/config/hosts/aspects/doloro-laptop/home.nix +++ b/config/hosts/aspects/doloro-laptop/home.nix @@ -21,7 +21,7 @@ modules.stylix modules.quickshell modules.lavd - modules.omp + # modules.omp # modules.podman # modules.openvivo ]; @@ -37,14 +37,6 @@ homeManager = { pkgs, ... }: { - xdg.configFile."hypr/hyprland-local.lua" = { - text = '' - -- Host overrides (laptop) - hl.config({ ["decoration.blur.enabled"] = false }) - hl.config({ ["input.sensitivity"] = 0 }) - hl.device({ name = "default", sensitivity = 0 }) - ''; - }; home.packages = with pkgs; [ telegram-desktop equibop diff --git a/config/hosts/aspects/doloro-laptop/host.nix b/config/hosts/aspects/doloro-laptop/host.nix index 4488e42..9649592 100644 --- a/config/hosts/aspects/doloro-laptop/host.nix +++ b/config/hosts/aspects/doloro-laptop/host.nix @@ -47,10 +47,6 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; services.upower.enable = true; - # boot.kernelPackages = pkgs.linuxPackages_6_12; # Hibernate works on 6.12 but not on latest - # boot.kernelPackages = pkgs.linuxPackages_latest; # Unpinned the linux version for now.. as i am not using hibernate that often - # boot.kernelPackages = - # inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-latest-lto-x86_64-v3; networking.hostName = "doloro-nixos-laptop"; # Define your hostname. # security.rtkit.enable = true; @@ -157,7 +153,7 @@ # # initialPassword = "sex"; # }; users.users.root = { - password = "meowmeowmeow"; + initialPassword = "meowmeowmeow"; }; users.mutableUsers = false; services.system76-scheduler.enable = false; diff --git a/config/modules/surface_patches.nix b/config/modules/surface_patches.nix index 0a69412..11f6ac1 100644 --- a/config/modules/surface_patches.nix +++ b/config/modules/surface_patches.nix @@ -6,7 +6,8 @@ }: { flake-file.inputs = { - x1e-kernel.url = "git+https://git.scug.io/nikkuss/x1e-nixos.git"; + x1e-kernel.url = "git+ssh://git@git.scug.io:/nikkuss/x1e-staging.git?ref=staging"; + x1e-kernel.inputs.nixpkgs.follows = "nixpkgs"; }; modules.surface-patches = { nixos = @@ -16,9 +17,55 @@ x1e-kernel.nixosModules.default ]; - x1e.model = "15"; # "13" (default) or "15" — selects the correct DTB - x1e.cpuParking = false; # loads cpu_parking at boot - x1e.ecReboot = true; # loads ec_reboot at boot, exposes /sys/kernel/ec_reboot/reboot + # x1e.model = "15"; # "13" (default) or "15" — selects the correct DTB + # x1e.cpuParking = false; # loads cpu_parking at boot + # x1e.ecReboot = true; # loads ec_reboot at boot, exposes /sys/kernel/ec_reboot/reboot + x1e = { + model = "15"; + cpuParking = false; + ecReboot = true; + el2 = { + debugTools = false; + enable = false; + }; + iso = { + enable = true; + modules = [ ]; + }; + msm = { + extraPatches = [ ]; + }; + pmSdamTrace = { + enable = true; + }; + psr = { + enable = false; + }; + ramoops = { + enable = false; + }; + spiHid = { + drivers = [ "legacy" ]; + legacy = { + enable = true; + }; + v4 = { + enable = false; + }; + }; + ssamPmNotifier = { + enable = false; + }; + ssamRequestTimeout = { + enable = true; + }; + touchscreen = { + enable = false; + }; + video = { + enable = false; + }; + }; # Prevent reboot hang - qcom_smd_qrtr workers stuck in D-state systemd.settings.Manager.DefaultTimeoutStopSec = "15s"; diff --git a/flake.lock b/flake.lock index 8b39dda..db0871d 100644 --- a/flake.lock +++ b/flake.lock @@ -140,11 +140,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1786604915, - "narHash": "sha256-Z1iCZoegN9p3n5dPc9oWFS7AVVgllASbsh5lfoJPoUY=", + "lastModified": 1787209648, + "narHash": "sha256-UqF8nrdmeymxWnQ5pTcGUrGOOqIGJjjGILHf9tT6BYI=", "owner": "Mic92", "repo": "direnv-instant", - "rev": "ab0e5239aaeadf4da20ff43c6141b0339586348a", + "rev": "c9c7754b9cbc4d2c839d101036f66ca1165b65b8", "type": "github" }, "original": { @@ -444,11 +444,11 @@ "vpkmerge": "vpkmerge" }, "locked": { - "lastModified": 1787037475, - "narHash": "sha256-ccKZPOCUyHUUWFFbLnI/SwoDVjfJH25I2yuQYq8Y/LU=", + "lastModified": 1787176058, + "narHash": "sha256-TA31vCODZamFaQfgr+HsYuLMiyVklEwO2BwxoLcSclw=", "owner": "Slush97", "repo": "grimoire", - "rev": "c7eb8e7ba96c6f15db2cdfd6eb7fa918faaba817", + "rev": "5cc6e33968f41e23be0e7a538eb000ee920b8482", "type": "github" }, "original": { @@ -460,11 +460,11 @@ "grimoire-social": { "flake": false, "locked": { - "lastModified": 1779261108, - "narHash": "sha256-f+wUZOR7dqigxd/IZtay1BrLS5rcSnaDage3NXxqsPE=", + "lastModified": 1785648456, + "narHash": "sha256-AR2rTNDuge19t+VAqL/I6dmB8f5niIqINmNnRL70k94=", "owner": "Slush97", "repo": "grimoire-social", - "rev": "efffe0b92a49d6cc8d82406d6fc163c2fd3662a5", + "rev": "e97a59d7cd55fc1ae1e11a56ca2fde5305de9c4f", "type": "github" }, "original": { @@ -482,11 +482,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1786886160, - "narHash": "sha256-legFYpDokCOzwAPmyH7mDi+2jkllaeE+czhJifeQsFU=", + "lastModified": 1787300923, + "narHash": "sha256-HSyz9Jbpz2Iz43lC1yYv2T+T3Lv+6coLLDv2lFv1SfE=", "owner": "vikingnope", "repo": "helium-browser-nix-flake", - "rev": "11edc339e075f16b356852096420ecd966462cc1", + "rev": "72a3f0cd428f04e1da9be5ea9554409f00ee4b20", "type": "github" }, "original": { @@ -502,11 +502,11 @@ ] }, "locked": { - "lastModified": 1786999651, - "narHash": "sha256-MTGMFlLDTklsXhCp4r5GXB4VAVadPdalXLvUjd/K7h0=", + "lastModified": 1787176219, + "narHash": "sha256-djoRr6jBpe35q/0JwAvXpFXg1Ktf+X54NU2RLR7wnHw=", "owner": "nix-community", "repo": "home-manager", - "rev": "353742587cbaf079b3caee743115d037bc51fea6", + "rev": "c53d643b3737e2fcd04e6cb3b3580ef50b2087a0", "type": "github" }, "original": { @@ -590,11 +590,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1786998364, - "narHash": "sha256-egMnyO7618cG4qcvsTwUkYHoxPFNSe1IThXfDrl43l4=", + "lastModified": 1787239441, + "narHash": "sha256-O4pHn5sN1gRWz33L5fcontzUb89ytCikDIQVbrnYvKw=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "af0d014cb26f536d8cb7cab2b9d5784f69767c8a", + "rev": "8d50be06aa7d84283ac364a03df74bd834cab0ee", "type": "github" }, "original": { @@ -839,11 +839,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1787004241, - "narHash": "sha256-p7xONTDDFewZr3WxoLUgVeC7nJLQCXeaAWiTrumcwG0=", + "lastModified": 1787083398, + "narHash": "sha256-ey29CH7VCwJoq3QFzXqnTwVmNC+8f1rWY0F1TPjauLw=", "owner": "JPyke3", "repo": "hytale-launcher-nix", - "rev": "2fe78a2196427045451d1aff18836847df25f8dc", + "rev": "726e21f2b80d52e1e95ae12dc8f6a31c63f233a9", "type": "github" }, "original": { @@ -988,11 +988,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1786989576, - "narHash": "sha256-Jro2RpF1ztNVSPEkzmr+Qc0pUOIhZ76Efg49SoRgSBE=", + "lastModified": 1787248950, + "narHash": "sha256-eq5FwprGyjytM68pitTTFT3fi0cSsF1M6v7h3rdcqj0=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "8d8e6d187674d138720bbd9094e150fed6101d11", + "rev": "c69c33c24148defbcc34ab25456cc460bc33fdbb", "type": "github" }, "original": { @@ -1023,11 +1023,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1786867632, - "narHash": "sha256-ez+ubZlA1RtdjCB18a6zJ9M4u8qoPDy08EcnsW5M3Xw=", + "lastModified": 1787144466, + "narHash": "sha256-HHfv2/HkNSKbbSyU9iD/g8lbP6r4tl33sSw1W4rXCk0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ff17823245ab9ff7bcae6acf950bd89cba82c38c", + "rev": "0471accf8d0a8210b31d947497d179ecc99e0021", "type": "github" }, "original": { @@ -1106,11 +1106,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1786514691, - "narHash": "sha256-9dkt1i5JNbEfPb+EjLcSDNs8zqEHQ/1JlSaKgj0SBAg=", + "lastModified": 1787135253, + "narHash": "sha256-RD2kNWCG+Bjo6h+JVjWVNntZs2GtRoeY2xHjts/FNkA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "867dcbc30bafe3c862ef88620f2e7a109d7d3be5", + "rev": "ffb3c9b700e759be2ef13237c9d8f953b32a1e46", "type": "github" }, "original": { @@ -1122,11 +1122,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1786527240, - "narHash": "sha256-OLtJPnSXcRy79Rf7BhYaMeXAVF625FpLcd3+Svq641Y=", + "lastModified": 1786920013, + "narHash": "sha256-tlbRqzZ3suDUO3vyR0QFBk0TrxJiRP50t7VWfHhtVrw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e0c84f9d0ad137f076dc957494f5b39885597d4f", + "rev": "33da5f36e599b50aa7dbbfacb718254423b18354", "type": "github" }, "original": { @@ -1153,11 +1153,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1787070046, - "narHash": "sha256-XkO39wgAVpB5TAI9JD4DzGgW9T5yfZ5HCPiVB2eqWlg=", + "lastModified": 1787305219, + "narHash": "sha256-3J7YJ5WgvbXdWpug6aAJuKjkcPeH7N5fuC3iWuwyi4E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0d4914ae2e7e83ca9958886a0ef27efacfa5d603", + "rev": "555447466bb9df8aa0094a2e4de61438b92d1344", "type": "github" }, "original": { @@ -1201,11 +1201,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1787001381, - "narHash": "sha256-Ue1Yo8gfHdD4TMtNewhA4tkSYeFqXThju0nCyJc3ALo=", + "lastModified": 1787135253, + "narHash": "sha256-RD2kNWCG+Bjo6h+JVjWVNntZs2GtRoeY2xHjts/FNkA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ec2d622de0773551768cf98f3fc50cbcc003b9c5", + "rev": "ffb3c9b700e759be2ef13237c9d8f953b32a1e46", "type": "github" }, "original": { @@ -1217,11 +1217,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1786963906, - "narHash": "sha256-3tkeMWSvHPo3tYljfXbPC/TgknikU1GvdVr/DkdfvE0=", + "lastModified": 1787172299, + "narHash": "sha256-PShzS87awOlE5XWkxUGBd/58/F+AtE2ZMgFffKj4r8s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f4b6996c4e8b9ee06ce147ec344c885f51071b14", + "rev": "07e1d92cdc0ed416cfa11ff3ca40d17e61cfba7a", "type": "github" }, "original": { @@ -1307,11 +1307,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1785454630, - "narHash": "sha256-LQy14TZp77TwbQf40gg1V3jo8FwJG0jGDkAH+zRHqg8=", + "lastModified": 1787070829, + "narHash": "sha256-vXNVDVtvfiQuXthP0NHPFdNvvMTkGpx0UP8oddIWbNk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1559d3daa3ecc813a650b79375ea61b6741b8746", + "rev": "0ae2bc1419c3f345984c2629e72e7a631820fa4d", "type": "github" }, "original": { @@ -1339,11 +1339,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1786862985, - "narHash": "sha256-FBJRXmbGXiSUDvYEbfLYRkckayyZ6SK1UEqhCrIZ2Cs=", + "lastModified": 1787001381, + "narHash": "sha256-Ue1Yo8gfHdD4TMtNewhA4tkSYeFqXThju0nCyJc3ALo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e5bdc4a41d4c072fe1e3787eaa0320a384741d44", + "rev": "ec2d622de0773551768cf98f3fc50cbcc003b9c5", "type": "github" }, "original": { @@ -1355,11 +1355,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1786935457, - "narHash": "sha256-kraAoy5+byR1VkJdQk2FTPSUAN6Pta4fyN3ywHcPAcc=", + "lastModified": 1787234702, + "narHash": "sha256-kvsnFCG4T5dmUj7BMcmpuPZjZNSjOZfhXUdjiBQG2xk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4df4976d944e0057c4c9f99919c6cda2c623563a", + "rev": "5cca3a89405eb65d2adb43754c2af8dac7b6f2e1", "type": "github" }, "original": { @@ -1405,11 +1405,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1787062366, - "narHash": "sha256-42RoRqxcuMB/MMLQU65StwyrPzdahxDXR3Sy58AzOMM=", + "lastModified": 1787270640, + "narHash": "sha256-L3ZXW7MSCPsOZz5powJZZqzZLxuPLh9QXHp5shwzqb8=", "owner": "nix-community", "repo": "nixvim", - "rev": "fe68d88884ac91ce1d17e955ac0ae486ff8bcdf0", + "rev": "bd46166bd8308861cd36984a52ed5d25522d0ba8", "type": "github" }, "original": { @@ -1448,11 +1448,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1787043897, - "narHash": "sha256-8V7UXeZ0US6eijwXiXosesD3ng/pkCIVRYiJQ9xBoMM=", + "lastModified": 1787209472, + "narHash": "sha256-S93TeBwxriOtdz9m3Osp2jN8Wjelgc9xLn+Dojx0yrg=", "ref": "main", - "rev": "75aaaf74ebd73f5e4fa25b22983b3357d98d53c2", - "revCount": 394, + "rev": "9ff8350142bae294c7c4091b2cd00186d9ce132b", + "revCount": 400, "type": "git", "url": "https://git.molez.org/mandlm/omp-nix" }, @@ -1686,11 +1686,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1786531493, - "narHash": "sha256-F93yabBSW2TpxKYMcArQOnFuCqBgAdbfZsdl0w5Pojg=", + "lastModified": 1787175104, + "narHash": "sha256-tzNjlb0loxeWlipvxSNAUUihloeTZoyGFhEen87yM9k=", "owner": "nix-community", "repo": "stylix", - "rev": "1e6ccadeda179d96728b4a9f20fc9d4dcf6b6059", + "rev": "a9e5a76a1b75b137f266e4f445e1eaba82e9783e", "type": "github" }, "original": { @@ -1864,11 +1864,11 @@ ] }, "locked": { - "lastModified": 1785945821, - "narHash": "sha256-NLSyTCW4K4ofhNBllt3omPasm6QpralXH1DBZOc91Dw=", + "lastModified": 1786901030, + "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ae7910970dddc408fe6ab1c8e4b277bb21d72dc0", + "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa", "type": "github" }, "original": { @@ -1913,18 +1913,24 @@ } }, "x1e-kernel": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, "locked": { - "lastModified": 1782927159, - "narHash": "sha256-FJGCl7pk4h+cSjEL6UakyovkUNBPLGLn9eo+TLEBSfQ=", - "ref": "refs/heads/main", - "rev": "ca7db709ee29ecdd3c00fec679febdfb2ebfaa32", - "revCount": 9, + "lastModified": 1787400532, + "narHash": "sha256-u+ZBBOsN32FX2O2x04NK4TXjEn/k5/fMNvw3M9idUNQ=", + "ref": "staging", + "rev": "96421eee18a7c0d445d432a4a80d35d030c441c8", + "revCount": 34, "type": "git", - "url": "https://git.scug.io/nikkuss/x1e-nixos.git" + "url": "ssh://git@git.scug.io/nikkuss/x1e-staging.git" }, "original": { + "ref": "staging", "type": "git", - "url": "https://git.scug.io/nikkuss/x1e-nixos.git" + "url": "ssh://git@git.scug.io/nikkuss/x1e-staging.git" } }, "xdph": { @@ -2008,11 +2014,11 @@ ] }, "locked": { - "lastModified": 1786685380, - "narHash": "sha256-3ZuubfWk7CHPF/60w5BVrVkzdO7Oed1MgZ+ugLsgww8=", + "lastModified": 1787200418, + "narHash": "sha256-4d24Wa/CO8WsSEjKwzFwJXn+oxbI4Bm8xuMR77xJgYI=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "e1e4aa6433a352f07059aeb8483ae42deb61f9b2", + "rev": "20195bc99e82b02abe82bb81ac366ae81c67dc5a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a0fcd2f..e09c802 100644 --- a/flake.nix +++ b/flake.nix @@ -51,7 +51,10 @@ url = "github:nix-community/stylix"; inputs.nixpkgs.follows = "nixpkgs"; }; - x1e-kernel.url = "git+https://git.scug.io/nikkuss/x1e-nixos.git"; + x1e-kernel = { + url = "git+ssh://git@git.scug.io:/nikkuss/x1e-staging.git?ref=staging"; + inputs.nixpkgs.follows = "nixpkgs"; + }; zen-browser = { url = "github:youwen5/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs";