Updated system

This commit is contained in:
Emmet 2025-10-31 10:51:41 -05:00
parent fe829f69c2
commit d7c174bc57
4 changed files with 49 additions and 48 deletions

84
flake.lock generated
View file

@ -104,11 +104,11 @@
"blocklist-hosts": { "blocklist-hosts": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1760670453, "lastModified": 1761441003,
"narHash": "sha256-KQx4CWPfKBJwuBONYSE7AIKa7UBXBvtNVcrOmkPrjkY=", "narHash": "sha256-LQ9yVGniACRrhx+a1M3BtDKiiw0rI6kBvIlTUFqTaOE=",
"owner": "StevenBlack", "owner": "StevenBlack",
"repo": "hosts", "repo": "hosts",
"rev": "5da10a61afc297307c489903bfc35b1eb8dac674", "rev": "2b274d002ccbb49407f1b43091417b041b947d28",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -126,11 +126,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1761326352, "lastModified": 1761827347,
"narHash": "sha256-DoR4mHaStX6Dg2Gilc2Dqr/XaxXmQTOQS5cZ5xKPQJY=", "narHash": "sha256-tIrTFSntAyXVrQE9GnauXzQxEZJCZA9TEp4jAENsgwA=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "6492dc810f2f250ef95096910a44f03eea6a594f", "rev": "0c234b99a8606b482d6644e1f2d26d41985fb85c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -147,11 +147,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1761325938, "lastModified": 1761902925,
"narHash": "sha256-E2dm2bIlu1zBVBAVYM2bZVdr9vkzXGj70aLTfXuXUKA=", "narHash": "sha256-z5hSaIejqMmiR0KZsrzcWpC6SAbVeg/U/R1+zKrGI9g=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "99807d1b33588b9d113fc5e9cca87e4f1ae3e0a1", "rev": "4b4422da5a110dc28df5473c597ec8fbf6c6839e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -322,11 +322,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761266473, "lastModified": 1761770832,
"narHash": "sha256-QxCyKWBmuzI+eMhYV1JmbZsiUnBNATRP1EW34OBt5Vg=", "narHash": "sha256-IQIWG6kHxnUpx5KEb9r0BROL3/R6UQ/30aO2oHncBA8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5c71d4a730bd3c972befff343bb074421e345937", "rev": "124b99dbd1594dbebdd575ac7142752ee96a98a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -342,11 +342,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761316995, "lastModified": 1761878381,
"narHash": "sha256-BAAjCpjTnfaxtc9NCkbUl9MUv5JmAG5qU7/G8TTHmb4=", "narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "82b58f38202540bce4e5e00759d115c5a43cab85", "rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -806,11 +806,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761202163, "lastModified": 1761748321,
"narHash": "sha256-6RySf5VQElrm7RYGWxlIkNttemDp4FF0aH+LX435G2Y=", "narHash": "sha256-hD5mVzmUeyVppjArdy2uVdQe/CQUR9i3WgZB05onE7A=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "47976126007d9658ca4ac4dd933bea8846170fd9", "rev": "533db5857c9e00ca352558a928417116ee08a824",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -859,11 +859,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1761114652, "lastModified": 1761672384,
"narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -875,11 +875,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1761173472, "lastModified": 1761597516,
"narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -891,11 +891,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1761173472, "lastModified": 1761597516,
"narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -906,11 +906,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1761114652, "lastModified": 1761672384,
"narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1048,11 +1048,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761273263, "lastModified": 1761758177,
"narHash": "sha256-6d6ojnu6A6sVxIjig8OL6E1T8Ge9st3YGgVwg5MOY+Q=", "narHash": "sha256-MsVJG2gQTm6n2jIGu2KDT87AMeMx1GExOaEQqNkQKVE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "28405834d4fdd458d28e123fae4db148daecec6f", "rev": "37f8f092415b444c3bed6eda6bcbee51cee22e5d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1066,11 +1066,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1761273263, "lastModified": 1761878277,
"narHash": "sha256-6d6ojnu6A6sVxIjig8OL6E1T8Ge9st3YGgVwg5MOY+Q=", "narHash": "sha256-6fCtyVdTzoQejwoextAu7dCLoy5fyD3WVh+Qm7t2Nhg=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "28405834d4fdd458d28e123fae4db148daecec6f", "rev": "6604534e44090c917db714faa58d47861657690c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1118,11 +1118,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1761028816, "lastModified": 1761840967,
"narHash": "sha256-s1XiIeJHpODVWfzsPaK9e21iz1dQSCU3H4/1OxOsyps=", "narHash": "sha256-alE8Vesztx3tPxXpJURtYWD8x1cXaU/x+10Q6hbgGBY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "stylix", "repo": "stylix",
"rev": "b81dc0a385443099e7d231fe6275189e32c3b760", "rev": "c33226f205aeab42a170913cd1f8bc3428b7e6b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1297,11 +1297,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761221437, "lastModified": 1761423586,
"narHash": "sha256-6V+PkcUvinA/Ryl+tZO0pLvEmJWzfieMKj8UyAFvduo=", "narHash": "sha256-vTxfhGDVkcudkZ8W17HYGjsn/sGdZURW7/1iXPqbb58=",
"owner": "winapps-org", "owner": "winapps-org",
"repo": "winapps", "repo": "winapps",
"rev": "daa052d42d338a50bb3e093a0c86daa3d32f08c5", "rev": "3d5e38110e1d521b7265e429f388b51089115187",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -27,8 +27,7 @@
vpl-gpu-rt vpl-gpu-rt
intel-media-driver intel-media-driver
intel-vaapi-driver intel-vaapi-driver
vaapiIntel libva-vdpau-driver
vaapiVdpau
libvdpau-va-gl libvdpau-va-gl
]; ];
extraPackages32 = with pkgs.driversi686Linux; [ extraPackages32 = with pkgs.driversi686Linux; [

View file

@ -14,11 +14,13 @@ in {
}; };
}; };
config = lib.mkIf cfg.enable { ## THIS IS BROKEN BECAUSE THEY CHANGED EMACS IN NIXPKGS I THINK
home.packages = with pkgs-stable; [ config = lib.mkIf false {
#config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
(pkgs.emacsWithPackagesFromUsePackage { (pkgs.emacsWithPackagesFromUsePackage {
config = ./init.el; config = ./init.el;
package = pkgs-stable.emacs-pgtk; package = pkgs.emacs-pgtk;
alwaysEnsure = false; alwaysEnsure = false;
extraEmacsPackages = epkgs: with epkgs; [ extraEmacsPackages = epkgs: with epkgs; [
org-modern olivetti org-modern olivetti

View file

@ -69,6 +69,6 @@ in {
programs.direnv.enable = true; programs.direnv.enable = true;
programs.direnv.enableZshIntegration = true; programs.direnv.enableZshIntegration = true;
programs.direnv.nix-direnv.enable = true; programs.direnv.nix-direnv.enable = true;
programs.direnv.nix-direnv.package = pkgs.nix-direnv-flakes; programs.direnv.nix-direnv.package = pkgs.nix-direnv;
}; };
} }