diff --git a/flake.lock b/flake.lock index 47be15e..2f43039 100644 --- a/flake.lock +++ b/flake.lock @@ -250,7 +250,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -268,7 +268,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -359,6 +359,27 @@ "type": "gitlab" } }, + "heliumFlake": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1767430948, + "narHash": "sha256-8tsy6PPGjR8gX6koEHUExf1hdzb7x9fRm4PpecscGfI=", + "owner": "vikingnope", + "repo": "helium-browser-nix-flake", + "rev": "b1f70c417611f9b25136a148c66c4218afc610e0", + "type": "github" + }, + "original": { + "owner": "vikingnope", + "repo": "helium-browser-nix-flake", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -450,7 +471,7 @@ "hyprwire": "hyprwire", "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", + "systems": "systems_2", "xdph": "xdph" }, "locked": { @@ -970,7 +991,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1766941632, @@ -1058,6 +1079,7 @@ "inputs": { "disko": "disko", "font-patcher": "font-patcher", + "heliumFlake": "heliumFlake", "home-manager": "home-manager", "hyprland": "hyprland", "neovim-nightly-overlay": "neovim-nightly-overlay", @@ -1119,7 +1141,7 @@ "spicetify-nix": { "inputs": { "nixpkgs": "nixpkgs_9", - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1766897356, @@ -1148,7 +1170,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_6", + "systems": "systems_7", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1170,21 +1192,6 @@ } }, "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1199,6 +1206,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "systems_3": { "locked": { "lastModified": 1681028828, @@ -1259,6 +1281,21 @@ "type": "github" } }, + "systems_7": { + "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": { @@ -1340,6 +1377,24 @@ "type": "github" } }, + "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" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/flake.nix b/flake.nix index e8382e3..ee60f87 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,10 @@ url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; inputs.nixpkgs.follows = "nixpkgs"; }; + heliumFlake = { + url = "github:vikingnope/helium-browser-nix-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nikkuss-pkgs = { url = "git+https://git.scug.io/nikkuss/pkgs"; # inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/doloro-laptop/home.nix b/hosts/doloro-laptop/home.nix index b217a2e..1ed08dd 100644 --- a/hosts/doloro-laptop/home.nix +++ b/hosts/doloro-laptop/home.nix @@ -18,12 +18,12 @@ quickshell.enable = true; # chromium.enable = true; wivrn.enable = false; - helium.enable = false; + helium.enable = true; sops.enable = true; wakatime.enable = false; # remoteBuild.use-remote-builders = true; nixvim.enable = true; - zen-browser.enable = true; + zen-browser.enable = false; kitty.enable = true; helix.enable = false; stylix.enable = true; @@ -86,7 +86,8 @@ hello vim telegram-desktop - vesktop + # vesktop + legcord pavucontrol lazygit btop diff --git a/hosts/doloro-laptop/laptop.nix b/hosts/doloro-laptop/laptop.nix index 5e625e5..71a18ef 100644 --- a/hosts/doloro-laptop/laptop.nix +++ b/hosts/doloro-laptop/laptop.nix @@ -6,11 +6,33 @@ in services.tlp = { enable = true; settings = { + CPU_ENERGY_PERF_POLICY_ON_BAT = "powersave"; + + # Wireless power saving + WIFI_PWR_ON_BAT = "1"; + + # USB autosuspend + USB_AUTOSUSPEND = "1"; + + # SATA drive power management + SATA_LINKPWR_ON_BAT = "min_power"; + + # PCI Express Active-State Power Management (ASPM) + PCIE_ASPM_ON_BAT = "powersave"; + + # Runtime Power Management for PCI(e) buses/devices + RUNTIME_PM_ON_BAT = "auto"; + + # Disable Bluetooth on battery + # DEVICES_TO_DISABLE_ON_BAT = "bluetooth"; + + # Restore brightness on battery + RESTORE_BRIGHTNESS_ON_BAT = "1"; CPU_ENERGY_PERF_POLICY_ON_AC = "balance_performance"; - CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; + # CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; CPU_ENERGY_PERF_POLICY_ON_SAV = "power"; CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; - PCIE_ASPM_ON_BAT = "powersave"; + # PCIE_ASPM_ON_BAT = "powersave"; CPU_SCALING_GOVERNOR_ON_AC = "balanced"; PCIE_ASPM_ON_AC = "balanced"; CPU_BOOST_ON_AC = 1; diff --git a/hosts/doloro-laptop/nixos.nix b/hosts/doloro-laptop/nixos.nix index 2c2f5a2..db8d6ca 100644 --- a/hosts/doloro-laptop/nixos.nix +++ b/hosts/doloro-laptop/nixos.nix @@ -33,7 +33,6 @@ in boot.loader.efi.canTouchEfiVariables = true; boot.kernelPackages = pkgs.linuxPackages_6_12; # Hibernate works on 6.12 but not on latest # boot.kernelPackages = pkgs.linuxPackages_zen; # Hibernate works on 6.12 but not on latest - networking.hostName = "doloro-nixos-laptop"; # Define your hostname. security.rtkit.enable = true; diff --git a/hosts/doloro/home.nix b/hosts/doloro/home.nix index 8995314..cb697ba 100644 --- a/hosts/doloro/home.nix +++ b/hosts/doloro/home.nix @@ -16,7 +16,7 @@ # chromium.enable = true; wivrn.enable = true; sops.enable = true; - helium.enable = false; + helium.enable = true; nixvim.enable = true; helix.enable = false; stylix.enable = true; @@ -28,7 +28,7 @@ autostart = true; }; blender.enable = true; - zen-browser.enable = true; + zen-browser.enable = false; bottles.enable = true; fish.enable = true; youtube-music.enable = true; diff --git a/modules/helium/home.nix b/modules/helium/home.nix index 89dcd34..9f5919f 100644 --- a/modules/helium/home.nix +++ b/modules/helium/home.nix @@ -9,7 +9,6 @@ let cfg = config.modules.helium; # packageNix = "${inputs.nixpkgs-gamescope}/pkgs/by-name/he/helium-browser/package.nix"; - # helium = inputs.nikkuss-pkgs.callPackage packageNix { }; in { options.modules.helium = { @@ -17,14 +16,11 @@ in }; config = lib.mkIf cfg.enable { home.packages = [ - inputs.nikkuss-pkgs.packages.x86_64-linux.helium-browser + inputs.heliumFlake.packages.x86_64-linux.helium ]; - # xdg.mimeApps.defaultApplications = { - # "text/html" = "chromium.desktop"; - # "x-scheme-handler/http" = "chromium.desktop"; - # "x-scheme-handler/https" = "chromium.desktop"; - # "x-scheme-handler/about" = "chromium.desktop"; - # "x-scheme-handler/unknown" = "chromium.desktop"; - # }; + # Gives me widevine support. yay + xdg.configFile."net.imput.helium/WidevineCdm/latest-component-updated-widevine-cdm" = { + text = ''{"Path":"${pkgs.widevine-cdm}/share/google/chrome/WidevineCdm"}''; + }; }; }