Skip to content

Commit

Permalink
feat: integrate andromeda into the flake
Browse files Browse the repository at this point in the history
  • Loading branch information
sioodmy committed Aug 3, 2024
1 parent 71b75a3 commit 5327e75
Show file tree
Hide file tree
Showing 36 changed files with 2,195 additions and 358 deletions.
385 changes: 83 additions & 302 deletions flake.lock

Large diffs are not rendered by default.

59 changes: 27 additions & 32 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -38,24 +38,20 @@
prettier.enable = true;
};
};
devShells.default = let
extra = import ./devShell;
in
inputs'.devshell.legacyPackages.mkShell {
name = "dotfiles";
commands = extra.shellCommands;
env = extra.shellEnv;
packages = with pkgs; [
inputs'.agenix.packages.default # provide agenix CLI within flake shell
config.treefmt.build.wrapper # treewide formatter
nil # nix ls
alejandra # nix formatter
git # flakes require git, and so do I
glow # markdown viewer
statix # lints and suggestions
deadnix # clean up unused nix code
];
};
devShells.default = pkgs.mkShell {
buildInputs = let
colors = inputs.nix-colors.colorSchemes.catppuccin-frappe.palette;
in
[
inputs'.agenix.packages.default
config.treefmt.build.wrapper
(pkgs.callPackage ./shell {inherit pkgs inputs colors;})
]
++ (import ./shell/packages.nix {inherit pkgs;});
shellHook = ''
nucleus
'';
};

# configure treefmt
treefmt = {
Expand Down Expand Up @@ -93,15 +89,18 @@

nixos-hardware.url = "github:nixos/nixos-hardware";
impermanence.url = "github:nix-community/impermanence";
nix-colors.url = "github:Misterio77/nix-colors";

nixpak = {
url = "github:nixpak/nixpak";
wrapper-manager = {
url = "github:viperML/wrapper-manager";
inputs.nixpkgs.follows = "nixpkgs";
};

# project shells
devshell = {
url = "github:numtide/devshell";
noshell = {
url = "github:viperML/noshell";
inputs.nixpkgs.follows = "nixpkgs";
};
nixpak = {
url = "github:nixpak/nixpak";
inputs.nixpkgs.follows = "nixpkgs";
};

Expand All @@ -124,14 +123,6 @@
url = "github:ryantm/agenix";
inputs.nixpkgs.follows = "nixpkgs";
};
andromeda = {
# url = "github:sioodmy/andromeda";
url = "path:/home/sioodmy/dev/andromeda";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-parts.follows = "flake-parts";
};
};

homix = {
url = "github:sioodmy/homix";
Expand Down Expand Up @@ -175,6 +166,10 @@
treefmt-nix.follows = "treefmt-nix";
};
};
zsh-auto-notify = {
url = "github:MichaelAquilina/zsh-auto-notify";
flake = false;
};
};
}
# see also:
Expand Down
33 changes: 33 additions & 0 deletions shell/aliases.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{pkgs, ...}: let
getExe = pkgs.lib.getExe;
in
with pkgs; rec {
l = "${getExe eza} --icons";
e = "${getExe eza} --icons -lha --git";

ls = l;
la = e;

m = "mkdir";

g = "git";
n = "nix";

ytmp3 = "yt-dlp -x --embed-metadata --audio-quality 0 --audio-format mp3";

cat = "${getExe bat}";
fzf = "${getExe skim}";

cp = "cp -ivr";
mv = "mv -iv";

kys = "shutdown now";

gpl = "curl https://www.gnu.org/licenses/gpl-3.0.txt -o LICENSE";

gcb = "git checkout";
gd = "git pull";
gu = "git push";
gc = "git commit";
ga = "git add";
}
Empty file added shell/config.nix
Empty file.
32 changes: 32 additions & 0 deletions shell/configs/bottom.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{pkgs, ...}: let
toml = pkgs.formats.toml {};

