diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..39f1094 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,9 @@ +{ + "nix.serverSettings": { + "nil": { + "options": { + "enable": true, + } + } + } +} diff --git a/darwin/homebrew.nix b/darwin/homebrew.nix index fbc6f11..3403c90 100644 --- a/darwin/homebrew.nix +++ b/darwin/homebrew.nix @@ -50,12 +50,12 @@ in { # limitiations, e.g., Transmit, install the Homebrew Cask. homebrew.caskArgs.no_quarantine = true; homebrew.casks = [ - "aerial" "alfred" "anytype" "arc" - "bartender" + # "bartender" # "discord" + "dozer" "firefox" "hazeover" "jitsi-meet" @@ -67,9 +67,9 @@ in { "lulu" "macsvg" "messenger" - "miniforge" "nova" # "obsidian" + "orion" "protonvpn" "qflipper" "rectangle" diff --git a/flake.lock b/flake.lock index 9cb6a06..727c2cf 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ ] }, "locked": { - "lastModified": 1691640097, - "narHash": "sha256-6vPsJYjtt2hs4mkiR46yt8c/Spdm/UiUKoSCIlc7iJw=", + "lastModified": 1696043447, + "narHash": "sha256-VbJ1dY5pVH2fX1bS+cT2+4+BYEk4lMHRP0+udu9G6tk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "426d38710b656b0a31f8eaae6e0002206a3b96d7", + "rev": "792c2e01347cb1b2e7ec84a1ef73453ca86537d8", "type": "github" }, "original": { @@ -70,11 +70,11 @@ "fisher-src": { "flake": false, "locked": { - "lastModified": 1688576744, - "narHash": "sha256-Xub7mTVQbFxrL1v99OGDvXUhSA0vtRzKTjwVvRKxzUo=", + "lastModified": 1692640630, + "narHash": "sha256-e8gIaVbuUzTwKtuMPNXBT5STeddYqQegduWBtURLT3M=", "owner": "jorgebucaran", "repo": "fisher", - "rev": "59228d6215cb4c36aff77008751736f540dc42d8", + "rev": "2efd33ccd0777ece3f58895a093f32932bd377b6", "type": "github" }, "original": { @@ -120,11 +120,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -182,11 +182,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1691765042, - "narHash": "sha256-EeMn5KYej0NmCf3ghOjq2s8axjaKfqurak5FzScGTO0=", + "lastModified": 1696255829, + "narHash": "sha256-5XId/8r09qEAyBI8lFq0qpVsEvtdDl6gHkBHmhp/sMA=", "owner": "helix-editor", "repo": "helix", - "rev": "ee3171cc54052bc8d3569cc04bd9f6a57b43afca", + "rev": "7fbfec766c2ce2570ca4160744723813dbdc3019", "type": "github" }, "original": { @@ -202,11 +202,11 @@ ] }, "locked": { - "lastModified": 1691672736, - "narHash": "sha256-HNPA/dKHerA0p4OsToEcW/DtTSXBcK5gFRsy/yPgV/Y=", + "lastModified": 1696145345, + "narHash": "sha256-3dM7I/d4751SLPJah0to1WBlWiyzIiuCEUwJqwBdmr4=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e1eff9aac0e8d84bda7f2d60ba6108eea9b7e79", + "rev": "6f9b5b83ad1f470b3d11b8a9fe1d5ef68c7d0e30", "type": "github" }, "original": { @@ -265,11 +265,11 @@ "kitty-themes": { "flake": false, "locked": { - "lastModified": 1691425157, - "narHash": "sha256-dky3zXfbEE5nmNzpC0JEGC8Gv6FuITOiQYolTev6xfo=", + "lastModified": 1694832264, + "narHash": "sha256-dhzYTHaaTrbE5k+xEC01Y9jGb+ZmEyvWMb4a2WWKGCw=", "owner": "kovidgoyal", "repo": "kitty-themes", - "rev": "b6598362df9ee042ab700f96db9d51ccb16cc7ce", + "rev": "c9c12d20f83b9536febb21e4b53e176c0ccccb51", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1691709280, - "narHash": "sha256-zmfH2OlZEXwv572d0g8f6M5Ac6RiO8TxymOpY3uuqrM=", + "lastModified": 1696234590, + "narHash": "sha256-mgOzQYTvaTT4bFopVOadlndy2RPwLy60rDjIWOGujwo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf73a86c35a84de0e2f3ba494327cf6fb51c0dfd", + "rev": "f902cb49892d300ff15cb237e48aa1cad79d68c3", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1691852799, - "narHash": "sha256-emaxnX7+/73asqNiPkZg1KV5vkpCqMNmLMO1L1RrrYk=", + "lastModified": 1696285335, + "narHash": "sha256-dsu/cEULkVLa4u5BEw/ScCsWqN8zTUUk2o02YOb+Y+c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aefe566f73164776003ef5ef78003b5f9ccd7c4f", + "rev": "2e8f277e5252b44d8b6f5c3e16335d8d543b50bf", "type": "github" }, "original": { @@ -341,11 +341,11 @@ ] }, "locked": { - "lastModified": 1691747570, - "narHash": "sha256-J3fnIwJtHVQ0tK2JMBv4oAmII+1mCdXdpeCxtIsrL2A=", + "lastModified": 1696158581, + "narHash": "sha256-h0vY4E7Lx95lpYQbG2w4QH4yG5wCYOvPJzK93wVQbT0=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "c5ac3aa3324bd8aebe8622a3fc92eeb3975d317a", + "rev": "033453f85064ccac434dfd957f95d8457901ecd6", "type": "github" }, "original": { @@ -401,11 +401,11 @@ "starship-src": { "flake": false, "locked": { - "lastModified": 1691816563, - "narHash": "sha256-aK5uY25R7d45o+rmeaErjjWK2WIX+edQGUqdY5RiIDU=", + "lastModified": 1696143619, + "narHash": "sha256-3YcmrAdrCXU3NZ82swMVL4uhRzM17e9IbLrFeke+6ak=", "owner": "starship", "repo": "starship", - "rev": "d63ef1febbf0009cdfc5527d02d2d3ec0ec4162b", + "rev": "7e82cb494c540c7a88cf126ec80aeb0f7ce611bc", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b062e95..c9206af 100644 --- a/flake.nix +++ b/flake.nix @@ -109,16 +109,11 @@ "steam" ]; home-manager.sharedModules = [{ - # programs.fish.shellAliases = { - # code = "${pkgs.vscodium}/bin/codium"; - # }; programs.ssh.matchBlocks.remarkable = { hostname = "10.11.99.1"; user = "root"; port = 22; }; - # programs.vscode.package = pkgs.vscodium; - programs.vscode.enable = true; }]; }]; }; @@ -136,6 +131,7 @@ home-manager.sharedModules = [{ # TODO: how to remove this entirely? home.file.".tarsnaprc" = lib.mkForce { text = ""; }; + launchd.agents.tarsnap.enable = lib.mkForce false; home.packages = [ pkgs.yubiswitch ]; programs.ssh.matchBlocks.devbox = { hostname = "csdev6"; @@ -145,7 +141,6 @@ programs.fish.functions.devbox.body = '' ssh -t devbox "agenttmux attach; or agenttmux new -s yelp" ''; - launchd.agents.tarsnap.enable = lib.mkForce false; }]; }) ]; diff --git a/home/fish.nix b/home/fish.nix index a95d9c0..5af4a22 100644 --- a/home/fish.nix +++ b/home/fish.nix @@ -169,7 +169,7 @@ cat = "${pkgs.bat}/bin/bat --style=plain --paging=never"; du = "${pkgs.du-dust}/bin/dust"; g = "${pkgs.gitAndTools.git}/bin/git"; - ls = "${pkgs.exa}/bin/exa"; + ls = "${pkgs.eza}/bin/eza"; ll = "ls -l --time-style long-iso --icons"; la = "ll -a"; http = "${pkgs.xh}/bin/xh"; @@ -180,8 +180,6 @@ colortest = "${pkgs.terminal-colors}/bin/terminal-colors -o"; } // lib.optionalAttrs pkgs.stdenv.isDarwin { sb = "set-background-to-macOS"; - conda-init = - "eval /opt/homebrew/bin/conda 'shell.fish' 'hook' $argv | source"; }; # Configuration that should be above `loginShellInit` and `interactiveShellInit`. diff --git a/home/programs.nix b/home/programs.nix index fa534e5..1c08895 100644 --- a/home/programs.nix +++ b/home/programs.nix @@ -23,10 +23,10 @@ AddKeysToAgent = "yes"; }; }; - # vscode = { - # enable = true; - # extensions = [ pijul-vscode ]; - # }; + vscode = { + enable = true; + # extensions = [ pijul-vscode ]; + }; zoxide = { enable = true; }; }; # }}} @@ -48,8 +48,8 @@ bottom # fancy version of `du` du-dust - # fancy version of `ls` - exa + # fancy version of `ls`, fork of now-unmaintained `exa` + eza # fancy version of `find` fd # wrapper for `ssh` that better at not dropping connections diff --git a/pkgs/default.nix b/pkgs/default.nix index ac8f59f..cceae9c 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -13,7 +13,7 @@ _: prev: prev.callPackage (./. + "/${name}.nix") ({ "${name}-src" = inputs."${name}-src"; } // extras)) { cinny = { }; - dark-mode-notify = { sdkVersion = "14.*"; }; + dark-mode-notify = { sdkVersion = "*.*"; }; ia-writer-family = { }; yubiswitch = { }; } diff --git a/statix.toml b/statix.toml new file mode 100644 index 0000000..3f02ae4 --- /dev/null +++ b/statix.toml @@ -0,0 +1 @@ +disabled = ["repeated_keys"]