diff --git a/flake.lock b/flake.lock index 7673b1f..8ae19ff 100644 --- a/flake.lock +++ b/flake.lock @@ -510,11 +510,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1680751757, - "narHash": "sha256-da6qOFIbmm8PBrW4JVSlXi15azHxw2SgidIx9jMmP8s=", + "lastModified": 1681141923, + "narHash": "sha256-PNHLOW1AQRd6PU2BoiGw8w1LWvCp5842sE4w1hfcAao=", "owner": "helix-editor", "repo": "helix", - "rev": "fc4ca96c2986bc875f1fc6e2cb164dcaf4f4a09c", + "rev": "686a1e2f311932c2fcfeee6e8384ab8ce959d618", "type": "github" }, "original": { @@ -531,11 +531,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1680597706, - "narHash": "sha256-ZqJ3T+BxzjPH9TnmeUwS4Uu9ZQPeBXAFC9sUWlharT4=", + "lastModified": 1681127522, + "narHash": "sha256-Eo4dd0AmKshM+A6msQRMwT42QvWGNxa8RjmZ4tY7g9E=", "owner": "nix-community", "repo": "home-manager", - "rev": "ec06f419af79207b33d797064dfb3fc9dbe1df4a", + "rev": "93f5cb2482dd20e57eb8ca6c819cdad9738f98a0", "type": "github" }, "original": { @@ -676,11 +676,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1680070330, - "narHash": "sha256-aoT2YZCd9LEtiEULFLIF0ykKydgE72X8gw/k9/pRS5I=", + "lastModified": 1680876084, + "narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "a6aa8174fa61e55bd7e62d35464d3092aefe0421", + "rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2", "type": "github" }, "original": { @@ -759,11 +759,11 @@ "nixpkgs-wayland": { "flake": false, "locked": { - "lastModified": 1680723078, - "narHash": "sha256-PJdW2c+7CSPebkr5wuNh1GjzYVlM97Aix3pipHBm+JY=", + "lastModified": 1681139493, + "narHash": "sha256-vNoib7DtiVLeMrn2Pu3YyH0IHesR6z9lT52313BO8iA=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "1053de6c3ad791811087bc798ae2b0948184c24e", + "rev": "38c71d36f86f8410a5d4e191b196ed6ec09504c7", "type": "github" }, "original": { @@ -805,11 +805,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1680669251, - "narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=", + "lastModified": 1681036984, + "narHash": "sha256-AbScJXshYzbeUKHh+Y3OICc3iAtr+NqJ3Xb81GW+ptU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9c8ff8b426a8b07b9e0a131ac3218740dc85ba1e", + "rev": "fd531dee22c9a3d4336cc2da39e8dd905e8f3de4", "type": "github" }, "original": { @@ -821,11 +821,11 @@ }, "nur": { "locked": { - "lastModified": 1680754279, - "narHash": "sha256-Fg87INxT7Z9FSqKUzz+s8Uj4OlbmoLV4jdgyVY4CTuk=", + "lastModified": 1681151175, + "narHash": "sha256-3RmW7n3KniHutKLah1MrqzEfSWJZkyN+nTq1U+oZn8U=", "owner": "nix-community", "repo": "NUR", - "rev": "67892cbc59ae24528f5a3bb3faa97c478290b76a", + "rev": "2e608fa1d533ac085adb44169ab14c9da5e98893", "type": "github" }, "original": { diff --git a/users/modules/helix/default.nix b/users/modules/helix/default.nix index 41bbbab..e21ca62 100644 --- a/users/modules/helix/default.nix +++ b/users/modules/helix/default.nix @@ -15,22 +15,22 @@ name = "nix"; language-server = {command = "${inputs.nil.packages.${pkgs.system}.default}/bin/nil";}; } - { - name = "rust"; - language-server = {command = "${pkgs.rust-analyzer}/bin/rust-analyzer";}; - } ]; settings = { editor = { + soft-wrap.enable = true; line-number = "relative"; middle-click-paste = false; true-color = true; whitespace.render = "all"; - cursor-shape.insert = "bar"; - lsp.display-messages = true; + cursor-shape.insert = "block"; + lsp = { + display-messages = true; + display-inlay-hints = true; + }; indent-guides = { render = true; - character = "|"; + # character = "|"; }; auto-pairs = { "(" = ")"; @@ -40,6 +40,11 @@ "'" = "'"; "<" = ">"; }; + statusline = { + left = ["mode" "spinner"]; + center = ["file-name" "file-encoding" "separator" "version-control"]; + right = ["diagnostics" "selections"]; + }; }; }; }; diff --git a/users/patriot/stylix.nix b/users/patriot/stylix.nix index c4be3c3..5aa1a38 100644 --- a/users/patriot/stylix.nix +++ b/users/patriot/stylix.nix @@ -4,10 +4,30 @@ pkgs, ... }: { - imports = [inputs.stylix.nixosModules.stylix]; + imports = [ + inputs.stylix.nixosModules.stylix + ]; stylix.image = ./wallpaper.png; stylix.polarity = "dark"; + stylix.base16Scheme = { + "base00" = "191a16"; + "base01" = "20211c"; + "base02" = "24251f"; # splatoon 3 dark background + "base03" = "50514c"; + "base04" = "7c7c79"; + "base05" = "a7a8a5"; + "base06" = "d3d3d2"; + "base07" = "ffffff"; + "base08" = "cf0466"; # splatoon 2 pink + "base09" = "2851f6"; # splatoon 1 blue + "base0A" = "6844e6"; # splatoon 3 purple + "base0B" = "17a80d"; # splatoon 2 green + "base0C" = "fea972"; # splatoon 3 fuzzy orange color + "base0D" = "fa5a00"; # splatoon 1 orange + "base0E" = "fffe27"; # splatoon 3 yellow + "base0F" = "bdbebc"; + }; stylix.fonts = { serif = { diff --git a/users/patriot/wallpaper.png b/users/patriot/wallpaper.png index 3609b50..3564c44 100644 Binary files a/users/patriot/wallpaper.png and b/users/patriot/wallpaper.png differ