From 8e5335ee3359abbf1b27cb517018e35b69ba989b Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Sat, 14 Oct 2023 09:49:58 -0700 Subject: [PATCH] flake update and general improvements --- darwin-configuration.nix | 7 ++++--- flake.lock | 24 ++++++++++++------------ home.nix | 4 ++-- programs/wezterm/wezterm.lua | 3 ++- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/darwin-configuration.nix b/darwin-configuration.nix index 975ad41..555161c 100644 --- a/darwin-configuration.nix +++ b/darwin-configuration.nix @@ -26,9 +26,10 @@ "nixpkgs=${nixpkgs}" ]; package = pkgs.nixUnstable; - extraOptions = '' - experimental-features = nix-command flakes - ''; + settings = { + experimental-features = "nix-command flakes repl-flake"; + trusted-users = [ "root" "salar" ]; + }; distributedBuilds = false; }; services.nix-daemon.enable = true; diff --git a/flake.lock b/flake.lock index dedd807..02a38ee 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1695424346, - "narHash": "sha256-jkjKhxaBpS7p//l90uz9lNdVK5imVe9eo+XH6zbfrJU=", + "lastModified": 1696360011, + "narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c286b23c7fd7f0622bc4af898c91f58b8d304ff1", + "rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a", "type": "github" }, "original": { @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1695224363, - "narHash": "sha256-+hfjJLUMck5G92RVFDZA7LWkR3kOxs5zQ7RPW9t3eM8=", + "lastModified": 1696940889, + "narHash": "sha256-p2Wic74A1tZpFcld1wSEbFQQbrZ/tPDuLieCnspamQo=", "owner": "nix-community", "repo": "home-manager", - "rev": "408ba13188ff9ce309fa2bdd2f81287d79773b00", + "rev": "6bba64781e4b7c1f91a733583defbd3e46b49408", "type": "github" }, "original": { @@ -43,11 +43,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695145219, - "narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=", + "lastModified": 1697059129, + "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5ba549eafcf3e33405e5f66decd1a72356632b96", + "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", "type": "github" }, "original": { @@ -59,11 +59,11 @@ }, "nur": { "locked": { - "lastModified": 1695434182, - "narHash": "sha256-SRnWqW5+tPa+WhNB5i/cZ7LjesdT/3A+LRULWVNbJ2U=", + "lastModified": 1697291160, + "narHash": "sha256-WV4TsmIi2vGu6cO5Xq4FPA/iSHsOEy1/Vy2uUC3p1jM=", "owner": "nix-community", "repo": "nur", - "rev": "f024b6efcc7bb61c3e55aa906a60531c9e262197", + "rev": "383bba42753ac667dc9904b83eca755c5f0324ca", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index a8da47d..55decf7 100644 --- a/home.nix +++ b/home.nix @@ -84,7 +84,7 @@ tokei tree tree-sitter - wget + # wget xz yq ]; @@ -346,7 +346,7 @@ # Neovim Configuration xdg.configFile."nvim".source = builtins.fetchGit { url = "https://git.softinio.com/nvim-config.git"; - rev = "bc2b71fa94386902cddf145b556575ab7381f827"; + rev = "c2d6d6379dba1c85381e8f18ff5bd1127255306c"; }; } diff --git a/programs/wezterm/wezterm.lua b/programs/wezterm/wezterm.lua index ba055be..db2b87d 100644 --- a/programs/wezterm/wezterm.lua +++ b/programs/wezterm/wezterm.lua @@ -8,11 +8,12 @@ end) return { adjust_window_size_when_changing_font_size = false, check_for_updates = false, + -- color_scheme = "Gruvbox Light"; color_scheme = "tokyonight", font = wezterm.font("FiraCode Nerd Font Mono"), font_size = 16, dpi = 144, - scrollback_lines = 10000, + scrollback_lines = 50000, initial_cols = 400, initial_rows = 80, leader = { key="b", mods="SUPER", timeout_milliseconds = 1000 },