From 09e60683d3aff8f3a133bfd8a7850bbe43468e51 Mon Sep 17 00:00:00 2001 From: Henry Hiles Date: Mon, 1 Jan 2024 09:09:29 -0500 Subject: [PATCH] Fixes --- flake.lock | 61 ++++++++++++++++++----------- home-manager/vscode.nix | 1 + modules/common-desktop/packages.nix | 2 + 3 files changed, 41 insertions(+), 23 deletions(-) mode change 100755 => 100644 flake.lock diff --git a/flake.lock b/flake.lock old mode 100755 new mode 100644 index 35f01e0..2dc4570 --- a/flake.lock +++ b/flake.lock @@ -133,11 +133,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1703023593, - "narHash": "sha256-M+Cw6vh7xCDmIhyVuEPNmaNVUwpmdFQq8zlsXZTKees=", + "lastModified": 1703785537, + "narHash": "sha256-+1LbSEgvKS31Kx9mL5T68n8nENL3jYoGRuQR4y7W6BA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "bad853333d9021e7012adb9b8fbfe7a7003f26bc", + "rev": "1bdf9a04f8faa061d219294a9ad99d432b18767c", "type": "github" }, "original": { @@ -201,11 +201,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1703674883, - "narHash": "sha256-Jna6MOmLdfgot+AopHv28L+wpwVDfaiafLtO7E4bkj0=", + "lastModified": 1704100519, + "narHash": "sha256-SgZC3cxquvwTN07vrYYT9ZkfvuhS5Y1k1F4+AMsuflc=", "owner": "nix-community", "repo": "home-manager", - "rev": "458544594ba7f0333cf5718045ee7a8eaf5de433", + "rev": "6e91c5df192395753d8e6d55a0352109cb559790", "type": "github" }, "original": { @@ -240,11 +240,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1701611132, - "narHash": "sha256-roFYOQhIrZ0DUlWbughOwHzx/PoEMrK0inJbFeuOySg=", + "lastModified": 1704072190, + "narHash": "sha256-mFPGdmkwWRuRQ1WZ0ZoM5PROLHnzV1BDM6oRKxZoHro=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "6a885e460cf8596aa23d6f043aa10219494f1da8", + "rev": "ce0a28bdd09d04e85a4a49c6f6e64f2a0411b521", "type": "github" }, "original": { @@ -255,11 +255,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703255338, - "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", + "lastModified": 1703637592, + "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", + "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", "type": "github" }, "original": { @@ -289,11 +289,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1701436327, - "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", + "lastModified": 1703499205, + "narHash": "sha256-lF9rK5mSUfIZJgZxC3ge40tp1gmyyOXZ+lRY3P8bfbg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1703637592, + "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", + "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", "type": "github" }, "original": { @@ -327,11 +343,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1701724946, - "narHash": "sha256-U5Q21HDFz3Ba31bqYhB/mfiJKOSD0s2Dc4aeNG6CcXo=", + "lastModified": 1704113806, + "narHash": "sha256-5WS7ITd0Lg4WBk4Ah8M0onADdZnVa9vX9wBcG4v/+/0=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "7d5f27049db2261da0b2da5a2fcc168ef9511ed2", + "rev": "39818027de525ab16992ad8b9752206a6d90c3b5", "type": "github" }, "original": { @@ -345,8 +361,7 @@ "firefox-gnome-theme": "firefox-gnome-theme", "home-manager": "home-manager", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_2", - "nixpkgs-local": "nixpkgs-local", + "nixpkgs": "nixpkgs_3", "programsdb": "programsdb", "stylix": "stylix", "wrapper-manager": "wrapper-manager" @@ -367,11 +382,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1703528325, - "narHash": "sha256-ajoMmEPbLhp9xsReDDQFaY7xX+ayIqwfMlZNg8YxHnw=", + "lastModified": 1703880383, + "narHash": "sha256-YAIbWRAKOCaWDQ4A29xXr79VTuAk9lPJSPYhMBk/VjU=", "owner": "danth", "repo": "stylix", - "rev": "7ccd1293a48f01eace7d0ce8d82af51919105b76", + "rev": "5a7f3f15ccc2a272e5873bb44fe378ab5d99e0ff", "type": "github" }, "original": { diff --git a/home-manager/vscode.nix b/home-manager/vscode.nix index 12ccf89..b48fccc 100755 --- a/home-manager/vscode.nix +++ b/home-manager/vscode.nix @@ -33,6 +33,7 @@ command = "-workbench.action.files.save"; } ]; + userSettings = { "editor.guides.bracketPairs" = "active"; "window.dialogStyle" = "custom"; diff --git a/modules/common-desktop/packages.nix b/modules/common-desktop/packages.nix index e2df230..bc4b5fb 100644 --- a/modules/common-desktop/packages.nix +++ b/modules/common-desktop/packages.nix @@ -10,6 +10,7 @@ gimp heroic aspell + fractal killall ripgrep inkscape @@ -29,5 +30,6 @@ nodePackages_latest.pnpm hunspellDicts.en_CA-large inputs.nix-gaming.packages.${system}.wine-ge + (retroarch.override { cores = with libretro; [bsnes-hd]; }) ]; }