Skip to content

Commit

Permalink
Merge pull request #75 from sioodmy/calypso
Browse files Browse the repository at this point in the history
Calypso
  • Loading branch information
sioodmy authored Dec 11, 2023
2 parents 569e9b0 + 6f20a05 commit e3e5917
Show file tree
Hide file tree
Showing 34 changed files with 914 additions and 938 deletions.
432 changes: 108 additions & 324 deletions flake.lock

Large diffs are not rendered by default.

8 changes: 2 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
nix-super.url = "github:privatevoid-net/nix-super";

schizofox = {
url = "github:schizofox/schizofox/wavefox";
# url = "path:/home/sioodmy/dev/schizofox";
# url = "github:schizofox/schizofox/wavefox";
url = "path:/home/sioodmy/dev/schizofox";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-parts.follows = "flake-parts";
Expand Down Expand Up @@ -87,10 +87,6 @@
url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs";
};
lanzaboote = {
url = "github:nix-community/lanzaboote";
inputs.nixpkgs.follows = "nixpkgs";
};
shadower = {
url = "github:n3oney/shadower";
inputs.nixpkgs.follows = "nixpkgs";
Expand Down
4 changes: 3 additions & 1 deletion home/cli/default.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{...}: {
imports = [
./zsh
./helix.nix
./starship.nix
./bottom.nix
./git.nix
./shell.nix
./tools
./packages.nix
];
}
53 changes: 24 additions & 29 deletions home/cli/helix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,29 @@
}: {
programs.helix = {
enable = true;
package = inputs.helix.packages.${pkgs.hostPlatform.system}.default.overrideAttrs (self: {
makeWrapperArgs = with pkgs;
self.makeWrapperArgs
or []
++ [
"--suffix"
"PATH"
":"
(lib.makeBinPath [
clang-tools
nil
luajitPackages.lua-lsp
typst-lsp
nodePackages.bash-language-server
nodePackages.vscode-css-languageserver-bin
nodePackages.vscode-langservers-extracted
nodePackages.prettier
black
alejandra
shellcheck
])
];
});
# package = inputs.helix.packages.${pkgs.hostPlatform.system}.default.overrideAttrs (self: {
# makeWrapperArgs = with pkgs;
# self.makeWrapperArgs
# or []
# ++ [
# "--suffix"
# "PATH"
# ":"
# (lib.makeBinPath [
# clang-tools
# nil
# luajitPackages.lua-lsp
# typst-lsp
# nodePackages.bash-language-server
# nodePackages.vscode-css-languageserver-bin
# nodePackages.vscode-langservers-extracted
# nodePackages.prettier
# black
# alejandra
# shellcheck
# ])
# ];
# });

settings = {
theme = "catppuccin_mocha_transparent";
Expand Down Expand Up @@ -57,20 +57,15 @@
idle-timeout = 1;
line-number = "relative";
scrolloff = 5;
rainbow-brackets = true;
# rainbow-brackets = true;
completion-replace = true;
cursor-word = true;
bufferline = "always";
true-color = true;
rulers = [80];
soft-wrap.enable = true;
indent-guides = {
render = true;
};
sticky-context = {
enable = false;
indicator = false;
};
lsp = {
display-messages = true;
display-inlay-hints = true;
Expand Down
65 changes: 65 additions & 0 deletions home/cli/packages.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
{pkgs, ...}: {
home.packages = with pkgs; [
# Runs programs without installing them
comma

# grep replacement
ripgrep

# ping, but with cool graph
gping

# dns client
dogdns

# neofetch but for git repos
onefetch

# neofetch but for cpu's
cpufetch

# neofetch but cooler
pfetch-rs

# download from yt and other websites
yt-dlp

# markdown previewer
glow

# profiling tool
hyperfine

# gimp for acoustic people
imagemagick

# premiere pro for acoustic people
ffmpeg-full

# preview images in terminal
catimg

# networking stuff
nmap
rsync
wget

# faster find
fd

# http request thingy
xh

# generate regex
grex

# todo app for acoustic people (wrriten by me :3)
todo

# json thingy
jq

# syncthnig for acoustic people
rsync
];
}
201 changes: 0 additions & 201 deletions home/cli/shell.nix

This file was deleted.

Loading

0 comments on commit e3e5917

Please sign in to comment.