changes to home

This commit is contained in:
ooks-io 2023-07-31 14:47:58 +12:00
parent aec2a2df16
commit 411e333252
40 changed files with 256 additions and 2928 deletions

View file

@ -1,10 +1,16 @@
{
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
hardware.url = "github:nixos/nixos-hardware";
nix-colors.url = "github:misterio77/nix-colors";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
hardware.url = "github:nixos/nixos-hardware";
nix-colors.url = "github:misterio77/nix-colors";
firefox-addons = {
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, home-manager, ... }:@inputs:

View file

@ -1,198 +0,0 @@
config, lib, pkgs, ... }:
{
imports = [
(import ../../environment/hypr-variable.nix)
];
programs = {
bash = {
initExtra = ''
if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
exec Hyprland
fi
'';
};
fish = {
loginShellInit = ''
set TTY1 (tty)
[ "$TTY1" = "/dev/tty1" ] && exec Hyprland
'';
};
};
systemd.user.targets.hyprland-session.Unit.Wants = [ "xdg-desktop-autostart.target" ];
wayland.windowManager.hyprland = {
enable = true;
systemdIntegration = true;
nvidiaPatches = false;
extraConfig = ''
monitor=,preferred,auto,auto
exec-once = swaybg -i ~/.dotfiles/walls/everforest/megacity.png
input {
kb_layout = us
kb_variant =
kb_model =
kb_options =
kb_rules =
follow_mouse = 1
touchpad {
natural_scroll = yes
}
sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
}
general {
gaps_in = 5
gaps_out = 5
border_size = 2
col.active_border = 0xffA7C080
col.inactive_border = rgba(595959aa)
layout = dwindle
}
decoration {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
rounding = 5
multisample_edges = true
blur = no
blur_size = 3
blur_passes = 1
blur_new_optimizations = on
drop_shadow = no
shadow_range = 4
shadow_render_power = 3
col.shadow = rgba(1a1a1aee)
}
misc {
animate_manual_resizes = false
enable_swallow = true
swallow_regex = ^(kitty)$
focus_on_activate = true
disable_hyprland_logo = true
}
# Animations
# -------------------------------------------------------------------------------------------------
animations {
enabled = yes
bezier = overshot, 0.11, 1, 0.36, 1
animation = windows, 1, 4, overshot, slide
animation = windowsOut, 1, 5, default, popin 80%
animation = border, 1, 5, default
animation = fade, 1, 8, default
animation = workspaces, 1, 6, overshot, slide
}
# Layout
# -------------------------------------------------------------------------------------------------
}
dwindle {
pseudotile = yes
preserve_split = yes
}
master {
new_is_master = true
}
# Gestures
# -------------------------------------------------------------------------------------------------
gestures {
workspace_swipe = off
}
# Device Config
# -------------------------------------------------------------------------------------------------
device:epic-mouse-v1 {
sensitivity = -0.5
}
# Window Rules
# -------------------------------------------------------------------------------------------------
# Example windowrule v1
# windowrule = float, ^(kitty)$
# Example windowrule v2
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
# Main Mod
# -------------------------------------------------------------------------------------------------
$mainMod = SUPER
# Program Binds
# -------------------------------------------------------------------------------------------------
bind = $mainMod, return, exec, kitty
bind = $mainMod, Q, killactive,
bind = $mainMod, B, exec, firefox
bind = $mainMod, M, exit,
bind = $mainMod, space, togglefloating,
bind = $mainMod, P, pseudo, # dwindle
bind = $mainMod, J, togglesplit, # dwindle
# Move focus with mainMod + arrow keys
bind = $mainMod, left, movefocus, l
bind = $mainMod, right, movefocus, r
bind = $mainMod, up, movefocus, u
bind = $mainMod, down, movefocus, d
# Workspaces
# -------------------------------------------------------------------------------------------------
bind = $mainMod, 1, workspace, 1
bind = $mainMod, 2, workspace, 2
bind = $mainMod, 3, workspace, 3
bind = $mainMod, 4, workspace, 4
bind = $mainMod, 5, workspace, 5
bind = $mainMod, 6, workspace, 6
bind = $mainMod, 7, workspace, 7
bind = $mainMod, 8, workspace, 8
bind = $mainMod, 9, workspace, 9
bind = $mainMod, 0, workspace, 10
binds {
workspace_back_and_forth = 1
allow_workspace_cycles = 1
}
bind=$mainMod,tab,workspace,previous
# Move To Workspaces
# -------------------------------------------------------------------------------------------------
bind = $mainMod SHIFT, 1, movetoworkspace, 1
bind = $mainMod SHIFT, 2, movetoworkspace, 2
bind = $mainMod SHIFT, 3, movetoworkspace, 3
bind = $mainMod SHIFT, 4, movetoworkspace, 4
bind = $mainMod SHIFT, 5, movetoworkspace, 5
bind = $mainMod SHIFT, 6, movetoworkspace, 6
bind = $mainMod SHIFT, 7, movetoworkspace, 7
bind = $mainMod SHIFT, 8, movetoworkspace, 8
bind = $mainMod SHIFT, 9, movetoworkspace, 9
bind = $mainMod SHIFT, 0, movetoworkspace, 10
# Workspaces Scroll
# -------------------------------------------------------------------------------------------------
bind = $mainMod, mouse_down, workspace, e+1
bind = $mainMod, mouse_up, workspace, e-1
# Move/resize windows with mainMod + LMB/RMB and dragging
bindm = $mainMod, mouse:272, movewindow
bindm = $mainMod, mouse:273, resizewindow
'';
};
}

