diff --git a/flake.lock b/flake.lock
index e754b29..6e741be 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
]
},
"locked": {
- "lastModified": 1722960479,
- "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=",
+ "lastModified": 1724537630,
+ "narHash": "sha256-gpqINM71zp3kw5XYwUXa84ZtPnCmLLnByuFoYesT1bY=",
"owner": "ipetkov",
"repo": "crane",
- "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4",
+ "rev": "3e08f4b1fc9aaede5dd511d8f5f4ef27501e49b0",
"type": "github"
},
"original": {
@@ -28,11 +28,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
- "lastModified": 1723185066,
- "narHash": "sha256-u7guFfIrfspwUp6/SEWCDhs2tVoE1fcgft0Fw7LdNEU=",
+ "lastModified": 1724567349,
+ "narHash": "sha256-w2G1EJlGvgRSC1OAm2147mCzlt6ZOWIiqX/TSJUgrGE=",
"owner": "nix-community",
"repo": "fenix",
- "rev": "d5f1b280af93acddbcce948d946bb5db2f8035fe",
+ "rev": "71fe264f6e208831aa0e7e54ad557a283c375014",
"type": "github"
},
"original": {
@@ -104,11 +104,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
- "lastModified": 1723218034,
- "narHash": "sha256-I6hMy00IkfQRcKVFVciHcZcCvuPmdnW/f58Xkstl13Y=",
+ "lastModified": 1724401716,
+ "narHash": "sha256-LXTYUVhv6Kz9Iy9DxXSI0J+2/hunUj2fj0Kvw2eDarQ=",
"owner": "helix-editor",
"repo": "helix",
- "rev": "e604d9f8e0fea2223a357be7c9dc6088daef47e7",
+ "rev": "620dfceb849d6b68d41d4f7678bb4675009fef4d",
"type": "github"
},
"original": {
@@ -124,11 +124,11 @@
]
},
"locked": {
- "lastModified": 1723015306,
- "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=",
+ "lastModified": 1724435763,
+ "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e",
+ "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
"type": "github"
},
"original": {
@@ -140,11 +140,11 @@
"lix": {
"flake": false,
"locked": {
- "lastModified": 1722484894,
- "narHash": "sha256-mmbf3xFov+q8h+44xx3jI/RQnIqhSbVa6ljWYV/jF3c=",
- "rev": "a3ab2cc78a736109435f3cc8e1364fcc366c6c97",
+ "lastModified": 1723511168,
+ "narHash": "sha256-XDcqLVPcsMhORerIPuQ1XNALtDvG6QRA2dKyNrccXyg=",
+ "rev": "f9a3bf6ccccf8ac6b1604c1a2980e3a565ae4f44",
"type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/a3ab2cc78a736109435f3cc8e1364fcc366c6c97.tar.gz"
+ "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f9a3bf6ccccf8ac6b1604c1a2980e3a565ae4f44.tar.gz?rev=f9a3bf6ccccf8ac6b1604c1a2980e3a565ae4f44"
},
"original": {
"type": "tarball",
@@ -161,11 +161,11 @@
]
},
"locked": {
- "lastModified": 1722485024,
- "narHash": "sha256-+7RReWaFQUO8MfAhJYNm4FkALuM3rPGy2AlXXv9Jmc8=",
+ "lastModified": 1723511483,
+ "narHash": "sha256-rT/OkVXKkns2YvyF1nFvl+8Gc3sld1c1sXPtGkbqaDY=",
"ref": "refs/heads/main",
- "rev": "e350380d72f94035c309e19fda2fd550f6ab7376",
- "revCount": 102,
+ "rev": "cecf70b77539c1a593f60ec9d0305b5e537ab6a9",
+ "revCount": 106,
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
},
@@ -205,11 +205,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1722813957,
- "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
+ "lastModified": 1724224976,
+ "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
+ "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
"type": "github"
},
"original": {
@@ -235,11 +235,11 @@
},
"nixpkgs-unstable-small": {
"locked": {
- "lastModified": 1723197662,
- "narHash": "sha256-NSvqhZYv0LY2eh0a3yoAvJjGlWeOLSjmPpivSnY9pXg=",
+ "lastModified": 1724558323,
+ "narHash": "sha256-uPXidysk1BXSayGzpxDW8JUgGvLWS+L1CTlBV3xcQB4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "0048951e7a3eba3dce8bf6ba893390d29375c5d0",
+ "rev": "ba0c72cea47a45556ccd5bc566433bd1242a0f93",
"type": "github"
},
"original": {
@@ -265,11 +265,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
- "lastModified": 1723124382,
- "narHash": "sha256-WdJYEBlc8qsif+y4qnkjaeEpDmOZhz8qA6i/2n1q2kw=",
+ "lastModified": 1724480527,
+ "narHash": "sha256-C+roFDGk6Bn/C58NGpyt7cneLCetdRMUfFTkm3O4zWM=",
"owner": "rust-lang",
"repo": "rust-analyzer",
- "rev": "dab022fb3127466e47e29e40769b11174b3e0ac3",
+ "rev": "74a6427861eb8d1e3b7c6090b2c2890ff4c53e0e",
"type": "github"
},
"original": {
diff --git a/modules/desktop-environment/home/notifications.nix b/modules/desktop-environment/home/notifications.nix
index 3d4eff1..25126ff 100644
--- a/modules/desktop-environment/home/notifications.nix
+++ b/modules/desktop-environment/home/notifications.nix
@@ -4,7 +4,7 @@
settings = {
global = {
dmenu = "${pkgs.rofi}/bin/rofi -theme gruvbox-dark -dmenu -p dunst";
- browser = "${pkgs.librewolf}/bin/librewolf";
+ browser = "${pkgs.firefox}/bin/firefox";
mouse_left_click = "context";
mouse_middle_click = "close_current";
background = "#282828";
diff --git a/modules/desktop-environment/home/panels/default.nix b/modules/desktop-environment/home/panels/default.nix
index 920a7dc..2f0bed2 100644
--- a/modules/desktop-environment/home/panels/default.nix
+++ b/modules/desktop-environment/home/panels/default.nix
@@ -2,5 +2,6 @@
imports = [
./xmobar
./polybar.nix
+ ./eww
];
}
diff --git a/modules/desktop-environment/home/panels/eww/configDir/eww.css b/modules/desktop-environment/home/panels/eww/configDir/eww.css
new file mode 100644
index 0000000..3e12d0f
--- /dev/null
+++ b/modules/desktop-environment/home/panels/eww/configDir/eww.css
@@ -0,0 +1,7 @@
+.topbar {
+ margin-bottom: 2px;
+}
+
+label {
+ font: 14pt "FiraCode Nerd Font";
+}
\ No newline at end of file
diff --git a/modules/desktop-environment/home/panels/eww/configDir/eww.yuck b/modules/desktop-environment/home/panels/eww/configDir/eww.yuck
new file mode 100644
index 0000000..e986e0b
--- /dev/null
+++ b/modules/desktop-environment/home/panels/eww/configDir/eww.yuck
@@ -0,0 +1,85 @@
+(defwindow topBar
+ :monitor 0
+ :stacking "fg"
+ :windowtype "normal"
+ :wm-ignore true
+ :exclusive true
+ :geometry (geometry
+ :width "100%"
+ :height "32px"
+ :anchor "top center")
+ (topBar))
+
+(defwidget topBar []
+ (overlay
+ :class "topBar"
+ (centerbox
+ (box
+ :halign "start"
+ :spacing 12
+ :space-evenly false
+ (label :text " ")
+ (cpu)
+ (sep)
+ (mem)
+ )
+ (box
+ :halign "center"
+ (label :text "Hi, jade! :3")
+ )
+ (box
+ :halign "end"
+ (time)
+ )
+ )
+ (box
+ :class "transFlag"
+ :height 1
+ ( flagEl :color "#5BCEFA")
+ ( flagEl :color "#F5A9B8")
+ ( flagEl :color "#FFFFFF")
+ ( flagEl :color "#F5A9B8")
+ ( flagEl :color "#5BCEFA")
+ )
+ )
+)
+
+(defwidget sep []
+ (label :text "|")
+)
+
+(defwidget time []
+ (label
+ :markup {
+ formattime(
+ EWW_TIME,
+ " %Y-%m-%d %H:%M:%S "
+ )
+ }
+ )
+)
+
+(defwidget cpu []
+ (box
+ :class "cpuIndicator"
+ (label
+ :markup " ${strlength(round(EWW_CPU.avg, 0)) == 1 ? " ${round(EWW_CPU.avg, 0)}" : round(EWW_CPU.avg, 0)}%"
+ )
+ )
+)
+
+(defwidget mem []
+ (box
+ :class "memIndicator"
+ (label
+ :markup " ${round(EWW_RAM.used_mem_perc, 0)}%"
+ )
+ )
+)
+
+(defwidget flagEl [color]
+ (box
+ :style "border-bottom: 2px solid ${color}"
+ :halign "fill"
+ )
+)
diff --git a/modules/desktop-environment/home/panels/eww/default.nix b/modules/desktop-environment/home/panels/eww/default.nix
new file mode 100644
index 0000000..377c1f4
--- /dev/null
+++ b/modules/desktop-environment/home/panels/eww/default.nix
@@ -0,0 +1,6 @@
+{ ... }: {
+ programs.eww = {
+ enable = true;
+ configDir = ./configDir;
+ };
+}
diff --git a/modules/desktop-environment/home/panels/eww/scripts/bat.nu b/modules/desktop-environment/home/panels/eww/scripts/bat.nu
new file mode 100644
index 0000000..01a043d
--- /dev/null
+++ b/modules/desktop-environment/home/panels/eww/scripts/bat.nu
@@ -0,0 +1,23 @@
+#!/usr/bin/env nu
+
+const ICONS = [
+ [ ]
+ [ ]
+ [ ]
+ [ ]
+ [ ]
+ [ ]
+ [ ]
+ [ ]
+ [ ]
+ [ ]
+ [ ]
+];
+
+def get_bat_percent [path: string] {
+ let energy_full = open $"/sys/class/power_supply/($path)/energy_full" | into float;
+ let energy_now = open $"/sys/class/power_supply/($path)/energy_now" | into float;
+
+ ($energy_now / $energy_full) * 100
+}
+
diff --git a/modules/desktop/social.nix b/modules/desktop/social.nix
index b8569bc..ea3e560 100644
--- a/modules/desktop/social.nix
+++ b/modules/desktop/social.nix
@@ -20,6 +20,8 @@ in
signal-desktop
mumble
element-desktop
+ # nheko
+ # iamb
];
};
};
diff --git a/modules/shell/helix.nix b/modules/shell/helix.nix
index 36d3e41..c3c4ea9 100644
--- a/modules/shell/helix.nix
+++ b/modules/shell/helix.nix
@@ -3,7 +3,11 @@
helix-inline-diags,
...
}: {
- home-manager.users.jade = {pkgs, ...}: {
+ home-manager.users.jade = {
+ pkgs,
+ pkgs-stable,
+ ...
+ }: {
home = {
sessionVariables.EDITOR = "hx";
packages = [
@@ -11,7 +15,7 @@
pkgs.vscode-langservers-extracted
pkgs.nodePackages.typescript-language-server
pkgs.emmet-language-server
- pkgs.typst-lsp
+ pkgs-stable.typst-lsp
];
};
programs.helix = {