a bunch of hm stuff I cba to split into diff commits

This commit is contained in:
blahai 2024-10-13 19:40:36 +03:00
parent cd751d53c0
commit ce0cc5229c
Signed by: blahai
SSH key fingerprint: SHA256:ZfCryi+V64yG+vC1ZIIsqgvBCmA31tTi7RJ6M8CvpRc
13 changed files with 100 additions and 393 deletions

View file

@ -1,14 +1,16 @@
{
description = "A very basic flake";
description = "Elissa's funny little flake";
nixConfig = {
extra-substituters = [
"https://nix-community.cachix.org"
"https://hyprland.cachix.org/"
"https://anyrun.cachix.org"
];
extra-trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
];
auto-optimise-store = true;
@ -36,17 +38,12 @@
inputs.nixpkgs.follows = "nixpkgs";
};
more-waita = {
url = "github:somepaulo/MoreWaita";
flake = false;
};
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
hyprland.url = "github:hyprwm/Hyprland";
};
outputs = { self, nixpkgs, chaotic, home-manager, ... }@inputs:
@ -67,7 +64,7 @@
specialArgs = { inherit inputs; };
modules = [
./hosts/helios/configuration.nix
inputs.home-manager.nixosModules.default
# inputs.home-manager.nixosModules.default
chaotic.nixosModules.default
];
};

View file

@ -1,22 +1,9 @@
{ inputs, config, pkgs, ... }:
let
moreWaita = pkgs.stdenv.mkDerivation {
name = "MoreWaita";
src = inputs.more-waita;
installPhase = ''
mkdir -p $out/share/icons
mv * $out/share/icons
'';
};
in
{ inputs, config, pkgs, lib, ... }:
{
imports = [
../../modules/home-manager/hypr/default.nix
../../modules/home-manager/spotify/default.nix
../../modules/home-manager/default.nix
];
# Home Manager needs a bit of information about you and the paths it should
# manage.
home.username = "pingu";
home.homeDirectory = "/home/pingu";
@ -27,94 +14,14 @@ in
size = 24;
};
# This value determines the Home Manager release that your configuration is
# compatible with. This helps avoid breakage when a new Home Manager release
# introduces backwards incompatible changes.
#
# You should not change this value, even if you update Home Manager. If you do
# want to update the value, then make sure to first check the Home Manager
# release notes.
home.stateVersion = "24.05"; # Please read the comment before changing.
home.stateVersion = "24.05";
# The home.packages option allows you to install Nix packages into your
# environment.
home.packages = [
];
home.file = {
".local/share/fonts" = {
recursive = true;
source = "${pkgs.nerdfonts}/share/fonts/truetype/NerdFonts";
};
".fonts" = {
recursive = true;
source = "${pkgs.nerdfonts}/share/fonts/truetype/NerdFonts";
};
};
gtk = {
enable = true;
font.name = "Rubik";
theme.name = "adw-gtk3-dark";
};
qt = {
enable = true;
platformTheme.name = "kde";
};
# Home Manager is pretty good at managing dotfiles. The primary way to manage
# plain files is through 'home.file'.
home.file = {
# # Building this configuration will create a copy of 'dotfiles/screenrc' in
# # the Nix store. Activating the configuration will then make '~/.screenrc' a
# # symlink to the Nix store copy.
# ".screenrc".source = dotfiles/screenrc;
# # You can also set the file content immediately.
# ".gradle/gradle.properties".text = ''
# org.gradle.console=verbose
# org.gradle.daemon.idletimeout=3600000
# '';
};
# Home Manager can also manage your environment variables through
# 'home.sessionVariables'. These will be explicitly sourced when using a
# shell provided by Home Manager. If you don't want to manage your shell
# through Home Manager then you have to manually source 'hm-session-vars.sh'
# located at either
#
# ~/.nix-profile/etc/profile.d/hm-session-vars.sh
#
# or
#
# ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
#
# or
#
# /etc/profiles/per-user/pingu/etc/profile.d/hm-session-vars.sh
#
home.sessionVariables = {
EDITOR = "nvim";
XMODIFIERS = "@im=ibus";
GTK_IM_MODULE = "ibus";
QT_IM_MODULE = "ibus";
WLR_NO_HARDWARE_CURSORS = "1";
GSK_RENDERER = "cairo";
MOZ_ENABLE_WAYLAND = "1";
XDG_CURRENT_DESKTOP = "Hyprland";
XDG_SESSION_TYPE = "wayland";
XDG_SESSION_DESKTOP = "Hyprland";
_JAVA_AWT_WM_NONREPARENTING = "1";
XCURSOR_THEME = "Bibata-Modern-Classic";
# HYPRCURSOR_THEME = "HyprBibataModernClassicSVG";
XCURSOR_SIZE = "24";
__GL_THREADED_OPTIMIZATIONS = "0";
QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
};
# Let Home Manager install and manage itself.

