From afb042f2fa9abd25b608f9478bb8495cb61de317 Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Tue, 2 Apr 2024 18:11:12 -0700 Subject: [PATCH] bump --- extras/dev.nix | 8 ++++---- flake.lock | 42 +++++++++++++++++++++--------------------- systems/BASED.nix | 17 ++++++++++++----- users/tao.nix | 2 +- users/tao/helix.nix | 12 ++---------- 5 files changed, 40 insertions(+), 41 deletions(-) diff --git a/extras/dev.nix b/extras/dev.nix index 22d5127..c87dd94 100644 --- a/extras/dev.nix +++ b/extras/dev.nix @@ -43,11 +43,11 @@ alejandra # python - pypy3 - # # python3 + # pypy3 + # python3 # python310Packages.python-lsp-server - ruff - ruff-lsp + # ruff + # ruff-lsp #rust bacon diff --git a/flake.lock b/flake.lock index f9ea383..90506c7 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1707830867, - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", + "lastModified": 1712079060, + "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", "owner": "ryantm", "repo": "agenix", - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "rev": "1381a759b205dff7a6818733118d02253340fd5e", "type": "github" }, "original": { @@ -104,11 +104,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1711986609, - "narHash": "sha256-rqxVKzDscKcC13T3eLcPuToSFNkdxgtJXA+fGysm5Cw=", + "lastModified": 1712077181, + "narHash": "sha256-hrVR4zWyTIsW8Pd+EsJN8WWuBk7jYZTaAsUPzNGsPEI=", "owner": "the-mikedavis", "repo": "helix", - "rev": "3aec6d157051709a6130151177503ece5c6a7aa3", + "rev": "37f23081ed69845bd26fd2e015af150807f7792f", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1711915616, - "narHash": "sha256-co6LoFA+j6BZEeJNSR8nZ4oOort5qYPskjrDHBaJgmo=", + "lastModified": 1712212014, + "narHash": "sha256-s+lbaf3nLRn1++/X2eXwY9mYCA/m9l8AvyG8beeOaXE=", "owner": "nix-community", "repo": "home-manager", - "rev": "820be197ccf3adaad9a8856ef255c13b6cc561a6", + "rev": "7e91f2a0ba4b62b88591279d54f741a13e36245b", "type": "github" }, "original": { @@ -189,11 +189,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1712001627, - "narHash": "sha256-ouYbQIKK6kbqRF1dAvocLSmuZonTPoirFyh63+Ki5/E=", + "lastModified": 1712204480, + "narHash": "sha256-G3jeiT3bMRKhA4wHYwyetOl8T2/tjk213YTSyk+maqA=", "owner": "martinvonz", "repo": "jj", - "rev": "7b3f8e8cb6cc33e5f183052822e081160bba564f", + "rev": "69d38fbf9623f39258f46d67b9ce9b25e1a10b63", "type": "github" }, "original": { @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1712002625, - "narHash": "sha256-RlK5CETVGugd/7qaUJ5GULe3LW3cfUqLT55qIj+95Yc=", + "lastModified": 1712214290, + "narHash": "sha256-cHkyv73w8WPVW2ocXQbB5q5BPey1ImK6qCsKa77cuhI=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "d60af3734b5616e6b16809c7f7e380b36470b156", + "rev": "b22c2d91865ad9757e29ccd1792ab281672a21ef", "type": "github" }, "original": { @@ -255,11 +255,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", + "lastModified": 1712122226, + "narHash": "sha256-pmgwKs8Thu1WETMqCrWUm0CkN1nmCKX3b51+EXsAZyY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", + "rev": "08b9151ed40350725eb40b1fe96b0b86304a654b", "type": "github" }, "original": { @@ -276,11 +276,11 @@ ] }, "locked": { - "lastModified": 1711920558, - "narHash": "sha256-F8ESttizNOXsLfv9PeTen3lvq3cnxG9RV2RiHgGzA2Q=", + "lastModified": 1712081763, + "narHash": "sha256-+xImkX19gde0Qac6kbJtJAXKXTOgcUE5z3RsBxVtseo=", "owner": "pjones", "repo": "plasma-manager", - "rev": "88cf932923835c05f26176a8a4df30a0dd1e7775", + "rev": "96a90a7f5ce6b29e01d7da83d082e870e4462174", "type": "github" }, "original": { diff --git a/systems/BASED.nix b/systems/BASED.nix index 62439e0..ff84b85 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -16,7 +16,8 @@ firefox ffmpeg git - inputs.helix.packages.${pkgs.system}.default + # inputs.helix.packages.${pkgs.system}.default + helix localsend mesa mpv @@ -41,8 +42,14 @@ NoDefaultBookmarks = false; }; programs.firefox.preferences = { + "accessibility.browsewithcaret_shortcut.enabled" = false; + "browser.bookmarks.restore_default_bookmarks" = false; + "widget.use-xdg-desktop-portal.file-picker" = 1; + "widget.use-xdg-desktop-portal.location" = 1; "widget.use-xdg-desktop-portal.mime-handler" = 1; + "widget.use-xdg-desktop-portal.open-uri" = 1; + "widget.use-xdg-desktop-portal.settings" = 1; }; services.xserver.enable = lib.mkDefault true; @@ -98,10 +105,10 @@ SKIM_DEFAULT_COMMAND = "rg --files"; }; environment.sessionVariables = { - EDITOR = "hx"; - VISUAL = "hx"; - PAGER = "bat"; - SKIM_DEFAULT_COMMAND = "rg --files"; + # EDITOR = "hx"; + # VISUAL = "hx"; + # PAGER = "bat"; + # SKIM_DEFAULT_COMMAND = "rg --files"; }; time.timeZone = lib.mkDefault "US/Pacific"; diff --git a/users/tao.nix b/users/tao.nix index a2c9d97..f6f496d 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -168,7 +168,7 @@ }; home-manager.useGlobalPkgs = true; - home-manager.useUserPkgs = true; + home-manager.useUserPackages = true; home-manager.verbose = true; home-manager.backupFileExtension = ".hm-bak"; home-manager.users.tao = import ./tao/HOME.nix {inherit inputs pkgs lib;}; diff --git a/users/tao/helix.nix b/users/tao/helix.nix index b30830a..ee1633f 100644 --- a/users/tao/helix.nix +++ b/users/tao/helix.nix @@ -7,7 +7,7 @@ settings = { theme = "dracula"; editor = { - rainbow-brackets = true; + # rainbow-brackets = true; line-number = "relative"; cursorline = true; completion-replace = true; @@ -92,7 +92,6 @@ unit = " "; }; } - # { name = "rust"; } ]; language-servers = { rust-analyzer.config = { @@ -114,17 +113,10 @@ }; }; grammar = [ - { - name = "nix"; - source = { - git = "https://github.com/nix-community/tree-sitter-nix"; - rev = "763168fa916a333a459434f1424b5d30645f015d"; - }; - } ]; }; enable = true; defaultEditor = true; - package = inputs.helix.packages.${pkgs.system}.default; + # package = inputs.helix.packages.${pkgs.system}.default; }; }