sloane
/
dotfiles.nix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add helix, others

work
mat ess 2022-09-04 13:39:34 -04:00
parent 4a8623227c
commit 4989388dd5
6 changed files with 211 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
darwin/homebrew.nix
View File

@ -81,6 +81,7 @@ in
# games # games
"gog-galaxy" "gog-galaxy"
"origin" "origin"
"sony-ps-remote-play"
"steam" "steam"
]; ];

182
flake.lock
View File

@ -16,6 +16,22 @@
"type": "github" "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": { "dark-mode-notify-src": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -53,6 +69,85 @@
"type": "github" "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-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -84,6 +179,43 @@
"type": "github" "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": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -168,6 +300,33 @@
"type": "github" "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1659446231, "lastModified": 1659446231,
@ -223,6 +382,7 @@
"darwin": "darwin", "darwin": "darwin",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"helix": "helix",
"home-manager": "home-manager", "home-manager": "home-manager",
"homebrew-enabled": "homebrew-enabled", "homebrew-enabled": "homebrew-enabled",
"kakoune-sudo-write-src": "kakoune-sudo-write-src", "kakoune-sudo-write-src": "kakoune-sudo-write-src",
@ -234,6 +394,28 @@
"smarttab-kak-src": "smarttab-kak-src" "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": { "smarttab-kak-src": {
"flake": false, "flake": false,
"locked": { "locked": {

32
flake.nix
View File

@ -3,47 +3,50 @@
inputs = { inputs = {
# Package sets # Package sets
nixpkgs.url = github:NixOS/nixpkgs/nixpkgs-21.11-darwin; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-21.11-darwin";
nixpkgs-unstable.url = github:NixOS/nixpkgs/nixpkgs-unstable; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nixpkgs-master.url = github:NixOS/nixpkgs/master; nixpkgs-master.url = "github:NixOS/nixpkgs/master";
# Environment/system management # Environment/system management
darwin.url = github:lnl7/nix-darwin/master; darwin.url = "github:lnl7/nix-darwin/master";
darwin.inputs.nixpkgs.follows = "nixpkgs-unstable"; 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"; home-manager.inputs.nixpkgs.follows = "nixpkgs-unstable";
# Config "flag" for disabling homebrew # Config "flag" for disabling homebrew
homebrew-enabled.url = github:boolean-option/true; homebrew-enabled.url = "github:boolean-option/true";
# Other sources # 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 = { flake-compat = {
url = github:edolstra/flake-compat; url = "github:edolstra/flake-compat";
flake = false; flake = false;
}; };
dark-mode-notify-src = { dark-mode-notify-src = {
url = github:bouk/dark-mode-notify; url = "github:bouk/dark-mode-notify";
flake = false; flake = false;
}; };
luar-src = { luar-src = {
url = github:gustavo-hms/luar; url = "github:gustavo-hms/luar";
flake = false; flake = false;
}; };
smarttab-kak-src = { smarttab-kak-src = {
url = github:andreyorst/smarttab.kak; url = "github:andreyorst/smarttab.kak";
flake = false; flake = false;
}; };
auto-pairs-kak-src = { auto-pairs-kak-src = {
url = github:alexherbo2/auto-pairs.kak; url = "github:alexherbo2/auto-pairs.kak";
flake = false; flake = false;
}; };
kakoune-sudo-write-src = { kakoune-sudo-write-src = {
url = github:occivink/kakoune-sudo-write; url = "github:occivink/kakoune-sudo-write";
flake = false; flake = false;
}; };
kitty-icon = { kitty-icon = {
url = github:DinkDonk/kitty-icon; url = "github:DinkDonk/kitty-icon";
flake = false; flake = false;
}; };
}; };
@ -69,6 +72,7 @@
pkgs = import ./pkgs { pkgs = import ./pkgs {
inherit inputs genAttrs; inherit inputs genAttrs;
inherit (final) callPackage; inherit (final) callPackage;
inherit (final.stdenv) system;
}; };
in in
pkgs // optionalAttrs (prev.stdenv.system == "aarch64-darwin") pkgs // optionalAttrs (prev.stdenv.system == "aarch64-darwin")

9
home/default.nix
View File

@ -49,11 +49,14 @@
set-bat-colors set-bat-colors
''; '';
}; };
helix = {
enable = true;
};
neovim = { neovim = {
enable = true; enable = true;
viAlias = true; # viAlias = true;
vimAlias = true; # vimAlias = true;
vimdiffAlias = true; # vimdiffAlias = true;
extraConfig = builtins.readFile ../configs/init.vim; extraConfig = builtins.readFile ../configs/init.vim;
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
neovim-sensible neovim-sensible

1
home/shells.nix
View File

@ -205,7 +205,6 @@
ls = "${exa}/bin/exa"; ls = "${exa}/bin/exa";
ll = "ls -l --time-style long-iso --icons"; ll = "ls -l --time-style long-iso --icons";
la = "ll -a"; la = "ll -a";
ps = "${procs}/bin/procs";
code = "${vscodium}/bin/codium"; code = "${vscodium}/bin/codium";
http = "${xh}/bin/xh"; http = "${xh}/bin/xh";
https = "${xh}/bin/xhs"; https = "${xh}/bin/xhs";

6
pkgs/default.nix
View File

@ -1,4 +1,4 @@
{ callPackage, inputs, genAttrs }: { callPackage, inputs, genAttrs, system }:
let let
buildPkg = name: buildPkg = name:
callPackage callPackage
@ -12,4 +12,6 @@ let
"yubiswitch" "yubiswitch"
]; ];
in in
genAttrs pkgs buildPkg genAttrs pkgs buildPkg // {
helix = inputs.helix.packages.${system}.default;
}