diff --git a/darwin/homebrew.nix b/darwin/homebrew.nix index b6a79a6..c908824 100644 --- a/darwin/homebrew.nix +++ b/darwin/homebrew.nix @@ -81,6 +81,7 @@ in # games "gog-galaxy" "origin" + "sony-ps-remote-play" "steam" ]; diff --git a/flake.lock b/flake.lock index 9d511b6..b161dfc 100644 --- a/flake.lock +++ b/flake.lock @@ -16,6 +16,22 @@ "type": "github" } }, + "crane": { + "flake": false, + "locked": { + "lastModified": 1654444508, + "narHash": "sha256-4OBvQ4V7jyt7afs6iKUvRzJ1u/9eYnKzVQbeQdiamuY=", + "owner": "ipetkov", + "repo": "crane", + "rev": "db5482bf225acc3160899124a1df5a617cfa27b5", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "dark-mode-notify-src": { "flake": false, "locked": { @@ -53,6 +69,85 @@ "type": "github" } }, + "devshell": { + "flake": false, + "locked": { + "lastModified": 1655976588, + "narHash": "sha256-VreHyH6ITkf/1EX/8h15UqhddJnUleb0HgbC3gMkAEQ=", + "owner": "numtide", + "repo": "devshell", + "rev": "899ca4629020592a13a46783587f6e674179d1db", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "dream2nix": { + "inputs": { + "alejandra": [ + "helix", + "nixCargoIntegration", + "nixpkgs" + ], + "crane": "crane", + "devshell": [ + "helix", + "nixCargoIntegration", + "devshell" + ], + "flake-utils-pre-commit": [ + "helix", + "nixCargoIntegration", + "nixpkgs" + ], + "gomod2nix": [ + "helix", + "nixCargoIntegration", + "nixpkgs" + ], + "mach-nix": [ + "helix", + "nixCargoIntegration", + "nixpkgs" + ], + "nixpkgs": [ + "helix", + "nixCargoIntegration", + "nixpkgs" + ], + "node2nix": [ + "helix", + "nixCargoIntegration", + "nixpkgs" + ], + "poetry2nix": [ + "helix", + "nixCargoIntegration", + "nixpkgs" + ], + "pre-commit-hooks": [ + "helix", + "nixCargoIntegration", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1655975833, + "narHash": "sha256-g8sdfuglIZ24oWVbntVzniNTJW+Z3n9DNL9w9Tt+UCE=", + "owner": "nix-community", + "repo": "dream2nix", + "rev": "4e75e665ec3a1cddae5266bed0dd72fce0b74a23", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "dream2nix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -84,6 +179,43 @@ "type": "github" } }, + "flake-utils_2": { + "locked": { + "lastModified": 1637014545, + "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "helix": { + "inputs": { + "nixCargoIntegration": "nixCargoIntegration", + "nixpkgs": [ + "nixpkgs-unstable" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1662086378, + "narHash": "sha256-wKSQT5HAOCdwfdO6cVJ9FXLy2Fftk3ITFnMatvEgOYQ=", + "owner": "helix-editor", + "repo": "helix", + "rev": "e8730ca5fd72e3bb275b4d825de40475eabea174", + "type": "github" + }, + "original": { + "owner": "helix-editor", + "repo": "helix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -168,6 +300,33 @@ "type": "github" } }, + "nixCargoIntegration": { + "inputs": { + "devshell": "devshell", + "dream2nix": "dream2nix", + "nixpkgs": [ + "helix", + "nixpkgs" + ], + "rust-overlay": [ + "helix", + "rust-overlay" + ] + }, + "locked": { + "lastModified": 1656453541, + "narHash": "sha256-ZCPVnS6zJOZJvIlwU3rKR8MBVm6A3F4/0mA7G1lQ3D0=", + "owner": "yusdacra", + "repo": "nix-cargo-integration", + "rev": "9eb74345b30cd2e536d9dac9d4435d3c475605c7", + "type": "github" + }, + "original": { + "owner": "yusdacra", + "repo": "nix-cargo-integration", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1659446231, @@ -223,6 +382,7 @@ "darwin": "darwin", "flake-compat": "flake-compat", "flake-utils": "flake-utils", + "helix": "helix", "home-manager": "home-manager", "homebrew-enabled": "homebrew-enabled", "kakoune-sudo-write-src": "kakoune-sudo-write-src", @@ -234,6 +394,28 @@ "smarttab-kak-src": "smarttab-kak-src" } }, + "rust-overlay": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "helix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1655779671, + "narHash": "sha256-6feeiGa6fb7ZPVHR71uswkmN1701TAJpwYQA8QffmRk=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "8159585609a772b041cce6019d5c21d240709244", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "smarttab-kak-src": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 5221622..23e16ef 100644 --- a/flake.nix +++ b/flake.nix @@ -3,47 +3,50 @@ inputs = { # Package sets - nixpkgs.url = github:NixOS/nixpkgs/nixpkgs-21.11-darwin; - nixpkgs-unstable.url = github:NixOS/nixpkgs/nixpkgs-unstable; - nixpkgs-master.url = github:NixOS/nixpkgs/master; + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-21.11-darwin"; + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + nixpkgs-master.url = "github:NixOS/nixpkgs/master"; # Environment/system management - darwin.url = github:lnl7/nix-darwin/master; + darwin.url = "github:lnl7/nix-darwin/master"; darwin.inputs.nixpkgs.follows = "nixpkgs-unstable"; - home-manager.url = github:nix-community/home-manager; + home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs-unstable"; # Config "flag" for disabling homebrew - homebrew-enabled.url = github:boolean-option/true; + homebrew-enabled.url = "github:boolean-option/true"; # Other sources - flake-utils.url = github:numtide/flake-utils; + flake-utils.url = "github:numtide/flake-utils"; + flake-utils.inputs.nixpkgs.follows = "nixpkgs-unstable"; + helix.url = "github:helix-editor/helix"; + helix.inputs.nixpkgs.follows = "nixpkgs-unstable"; flake-compat = { - url = github:edolstra/flake-compat; + url = "github:edolstra/flake-compat"; flake = false; }; dark-mode-notify-src = { - url = github:bouk/dark-mode-notify; + url = "github:bouk/dark-mode-notify"; flake = false; }; luar-src = { - url = github:gustavo-hms/luar; + url = "github:gustavo-hms/luar"; flake = false; }; smarttab-kak-src = { - url = github:andreyorst/smarttab.kak; + url = "github:andreyorst/smarttab.kak"; flake = false; }; auto-pairs-kak-src = { - url = github:alexherbo2/auto-pairs.kak; + url = "github:alexherbo2/auto-pairs.kak"; flake = false; }; kakoune-sudo-write-src = { - url = github:occivink/kakoune-sudo-write; + url = "github:occivink/kakoune-sudo-write"; flake = false; }; kitty-icon = { - url = github:DinkDonk/kitty-icon; + url = "github:DinkDonk/kitty-icon"; flake = false; }; }; @@ -69,6 +72,7 @@ pkgs = import ./pkgs { inherit inputs genAttrs; inherit (final) callPackage; + inherit (final.stdenv) system; }; in pkgs // optionalAttrs (prev.stdenv.system == "aarch64-darwin") diff --git a/home/default.nix b/home/default.nix index ab054a9..be68803 100644 --- a/home/default.nix +++ b/home/default.nix @@ -49,11 +49,14 @@ set-bat-colors ''; }; + helix = { + enable = true; + }; neovim = { enable = true; - viAlias = true; - vimAlias = true; - vimdiffAlias = true; + # viAlias = true; + # vimAlias = true; + # vimdiffAlias = true; extraConfig = builtins.readFile ../configs/init.vim; plugins = with pkgs.vimPlugins; [ neovim-sensible diff --git a/home/shells.nix b/home/shells.nix index abb149f..9a61293 100644 --- a/home/shells.nix +++ b/home/shells.nix @@ -205,7 +205,6 @@ ls = "${exa}/bin/exa"; ll = "ls -l --time-style long-iso --icons"; la = "ll -a"; - ps = "${procs}/bin/procs"; code = "${vscodium}/bin/codium"; http = "${xh}/bin/xh"; https = "${xh}/bin/xhs"; diff --git a/pkgs/default.nix b/pkgs/default.nix index 72bbd55..91e8b2b 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,4 +1,4 @@ -{ callPackage, inputs, genAttrs }: +{ callPackage, inputs, genAttrs, system }: let buildPkg = name: callPackage @@ -12,4 +12,6 @@ let "yubiswitch" ]; in -genAttrs pkgs buildPkg +genAttrs pkgs buildPkg // { + helix = inputs.helix.packages.${system}.default; +}