Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev #80

Merged
merged 13 commits into from
Jun 27, 2024
305 changes: 129 additions & 176 deletions flake.lock

Large diffs are not rendered by default.

13 changes: 3 additions & 10 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
description = "Redyf's Flake";

inputs = {
# Core
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = {
url = "github:nix-community/home-manager/master";
Expand All @@ -17,22 +16,15 @@
stylix.url = "github:danth/stylix";
ags.url = "github:Aylur/ags";
matugen.url = "github:InioX/matugen?ref=v2.2.0";
xdg-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland";

# git+ssh://git@git.example.com/User/repo.git
# fontflake.url = "git+ssh://git@github.com/redyf/font-flake.git";

# liga-martian-mono = {
# url = "github:redyf/LigaMartianMono";
# flake = false;
# };
font-flake.url = "github:redyf/font-flake";

# SFMono w/ patches
# sf-mono-liga-src = {
# url = "github:shaunsingh/SFMono-Nerd-Font-Ligaturized";
# flake = false;
# };

# git+ssh://git@git.example.com/User/repo.git if you're using private repos
# berkeley = {
# url = "git+ssh://git@github.com/redyf/berkeley.git";
# flake = false;
Expand All @@ -51,6 +43,7 @@
home-manager,
disko,
stylix,
font-flake,
...
} @ inputs: let
supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
Expand Down
5 changes: 3 additions & 2 deletions home/redyf/apps/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
_: {
imports = [
# ./artix-game-launcher
./artix-game-launcher
./discord
# ./davinci-resolve
# ./emacs
# ./figma
./firefox
# ./insomnia
./insomnia
./misc
./obs
# ./vscode
Expand Down
5 changes: 5 additions & 0 deletions home/redyf/apps/figma/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{pkgs, ...}: {
home.packages = with pkgs; [
figma-linux
];
}
14 changes: 2 additions & 12 deletions home/redyf/apps/misc/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{pkgs, ...}: {
# Requires https://github.com/caarlos0/timer to be installed. spd-say should ship with your distro (Thanks Bashbunni!)
home.packages = with pkgs; [
# Anime/Manga
# ani-cli # A cli tool to browse and play anime
Expand All @@ -15,32 +14,23 @@
obsidian

# Other stuff
gh
ollama
playerctl
# spotify
# brave

# Rice
bemenu
# cmatrix
nitrogen # Wallpaper utility for X11
nwg-look # Change GTK theme

# Screenshot + extra utils
grim # Screenshot tool for hyprland
slurp # Works with grim to screenshot on wayland
wl-clipboard # Enables copy/paste on wayland
# Extra utils
vlc

# System Utils
mpv
glib
unzip # Unzip files using the terminal
ffmpeg_6 # A complete, cross-platform solution to record, convert and stream audio and video
tree-sitter # A parser generator tool and an incremental parsing library
appimage-run # Run appimage files in the terminal
polkit_gnome
cinnamon.nemo
pcmanfm
];
}
1 change: 0 additions & 1 deletion home/redyf/cli-apps/neovim/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
home = {
packages = with pkgs; [
neovim
lazygit
stylua
sumneko-lua-language-server
ripgrep
Expand Down
1 change: 0 additions & 1 deletion home/redyf/cli-apps/neve/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
}: {
home.packages = with pkgs; [
inputs.Neve.packages.${system}.default
lazygit
stylua
sumneko-lua-language-server
ripgrep
Expand Down
1 change: 1 addition & 0 deletions home/redyf/desktop/awesomewm.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
dunst
dmenu
flameshot
nitrogen # Wallpaper utility for X11
];
};
services = {
Expand Down
15 changes: 7 additions & 8 deletions home/redyf/desktop/hyprland/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@
gnomeSchema = "org.gnome.desktop.interface";
in {
home.packages = with pkgs; [
grim
slurp
swappy
grim # Screenshot tool for hyprland
slurp # Works with grim to screenshot on wayland
swappy # Wayland native snapshot editing tool, inspired by Snappy on macOS
wl-clipboard # Enables copy/paste on wayland
bemenu
nwg-look # Change GTK theme

(writeShellScriptBin "screenshot" ''
grim -g "$(slurp)" - | wl-copy
Expand All @@ -44,10 +47,6 @@ in {
swww kill
swww init

# Mako (Notifications)
pkill mako
mako &

# Cursor
gsettings set org.gnome.desktop.interface cursor-theme macOS-BigSur
hyprctl setcursor macOS-BigSur 32 # "Catppuccin-Mocha-Mauve-Cursors"
Expand Down Expand Up @@ -187,7 +186,7 @@ in {
mfact = 0.5;
orientation = "right";
special_scale_factor = 0.8;
new_is_master = true;
new_status = "master";
no_gaps_when_only = false;
};

Expand Down
38 changes: 0 additions & 38 deletions home/redyf/home.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,44 +30,6 @@
config = {
allowUnfree = true;
};
overlays = with inputs; [
(
final: prev: {
sf-mono-liga-bin = prev.stdenvNoCC.mkDerivation {
pname = "sf-mono-liga-bin";
version = "dev";
src = sf-mono-liga-src;
dontConfigure = true;
installPhase = ''
mkdir -p $out/share/fonts/opentype
cp -R $src/*.otf $out/share/fonts/opentype/
'';
};

monolisa-script = prev.stdenvNoCC.mkDerivation {
pname = "monolisa";
version = "dev";
src = monolisa-script;
dontConfigure = true;
installPhase = ''
mkdir -p $out/share/fonts/opentype
cp -R $src/*.ttf $out/share/fonts/opentype/
'';
};

berkeley = prev.stdenvNoCC.mkDerivation {
pname = "berkeley-mono";
version = "dev";
src = berkeley;
dontConfigure = true;
installPhase = ''
mkdir -p $out/share/fonts/opentype
cp -R $src/*.otf $out/share/fonts/opentype/
'';
};
}
)
];
};

# Add support for .local/bin
Expand Down
2 changes: 0 additions & 2 deletions home/redyf/system/nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
nil
statix
alejandra
nurl
nix-init
nix-prefetch-git
];
}
6 changes: 5 additions & 1 deletion home/redyf/tools/git/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
_: {
{pkgs, ...}: {
programs.git = {
enable = true;
userName = "Redyf";
Expand All @@ -9,4 +9,8 @@ _: {
pull.rebase = false;
};
};
home.packages = with pkgs; [
gh
lazygit
];
}
2 changes: 1 addition & 1 deletion home/redyf/tools/http/default.nix
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{pkgs, ...}: {
home.packages = with pkgs; [curl httpie openssl];
home.packages = with pkgs; [curl openssl];
}
7 changes: 4 additions & 3 deletions hosts/redyf/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ in {
sessionVariables = {
NIXOS_OZONE_WL = "1"; # Hint electron apps to use wayland
WLR_NO_HARDWARE_CURSORS = "1"; # Fix cursor rendering issue on wlr nvidia.
DEFAULT_BROWSER = "${pkgs.brave}/bin/brave"; # Set default browser
DEFAULT_BROWSER = "${pkgs.firefox}/bin/firefox"; # Set default browser
};
shellAliases = {nvidia-settings = "nvidia-settings --config='$XDG_CONFIG_HOME'/nvidia/settings";};
};
Expand Down Expand Up @@ -133,6 +133,7 @@ in {
hyprland = {
enable = true;
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
portalPackage = with pkgs; xdg-desktop-portal-hyprland;
};
noisetorch.enable = true;
nh = {
Expand All @@ -157,8 +158,8 @@ in {
base16Scheme = "${pkgs.base16-schemes}/share/themes/${theme}.yaml";
fonts = {
monospace = {
package = with pkgs; nerdfonts.override {fonts = ["MartianMono"];};
name = "MartianMono Nerd Font";
package = with pkgs; nerdfonts.override {fonts = ["IBMPlexMono"];};
name = "BlexMono Nerd Font Bold";
};
sansSerif = {
package = pkgs.dejavu_fonts;
Expand Down