diff --git a/home-manager/common/desktop/xmobar/default.nix b/home-manager/common/desktop/xmobar/default.nix new file mode 100644 index 0000000..5709132 --- /dev/null +++ b/home-manager/common/desktop/xmobar/default.nix @@ -0,0 +1,13 @@ +{ inputs, pkgs, ... }: + +{ + nixpkgs.overlays = [ + (final: prev: { + xmobar = inputs.xmobar-config.packages.${pkgs.system}.xmobar-config; + }) + ]; + + home.pkgs = with pkgs; [ + xmobar + ]; +} diff --git a/home-manager/common/desktop/xmobar/flake.lock b/home-manager/common/desktop/xmobar/xmobar-config/flake.lock similarity index 66% rename from home-manager/common/desktop/xmobar/flake.lock rename to home-manager/common/desktop/xmobar/xmobar-config/flake.lock index e9476dc..37e7c12 100644 --- a/home-manager/common/desktop/xmobar/flake.lock +++ b/home-manager/common/desktop/xmobar/xmobar-config/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1683560683, - "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=", + "lastModified": 1688466019, + "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "006c75898cf814ef9497252b022e91c946ba8e17", + "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "haskell-flake": { "locked": { - "lastModified": 1684069239, - "narHash": "sha256-1nPdY5KasmGwwtuKv7OKCLCZC3wlAE+hJWwKZRBAluo=", + "lastModified": 1689950301, + "narHash": "sha256-sUYqHggNUIMuBVOsRoseBn3/tx58yMnMvOM31Rqf9dU=", "owner": "srid", "repo": "haskell-flake", - "rev": "b8ccbf305e720e3483d7b983aeda61326169226a", + "rev": "92aabc529c4487960c14016b65b3ac7e7e159b13", "type": "github" }, "original": { @@ -35,11 +35,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1684120848, - "narHash": "sha256-gIwJ5ac1FwZEkCRwjY+gLwgD4G1Bw3Xtr2jr2XihMPo=", + "lastModified": 1689935543, + "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0cb867999eec4085e1c9ca61c09b72261fa63bb4", + "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", "type": "github" }, "original": { @@ -52,11 +52,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1682879489, - "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=", + "lastModified": 1688049487, + "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0", + "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", "type": "github" }, "original": { diff --git a/home-manager/common/desktop/xmobar/flake.nix b/home-manager/common/desktop/xmobar/xmobar-config/flake.nix similarity index 100% rename from home-manager/common/desktop/xmobar/flake.nix rename to home-manager/common/desktop/xmobar/xmobar-config/flake.nix diff --git a/home-manager/common/desktop/xmobar/src/xmobar-top.hs b/home-manager/common/desktop/xmobar/xmobar-config/src/xmobar-top.hs similarity index 94% rename from home-manager/common/desktop/xmobar/src/xmobar-top.hs rename to home-manager/common/desktop/xmobar/xmobar-config/src/xmobar-top.hs index 64424fa..d688db7 100644 --- a/home-manager/common/desktop/xmobar/src/xmobar-top.hs +++ b/home-manager/common/desktop/xmobar/xmobar-config/src/xmobar-top.hs @@ -8,7 +8,7 @@ config = defaultConfig , additionalFonts = [ "Symbols Nerd Font 2048-em 24" ] , bgColor = bg1 , fgColor = fg0 - , position = Static { xpos = 1920, ypos = 0, width = 2560, height = 24 } + , position = Static { xpos = 0, ypos = 0, width = 2560, height = 24 } -- commands to run , commands = [ Run $ XPropertyLog "_XMONAD_LOG_1" diff --git a/home-manager/common/desktop/xmobar/xmobar-config.cabal b/home-manager/common/desktop/xmobar/xmobar-config/xmobar-config.cabal similarity index 100% rename from home-manager/common/desktop/xmobar/xmobar-config.cabal rename to home-manager/common/desktop/xmobar/xmobar-config/xmobar-config.cabal