diff --git a/flake.lock b/flake.lock index 80d6198..05768bd 100644 --- a/flake.lock +++ b/flake.lock @@ -232,6 +232,26 @@ "type": "gitlab" } }, + "helium": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1786621994, + "narHash": "sha256-ygaOQQFGv3QHcNMoGBor22Dm5GouzmwYucrUfX6oTxQ=", + "owner": "oxcl", + "repo": "nix-flake-helium-browser", + "rev": "810640b8a7aa504d3962ec8bb857f8252aad6547", + "type": "github" + }, + "original": { + "owner": "oxcl", + "repo": "nix-flake-helium-browser", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -438,6 +458,7 @@ }, "root": { "inputs": { + "helium": "helium", "home-manager": "home-manager", "lanzaboote": "lanzaboote", "nix-easyroam": "nix-easyroam", diff --git a/flake.nix b/flake.nix index 18a5d40..1f4d814 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,10 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + helium = { + url = "github:oxcl/nix-flake-helium-browser"; + inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -41,6 +45,7 @@ stylix, nixvim, lanzaboote, + helium, ... }: { @@ -61,7 +66,9 @@ home-manager.useGlobalPkgs = true; home-manager.extraSpecialArgs = { inherit inputs; }; } - ({ lib, ... }: { + ({ lib, pkgs, ... }: { + nixpkgs.overlays = [ helium.overlays.default ]; + environment.systemPackages = [ pkgs.helium ]; boot.loader.systemd-boot.enable = true; networking.hostName = lib.mkForce "seele"; powerManagement.powertop.enable = true; @@ -97,9 +104,11 @@ ... }: { + nixpkgs.overlays = [ helium.overlays.default ]; networking.hostName = lib.mkForce "nerv"; environment.systemPackages = [ pkgs.sbctl + pkgs.helium ]; boot.kernelParams = [ "video=card2-DP-5:2560x1440@60" diff --git a/home-manager/hyprland/hyprland.lua b/home-manager/hyprland/hyprland.lua index 37008e2..7a489f0 100644 --- a/home-manager/hyprland/hyprland.lua +++ b/home-manager/hyprland/hyprland.lua @@ -37,12 +37,12 @@ hl.config({ }, decoration = { - rounding = 18, + rounding = 0, rounding_power = 2, active_opacity = 1.0, inactive_opacity = 1.0, shadow = { - enabled = true, + enabled = false, range = 4, render_power = 3, color = 0xee1a1a1a, diff --git a/home-manager/programs/common.nix b/home-manager/programs/common.nix index fd82543..e249ec9 100644 --- a/home-manager/programs/common.nix +++ b/home-manager/programs/common.nix @@ -1,7 +1,6 @@ { pkgs, ... }: { programs.quickshell.enable = true; programs.fuzzel.enable = true; - programs.google-chrome.enable = true; programs.home-manager.enable = true; services.syncthing.enable = true; programs.spicetify.enable = true; diff --git a/nixos/nixvim/plugins/statusline.nix b/nixos/nixvim/plugins/statusline.nix index 3dd832a..399d08b 100644 --- a/nixos/nixvim/plugins/statusline.nix +++ b/nixos/nixvim/plugins/statusline.nix @@ -18,7 +18,7 @@ 'filetype_lsp', function(active) return Slimline.highlights.hl_component( - { primary = '%3l:%-2c', secondary = '%P' }, + { primary = '%3l:%-2c'}, Slimline.get_mode().hls, Slimline.get_sep('mode'), 'right', diff --git a/nixos/stylix/stylix.nix b/nixos/stylix/stylix.nix index c318f8a..3687324 100644 --- a/nixos/stylix/stylix.nix +++ b/nixos/stylix/stylix.nix @@ -1,4 +1,5 @@ { + config, inputs, pkgs, lib, @@ -26,7 +27,7 @@ let map (n: "${dir}/${n}/${platform}.nix") ( builtins.filter (n: builtins.pathExists "${dir}/${n}/${platform}.nix") drop ); - palette = "tokyodark"; + palette = "oxocarbon-dark"; stylixPalette = lib.strings.concatStrings [ "${pkgs.base16-schemes}/share/themes/" "${palette}" @@ -38,7 +39,7 @@ in disabledModules = disable "nixos"; stylix.opacity = { - terminal = 0.8; + terminal = 1.0; desktop = 1.0; popups = 1.0; }; @@ -76,16 +77,16 @@ in desktop = 10; }; serif = { - package = pkgs.lora; - name = "Lora"; + package = config.stylix.fonts.monospace.package; + name = config.stylix.fonts.monospace.name; }; sansSerif = { - package = pkgs.lora; - name = "Lora"; + package = config.stylix.fonts.monospace.package; + name = config.stylix.fonts.monospace.name; }; monospace = { - name = "Monaspace Xenon NF"; - package = pkgs.monaspace; + name = "Meslo LG M DZ"; + package = pkgs.meslo-lg; }; emoji = {