diff --git a/flake.lock b/flake.lock index f72f746..fcf32c1 100644 --- a/flake.lock +++ b/flake.lock @@ -61,20 +61,19 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils" + ] }, "locked": { - "lastModified": 1681092193, - "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", + "lastModified": 1685599623, + "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", + "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.11", + "ref": "release-23.05", "repo": "home-manager", "type": "github" } @@ -129,16 +128,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1684661732, - "narHash": "sha256-2/Xo/UmUUoMXc0T5tzoUsYjMLLMjEfzRWDAQB0WwtW0=", + "lastModified": 1685533922, + "narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b0671cbf1e5c443f7fbfd4941ee0f8a151435114", + "rev": "3a70dd92993182f8e514700ccf5b1ae9fc8a3b8d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -152,21 +151,6 @@ "nixpkgs": "nixpkgs_2", "nixpkgs-unstable-small": "nixpkgs-unstable-small" } - }, - "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index fe78e43..3a918c3 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ type = "github"; owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-22.11"; + ref = "nixos-23.05"; }; nixpkgs-unstable-small = { @@ -25,7 +25,7 @@ type = "github"; owner = "nix-community"; repo = "home-manager"; - ref = "release-22.11"; + ref = "release-23.05"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/x/i3.nix b/home/x/i3.nix index 29f17b2..4c583df 100644 --- a/home/x/i3.nix +++ b/home/x/i3.nix @@ -47,7 +47,7 @@ in { config.xdg.configFile."i3status-rust/config-top.toml".target; in [ { - statusCommand = "i3status-rs ${barConfigPath}"; + statusCommand = "i3status-rs ~/${barConfigPath}"; position = "top"; fonts = { names = ["DejaVuSansMono" "FontAwesome6Free"]; diff --git a/home/x/i3bar.nix b/home/x/i3bar.nix index fc2ecd0..b09aeb3 100644 --- a/home/x/i3bar.nix +++ b/home/x/i3bar.nix @@ -52,46 +52,42 @@ in { bars = { top = { icons = "awesome5"; - theme = i3BarTheme.theme.name; - settings = i3BarTheme; + settings.theme = { + theme = i3BarTheme.theme.name; + overrides = i3BarTheme.theme.overrides; + }; blocks = [ { block = "pomodoro"; - length = 50; - break_length = 10; - notifier = "i3nag"; + notify_cmd = "i3nag"; + blocking_cmd = true; } { block = "disk_space"; path = "/"; - alias = "/"; info_type = "available"; - unit = "GB"; interval = 60; warning = 20.0; alert = 10.0; + alert_unit = "GB"; } { block = "memory"; - display_type = "memory"; - format_mem = "{mem_used;G}/{mem_total;G}"; + format = " $icon $mem_used.eng(prefix:G)/$mem_total.eng(prefix:G) "; warning_mem = 70.0; critical_mem = 90.0; - # don't show swap - clickable = false; } { block = "cpu"; interval = 1; - format = "{barchart}"; + format = " $icon $barchart "; } { block = "temperature"; - collapsed = false; interval = 10; - format = "{max}"; + format = " $icon $max "; chip = cfg.temperature.chip; inputs = cfg.temperature.inputs; } @@ -103,14 +99,18 @@ in { block = "net"; device = interface; interval = 1; - hide_inactive = true; + missing_format = ""; }) cfg.networking.throughput_interfaces) ) ++ [ { - block = "networkmanager"; - primary_only = true; + block = "net"; + format = " $icon $ip {SSID: $ssid|}"; + theme_overrides = { + idle_bg = { link = "good_bg"; }; + idle_fg = { link = "good_fg"; }; + }; } { block = "sound"; @@ -121,6 +121,7 @@ in { optional config.my.home.laptop.enable { block = "battery"; + format = " $icon $percentage ($power) "; } ) ++ [ @@ -130,8 +131,7 @@ in { { block = "time"; interval = 5; - format = "%a %d/%m %T"; - locale = "fr_FR"; + format = " $icon $timestamp.datetime(f:'%a %d/%m %T', l:fr_FR) "; timezone = "Europe/Paris"; } ];