diff --git a/flake.lock b/flake.lock index 4c8c8b3..a0b679e 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1708890466, - "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "lastModified": 1732200724, + "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "665b3c6748534eb766c777298721cece9453fdae", + "rev": "153d52373b0fb2d343592871009a286ec8837aec", "type": "github" }, "original": { @@ -140,11 +140,11 @@ "fromYaml": { "flake": false, "locked": { - "lastModified": 1689549921, - "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", "owner": "SenchoPens", "repo": "fromYaml", - "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", "type": "github" }, "original": { @@ -175,11 +175,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1731964590, - "narHash": "sha256-NBqbPdUHFaIQILooq+a//vg18gHDgELIeru4L24hDX4=", + "lastModified": 1732303962, + "narHash": "sha256-5Umjb5AdtxV5jSJd5jxoCckh5mlg+FBQDsyAilu637g=", "owner": "nix-community", "repo": "home-manager", - "rev": "705cf3763a6d6074c1b7edb3ff0bb44efa7f091b", + "rev": "8cf9cb2ee78aa129e5b8220135a511a2be254c0c", "type": "github" }, "original": { @@ -215,11 +215,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1731925304, - "narHash": "sha256-FeUIzD9f5Z8OMkogeEMaVLIhawGdmOhKJ4VVpdycOeA=", + "lastModified": 1732359130, + "narHash": "sha256-6oOIuAMih3tN1Fjo9cQp1Q5LNe1t3eueA2i0IV1QAVI=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "d589673486d8a5c1c6cbc3c0e1c077200da7e085", + "rev": "6f4ed139a161539429acedf08c5e6c6bc65bffdf", "type": "github" }, "original": { @@ -230,11 +230,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -312,11 +312,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1731935397, - "narHash": "sha256-YjOrhtDUrxNDddnKBTPya0fdbiwpG1cJvrT5Pi+4P/s=", + "lastModified": 1732367223, + "narHash": "sha256-YdYoULSyTkTE6wUGlof91Vc7oO0cqFn3qomoO0pIZIQ=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "6a43f2121ab404bd05f3a5a7242a6701cac96471", + "rev": "69fbca8d0f628b43224cac25768f37da55783d97", "type": "github" }, "original": { @@ -353,11 +353,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1731920923, - "narHash": "sha256-Pqe38TdvfyywhlhpR1WLJlD7uTOGXRRuzpHIh2edOz0=", + "lastModified": 1732261424, + "narHash": "sha256-8uTKUHkaU980J5kRnLYrdwmjZYB88eBGUk1oVgIUHFE=", "owner": "danth", "repo": "stylix", - "rev": "f8699483e46972f64b0dee5d5e41bf4bb142629b", + "rev": "b667a340730dd3d0596083aa7c949eef01367c62", "type": "github" }, "original": { diff --git a/home-manager/firefox.nix b/home-manager/firefox.nix index a5c58ec..d63f9f3 100644 --- a/home-manager/firefox.nix +++ b/home-manager/firefox.nix @@ -82,7 +82,6 @@ }; "Bing".metaData.hidden = true; - "DuckDuckGo".metaData.hidden = true; "Google".metaData.hidden = true; "Amazon.ca".metaData.hidden = true; "eBay".metaData.hidden = true; diff --git a/home-manager/vscode.nix b/home-manager/vscode.nix index 68baa9c..57635ff 100755 --- a/home-manager/vscode.nix +++ b/home-manager/vscode.nix @@ -92,6 +92,7 @@ "nix.formatterPath" = lib.meta.getExe pkgs.alejandra; "indentRainbow.ignoreErrorLanguages" = ["*"]; "dart.runPubGetOnPubspecChanges" = "never"; + "dart.debugExternalPackageLibraries" = true; }; }; } diff --git a/modules/common-desktop/desktop.nix b/modules/common-desktop/desktop.nix index f613753..1a2b48a 100644 --- a/modules/common-desktop/desktop.nix +++ b/modules/common-desktop/desktop.nix @@ -1,5 +1,6 @@ { environment.sessionVariables.NIXOS_OZONE_WL = "1"; + environment.sessionVariables.GSK_RENDERER = "ngl"; services.xserver = { enable = true; diff --git a/wrappers/common-desktop/vscode/default.nix b/wrappers/common-desktop/vscode/default.nix index 7601a48..241c848 100644 --- a/wrappers/common-desktop/vscode/default.nix +++ b/wrappers/common-desktop/vscode/default.nix @@ -1,21 +1,21 @@ {pkgs, ...}: { - wrappers.vscode = { - basePackage = pkgs.vscodium; + # wrappers.vscode = { + # basePackage = pkgs.vscodium; - pathAdd = with pkgs.vscode-extensions; [ - mkhl.direnv - eamodio.gitlens - jnoortheen.nix-ide - timonwong.shellcheck - usernamehw.errorlens - ritwickdey.liveserver - dbaeumer.vscode-eslint - esbenp.prettier-vscode - oderwat.indent-rainbow - astro-build.astro-vscode - pkief.material-icon-theme - streetsidesoftware.code-spell-checker - arcticicestudio.nord-visual-studio-code - ]; - }; + # pathAdd = with pkgs.vscode-extensions; [ + # mkhl.direnv + # eamodio.gitlens + # jnoortheen.nix-ide + # timonwong.shellcheck + # usernamehw.errorlens + # ritwickdey.liveserver + # dbaeumer.vscode-eslint + # esbenp.prettier-vscode + # oderwat.indent-rainbow + # astro-build.astro-vscode + # pkief.material-icon-theme + # streetsidesoftware.code-spell-checker + # arcticicestudio.nord-visual-studio-code + # ]; + # }; } diff --git a/wrappers/default.nix b/wrappers/default.nix index cd24fbf..c80b3dd 100644 --- a/wrappers/default.nix +++ b/wrappers/default.nix @@ -8,7 +8,7 @@ environment.systemPackages = with dirUtils; [ (inputs.wrapper-manager.lib.build { inherit pkgs; - modules = dirFiles ./common ++ opt false (dirFiles ./common-desktop); + modules = dirFiles ./common ++ opt isDesktop (dirFiles ./common-desktop); }) ]; }