add new and improved hyprman

flake.lock

@@ -452,16 +452,17 @@
     },
     "hyprman": {
       "inputs": {
+        "nim2nix": "nim2nix",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1718917071,
+        "lastModified": 1729435058,
-        "narHash": "sha256-Ub3xTWzWry05O+Kqxdeob+Zp5mq4tI8KTbvwDzEHINE=",
+        "narHash": "sha256-eGikARBVu4R3Lf9jltmJ6u/z1vf2JOiUhvPsOXhZkcE=",
         "ref": "refs/heads/main",
-        "rev": "bc50f371874a64749209bfb6e650b87c4067b0e2",
+        "rev": "795e6941f83daef55ac957a7136a45abf050fb78",
-        "revCount": 16,
+        "revCount": 6,
         "type": "git",
         "url": "https://git.dayl.in/daylin/hyprman.git"
       },
@@ -579,6 +580,7 @@
     "nim2nix": {
       "inputs": {
         "nixpkgs": [
+          "hyprman",
           "nixpkgs"
         ]
       },
@@ -598,7 +600,9 @@
     },
     "nim2nix_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1725469705,
@@ -615,6 +619,24 @@
       }
     },
     "nim2nix_3": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_7"
+      },
+      "locked": {
+        "lastModified": 1725469705,
+        "narHash": "sha256-4/iSUwB3XKmybdt4R87VhBPiD3z4BL6RrD9LyrrkesM=",
+        "owner": "daylinmorgan",
+        "repo": "nim2nix",
+        "rev": "42af12ca45025c7146bc24e27f5d8b65b003d663",
+        "type": "github"
+      },
+      "original": {
+        "owner": "daylinmorgan",
+        "repo": "nim2nix",
+        "type": "github"
+      }
+    },
+    "nim2nix_4": {
       "inputs": {
         "nixpkgs": [
           "utils",
@@ -999,7 +1021,7 @@
         "hyprman": "hyprman",
         "lix": "lix",
         "lix-module": "lix-module",
-        "nim2nix": "nim2nix",
+        "nim2nix": "nim2nix_2",
         "nix-index-database": "nix-index-database",
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs_4",
@@ -1179,7 +1201,7 @@
     },
     "tsm": {
       "inputs": {
-        "nim2nix": "nim2nix_2",
+        "nim2nix": "nim2nix_3",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -1202,7 +1224,7 @@
     },
     "utils": {
       "inputs": {
-        "nim2nix": "nim2nix_3",
+        "nim2nix": "nim2nix_4",
         "nixpkgs": "nixpkgs_8"
       },
       "locked": {

hosts/othalan/default.nix

@@ -18,10 +18,10 @@
     // (
       ''
         vpn|desktop|hyprland|chrome
-        docker|vbox|backups|hp-scanner|llm
+        backups|hp-scanner|llm
+        podman|docker|vbox
       ''
       |> listify
       |> enableAttrs
     );
-
 }

hosts/othalan/pkgs.nix

@@ -3,6 +3,7 @@
   environment.systemPackages =
     [ (flake.pkg "utils") ]
     ++ (with pkgs; [
+      distrobox
       zk
       quarto
       cachix

modules/desktop/window-managers/hyprland.nix

@@ -32,12 +32,13 @@ mkOizysModule config "hyprland" {
       ksnip
       wl-clipboard
       rofi-wayland
-      pavucontrol
+      pwvucontrol
 
       #hypr ecosystem
       hyprlock
       hypridle
 
+      # wallpapers
       swww
 
       catppuccin-cursors.mochaDark
@@ -52,22 +53,21 @@ mkOizysModule config "hyprland" {
       mako
       eww
       wlr-randr
-      # swww
-      #
-      # dunst
     ]);
+
   nixpkgs.overlays = [
     (flake.overlay "hyprland-contrib")
     # (overlayFrom "nixpkgs-wayland")
     # (overlayFrom "hyprland")
   ];
+
   # using the below to autostart Hyprland
   # broke my keybindings that were working before
-
+  #
-  services.getty = {
+  # services.getty = {
-    extraArgs = [ "--skip-login" ];
+  #   extraArgs = [ "--skip-login" ];
-    loginOptions = "-p -- ${config.oizys.user}";
+  #   loginOptions = "-p -- ${config.oizys.user}";
-  };
+  # };
 
   # environment.etc =
   #   let

modules/oizys.nix

@@ -26,6 +26,7 @@ in
 
     virtualbox
     docker
+    podman
 
     gui
     fonts

modules/virtualization/podman.nix

@@ -0,0 +1,27 @@
+{
+  config,
+  pkgs,
+  mkOizysModule,
+  enabled,
+  ...
+}:
+mkOizysModule config "podman" {
+
+  # I'm not sure what this is doing, but it was in the old wiki...
+  # Enable common container config files in /etc/containers
+  virtualisation.containers = enabled;
+  virtualisation = {
+    podman = enabled // {
+      # Create a `docker` alias for podman, to use it as a drop-in replacement
+      # dockerCompat = true;
+
+      # Required for containers under podman-compose to be able to talk to each other.
+      defaultNetwork.settings.dns_enabled = true;
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    podman-tui # status of containers in the terminal
+    podman-compose # start group of containers for dev
+  ];
+}

pkgs/default.nix

@@ -3,4 +3,5 @@
   nph = pkgs.callPackage ./nim/nph { }; # doesn't compile with 2.2.0 :/
   nimlangserver = pkgs.callPackage ./nim/nimlangserver { };
   nimble = pkgs.callPackage ./nim/nimble { };
+  distrobox = pkgs.callPackage ./distrobox {};
 }

pkgs/distrobox/default.nix

@@ -0,0 +1,64 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchFromGitHub,
+  makeWrapper,
+  wget,
+  installShellFiles,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "distrobox";
+  version = "1.8.0";
+
+  src = fetchFromGitHub {
+    owner = "89luca89";
+    repo = "distrobox";
+    rev = finalAttrs.version;
+    hash = "sha256-e9oSTk+UlkrkRSipqjjMqwtxEvEZffVBmlSTmsIT7cU=";
+  };
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  nativeBuildInputs = [ makeWrapper  installShellFiles];
+
+  installPhase = ''
+    runHook preInstall
+
+    # https://github.com/89luca89/distrobox/issues/408
+    substituteInPlace ./distrobox-generate-entry \
+    --replace-fail 'icon_default="''${XDG_DATA_HOME:-''${HOME}/.local/share}' "icon_default=\"$out"
+    ./install -P $out
+
+    runHook postInstall
+  '';
+
+  # https://github.com/89luca89/distrobox/issues/407
+  postFixup = ''
+    wrapProgram "$out/bin/distrobox-generate-entry" \
+      --prefix PATH ":" ${lib.makeBinPath [ wget ]}
+
+    mkdir -p $out/share/distrobox
+    echo 'container_additional_volumes="/nix:/nix"' > $out/share/distrobox/distrobox.conf
+  '';
+
+
+  postInstall = ''
+    ls completions/zsh
+    installShellCompletion --cmd distrbox --zsh completions/zsh/_distrobox
+  '';
+
+  meta = with lib; {
+    description = "Wrapper around podman or docker to create and start containers";
+    longDescription = ''
+      Use any linux distribution inside your terminal. Enable both backward and
+      forward compatibility with software and freedom to use whatever distribution
+      you’re more comfortable with
+    '';
+    homepage = "https://distrobox.it/";
+    license = licenses.gpl3Only;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ atila ];
+  };
+})