flake.lock

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

hosts/othalan/default.nix

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

hosts/othalan/pkgs.nix

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

modules/desktop/window-managers/hyprland.nix

@@ -32,13 +32,12 @@ mkOizysModule config "hyprland" {
       ksnip
       wl-clipboard
       rofi-wayland
-      pwvucontrol
+      pavucontrol
 
       #hypr ecosystem
       hyprlock
       hypridle
 
-      # wallpapers
       swww
 
       catppuccin-cursors.mochaDark
@@ -53,21 +52,22 @@ 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,7 +26,6 @@ in
 
     virtualbox
     docker
-    podman
 
     gui
     fonts

modules/virtualization/podman.nix

@@ -1,27 +0,0 @@
-{
-  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,5 +3,4 @@
   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

@@ -1,64 +0,0 @@
-{
-  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 ];
-  };
-})