Sat Jun 1 06:10:39 PM CEST 2024

NixOS/flake.lock

@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -198,12 +214,29 @@
         "type": "github"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1711163522,
+        "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "nixpkgs": "nixpkgs_2",
-        "split-monitor-workspaces": "split-monitor-workspaces"
+        "split-monitor-workspaces": "split-monitor-workspaces",
+        "waybar": "waybar"
       }
     },
     "split-monitor-workspaces": {
@@ -242,6 +275,27 @@
         "type": "github"
       }
     },
+    "waybar": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1714646798,
+        "narHash": "sha256-f4S92muHiNmLAxzFjQorB3HYO7P98m58IwbhD3NTxf4=",
+        "ref": "refs/heads/master",
+        "rev": "b41f57e578e5f7c8c56e178aa6d860196291ade9",
+        "revCount": 3435,
+        "submodules": true,
+        "type": "git",
+        "url": "https://github.com/thomasave/Waybar"
+      },
+      "original": {
+        "submodules": true,
+        "type": "git",
+        "url": "https://github.com/thomasave/Waybar"
+      }
+    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": "hyprland-protocols",

NixOS/home.nix

@@ -2,11 +2,12 @@
 
 {
   imports = [
-    (import ./modules/zsh/config.nix { inherit config pkgs; })
-    (import ./modules/nvim/config.nix { inherit config pkgs; })
-    (import ./modules/email/config.nix { inherit config pkgs; })
+    (import ./modules/zsh/config.nix)
+    (import ./modules/nvim/config.nix)
+    (import ./modules/email/config.nix)
+    (import ./modules/rofi/config.nix)
     (import ./modules/hyprland/config.nix { inherit inputs config pkgs; })
-    (import ./modules/rofi/config.nix { inherit inputs config pkgs; })
+    (import ./modules/waybar/config.nix { inherit inputs config pkgs; })
   ];
 
   home.stateVersion = "24.11";

NixOS/modules/hyprland/config.nix

@@ -8,7 +8,7 @@ let
   playerctl = "${pkgs.playerctl}/bin/playerctl";
   wl-paste = "${pkgs.wl-clipboard}/bin/wl-paste";
   hyprpaper = "${pkgs.hyprpaper}/bin/hyprpaper";
-  waybar = "${pkgs.waybar}/bin/waybar";
+  waybar = "${inputs.waybar.packages.${pkgs.system}.waybar}/bin/waybar";
   wpctl = "${pkgs.wireplumber}/bin/wpctl";
   alacritty = "${pkgs.alacritty}/bin/alacritty";
   swaylock = "${pkgs.swaylock}/bin/swaylock";
@@ -107,9 +107,9 @@ in
       "$mainMod" = "SUPER";
       exec-once = [
         "hyprpaper"
+        "${waybar}"
         "${wl-paste} --type text --watch cliphist store"
         "${wl-paste} --type image --watch cliphist store"
-        # "${waybar}"
       ];
       env = [
         "WLR_NO_HARDWARE_CURSORS,1"