Compare commits

..

No commits in common. "ac38fa15e8cdfd1a725e1c9272a39790bd4978de" and "e7e637b2f6988a720c1344451aba5a4b94adcc91" have entirely different histories.

6 changed files with 45 additions and 177 deletions

182
flake.lock generated
View file

@ -190,24 +190,6 @@
"type": "github" "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": { "flakeCompat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -745,26 +727,6 @@
"type": "github" "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": { "ixx": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@ -842,38 +804,6 @@
} }
}, },
"nixpkgs_10": { "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": { "locked": {
"lastModified": 1744868846, "lastModified": 1744868846,
"narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
@ -954,38 +884,6 @@
} }
}, },
"nixpkgs_6": { "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": { "locked": {
"lastModified": 1755186698, "lastModified": 1755186698,
"narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
@ -1001,7 +899,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_9": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1743315132, "lastModified": 1743315132,
"narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
@ -1017,10 +915,42 @@
"type": "github" "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": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_9", "nixpkgs": "nixpkgs_7",
"nixvim": "nixvim_2" "nixvim": "nixvim_2"
}, },
"locked": { "locked": {
@ -1040,7 +970,7 @@
"nixvim_2": { "nixvim_2": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_10", "nixpkgs": "nixpkgs_8",
"nuschtosSearch": "nuschtosSearch" "nuschtosSearch": "nuschtosSearch"
}, },
"locked": { "locked": {
@ -1060,7 +990,7 @@
"nur": { "nur": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_3",
"nixpkgs": "nixpkgs_11" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1755435577, "lastModified": 1755435577,
@ -1078,7 +1008,7 @@
}, },
"nuschtosSearch": { "nuschtosSearch": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"ixx": "ixx", "ixx": "ixx",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
@ -1132,9 +1062,8 @@
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprpicker": "hyprpicker", "hyprpicker": "hyprpicker",
"hyprsunset": "hyprsunset", "hyprsunset": "hyprsunset",
"iamb": "iamb",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_8", "nixpkgs": "nixpkgs_6",
"nixvim": "nixvim", "nixvim": "nixvim",
"nur": "nur", "nur": "nur",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
@ -1157,27 +1086,9 @@
"type": "github" "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": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_12" "nixpkgs": "nixpkgs_10"
}, },
"locked": { "locked": {
"lastModified": 1754988908, "lastModified": 1754988908,
@ -1253,21 +1164,6 @@
"type": "github" "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": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": [ "hyprland-protocols": [

View file

@ -16,7 +16,6 @@
nixvim.url = "github:ahwxorg/nixvim-config"; nixvim.url = "github:ahwxorg/nixvim-config";
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
disko.url = "github:nix-community/disko/latest"; disko.url = "github:nix-community/disko/latest";
iamb.url = "github:ulyssa/iamb";
}; };
outputs = outputs =
@ -25,7 +24,6 @@
nixpkgs, nixpkgs,
sops-nix, sops-nix,
disko, disko,
iamb,
... ...
}@inputs: }@inputs:
let let

View file

@ -1,4 +1,4 @@
{ pkgs, inputs, ... }: { pkgs, ... }:
{ {
programs = { programs = {
dconf.enable = true; dconf.enable = true;
@ -15,6 +15,5 @@
git git
dig dig
traceroute traceroute
inputs.iamb.packages.${pkgs.stdenv.targetPlatform.system}.default
]; ];
} }

View file

@ -1,10 +1,4 @@
{ { pkgs, host, ... }:
pkgs,
host,
config,
username,
...
}:
{ {
virtualisation = { virtualisation = {
# vmware.host.enable = true; # Causes issues for now :p # vmware.host.enable = true; # Causes issues for now :p
@ -20,23 +14,10 @@
true true
else else
false; false;
spiceUSBRedirection.enable = spiceUSBRedirection.enable = true;
if (config.virtualisation.libvirtd.enable == true) then true else false;
}; };
programs.virt-manager.enable = programs.virt-manager.enable = true;
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 # Enable qemu etc
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

View file

@ -85,7 +85,6 @@
"wl-paste --watch cliphist store &" "wl-paste --watch cliphist store &"
"yubikey-touch-detector --libnotify &" "yubikey-touch-detector --libnotify &"
"mpDris2 &" "mpDris2 &"
"foot --server"
]; ];
input = { input = {
@ -214,8 +213,8 @@
bind = [ bind = [
# keybindings # keybindings
"$mainMod, Return, exec, footclient" "$mainMod, Return, exec, kitty"
"$mainMod SHIFT, Return, exec, [float; center; size 950 650] footclient" "$mainMod SHIFT, Return, exec, [float; center; size 950 650] kitty"
"$mainMod, Q, killactive," "$mainMod, Q, killactive,"
"$mainMod, F, fullscreen, 0" # set 1 to 0 to set full screen without waybar "$mainMod, F, fullscreen, 0" # set 1 to 0 to set full screen without waybar
"$mainMod, Space, togglefloating," "$mainMod, Space, togglefloating,"
@ -333,9 +332,6 @@
"float,title:^(float_kitty)$" "float,title:^(float_kitty)$"
"center,title:^(float_kitty)$" "center,title:^(float_kitty)$"
"size 950 600,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:^(Volume Control)$"
"float,title:^(Librewolf Sharing Indicator)$" "float,title:^(Librewolf Sharing Indicator)$"
"move 0 0,title:^(Librewolf Sharing Indicator)$" "move 0 0,title:^(Librewolf Sharing Indicator)$"

View file

@ -31,8 +31,6 @@
python3 python3
# CLI shit # CLI shit
imagemagick
foot
termpdfpy termpdfpy
vimv vimv
iamb iamb