View file

@ -1,14 +0,0 @@
{ config, pkgs, ... }:
{
programs.firefox = {
enable = true;
extraPolicies = {
DisplayBookmarksToolbar = true;
Preferences = {
"browser.toolbars.bookmarks.visibility" = "never";
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
"media.ffmpeg.vaapi.enabled" = true;
};
};
};

View file

@ -1,11 +0,0 @@
{ config, pkgs, ... }:
{
programs = {
kitty = {
enable = true;
environment = { };
keybindings = { };
};
};
}

View file

@ -1,11 +0,0 @@
{ lib, pkgs, user, ... }:
{
programs = {
mpv = {
enable = true;
};
};
home.file.".config/mpv/mpv.conf".source = ./mpv.conf;
home.file.".config/mpv/scripts/file-browser.lua".source = ./scripts/file-browser.lua;
}

View file

@ -1,8 +0,0 @@
# hwdec=auto
# vo=gpu-next #This will break Anime4K
gpu-api=opengl
gpu-context=wayland
hwdec=auto-safe
vo=gpu
profile=gpu-hq
script-opts=ytdl_hook-ytdl_path=yt-dlp

File diff suppressed because it is too large Load diff

View file

@ -1,5 +0,0 @@
{ config, lib, pkgs, ... }:
{
home.packages = [ pkgs.neofetch ];
}

View file

@ -1,6 +0,0 @@
{ config, pkgs, ... }:
{
services.mako = {
enable = true;
};
}

View file

@ -1,76 +0,0 @@
{ lib, pkgs, user, ... }:
{
programs.zathura = {
enable = true;
extraConfig = ''
# Zathura configuration file
# See man `man zathurarc'
# Open document in fit-width mode by default
set adjust-open "best-fit"
# One page per row by default
set pages-per-row 1
#stop at page boundries
set scroll-page-aware "true"
set scroll-full-overlap 0.01
set scroll-step 100
#zoom settings
set zoom-min 10
set guioptions ""
# zathurarc-dark
set font "JetBrains Mono Nerd Font 15"
set default-fg "#96CDFB"
set default-bg "#1A1823"
set completion-bg "#1A1823"
set completion-fg "#96cdfb"
set completion-highlight-bg "#302D41"
set completion-highlight-fg "#96cdfb"
set completion-group-bg "#1a1823"
set completion-group-fg "#89DCEB"
set statusbar-fg "#C9CBFF"
set statusbar-bg "#1A1823"
set statusbar-h-padding 10
set statusbar-v-padding 10
set notification-bg "#1A1823"
set notification-fg "#D9E0EE"
set notification-error-bg "#d9e0ee"
set notification-error-fg "#D9E0EE"
set notification-warning-bg "#FAE3B0"
set notification-warning-fg "#D9E0EE"
set selection-notification "true"
set inputbar-fg "#C9CBFF"
set inputbar-bg "#1A1823"
set recolor "true"
set recolor-lightcolor "#D9E0EE"
set recolor-darkcolor "#1A1823"
set index-fg "#96cdfb"
set index-bg "#1A1823"
set index-active-fg "#96cdfb"
set index-active-bg "#1A1823"
set render-loading-bg "#1A1823"
set render-loading-fg "#96cdfb"
set highlight-color "#96cdfb"
set highlight-active-color "#DDB6F2"
set render-loading "false"
set scroll-step 50
set selection-clipboard clipboard
'';
};
}

View file

@ -0,0 +1,7 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
alsa-utils
spotify-player
];
}