settings = {
flags.group_processes = true;
row = [
{
ratio = 2;
child = [
{type = "cpu";}
{type = "mem";}
];
}
{
ratio = 3;
child = [
{
type = "proc";
ratio = 1;
default = true;
}
];
}
];
};
in {
basePackage = pkgs.bottom;
flags = [
"--config"
(toml.generate "config.toml" settings)
];
}
9 changes: 9 additions & 0 deletions shell/configs/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
inputs,
pkgs,
colors,
...
}: {
bottom = import ./bottom.nix {inherit inputs pkgs;};
nvim = import ./nvim {inherit inputs pkgs colors;};
}
142 changes: 142 additions & 0 deletions shell/configs/nvim/_sources/generated.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
{
"incline": {
"cargoLocks": null,
"date": "2024-05-16",
"extract": null,
"name": "incline",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"owner": "b0o",
"repo": "incline.nvim",
"rev": "16fc9c073e3ea4175b66ad94375df6d73fc114c0",
"sha256": "sha256-5DoIvIdAZV7ZgmQO2XmbM3G+nNn4tAumsShoN3rDGrs=",
"type": "github"
},
"version": "16fc9c073e3ea4175b66ad94375df6d73fc114c0"
},
"neotree": {
"cargoLocks": null,
"date": "2024-06-11",
"extract": null,
"name": "neotree",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"owner": "nvim-neo-tree",
"repo": "neo-tree.nvim",
"rev": "206241e451c12f78969ff5ae53af45616ffc9b72",
"sha256": "sha256-eNGuQEjAKsPuRDGaw95kCVOmP64ZDnUuFBppqtcrhZ4=",
"type": "github"
},
"version": "206241e451c12f78969ff5ae53af45616ffc9b72"
},
"nvim-base-16": {
"cargoLocks": null,
"date": "2024-05-23",
"extract": null,
"name": "nvim-base-16",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"owner": "RRethy",
"repo": "nvim-base16",
"rev": "6ac181b5733518040a33017dde654059cd771b7c",
"sha256": "sha256-GRF/6AobXHamw8TZ3FjL7SI6ulcpwpcohsIuZeCSh2A=",
"type": "github"
},
"version": "6ac181b5733518040a33017dde654059cd771b7c"
},
"org-bullets": {
"cargoLocks": null,
"date": "2024-07-09",
"extract": null,
"name": "org-bullets",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"owner": "nvim-orgmode",
"repo": "org-bullets.nvim",
"rev": "7e76e04827ac3fb13fc645a6309ac14203c4ca6a",
"sha256": "sha256-bxiL88uUa0Zd/HL7RcC/XVhbkgdlFr6MmlQfkpxFybE=",
"type": "github"
},
"version": "7e76e04827ac3fb13fc645a6309ac14203c4ca6a"
},
"recession": {
"cargoLocks": null,
"date": "2024-07-01",
"extract": null,
"name": "recession",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"owner": "stevearc",
"repo": "resession.nvim",
"rev": "e087ebeef81df25a12fcc4ec067ca73e2bb54c4a",
"sha256": "sha256-Id7rJwxvH81TnBKHAsPuP8nmu7SS6b5PiLoE2UzeRX0=",
"type": "github"
},
"version": "e087ebeef81df25a12fcc4ec067ca73e2bb54c4a"
},
"scope": {
"cargoLocks": null,
"date": "2024-03-31",
"extract": null,
"name": "scope",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"owner": "tiagovla",
"repo": "scope.nvim",
"rev": "86a0f5b594b08b2ad65f470ffdee81654942b6ac",
"sha256": "sha256-8Bd1DI6nuUxkTCx0wCfWKHdi6UXQNuDygj5UuSGypLs=",
"type": "github"
},
"version": "86a0f5b594b08b2ad65f470ffdee81654942b6ac"
},
"telescope-orgmode": {
"cargoLocks": null,
"date": "2024-07-07",
"extract": null,
"name": "telescope-orgmode",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"owner": "nvim-orgmode",
"repo": "telescope-orgmode.nvim",
"rev": "b1d0fab19fafeb7de0fd78b16d4c023021c01765",
"sha256": "sha256-46R9HO6kmGmWzBXAiL+SeR44uj0P716vwOfUTI8ec7E=",
"type": "github"
},
"version": "b1d0fab19fafeb7de0fd78b16d4c023021c01765"
}
}
88 changes: 88 additions & 0 deletions shell/configs/nvim/_sources/generated.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
# This file was generated by nvfetcher, please do not modify it manually.
{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
{
incline = {
pname = "incline";
version = "16fc9c073e3ea4175b66ad94375df6d73fc114c0";
src = fetchFromGitHub {
owner = "b0o";
repo = "incline.nvim";
rev = "16fc9c073e3ea4175b66ad94375df6d73fc114c0";
fetchSubmodules = false;
sha256 = "sha256-5DoIvIdAZV7ZgmQO2XmbM3G+nNn4tAumsShoN3rDGrs=";
};
date = "2024-05-16";
};
neotree = {
pname = "neotree";
version = "206241e451c12f78969ff5ae53af45616ffc9b72";
src = fetchFromGitHub {
owner = "nvim-neo-tree";
repo = "neo-tree.nvim";
rev = "206241e451c12f78969ff5ae53af45616ffc9b72";
fetchSubmodules = false;
sha256 = "sha256-eNGuQEjAKsPuRDGaw95kCVOmP64ZDnUuFBppqtcrhZ4=";
};
date = "2024-06-11";
};
nvim-base-16 = {
pname = "nvim-base-16";
version = "6ac181b5733518040a33017dde654059cd771b7c";
src = fetchFromGitHub {
owner = "RRethy";
repo = "nvim-base16";
rev = "6ac181b5733518040a33017dde654059cd771b7c";
fetchSubmodules = false;
sha256 = "sha256-GRF/6AobXHamw8TZ3FjL7SI6ulcpwpcohsIuZeCSh2A=";
};
date = "2024-05-23";
};
org-bullets = {
pname = "org-bullets";
version = "7e76e04827ac3fb13fc645a6309ac14203c4ca6a";
src = fetchFromGitHub {
owner = "nvim-orgmode";
repo = "org-bullets.nvim";
rev = "7e76e04827ac3fb13fc645a6309ac14203c4ca6a";
fetchSubmodules = false;
sha256 = "sha256-bxiL88uUa0Zd/HL7RcC/XVhbkgdlFr6MmlQfkpxFybE=";
};
date = "2024-07-09";
};
recession = {
pname = "recession";
version = "e087ebeef81df25a12fcc4ec067ca73e2bb54c4a";
src = fetchFromGitHub {
owner = "stevearc";
repo = "resession.nvim";
rev = "e087ebeef81df25a12fcc4ec067ca73e2bb54c4a";
fetchSubmodules = false;
sha256 = "sha256-Id7rJwxvH81TnBKHAsPuP8nmu7SS6b5PiLoE2UzeRX0=";
};
date = "2024-07-01";
};
scope = {
pname = "scope";
version = "86a0f5b594b08b2ad65f470ffdee81654942b6ac";
src = fetchFromGitHub {
owner = "tiagovla";
repo = "scope.nvim";
rev = "86a0f5b594b08b2ad65f470ffdee81654942b6ac";
fetchSubmodules = false;
sha256 = "sha256-8Bd1DI6nuUxkTCx0wCfWKHdi6UXQNuDygj5UuSGypLs=";
};
date = "2024-03-31";
};
telescope-orgmode = {
pname = "telescope-orgmode";
version = "b1d0fab19fafeb7de0fd78b16d4c023021c01765";
src = fetchFromGitHub {
owner = "nvim-orgmode";
repo = "telescope-orgmode.nvim";
rev = "b1d0fab19fafeb7de0fd78b16d4c023021c01765";
fetchSubmodules = false;
sha256 = "sha256-46R9HO6kmGmWzBXAiL+SeR44uj0P716vwOfUTI8ec7E=";
};
date = "2024-07-07";
};
}
Loading

0 comments on commit 5327e75

Please sign in to comment.