View file

@ -5,26 +5,17 @@
home.packages = with pkgs; [
bun
dart-sass
swww
fd
brightnessctl
swww
inputs.matugen.packages.${system}.default
slurp
wl-clipboard
wayshot
swappy
hyprpicker
pavucontrol
networkmanager
gtk3
pwvucontrol
which
];
#home.activation = {
# linkAgs = lib.hm.dag.entryAfter ["writeBoundary"] ''
# ln -sf ~/.config/nixos/modules/home-manager/ags/ags ~/.config/ags
# '';
#};
programs.ags = {
enable = true;

View file

@ -1,11 +1,23 @@
{ pkgs, lib, config } :
{ pkgs, lib, config, ... } :
{
programs.alacritty = {
enable = true;
settings = {
window.opacity = 0.9;
padding = { x = 5; y = 5; };
window = {
opacity = 0.9;
dynamic_padding = true;
padding = {
x = 5;
y = 5;
};
};
font = {
normal = {
family = "SpaceMono Nerd Font";
style = "Regular";
};
};
};
};
}

View file

@ -1,22 +1,19 @@
{ pkgs, lib, config, ... }:
{
{ pkgs, lib, config, ... }: {
programs.fastfetch = {
enable = true;
settings = {
logo = {
type = "sixel";
source = "~/Pictures/nix-Wallpaper.png";
source = "~/Pictures/gay.png";
width = 32;
};
display = {
separator = " ";
};
display = { separator = " "; };
modules = [
{
type = "custom";
format = " \u001b[1mHardware Information\u001b[0m ";
format = " Hardware Information ";
}
{
type = "cpu";
@ -36,7 +33,7 @@
}
{
type = "custom";
format = " \u001b[1mSoftware Information\u001b[0m ";
format = " Software Information ";
}
{
type = "title";
@ -45,7 +42,7 @@
}
{
type = "os";
key = " ";
key = " ";
}
{
type = "kernel";
@ -54,7 +51,7 @@
}
{
type = "wm";
key = "";
key = " ";
}
{
type = "shell";
@ -69,7 +66,7 @@
key = " 󰅐";
}
{
type = "media",;
type = "media";
key = " 󰝚";
}
{

View file

@ -1,8 +1,4 @@
{ config, lib, pkgs, ... }: {
imports = [
../starship/default.nix
];
programs.fish = {
enable = true;

View file

@ -2,48 +2,20 @@
programs.foot = {
enable = true;
settings = {
main = {
include = "${pkgs.foot.themes}/share/foot/themes/catppuccin-mocha";
term = "xterm-256color";
title = "foot";
font = "SpaceMono Nerd Font:size=11";
letter-spacing = 0;
pad = "25x25";
};
cursor = {
color = "11111b f5e0dc";
style = "beam";
beam-thickness = 1.5;
};
colors = {
foreground = "cdd6f4";
background = "1e1e2e";
alpha = 0.9;
regular0 = "45475a";
regular1 = "f38ba8";
regular2 = "a6e3a1";
regular3 = "f9e2af";
regular4 = "89b4fa";
regular5 = "f5c2e7";
regular6 = "94e2d5";
regular7 = "bac2de";
bright0 = "585b70";
bright1 = "f38ba8";
bright2 = "a6e3a1";
bright3 = "f9e2af";
bright4 = "89b4fa";
bright5 = "f5c2e7";
bright6 = "94e2d5";
bright7 = "a6adc8";
selection-foreground = "cdd6f4";
selection-background = "414356";
search-box-no-match = "11111b f38ba8";
search-box-match = "cdd6f4 313244";
jump-labels = "11111b fab387";
urls = "89b4fa";
};
colors = { alpha = 0.9; };
};
};
}

View file

@ -33,7 +33,7 @@
"Pictures" = " ";
"Videos" = " ";
"iso" = "󰌽 ";
".config" = "";
".config" = " ";
};
};

View file

@ -5,7 +5,6 @@
./hyprland/keybinds.nix
./hyprland/execs.nix
./hyprlock.nix
../ags/default.nix
];
home.packages = with pkgs; [
@ -16,7 +15,6 @@
brightnessctl
xwayland
swww
mpvpaper
grim
slurp
libnotify
@ -54,10 +52,10 @@
general = {
# Gaps and border
gaps_in = 4;
gaps_out = 5;
gaps_workspaces = 50;
border_size = 3;
gaps_in = 8;
gaps_out = 8;
gaps_workspaces = 0;
border_size = 2;
# Fallback colours
"col.active_border" = "rgba(0DB7D4FF)";
@ -83,10 +81,10 @@
xray = true;
special = true;
new_optimizations = true;
size = 14;
passes = 4;
size = 2;
passes = 2;
brightness = 1;
noise = 0.05;
noise = 1.17e-2;
contrast = 1;
popups = true;
popups_ignorealpha = 0.6;

View file

@ -1,10 +0,0 @@
general {
col.active_border = rgba(DFE2EF39)
col.inactive_border = rgba(8C909F30)
}
misc {
background_color = rgba(0F131CFF)
}
windowrulev2 = bordercolor rgba(ADC6FFAA) rgba(ADC6FF77),pinned:1

View file

@ -2,12 +2,7 @@
wayland.windowManager.hyprland.settings = {
exec-once = [
"${pkgs.swww}/bin/swww-daemon --format xrgb"
"${pkgs.mpvpaper}/bin/mpvpaper DP-1 -f -o 'loop panscan=1.0' ~/Pictures/wallpapers/videos/current"
"${pkgs.ags}/bin/ags &"
"${pkgs.floorp}/bin/floorp"
"${pkgs.vesktop}/bin/vesktop"
"${pkgs.hyprland}/bin/hyprctl setcursor Bibata-Modern-Classic 24"
"ags"
];
};
}

View file

@ -1,10 +1,7 @@
{ pkgs, config, inputs, ... }: {
wayland.windowManager.hyprland.settings = {
bindm = [
"Super, mouse:272, movewindow"
"Super, mouse:273, resizewindow"
];
bindm = [ "Super, mouse:272, movewindow" "Super, mouse:273, resizewindow" ];
bind = [
"Super, mouse_up, workspace, +1"
@ -12,37 +9,31 @@
"Super+Shift, S, togglespecialworkspace"
"Super, R, exec, ${pkgs.anyrun}/bin/anyrun"
"Super, W, exec, ${pkgs.floorp}/bin/floorp"
"Super, Q, exec, ${pkgs.foot}/bin/foot"
"Super, C, killactive"
"Super, V, togglefloating"
"Super, E, exec, ${pkgs.nautilus}/bin/nautilus -w"
"SUPERALT, V, exec, pkill fuzzel || cliphist list | fuzzel --no-fuzzy --icon-theme=candy-icons --background-color=1A1513dd --text-color=F8D4D2ff --match-color=FFB3B1ff --border-width=2 --border-radius=15 --border-color=EB8A89ff --selection-color=585b70ff --selection-text-color=F8D4D2ff --selection-match-color=FFB3B1ff --font='Lexend' --prompt='>> ' --dmenu | cliphist decode | wl-copy"
"SUPERALT, V, exec, pkill fuzzel || cliphist list | fuzzel --icon-theme=candy-icons --background-color=1A1513dd --text-color=F8D4D2ff --match-color=FFB3B1ff --border-width=2 --border-radius=15 --border-color=EB8A89ff --selection-color=585b70ff --selection-text-color=F8D4D2ff --selection-match-color=FFB3B1ff --font='Lexend' --prompt='>> ' --dmenu | cliphist decode | wl-copy"
"Super, L, exec, ${pkgs.hyprlock}/bin/hyprlock"
# AGS
"Super, Tab, exec, ags -t 'toggleAppsWindow()'"
"Super, A, exec, ags -t "
"Super, D, exec, ags -t sidebar"
"Control+Super, R, exec, pkill ags ; ags &"
"Control+Super, T, exec, ~/.config/ags/scripts/color_generation/switchwall.sh"
"Super, X, exec, for ((i=0; i<$(hyprctl monitors -j | jq length); i++)); do ags -t 'session''$i'; done"
# recording and ss stuff
"Super, S, exec, pkill slurp || grimblast --freeze copysave area -"
"Super, S, exec, pkill slurp || grimblast --freeze copy area"
# ags stuff
"Super + Control, R, exec, pkill ags; ags"
"Super, Tab, exec, ags -t launcher"
"Super, X, exec, ags -t powermenu"
] ++ map (n: "Alt, ${toString n}, exec, movetoworkspacesilent ${toString (
if n == 0
then 10
else n
)}") [1 2 3 4 5 6 7 8 9 0]
++ map (n: "Super, ${toString n}, exec, workspace, ${toString (
if n == 0
then 10
else n
)}") [1 2 3 4 5 6 7 8 9 0];
] ++ map (n:
"Alt, ${toString n}, movetoworkspacesilent, ${
toString (if n == 0 then 10 else n)
}") [ 1 2 3 4 5 6 7 8 9 0 ] ++ map (n:
"Super, ${toString n}, workspace, ${
toString (if n == 0 then 10 else n)
}") [ 1 2 3 4 5 6 7 8 9 0 ];
};
}

View file

@ -1,139 +0,0 @@
{ config, lib, pkgs, ... }: {
programs.fish = {
enable = true;
interactiveShellInit = ''
function fish_greeting
echo The time is (set_color purple; date +%T; set_color purple)
if test -z $SSH_CLIENT;
fastfetch
else
neofetch
end
end
'';
shellAliases = {
"ls" = "eza -l -a --group-directories-first --icons";
"grep" = "rg -p";
"rg" = "rg -p";
"cp" = "cp -rv";
":q" = "exit";
":qa" = "pkill fish";
".." = "z ..";
".2" = "z ../..";
".3" = "z ../../..";
".4" = "z ../../../..";
".5" = "z ../../../../..";
".r" = "z /";
".h" = "z ~";
".c" = "z ~/.config/";
".a" = "z ~/.config/ags/";
".d" = "z ~/Documents/";
".C" = "z ~/Documents/code/";
".D" = "z ~/Downloads/";
".p" = "z ~/Pictures/";
# git
"gc" = "git clone";
"gp" = "git push";
"ga" = "git add";
"gcm" = "git commit -m";
"fetch" = "clear ; fastfetch --logo ~/Downloads/gay.png --logo-width 32";
"hvim" = "z ~/.config/hypr/ ; nvim ; z";
"fvim" = "nvim ~/.config/fish/config.fish";
"se" = "sudoedit";
"vim" = "nvim";
"nvide" = "env -u WAYLAND_DISPLAY neovide --multigrid";
"transcat" = "queercat -b -f 1 -v 0.45 -h 0.45";
"clock" = "tty-clock -s -C 5 -D -c -b";
};
functions = {
# Credit for these 3
# https://www.reddit.com/r/linux/comments/1fq0za8/comment/lp1ybdn
disks = ''
function disks
lsblk -o NAME,MOUNTPOINT,FSTYPE,FSUSE%,SIZE
end
'';
gr = ''
function gr
set GROOT (git rev-parse --show-toplevel 2>/dev/null); and cd $GROOT; or return $argv
end
'';
mkcd = ''
function mkcd
mkdir -p -- $argv[1] && cd $argv; or return $status
end
'';
};
};
programs = {
starship = {
enable = true;
enableFishIntegration = true;
settings = {
add_newline = false;
format = "[](bg:none fg:#f38ba8)$username[](bg:#fab387 fg:#f38ba8)$hostname[](bg:#f9e2af fg:#fab387)$directory[](bg:#a6e3a1 fg:#f9e2af)$git_branch[](bg:#74c7ec fg:#a6e3a1)$cmd_duration[](bg:none fg:#74c7ec)$line_break$character";
character = {
success_symbol = "[ 󱞪](#a6e3a1 bold)";
error_symbol = "[ 󱞪](#f38ba8)";
vicmd_symbol = "[ 󱞪](#f9e2af)";
};
username = {
format = "[ $user ](bg:#f38ba8 fg:#1e1e2e bold)";
show_always = true;
};
hostname = {
format = "[ $hostname ]( bg:#fab387 fg:#1e1e2e bold)";
ssh_only = false;
};
directory = {
truncation_length = 5;
format = "[ $path](bg:#f9e2af fg:#1e1e2e bold)";
substitutions = {
"Documents" = "󰈙 ";
"Downloads" = " ";
"Music" = " ";
"Pictures" = " ";
"Videos" = " ";
"iso" = "󰌽 ";
".config" = "";
};
};
git_branch = {
format = "[ $branch](bg:#a6e3a1 fg:#1e1e2e bold)";
};
cmd_duration = {
min_time = 4;
show_milliseconds = false;
format = "[ 󱑆 $duration](bg:#74c7ec fg:#1e1e2e bold)";
};
};
};
zoxide = {
enable = true;
enableFishIntegration = true;
};
atuin = {
enable = true;
enableFishIntegration = true;
};
};
}