View file

@ -0,0 +1,38 @@
{ pkgs, ... }:
{
imports = [
./mako.nix
./kitty.nix
./firefox.nix
./zathura.nix
./gammastep.nix
];
xdg.mimeApps.enable = true;
home.packages = with pkgs; [
grim
mkv
gtk3
pulseaudio
slurp
wf-recorder
wl-clipboard
wl-mirror
wl-mirror-pick
xdg-utils
ydotool
];
home.sessionVariables = {
MOZ_ENABLE_WAYLAND = 1;
QT_QPA_PLATFORM = "wayland";
LIBSEAT_BACKEND = "logind";
EDITOR = "nvim";
BROWSER = "firefox";
};
}

View file

@ -0,0 +1,51 @@
{ pkgs, lib, inputs, ... }:
let
addons = inputs.firefox-addons.packages.${pkgs.system};
in
{
programs.browserpass.enable = true;
programs.firefox = {
enable = true;
profiles.ooks = {
bookmarks = { };
extensions = with addons; [
ublock-origin
browserpass
onepassword-password-manager
stylus
surfingkeys
];
bookmarks = { };
settings = {
"browser.disableResetPrompt" = true;
"browser.download.panel.shown" = true;
"browser.download.useDownloadDir" = false;
"browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
"browser.shell.checkDefaultBrowser" = false;
"browser.shell.defaultBrowserCheckCount" = 1;
"browser.startup.homepage" = "https://start.duckduckgo.com";
"browser.uiCustomization.state" = ''{"placements":{"widget-overflow-fixed-list":[],"nav-bar":["back-button","forward-button","stop-reload-button","home-button","urlbar-container","downloads-button","library-button","ublock0_raymondhill_net-browser-action","_testpilot-containers-browser-action"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button"],"PersonalToolbar":["import-button","personal-bookmarks"]},"seen":["save-to-pocket-button","developer-button","ublock0_raymondhill_net-browser-action","_testpilot-containers-browser-action"],"dirtyAreaCache":["nav-bar","PersonalToolbar","toolbar-menubar","TabsToolbar","widget-overflow-fixed-list"],"currentVersion":18,"newElementCount":4}'';
"dom.security.https_only_mode" = true;
"identity.fxaccounts.enabled" = false;
"privacy.trackingprotection.enabled" = true;
"signon.rememberSignons" = false;
};
};
};
home = {
sessionVariables = {
# https://github.com/NixOS/nixpkgs/issues/238025
TZ = "/etc/localtime";
BROWSER = "firefox";
};
};
xdg.mimeApps.defaultApplications = {
"text/html" = [ "firefox.desktop" ];
"text/xml" = [ "firefox.desktop" ];
"x-scheme-handler/http" = [ "firefox.desktop" ];
"x-scheme-handler/https" = [ "firefox.desktop" ];
};
}

View file

@ -0,0 +1,13 @@
{
services.gammastep = {
enable = true;
provider = "geoclue2";
temperature = {
day = 6000;
night = 4600;
};
settings = {
general.adjustment-method = "wayland";
};
};
}

View file

@ -0,0 +1,66 @@
{ config, pkgs, ... }:
let
inherit (config.colorscheme) colors;
kitty-xterm = pkgs.writeShellScriptBin "xterm" ''
${config.programs.kitty.package}/bin/kitty -1 "$@"
'';
in
{
home = {
packages = [ kitty-xterm ];
sessionVariables = {
TERMINAL = "kitty -1";
};
};
programs.kitty = {
enable = true;
font = {
name = config.fontProfiles.monospace.family;
size = 12;
};
settings = {
shell_integration = "no-rc"; # I prefer to do it manually
scrollback_lines = 4000;
scrollback_pager_history_size = 2048;
window_padding_width = 15;
foreground = "#${colors.base05}";
background = "#${colors.base00}";
selection_background = "#${colors.base05}";
selection_foreground = "#${colors.base00}";
url_color = "#${colors.base04}";
cursor = "#${colors.base05}";
active_border_color = "#${colors.base03}";
inactive_border_color = "#${colors.base01}";
active_tab_background = "#${colors.base00}";
active_tab_foreground = "#${colors.base05}";
inactive_tab_background = "#${colors.base01}";
inactive_tab_foreground = "#${colors.base04}";
tab_bar_background = "#${colors.base01}";
color0 = "#${colors.base00}";
color1 = "#${colors.base08}";
color2 = "#${colors.base0B}";
color3 = "#${colors.base0A}";
color4 = "#${colors.base0D}";
color5 = "#${colors.base0E}";
color6 = "#${colors.base0C}";
color7 = "#${colors.base05}";
color8 = "#${colors.base03}";
color9 = "#${colors.base08}";
color10 = "#${colors.base0B}";
color11 = "#${colors.base0A}";
color12 = "#${colors.base0D}";
color13 = "#${colors.base0E}";
color14 = "#${colors.base0C}";
color15 = "#${colors.base07}";
color16 = "#${colors.base09}";
color17 = "#${colors.base0F}";
color18 = "#${colors.base01}";
color19 = "#${colors.base02}";
color20 = "#${colors.base04}";
color21 = "#${colors.base06}";
};
};
}

View file

@ -0,0 +1,22 @@
{ config, ... }:
let inherit (config.colorscheme) colors kind;
in {
services.mako = {
enable = true;
iconPath =
if kind == "dark" then
"${config.gtk.iconTheme.package}/share/icons/Papirus-Dark"
else
"${config.gtk.iconTheme.package}/share/icons/Papirus-Light";
font = "${config.fontProfiles.regular.family} 12";
padding = "10,20";
anchor = "top-center";
width = 400;
height = 150;
borderSize = 2;
defaultTimeout = 12000;
backgroundColor = "#${colors.base00}dd";
borderColor = "#${colors.base03}dd";
textColor = "#${colors.base05}dd";
};
}

View file

@ -0,0 +1,32 @@
{ config, ... }:
let inherit (config.colorscheme) colors;
in {
programs.zathura = {
enable = true;
options = {
selection-clipboard = "clipboard";
font = "${config.fontProfiles.regular.family} 12";
recolor = true;
default-bg = "#${colors.base00}";
default-fg = "#${colors.base01}";
statusbar-bg = "#${colors.base02}";
statusbar-fg = "#${colors.base04}";
inputbar-bg = "#${colors.base00}";
inputbar-fg = "#${colors.base07}";
notification-bg = "#${colors.base00}";
notification-fg = "#${colors.base07}";
notification-error-bg = "#${colors.base00}";
notification-error-fg = "#${colors.base08}";
notification-warning-bg = "#${colors.base00}";
notification-warning-fg = "#${colors.base08}";
highlight-color = "#${colors.base0A}";
highlight-active-color = "#${colors.base0D}";
completion-bg = "#${colors.base01}";
completion-fg = "#${colors.base05}";
completions-highlight-bg = "#${colors.base0D}";
completions-highlight-fg = "#${colors.base07}";
recolor-lightcolor = "#${colors.base00}";
recolor-darkcolor = "#${colors.base06}";
};
};
}

View file

@ -0,0 +1,14 @@
{ pkgs, ... }:
{
home.sessionVariables.EDITOR = "nvim";
programs = {
neovim = {
enable = true;
viAlias = true;
};
};
}

View file

@ -5,8 +5,9 @@ in
{
imports = [
inputs.nix-colors.homeManagerModule
../modules/editors/nvim/
../modules/common/
../modules/feature/shell/
../modules/feature/nvim/
] ++ (builtins.attrValues outputs.homeManagerModules);
nixpkgs = {