Re-arranged some packages to allow mpv and imv to work again

9f740aa87254… · Ryan Schanzenbacher ·

Forgot home-config
parent bde398cb8c3d… diff

Changed files

diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm
index a665e70..dd14824 100644
--- a/home-config/home-configuration.scm
+++ b/home-config/home-configuration.scm
@@ -85,7 +85,7 @@
"syncthing"
"taskwarrior"
"tasksh"
- "imv"
+ ;"imv" ; Nix pkg now for MESA stuff
"perl"
"tor"
"unzip"
@@ -119,7 +119,7 @@
"python-lsp-server"
"kdenlive"
"sqlite"
- "mpv"
+ ;"mpv" ; Now a nix pkg for MESA stuff
"qbittorrent"
"playerctl"
;"aerc"
diff --git a/home-config/nix-home-manager/flake.lock b/home-config/nix-home-manager/flake.lock
index 8885a8c..f899e74 100644
--- a/home-config/nix-home-manager/flake.lock
+++ b/home-config/nix-home-manager/flake.lock
@@ -55,16 +55,17 @@
]
},
"locked": {
- "lastModified": 1729260213,
- "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=",
+ "lastModified": 1729321331,
+ "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75",
+ "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
+ "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68",
"type": "github"
}
},
@@ -217,15 +218,16 @@
"systems": "systems_2"
},
"locked": {
- "lastModified": 1727732210,
- "narHash": "sha256-VNKakkdx1mjfO5MyGZbx8m87YKZ4B8cylU50R0J662g=",
+ "lastModified": 1727705155,
+ "narHash": "sha256-gu26MSYbTlRLMUpZ9PeYXtqqhzPDQXxEDkjiJgwzIIc=",
"owner": "hyprwm",
"repo": "hyprpicker",
- "rev": "4411a6dc0dccdabad64213463fb94de520b52725",
+ "rev": "116cec14a552191a9ad69ca96252ca12ecfa9826",
"type": "github"
},
"original": {
"owner": "hyprwm",
+ "ref": "v0.4.1",
"repo": "hyprpicker",
"type": "github"
}
@@ -348,22 +350,23 @@
"original": {
"owner": "nix-community",
"repo": "nixGL",
+ "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
"type": "github"
}
},
"nixpkgs": {
"locked": {
- "lastModified": 1729070438,
- "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=",
+ "lastModified": 1729168305,
+ "narHash": "sha256-jmhxZnrlOyLEMUL2+JkVfkN0XWXI5uE6EB5kVZFR0fo=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "5785b6bb5eaae44e627d541023034e1601455827",
+ "rev": "2a55bdc8cfcf41551323a4a6cef24d3f566c824d",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "nixos-unstable",
"repo": "nixpkgs",
+ "rev": "2a55bdc8cfcf41551323a4a6cef24d3f566c824d",
"type": "github"
}
},
diff --git a/home-config/nix-home-manager/flake.nix b/home-config/nix-home-manager/flake.nix
index 6429214..7ba72b4 100644
--- a/home-config/nix-home-manager/flake.nix
+++ b/home-config/nix-home-manager/flake.nix
@@ -3,13 +3,13 @@
inputs = {
# Specify the source of Home Manager and Nixpkgs.
- nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+ nixpkgs.url = "github:nixos/nixpkgs/2a55bdc8cfcf41551323a4a6cef24d3f566c824d";
home-manager = {
- url = "github:nix-community/home-manager";
+ url = "github:nix-community/home-manager/122f70545b29ccb922e655b08acfe05bfb44ec68";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprpicker-git = {
- url = "github:hyprwm/hyprpicker";
+ url = "github:hyprwm/hyprpicker/v0.4.1";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland = {
@@ -17,7 +17,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nixgl = {
- url = "github:nix-community/nixGL";
+ url = "github:nix-community/nixGL/310f8e49a149e4c9ea52f1adf70cdc768ec53f8a";
inputs.nixpkgs.follows = "nixpkgs";
};
};
diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix
index a886c6a..e7ec0f5 100644
--- a/home-config/nix-home-manager/home.nix
+++ b/home-config/nix-home-manager/home.nix
@@ -49,6 +49,10 @@
xwayland
xdg-desktop-portal
xdg-desktop-portal-gtk
+ mpv
+ imv
+ libva
+ libvdpau
# Flakes specific things defined in flake.nix
hyprland.packages.${pkgs.system}.default
@@ -58,7 +62,7 @@
# Fonts!
noto-fonts
liberation_ttf
- noto-fonts-cjk
+ noto-fonts-cjk-sans
noto-fonts-emoji
# # It is sometimes useful to fine-tune packages, for example, by applying