nix flakeHEADmaster

Author:    refaelsh <refaelsh@pm.me>
Date:      Tue Oct 8 18:14:23 2024 +0100

6 files changed, 369 insertions, 120 deletions

diff --git a/flake.lock b/flake.lock
deleted file mode 100644
index e60d10e..0000000
--- a/flake.lock
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nodes": {
-    "flake-utils": {
-      "locked": {
-        "lastModified": 1653893745,
-        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "git-ignore-nix": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1646480205,
-        "narHash": "sha256-kekOlTlu45vuK2L9nq8iVN17V3sB0WWPqTTW3a2SQG0=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "bff2832ec341cf30acb3a4d3e2e7f1f7b590116a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "ref": "master",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1632846328,
-        "narHash": "sha256-sFi6YtlGK30TBB9o6CW7LG9mYHkgtKeWbSLAjjrNTX0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2b71ddd869ad592510553d09fe89c9709fa26b2b",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1654398695,
-        "narHash": "sha256-Kw/KeoFXszNsF5mORP45mrxCP+k9Aq03hWcuWCL9sdI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c5d810f4c74c824ae0fb788103003c6c9d366a08",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "git-ignore-nix": "git-ignore-nix",
-        "nixpkgs": "nixpkgs_2"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/flake.nix b/flake.nix
deleted file mode 100644
index 7471fb9..0000000
--- a/flake.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  inputs = {
-    git-ignore-nix.url = "github:hercules-ci/gitignore.nix/master";
-    flake-utils.url = "github:numtide/flake-utils";
-  };
-  outputs = { self, nixpkgs, flake-utils, git-ignore-nix }:
-    let
-      overlay = final: prev: {
-        haskellPackages = prev.haskellPackages.override (old: {
-          overrides = prev.lib.composeExtensions (old.overrides or (_: _: { }))
-            (hself: hsuper: {
-              xmobar = prev.haskell.lib.compose.dontCheck (hself.callCabal2nix "xmobar"
-                (git-ignore-nix.lib.gitignoreSource ./.) { });
-            });
-        });
-      };
-      overlays = [ overlay ];
-    in flake-utils.lib.eachDefaultSystem (system:
-      let pkgs = import nixpkgs { inherit system overlays; };
-          dynamicLibraries = with pkgs; [
-            xorg.libX11
-            xorg.libXrandr
-            xorg.libXrender
-            xorg.libXScrnSaver
-            xorg.libXext
-            xorg.libXft
-            xorg.libXpm.out
-            xorg.libXrandr
-            xorg.libXrender
-          ];
-      in rec {
-        devShell = pkgs.haskellPackages.shellFor {
-          packages = p: [ p.xmobar ];
-          buildInputs = with pkgs; [
-            haskellPackages.cabal-install
-            #haskellPackages.haskell-language-server
-          ] ++ dynamicLibraries;
-
-          LD_LIBRARY_PATH = pkgs.lib.strings.makeLibraryPath dynamicLibraries;
-        };
-        defaultPackage = pkgs.haskellPackages.xmobar;
-      }) // {
-        inherit overlay overlays;
-      };
-}
diff --git a/nix/default.nix b/nix/default.nix
new file mode 100644
index 0000000..aea52ed
--- /dev/null
+++ b/nix/default.nix
@@ -0,0 +1,130 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+let
+  cfg = config.programs.nixmobar;
+in
+{
+  options.programs.nixmobar = {
+    enable = mkEnableOption (mdDoc "Xmobar, a minimalistic status bar");
+
+    font = mkOption {
+      type = types.str;
+      default = "Fira Code 13";
+      description = mdDoc "Main font for Xmobar.";
+    };
+
+    additionalFonts = mkOption {
+      type = types.listOf types.str;
+      default = [ "Fira Code 22" ];
+      description = mdDoc "Additional fonts for use in Xmobar.";
+    };
+
+    bgColor = mkOption {
+      type = types.str;
+      default = "#282a36";
+      description = mdDoc "Background color of Xmobar.";
+    };
+
+    fgColor = mkOption {
+      type = types.str;
+      default = "#f8f8f2";
+      description = mdDoc "Foreground (text) color of Xmobar.";
+    };
+
+    textOffset = mkOption {
+      type = types.int;
+      default = 2;
+      description = mdDoc "Offset of the text from the edge.";
+    };
+
+    verbose = mkOption {
+      type = types.bool;
+      default = true;
+      description = mdDoc "Enable verbose mode for Xmobar.";
+    };
+
+    allDesktops = mkOption {
+      type = types.bool;
+      default = true;
+      description = mdDoc "Show Xmobar on all desktops.";
+    };
+
+    lowerOnStart = mkOption {
+      type = types.bool;
+      default = true;
+      description = mdDoc "Whether Xmobar should be lowered on start.";
+    };
+
+    overrideRedirect = mkOption {
+      type = types.bool;
+      default = true;
+      description = mdDoc "If true, Xmobar will bypass window manager redirection.";
+    };
+
+    position = mkOption {
+      type = types.str;
+      default = "BottomH 26";
+      description = mdDoc "Position of Xmobar on the screen.";
+    };
+
+    alpha = mkOption {
+      type = types.int;
+      default = 200;
+      description = mdDoc "Transparency level of Xmobar (0-255).";
+    };
+
+    commands = mkOption {
+      type = types.lines;
+      default = ''
+        Run XMonadLog
+        Run DiskU ["/", "<fc=#bd93f9><fn=1>\\xf0a0</fn></fc> <free>"] [] 50
+        Run DiskIO ["/", "<read><fc=#bd93f9> R</fc> <fc=#bd93f9>W</fc> <write>"] ["-t", "", "-w", "4"] 10
+        Run Date "%a %_d %b %H:%M:%S" "date" 10
+        # Add more commands here, one per line
+      '';
+      description = mdDoc "List of commands to run in Xmobar, each on a new line.";
+    };
+
+    alignSep = mkOption {
+      type = types.str;
+      default = "}{";
+      description = mdDoc "Separators for alignment left and right.";
+    };
+
+    template = mkOption {
+      type = types.str;
+      default = "<hspace=8/>%XMonadLog% }{ %load%|%disku%|%diskio%|<fc=#bd93f9><fn=1></fn></fc>%wifi_signal%|%dynnetwork%|<fc=#bd93f9><fn=1>󰈐</fn></fc>%cat0%|%multicoretemp%|%cpufreq%|%multicpu%|<fc=#bd93f9><fn=1></fn></fc>%kbd%|%memory% %swap%|%battery%|%alsa:default:Master%|<fc=#bd93f9><fn=1></fn></fc>%kernel_version%|%date%|%_XMONAD_TRAYPAD%";
+      description = mdDoc "Template string for Xmobar layout.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.xmobar ];
+    xdg.configFile."xmobar/.xmobarrc" = {
+      text = # haskell
+        ''
+          Config {
+            font = "${cfg.font}",
+            additionalFonts = [${lib.concatMapStringsSep ", " (s: "\"" + s + "\"") cfg.additionalFonts}],
+            bgColor = "${cfg.bgColor}",
+            fgColor = "${cfg.fgColor}",
+            textOffset = ${toString cfg.textOffset},
+            verbose = ${if cfg.verbose then "True" else "False"},
+            allDesktops = ${if cfg.allDesktops then "True" else "False"},
+            lowerOnStart = ${if cfg.lowerOnStart then "True" else "False"},
+            overrideRedirect = ${if cfg.overrideRedirect then "True" else "False"},
+            position = ${cfg.position},
+            alpha = ${toString cfg.alpha},
+            commands = [${cfg.commands}],
+            alignSep = "${cfg.alignSep}",
+            template = "${cfg.template}"
+          }
+        '';
+    };
+  };
+}
diff --git a/nix/flake.lock b/nix/flake.lock
new file mode 100644
index 0000000..3f272ee
--- /dev/null
+++ b/nix/flake.lock
@@ -0,0 +1,95 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "git-ignore-nix": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "ref": "master",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1666603677,
+        "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1728018373,
+        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "git-ignore-nix": "git-ignore-nix",
+        "nixpkgs": "nixpkgs_2"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/nix/flake.nix b/nix/flake.nix
new file mode 100644
index 0000000..b422c9a
--- /dev/null
+++ b/nix/flake.nix
@@ -0,0 +1,64 @@
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    git-ignore-nix.url = "github:hercules-ci/gitignore.nix/master";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+  outputs =
+    {
+      self,
+      nixpkgs,
+      flake-utils,
+      git-ignore-nix,
+    }:
+    let
+      overlay = final: prev: {
+        haskellPackages = prev.haskellPackages.override (old: {
+          overrides = prev.lib.composeExtensions (old.overrides or (_: _: { })) (
+            hself: hsuper: {
+              xmobar = prev.haskell.lib.compose.dontCheck (
+                hself.callCabal2nix "xmobar" (git-ignore-nix.lib.gitignoreSource ./.) { }
+              );
+            }
+          );
+        });
+      };
+      overlays = [ overlay ];
+
+      homeModules.mainmodule = import ./default.nix;
+    in
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = import nixpkgs { inherit system overlays; };
+        dynamicLibraries = with pkgs; [
+          xorg.libX11
+          xorg.libXrandr
+          xorg.libXrender
+          xorg.libXScrnSaver
+          xorg.libXext
+          xorg.libXft
+          xorg.libXpm.out
+          xorg.libXrandr
+          xorg.libXrender
+        ];
+      in
+      {
+        devShell = pkgs.haskellPackages.shellFor {
+          packages = p: [ p.xmobar ];
+          buildInputs =
+            with pkgs;
+            [
+              haskellPackages.cabal-install
+            ]
+            ++ dynamicLibraries;
+
+          LD_LIBRARY_PATH = pkgs.lib.strings.makeLibraryPath dynamicLibraries;
+        };
+        defaultPackage = pkgs.haskellPackages.xmobar;
+      }
+    )
+    // {
+      inherit overlay overlays homeModules;
+    };
+}
diff --git a/nix/readme.org b/nix/readme.org
new file mode 100644
index 0000000..d83d232
--- /dev/null
+++ b/nix/readme.org
@@ -0,0 +1,80 @@
+* Nix flake for Xmobar
+This flake exposes a module to use with home-manager.
+Here is how to set it up:
+
+1. Add the nixmobar flake as an input to your NiOS flake:
+  #+BEGIN_SRC nix
+  inputs = {
+    nixmobar.url = "git+https://codeberg.org/xmobar/xmobar.git/?dir=nix";
+  };
+  #+END_SRC
+
+2. And then, where you import your `home.nix`, add `extraSpecialArgs` like this:
+  #+BEGIN_SRC nix
+  home-manager = {
+    extraSpecialArgs = {
+      inherit inputs nixmobar;
+    };
+    users.refaelsh = import ./home.nix;
+  };
+  #+END_SRC
+
+3. Final step, use the module in `home.nix`:
+  #+BEGIN_SRC nix
+  {
+    inputs,
+    ...
+  }:
+  {
+    home.stateversion = "24.05";
+  
+    imports = [
+      inputs.nixmobar.homemodules.mainmodule
+      # Other imports go here.
+    ];
+  
+  }
+  #+END_SRC
+
+* Example usage
+#+BEGIN_SRC haskell
+{
+  programs.nixmobar = {
+    enable = true;
+    font = "Fira Code 13";
+    additionalFonts = [ "Fira Code 22" ];
+    bgColor = "#282A36";
+    fgColor = "#F8F8F2";
+    textOffset = 2;
+    verbose = true;
+    allDesktops = true;
+    lowerOnStart = true;
+    overrideRedirect = true;
+    position = "BottomH 26";
+    alpha = 200;
+    alignSep = "}{";
+    template = "<hspace=8/>%XMonadLog% }{ %load%|%disku%|%diskio%|<fc=#bd93f9><fn=1></fn></fc>%wifi_signal%|%dynnetwork%|<fc=#bd93f9><fn=1>󰈐</fn></fc>%cat0%|%multicoretemp%|%cpufreq%|%multicpu%|<fc=#bd93f9><fn=1></fn></fc>%kbd%|%memory% %swap%|%battery%|%alsa:default:Master%|<fc=#bd93f9><fn=1></fn></fc>%kernel_version%|%date%|%_XMONAD_TRAYPAD%";
+    commands = # haskell
+      ''
+        Run XMonadLog,
+        Run DiskU [("/", "<fc=#bd93f9><fn=1>\xf0a0</fn></fc> <free>")] [] 50,
+        Run DiskIO [("/", "<read><fc=#bd93f9> R</fc> <fc=#bd93f9>W</fc> <write>")] ["-t", "", "-w", "4"] 10,
+        Run DynNetwork ["-t", "<rx>KB/s<fc=#bd93f9><fn=1>\x1F89B</fn></fc><fc=#bd93f9><fn=1>\x1F899</fn></fc><tx>KB/s", "-w", "5"] 10,
+        Run Memory ["-t", "<fc=#bd93f9><fn=1>\xE266</fn></fc><usedratio>%"] 10,
+        Run Swap ["-t", "<fc=#bd93f9>S</fc><usedratio>%"] 10,
+        Run Kbd [],
+        Run CpuFreq ["-t", "<avg>GHz"] 50,
+        Run MultiCoreTemp ["-t", "<fc=#bd93f9><fn=1>\xf2c9</fn></fc><avg>°", "-L", "60", "-H", "95", "-l", "white", "-n", "white", "-h", "red"] 50,
+        Run CatInt 0 "/sys/class/hwmon/hwmon4/fan1_input" [] 50,
+        Run MultiCpu ["-t", "<fc=#bd93f9><fn=1>\xf4bc</fn></fc> <vbar0><vbar1><vbar2><vbar3><vbar4><vbar5><vbar6><vbar7>", "-w", "99", "-L", "3", "-H", "50", "--normal", "green", "--high", "red"] 10,
+        Run BatteryP ["BAT0"] ["-t", "<fc=#bd93f9><fn=1>󱊣</fn></fc><left>%", "-L", "10", "-H", "80", "-p", "3", "--", "-O", "<fc=green>On</fc> - ", "-i", "", "-L", "-15", "-H", "-5", "-l", "red", "-m", "blue", "-h", "green", "-a", "notify-send -u critical 'Battery running out!!'", "-A", "3"] 600,
+        Run Alsa "default" "Master" ["-t", "<fc=#bd93f9><fn=1>\xf028</fn></fc> <volume>%"],
+        Run Date "%a %_d %b %H:%M:%S" "date" 10,
+        Run Load ["-t", "<fc=#bd93f9><fn=0>L</fn></fc><load1>", "-L", "1", "-H", "3", "-d", "2"] 300,
+        Run ComX "nmcli" ["-t", "-f", "SIGNAL", "dev", "wifi"] "N/A" "wifi_signal" 50,
+        Run Com "uname" ["-r"] "kernel_version" 3600,
+        Run XPropertyLog "_XMONAD_TRAYPAD"
+      '';
+  };
+}
+#+END_SRC