chore: merge remote-tracking branch 'refs/remotes/origin/master'

chore: adds iamb
flake: add iamb
2025-12-05 07:05:40 +01:00 · 2025-09-09 08:14:35 +02:00 · 2025-09-09 08:14:23 +02:00 · 2025-09-09 08:14:16 +02:00 · 2025-09-09 08:14:05 +02:00 · 2025-09-09 08:13:30 +02:00
6 changed files with 177 additions and 45 deletions
--- a/flake.lock
+++ b/flake.lock
@ -190,6 +190,24 @@
        "type": "github"
      }
    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_5"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
    "flakeCompat": {
      "flake": false,
      "locked": {
@ -727,6 +745,26 @@
        "type": "github"
      }
    },
+    "iamb": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_6",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1756876216,
+        "narHash": "sha256-ZVRwUbMrGeH3XZrFt/YoCOxXR6TWwkXcqWwWAA+F+Rs=",
+        "owner": "ulyssa",
+        "repo": "iamb",
+        "rev": "7b1dc93f3a01f4e8b138922a27bb3ce60d7be1f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ulyssa",
+        "repo": "iamb",
+        "type": "github"
+      }
+    },
    "ixx": {
      "inputs": {
        "flake-utils": [
@ -804,6 +842,38 @@
      }
    },
    "nixpkgs_10": {
+      "locked": {
+        "lastModified": 1742800061,
+        "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_11": {
+      "locked": {
+        "lastModified": 1755186698,
+        "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_12": {
      "locked": {
        "lastModified": 1744868846,
        "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
@ -884,6 +954,38 @@
      }
    },
    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1756542300,
+        "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
+      "locked": {
+        "lastModified": 1744536153,
+        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_8": {
      "locked": {
        "lastModified": 1755186698,
        "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
@ -899,7 +1001,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_7": {
+    "nixpkgs_9": {
      "locked": {
        "lastModified": 1743315132,
        "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
@ -915,42 +1017,10 @@
        "type": "github"
      }
    },
-    "nixpkgs_8": {
-      "locked": {
-        "lastModified": 1742800061,
-        "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_9": {
-      "locked": {
-        "lastModified": 1755186698,
-        "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nixvim": {
      "inputs": {
        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_7",
+        "nixpkgs": "nixpkgs_9",
        "nixvim": "nixvim_2"
      },
      "locked": {
@ -970,7 +1040,7 @@
    "nixvim_2": {
      "inputs": {
        "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_8",
+        "nixpkgs": "nixpkgs_10",
        "nuschtosSearch": "nuschtosSearch"
      },
      "locked": {
@ -990,7 +1060,7 @@
    "nur": {
      "inputs": {
        "flake-parts": "flake-parts_3",
-        "nixpkgs": "nixpkgs_9"
+        "nixpkgs": "nixpkgs_11"
      },
      "locked": {
        "lastModified": 1755435577,
@ -1008,7 +1078,7 @@
    },
    "nuschtosSearch": {
      "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
        "ixx": "ixx",
        "nixpkgs": [
          "nixvim",
@ -1062,8 +1132,9 @@
        "hyprland": "hyprland",
        "hyprpicker": "hyprpicker",
        "hyprsunset": "hyprsunset",
+        "iamb": "iamb",
        "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_8",
        "nixvim": "nixvim",
        "nur": "nur",
        "sops-nix": "sops-nix"
@ -1086,9 +1157,27 @@
        "type": "github"
      }
    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_7"
+      },
+      "locked": {
+        "lastModified": 1756694554,
+        "narHash": "sha256-z/Iy4qvcMqzhA2IAAg71Sw4BrMwbBHvCS90ZoPLsnIk=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "b29e5365120f344fe7161f14fc9e272fcc41ee56",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
    "sops-nix": {
      "inputs": {
-        "nixpkgs": "nixpkgs_10"
+        "nixpkgs": "nixpkgs_12"
      },
      "locked": {
        "lastModified": 1754988908,
@ -1164,6 +1253,21 @@
        "type": "github"
      }
    },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
    "xdph": {
      "inputs": {
        "hyprland-protocols": [
--- a/flake.nix
+++ b/flake.nix
@ -16,6 +16,7 @@
    nixvim.url = "github:ahwxorg/nixvim-config";
    sops-nix.url = "github:Mic92/sops-nix";
    disko.url = "github:nix-community/disko/latest";
+    iamb.url = "github:ulyssa/iamb";
  };

  outputs =
@ -24,6 +25,7 @@
      nixpkgs,
      sops-nix,
      disko,
+      iamb,
      ...
    }@inputs:
    let
--- a/modules/core/program.nix
+++ b/modules/core/program.nix
@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
  programs = {
    dconf.enable = true;
@ -15,5 +15,6 @@
    git
    dig
    traceroute
+    inputs.iamb.packages.${pkgs.stdenv.targetPlatform.system}.default
  ];
 }
--- a/modules/core/virtualization.nix
+++ b/modules/core/virtualization.nix
@ -1,4 +1,10 @@
-{ pkgs, host, ... }:
+{
+  pkgs,
+  host,
+  config,
+  username,
+  ...
+}:
 {
  virtualisation = {
    # vmware.host.enable = true; # Causes issues for now :p
@ -14,10 +20,23 @@
        true
      else
        false;
-    spiceUSBRedirection.enable = true;
+    spiceUSBRedirection.enable =
+      if (config.virtualisation.libvirtd.enable == true) then true else false;
  };

-  programs.virt-manager.enable = true;
+  programs.virt-manager.enable =
+    if (config.virtualisation.waydroid.enable == true) then true else false;
+  #dconf.settings."org/virt-manager/virt-manager/connections" =
+  #  if (config.programs.virt-manager.enable == true) then
+  #    {
+  #      autoconnect = [ "qemu:///system" ];
+  #      uris = [ "qemu:///system" ];
+  #    }
+  #  else
+  #    { };
+
+  users.groups.libvirtd.members =
+    if (config.virtualisation.waydroid.enable == true) then [ username ] else [ ];

  # Enable qemu etc
  environment.systemPackages = with pkgs; [
--- a/modules/home/hyprland/config.nix
+++ b/modules/home/hyprland/config.nix
@ -85,6 +85,7 @@
        "wl-paste --watch cliphist store &"
        "yubikey-touch-detector --libnotify &"
        "mpDris2 &"
+        "foot --server"
      ];

      input = {
@ -213,8 +214,8 @@

      bind = [
        # keybindings
-        "$mainMod, Return, exec, kitty"
-        "$mainMod SHIFT, Return, exec, [float; center; size 950 650] kitty"
+        "$mainMod, Return, exec, footclient"
+        "$mainMod SHIFT, Return, exec, [float; center; size 950 650] footclient"
        "$mainMod, Q, killactive,"
        "$mainMod, F, fullscreen, 0" # set 1 to 0 to set full screen without waybar
        "$mainMod, Space, togglefloating,"
@ -332,6 +333,9 @@
        "float,title:^(float_kitty)$"
        "center,title:^(float_kitty)$"
        "size 950 600,title:^(float_kitty)$"
+        "float,title:^(float_foot)$"
+        "center,title:^(float_foot)$"
+        "size 950 600,title:^(float_foot)$"
        "float,title:^(Volume Control)$"
        "float,title:^(Librewolf — Sharing Indicator)$"
        "move 0 0,title:^(Librewolf — Sharing Indicator)$"
--- a/modules/home/packages.nix
+++ b/modules/home/packages.nix
@ -31,6 +31,8 @@
    python3

    # CLI shit
+    imagemagick
+    foot
    termpdfpy
    vimv
    iamb
Author	SHA1	Message	Date
Ahwx	ac38fa15e8	chore: merge remote-tracking branch 'refs/remotes/origin/master'	2025-09-09 08:14:35 +02:00
Ahwx	11d61defac	chore: adds iamb	2025-09-09 08:14:23 +02:00
Ahwx	ac356565f7	flake: add iamb	2025-09-09 08:14:16 +02:00
Ahwx	6ee8d321ed	feat: adds `foot` and `imagemagick`	2025-09-09 08:14:05 +02:00
Ahwx	2868f55690	feat: switch to foot for hyprland config	2025-09-09 08:13:30 +02:00
Ahwx	0d89ebd2e5	feat: improves virtualization modularity and implementation	2025-09-09 08:13:15 +02:00