summaryrefslogtreecommitdiff
path: root/home
diff options
context:
space:
mode:
authorFuwn <[email protected]>2024-09-01 20:19:11 -0700
committerFuwn <[email protected]>2024-09-01 20:19:11 -0700
commit0d0c04f4e9c169630688d06defa14570a3cfbb32 (patch)
tree74e5c4c4587360580894f9c8eded0088d9af5d88 /home
parenthi (diff)
downloadnixos-config-0d0c04f4e9c169630688d06defa14570a3cfbb32.tar.xz
nixos-config-0d0c04f4e9c169630688d06defa14570a3cfbb32.zip
format
Diffstat (limited to 'home')
-rw-r--r--home/ebisu/fortune/communication/discord/vesktop.nix3
-rw-r--r--home/ebisu/fortune/communication/irc.nix3
-rw-r--r--home/ebisu/fortune/desktop/wayland/clipboard.nix8
-rw-r--r--home/ebisu/fortune/desktop/wayland/hyprland/hyprland/binds.nix236
-rw-r--r--home/ebisu/fortune/desktop/wayland/hyprland/hyprland/general.nix3
-rw-r--r--home/ebisu/fortune/desktop/wayland/hyprland/hyprland/plugins.nix4
-rw-r--r--home/ebisu/fortune/desktop/wayland/screenshot.nix3
-rw-r--r--home/ebisu/fortune/desktop/xorg.nix3
-rw-r--r--home/ebisu/fortune/development/database.nix3
-rw-r--r--home/ebisu/fortune/development/infrastructure.nix3
-rw-r--r--home/ebisu/fortune/development/languages/agnostic.nix3
-rw-r--r--home/ebisu/fortune/development/languages/assembly.nix3
-rw-r--r--home/ebisu/fortune/development/languages/cobol.nix5
-rw-r--r--home/ebisu/fortune/development/languages/crystal.nix3
-rw-r--r--home/ebisu/fortune/development/languages/dotnet.nix3
-rw-r--r--home/ebisu/fortune/development/languages/gleam.nix3
-rw-r--r--home/ebisu/fortune/development/languages/go.nix3
-rw-r--r--home/ebisu/fortune/development/languages/hare.nix5
-rw-r--r--home/ebisu/fortune/development/languages/haskell.nix3
-rw-r--r--home/ebisu/fortune/development/languages/javascript.nix3
-rw-r--r--home/ebisu/fortune/development/languages/jvm.nix3
-rw-r--r--home/ebisu/fortune/development/languages/nim.nix3
-rw-r--r--home/ebisu/fortune/development/languages/protobuf.nix5
-rw-r--r--home/ebisu/fortune/development/languages/python.nix3
-rw-r--r--home/ebisu/fortune/development/languages/rust.nix3
-rw-r--r--home/ebisu/fortune/development/languages/tex.nix5
-rw-r--r--home/ebisu/fortune/development/languages/vlang.nix5
-rw-r--r--home/ebisu/fortune/development/languages/yaml.nix5
-rw-r--r--home/ebisu/fortune/development/tools/build.nix3
-rw-r--r--home/ebisu/fortune/education/calculator.nix3
-rw-r--r--home/ebisu/fortune/filesystem/archive.nix3
-rw-r--r--home/ebisu/fortune/filesystem/core/bat/default.nix3
-rw-r--r--home/ebisu/fortune/filesystem/core/default.nix3
-rw-r--r--home/ebisu/fortune/multimedia/document.nix3
-rw-r--r--home/ebisu/fortune/network/tools/default.nix3
-rw-r--r--home/ebisu/fortune/network/tools/http/httpie.nix3
-rw-r--r--home/ebisu/fortune/network/tools/shark.nix8
-rw-r--r--home/ebisu/fortune/rice/bottom.nix3
-rw-r--r--home/ebisu/fortune/rice/glances.nix3
-rw-r--r--home/ebisu/fortune/rice/gtk.nix5
-rw-r--r--home/ebisu/fortune/scripts/default.nix8
-rw-r--r--home/ebisu/fortune/system/bitwarden.nix3
-rw-r--r--home/ebisu/fortune/system/opengl.nix9
-rw-r--r--home/ebisu/fortune/system/peripheral.nix3
-rw-r--r--home/ebisu/fortune/system/shell/scripting/charmbracelet.nix3
-rw-r--r--home/ebisu/fortune/system/shell/scripting/ripgrep.nix3
-rw-r--r--home/ebisu/fortune/system/shell/starship.nix3
-rw-r--r--home/ebisu/fortune/system/terminal/foot.nix3
-rw-r--r--home/ebisu/home.nix9
49 files changed, 240 insertions, 182 deletions
diff --git a/home/ebisu/fortune/communication/discord/vesktop.nix b/home/ebisu/fortune/communication/discord/vesktop.nix
index 7d35c84..170a379 100644
--- a/home/ebisu/fortune/communication/discord/vesktop.nix
+++ b/home/ebisu/fortune/communication/discord/vesktop.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
vesktop
];
diff --git a/home/ebisu/fortune/communication/irc.nix b/home/ebisu/fortune/communication/irc.nix
index 61a2ebf..1d92bdd 100644
--- a/home/ebisu/fortune/communication/irc.nix
+++ b/home/ebisu/fortune/communication/irc.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
catgirl
litterbox
diff --git a/home/ebisu/fortune/desktop/wayland/clipboard.nix b/home/ebisu/fortune/desktop/wayland/clipboard.nix
index 05784b9..e063ca5 100644
--- a/home/ebisu/fortune/desktop/wayland/clipboard.nix
+++ b/home/ebisu/fortune/desktop/wayland/clipboard.nix
@@ -1,6 +1,8 @@
-{ pkgs
-, ...
-}: {
+{
+ pkgs,
+ ...
+}:
+{
home.packages = with pkgs; [
wl-clipboard
cliphist
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/binds.nix b/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/binds.nix
index 048cfa9..cb96ef0 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/binds.nix
+++ b/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/binds.nix
@@ -6,9 +6,9 @@ _: {
"$script_path" = "$HOME/.config/hypr/hyprland/scripts";
"$term" = "kitty";
- bind = builtins.concatLists
- (builtins.genList
- (
+ bind =
+ builtins.concatLists (
+ builtins.genList (
x:
let
ws =
@@ -26,115 +26,114 @@ _: {
"$mod SHIFT, ${ws}, exec, $script_path/move_window_to_workspace ${toString (x + 1)}"
# "$mod SHIFT, ${ws}, split-movetoworkspacesilent, ${toString (x + 1)}"
]
- )
- 10)
- ++
- [
- # Scratchpads
- "$mod, apostrophe, exec, hyprctl dispatch togglespecialworkspace simple_calculator"
- "$mod SHIFT, RETURN, exec, hyprctl dispatch togglespecialworkspace simple_terminal"
- "$mod SHIFT, c, exec, hyprctl dispatch togglespecialworkspace chatgpt"
- "$mod SHIFT, s, exec, hyprctl dispatch togglespecialworkspace spotify"
- "$mod SHIFT, apostrophe, exec, hyprctl dispatch togglespecialworkspace calculator"
-
- # Focus
- "$mod, k, movefocus, u"
- "$mod, j, movefocus, d"
- "$mod, l, movefocus, r"
- "$mod, h, movefocus, l"
-
- # "$mod, j, layoutmsg, cyclenext"
- # "$mod, j, layoutmsg, cycleprev"
-
- # "$mod, tab, hycov:toggleoverview"
- # "$mod SHIFT, tab, overview:toggle"
-
- # Emoji picker
- "$mod, GRAVE, exec, rofi -modi emoji -show emoji"
-
- # Volume control
- "$mod, MINUS, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
- "$mod SHIFT, MINUS, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%-"
- "$mod, EQUAL, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
- "$mod SHIFT, EQUAL, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%+"
-
- # Session control
- "$mod SHIFT, Q, exec, wlogout"
- "$mod SHIFT, R, exec, hyprctl reload"
-
- # Window control
- "$mod, F, fullscreen"
- # "$mod SHIFT, F, fullscreen, 2"
- "$mod SHIFT, F, exec, hyprctl dispatch fakefullscreen && $script_path/fake_fullscreen_status"
- "$mod, G, togglefloating"
- "$mod, P, pseudo"
- "$mod SHIFT, P, pin"
- "$mod, T, togglesplit"
- "$mod, U, focusurgentorlast"
- "$mod, Q, killactive"
- "$mod, S, exec, hyprctl keyword window:sticky 1"
- "$mod, b, exec, pkill -SIGUSR1 waybar"
- "$mod, SPACE, layoutmsg, swapwithmaster"
- "$mod, V, exec, $script_path/toggle_layout"
-
- # Application binds
- "$mod, W, exec, $BROWSER"
- "$mod SHIFT, W, exec, $term -e sudo nmtui"
- "$mod, E, exec, $mail"
- "$mod SHIFT, R, exec, $term -e htop"
- "$mod, R, exec, rofi -show run"
- "$mod SHIFT, D, exec, bitwarden-desktop"
- "$mod, RETURN, exec, $term"
- "$mod SHIFT, N, exec, $BROWSER https://sumi.news"
- "$mod, M, exec, spotify"
- "$mod SHIFT, M, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
- "$mod ALT, A, exec, hyprpicker -a"
-
- # Launchers
- "$mod, D, exec, rofi -show combi"
- "$mod, C, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy"
-
- # Spotify control
- "$mod, P, exec, spt pb --toggle"
- "$mod SHIFT, P, exec, mpc pause; pauseallmpv"
- "$mod, BRACKETLEFT, exec, spt pb --seek -10"
- "$mod SHIFT, BRACKETLEFT, exec, spt pb --seek -60"
- "$mod, BRACKETRIGHT, exec, spt pb --seek +10"
- "$mod SHIFT, BRACKETRIGHT, exec, spt pb --seek +60"
- "$mod, COMMA, exec, spt pb --pp"
- "$mod, PERIOD, exec, spt pb --next"
- "$mod SHIFT, PERIOD, exec, spt pb --previous"
-
- # Gaps control
- "$mod, a, exec, $script_path/toggle_gaps"
- "$mod SHIFT, a, exec, bash -c 'hyprctl keyword general:gaps_in 5; hyprctl keyword general:gaps_out 10'"
-
- # Increment gaps
- "$mod, mouse_up, exec, hyprctl keyword general:gaps_out `expr $(hyprctl getoption general:gaps_out | awk '{ print $3 }') + 3`"
- "$mod, mouse_up, exec, hyprctl keyword general:gaps_in `expr $(hyprctl getoption general:gaps_in | awk '{ print $3 }') + 2`"
-
- # Decrement gaps
- "$mod, mouse_down, exec, hyprctl keyword general:gaps_out `expr $(hyprctl getoption general:gaps_out | awk '{ print $3 }') - 3`"
- "$mod, mouse_down, exec, hyprctl keyword general:gaps_in `expr $(hyprctl getoption general:gaps_in | awk '{ print $3 }') - 2`"
-
- # Move focus to monitor
- "$mod, LEFT, exec, $script_path/move_focus_to_monitor left"
- "$mod, RIGHT, exec, $script_path/move_focus_to_monitor right"
-
- # Move window to monitor
- "$mod SHIFT, h, exec, $script_path/move_window_to_monitor left"
- "$mod SHIFT, l, exec, $script_path/move_window_to_monitor right"
-
- # Screenshot
- ", Print, exec, screenshot --area"
- "$mod SHIFT, Print, exec, screenshot --window"
- "$mod CTRL, Print, exec, screenshot --monitor"
- "$mod, Print, exec, screenshot --now"
- "$mod SHIFT, v, exec, screenshot --now --clipboard && hyprctl dispatch togglespecialworkspace chatgpt && ydotool key 42:1 1:1 1:0 42:0 29:1 47:1 29:0 47:0"
-
- # Media keys
- # ...
- ];
+ ) 10
+ )
+ ++ [
+ # Scratchpads
+ "$mod, apostrophe, exec, hyprctl dispatch togglespecialworkspace simple_calculator"
+ "$mod SHIFT, RETURN, exec, hyprctl dispatch togglespecialworkspace simple_terminal"
+ "$mod SHIFT, c, exec, hyprctl dispatch togglespecialworkspace chatgpt"
+ "$mod SHIFT, s, exec, hyprctl dispatch togglespecialworkspace spotify"
+ "$mod SHIFT, apostrophe, exec, hyprctl dispatch togglespecialworkspace calculator"
+
+ # Focus
+ "$mod, k, movefocus, u"
+ "$mod, j, movefocus, d"
+ "$mod, l, movefocus, r"
+ "$mod, h, movefocus, l"
+
+ # "$mod, j, layoutmsg, cyclenext"
+ # "$mod, j, layoutmsg, cycleprev"
+
+ # "$mod, tab, hycov:toggleoverview"
+ # "$mod SHIFT, tab, overview:toggle"
+
+ # Emoji picker
+ "$mod, GRAVE, exec, rofi -modi emoji -show emoji"
+
+ # Volume control
+ "$mod, MINUS, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
+ "$mod SHIFT, MINUS, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%-"
+ "$mod, EQUAL, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
+ "$mod SHIFT, EQUAL, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%+"
+
+ # Session control
+ "$mod SHIFT, Q, exec, wlogout"
+ "$mod SHIFT, R, exec, hyprctl reload"
+
+ # Window control
+ "$mod, F, fullscreen"
+ # "$mod SHIFT, F, fullscreen, 2"
+ "$mod SHIFT, F, exec, hyprctl dispatch fakefullscreen && $script_path/fake_fullscreen_status"
+ "$mod, G, togglefloating"
+ "$mod, P, pseudo"
+ "$mod SHIFT, P, pin"
+ "$mod, T, togglesplit"
+ "$mod, U, focusurgentorlast"
+ "$mod, Q, killactive"
+ "$mod, S, exec, hyprctl keyword window:sticky 1"
+ "$mod, b, exec, pkill -SIGUSR1 waybar"
+ "$mod, SPACE, layoutmsg, swapwithmaster"
+ "$mod, V, exec, $script_path/toggle_layout"
+
+ # Application binds
+ "$mod, W, exec, $BROWSER"
+ "$mod SHIFT, W, exec, $term -e sudo nmtui"
+ "$mod, E, exec, $mail"
+ "$mod SHIFT, R, exec, $term -e htop"
+ "$mod, R, exec, rofi -show run"
+ "$mod SHIFT, D, exec, bitwarden-desktop"
+ "$mod, RETURN, exec, $term"
+ "$mod SHIFT, N, exec, $BROWSER https://sumi.news"
+ "$mod, M, exec, spotify"
+ "$mod SHIFT, M, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
+ "$mod ALT, A, exec, hyprpicker -a"
+
+ # Launchers
+ "$mod, D, exec, rofi -show combi"
+ "$mod, C, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy"
+
+ # Spotify control
+ "$mod, P, exec, spt pb --toggle"
+ "$mod SHIFT, P, exec, mpc pause; pauseallmpv"
+ "$mod, BRACKETLEFT, exec, spt pb --seek -10"
+ "$mod SHIFT, BRACKETLEFT, exec, spt pb --seek -60"
+ "$mod, BRACKETRIGHT, exec, spt pb --seek +10"
+ "$mod SHIFT, BRACKETRIGHT, exec, spt pb --seek +60"
+ "$mod, COMMA, exec, spt pb --pp"
+ "$mod, PERIOD, exec, spt pb --next"
+ "$mod SHIFT, PERIOD, exec, spt pb --previous"
+
+ # Gaps control
+ "$mod, a, exec, $script_path/toggle_gaps"
+ "$mod SHIFT, a, exec, bash -c 'hyprctl keyword general:gaps_in 5; hyprctl keyword general:gaps_out 10'"
+
+ # Increment gaps
+ "$mod, mouse_up, exec, hyprctl keyword general:gaps_out `expr $(hyprctl getoption general:gaps_out | awk '{ print $3 }') + 3`"
+ "$mod, mouse_up, exec, hyprctl keyword general:gaps_in `expr $(hyprctl getoption general:gaps_in | awk '{ print $3 }') + 2`"
+
+ # Decrement gaps
+ "$mod, mouse_down, exec, hyprctl keyword general:gaps_out `expr $(hyprctl getoption general:gaps_out | awk '{ print $3 }') - 3`"
+ "$mod, mouse_down, exec, hyprctl keyword general:gaps_in `expr $(hyprctl getoption general:gaps_in | awk '{ print $3 }') - 2`"
+
+ # Move focus to monitor
+ "$mod, LEFT, exec, $script_path/move_focus_to_monitor left"
+ "$mod, RIGHT, exec, $script_path/move_focus_to_monitor right"
+
+ # Move window to monitor
+ "$mod SHIFT, h, exec, $script_path/move_window_to_monitor left"
+ "$mod SHIFT, l, exec, $script_path/move_window_to_monitor right"
+
+ # Screenshot
+ ", Print, exec, screenshot --area"
+ "$mod SHIFT, Print, exec, screenshot --window"
+ "$mod CTRL, Print, exec, screenshot --monitor"
+ "$mod, Print, exec, screenshot --now"
+ "$mod SHIFT, v, exec, screenshot --now --clipboard && hyprctl dispatch togglespecialworkspace chatgpt && ydotool key 42:1 1:1 1:0 42:0 29:1 47:1 29:0 47:0"
+
+ # Media keys
+ # ...
+ ];
binde = [
# Increment gaps
@@ -156,13 +155,12 @@ _: {
"$mod ALT, h, moveactive, -100 0"
];
- bindm =
- [
- # Move window with mouse
- "$mod, mouse:272, movewindow"
- "$mod, mouse:273, resizewindow"
- "$mod SHIFT, mouse:273, resizewindow 1"
- ];
+ bindm = [
+ # Move window with mouse
+ "$mod, mouse:272, movewindow"
+ "$mod, mouse:273, resizewindow"
+ "$mod SHIFT, mouse:273, resizewindow 1"
+ ];
};
extraConfig = ''
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/general.nix b/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/general.nix
index 92d7c67..088c7da 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/general.nix
+++ b/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/general.nix
@@ -1,4 +1,5 @@
-{ config, ... }: {
+{ config, ... }:
+{
wayland.windowManager.hyprland = {
settings = {
monitor = [
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/plugins.nix b/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/plugins.nix
index 61d73e3..dc36858 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/plugins.nix
+++ b/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/plugins.nix
@@ -45,13 +45,13 @@ _: {
hycov = {
overview_gappo = 10; # gaps width from screen edge
overview_gappi = 10; # gaps width from clients
- enable_hotarea = 0; # enable mouse cursor hotarea, when cursor enter hotarea, it will toggle overview
+ enable_hotarea = 0; # enable mouse cursor hotarea, when cursor enter hotarea, it will toggle overview
enable_click_action = 1; # enable mouse left button jump and right button kill in overview mode
hotarea_monitor = "all"; # monitor name which hotarea is in, default is all
hotarea_pos = 1; # position of hotarea (1: bottom left, 2: bottom right, 3: top left, 4: top right)
hotarea_size = 10; # hotarea size, 10x10
swipe_fingers = 4; # finger number of gesture,move any directory
- move_focus_distance = 100; # distance for movefocus,only can use 3 finger to move
+ move_focus_distance = 100; # distance for movefocus,only can use 3 finger to move
enable_gesture = 0; # enable gesture
auto_exit = 1; # enable auto exit when no client in overview
auto_fullscreen = 0; # auto make active window maximize after exit overview
diff --git a/home/ebisu/fortune/desktop/wayland/screenshot.nix b/home/ebisu/fortune/desktop/wayland/screenshot.nix
index 5900ee2..481ffb5 100644
--- a/home/ebisu/fortune/desktop/wayland/screenshot.nix
+++ b/home/ebisu/fortune/desktop/wayland/screenshot.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
grim
slurp
diff --git a/home/ebisu/fortune/desktop/xorg.nix b/home/ebisu/fortune/desktop/xorg.nix
index 801a736..1019327 100644
--- a/home/ebisu/fortune/desktop/xorg.nix
+++ b/home/ebisu/fortune/desktop/xorg.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
gifsicle
main
diff --git a/home/ebisu/fortune/development/database.nix b/home/ebisu/fortune/development/database.nix
index a9782a1..27f7f28 100644
--- a/home/ebisu/fortune/development/database.nix
+++ b/home/ebisu/fortune/development/database.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
diesel-cli
redis
diff --git a/home/ebisu/fortune/development/infrastructure.nix b/home/ebisu/fortune/development/infrastructure.nix
index 7f43f0b..4372f23 100644
--- a/home/ebisu/fortune/development/infrastructure.nix
+++ b/home/ebisu/fortune/development/infrastructure.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
flyctl
nodePackages_latest.wrangler
diff --git a/home/ebisu/fortune/development/languages/agnostic.nix b/home/ebisu/fortune/development/languages/agnostic.nix
index e726fae..032bc22 100644
--- a/home/ebisu/fortune/development/languages/agnostic.nix
+++ b/home/ebisu/fortune/development/languages/agnostic.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
clang
mold
diff --git a/home/ebisu/fortune/development/languages/assembly.nix b/home/ebisu/fortune/development/languages/assembly.nix
index ec21e8e..a1dad35 100644
--- a/home/ebisu/fortune/development/languages/assembly.nix
+++ b/home/ebisu/fortune/development/languages/assembly.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
nasm
nasmfmt
diff --git a/home/ebisu/fortune/development/languages/cobol.nix b/home/ebisu/fortune/development/languages/cobol.nix
index cb84d30..cec0d59 100644
--- a/home/ebisu/fortune/development/languages/cobol.nix
+++ b/home/ebisu/fortune/development/languages/cobol.nix
@@ -1 +1,4 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ gnu-cobol ]; }
+{ pkgs, ... }:
+{
+ home.packages = with pkgs; [ gnu-cobol ];
+}
diff --git a/home/ebisu/fortune/development/languages/crystal.nix b/home/ebisu/fortune/development/languages/crystal.nix
index aa7a8ed..035c20a 100644
--- a/home/ebisu/fortune/development/languages/crystal.nix
+++ b/home/ebisu/fortune/development/languages/crystal.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
ameba
crystal
diff --git a/home/ebisu/fortune/development/languages/dotnet.nix b/home/ebisu/fortune/development/languages/dotnet.nix
index d3d60b4..2bd09b5 100644
--- a/home/ebisu/fortune/development/languages/dotnet.nix
+++ b/home/ebisu/fortune/development/languages/dotnet.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
dotnetCorePackages.dotnet_9.sdk
dotnetCorePackages.dotnet_9.runtime
diff --git a/home/ebisu/fortune/development/languages/gleam.nix b/home/ebisu/fortune/development/languages/gleam.nix
index 421c21a..bdea22c 100644
--- a/home/ebisu/fortune/development/languages/gleam.nix
+++ b/home/ebisu/fortune/development/languages/gleam.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
erlang_nox
gleam
diff --git a/home/ebisu/fortune/development/languages/go.nix b/home/ebisu/fortune/development/languages/go.nix
index d7ca20f..e389414 100644
--- a/home/ebisu/fortune/development/languages/go.nix
+++ b/home/ebisu/fortune/development/languages/go.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
programs.go.enable = true;
home.packages = with pkgs; [ gopls ];
}
diff --git a/home/ebisu/fortune/development/languages/hare.nix b/home/ebisu/fortune/development/languages/hare.nix
index 1cd3cbf..53a81c7 100644
--- a/home/ebisu/fortune/development/languages/hare.nix
+++ b/home/ebisu/fortune/development/languages/hare.nix
@@ -1 +1,4 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ hare ]; }
+{ pkgs, ... }:
+{
+ home.packages = with pkgs; [ hare ];
+}
diff --git a/home/ebisu/fortune/development/languages/haskell.nix b/home/ebisu/fortune/development/languages/haskell.nix
index f9a17ce..974c278 100644
--- a/home/ebisu/fortune/development/languages/haskell.nix
+++ b/home/ebisu/fortune/development/languages/haskell.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
ghc
haskellPackages.cabal-fmt
diff --git a/home/ebisu/fortune/development/languages/javascript.nix b/home/ebisu/fortune/development/languages/javascript.nix
index cf14f25..0a8cae2 100644
--- a/home/ebisu/fortune/development/languages/javascript.nix
+++ b/home/ebisu/fortune/development/languages/javascript.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
bun
# deno
diff --git a/home/ebisu/fortune/development/languages/jvm.nix b/home/ebisu/fortune/development/languages/jvm.nix
index c519352..6461e4b 100644
--- a/home/ebisu/fortune/development/languages/jvm.nix
+++ b/home/ebisu/fortune/development/languages/jvm.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
kotlin
cfr
diff --git a/home/ebisu/fortune/development/languages/nim.nix b/home/ebisu/fortune/development/languages/nim.nix
index 4dcb2cf..8343ea6 100644
--- a/home/ebisu/fortune/development/languages/nim.nix
+++ b/home/ebisu/fortune/development/languages/nim.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
nim
nimble
diff --git a/home/ebisu/fortune/development/languages/protobuf.nix b/home/ebisu/fortune/development/languages/protobuf.nix
index 0391f07..19b01c3 100644
--- a/home/ebisu/fortune/development/languages/protobuf.nix
+++ b/home/ebisu/fortune/development/languages/protobuf.nix
@@ -1 +1,4 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ protobuf ]; }
+{ pkgs, ... }:
+{
+ home.packages = with pkgs; [ protobuf ];
+}
diff --git a/home/ebisu/fortune/development/languages/python.nix b/home/ebisu/fortune/development/languages/python.nix
index f970f71..aaaa97e 100644
--- a/home/ebisu/fortune/development/languages/python.nix
+++ b/home/ebisu/fortune/development/languages/python.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
python3
rye
diff --git a/home/ebisu/fortune/development/languages/rust.nix b/home/ebisu/fortune/development/languages/rust.nix
index 5d27188..b2376f0 100644
--- a/home/ebisu/fortune/development/languages/rust.nix
+++ b/home/ebisu/fortune/development/languages/rust.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
cargo-outdated
cargo-watch
diff --git a/home/ebisu/fortune/development/languages/tex.nix b/home/ebisu/fortune/development/languages/tex.nix
index f79521f..408b025 100644
--- a/home/ebisu/fortune/development/languages/tex.nix
+++ b/home/ebisu/fortune/development/languages/tex.nix
@@ -1 +1,4 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ tectonic ]; }
+{ pkgs, ... }:
+{
+ home.packages = with pkgs; [ tectonic ];
+}
diff --git a/home/ebisu/fortune/development/languages/vlang.nix b/home/ebisu/fortune/development/languages/vlang.nix
index 626e7cd..bd3cd77 100644
--- a/home/ebisu/fortune/development/languages/vlang.nix
+++ b/home/ebisu/fortune/development/languages/vlang.nix
@@ -1 +1,4 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ vlang ]; }
+{ pkgs, ... }:
+{
+ home.packages = with pkgs; [ vlang ];
+}
diff --git a/home/ebisu/fortune/development/languages/yaml.nix b/home/ebisu/fortune/development/languages/yaml.nix
index feef34e..b53bd12 100644
--- a/home/ebisu/fortune/development/languages/yaml.nix
+++ b/home/ebisu/fortune/development/languages/yaml.nix
@@ -1 +1,4 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ yamllint ]; }
+{ pkgs, ... }:
+{
+ home.packages = with pkgs; [ yamllint ];
+}
diff --git a/home/ebisu/fortune/development/tools/build.nix b/home/ebisu/fortune/development/tools/build.nix
index 6dff41a..6b0c770 100644
--- a/home/ebisu/fortune/development/tools/build.nix
+++ b/home/ebisu/fortune/development/tools/build.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
cmake
just
diff --git a/home/ebisu/fortune/education/calculator.nix b/home/ebisu/fortune/education/calculator.nix
index a8bcc7f..1022e18 100644
--- a/home/ebisu/fortune/education/calculator.nix
+++ b/home/ebisu/fortune/education/calculator.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
gavin-bc
qalculate-gtk
diff --git a/home/ebisu/fortune/filesystem/archive.nix b/home/ebisu/fortune/filesystem/archive.nix
index f52123b..cb16eff 100644
--- a/home/ebisu/fortune/filesystem/archive.nix
+++ b/home/ebisu/fortune/filesystem/archive.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
unrar
xar
diff --git a/home/ebisu/fortune/filesystem/core/bat/default.nix b/home/ebisu/fortune/filesystem/core/bat/default.nix
index c1dad3f..f206c02 100644
--- a/home/ebisu/fortune/filesystem/core/bat/default.nix
+++ b/home/ebisu/fortune/filesystem/core/bat/default.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
programs.bat = {
enable = true;
config.pager = "less -FR";
diff --git a/home/ebisu/fortune/filesystem/core/default.nix b/home/ebisu/fortune/filesystem/core/default.nix
index 6408adb..ce302c5 100644
--- a/home/ebisu/fortune/filesystem/core/default.nix
+++ b/home/ebisu/fortune/filesystem/core/default.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
imports = [
./bat
./eza
diff --git a/home/ebisu/fortune/multimedia/document.nix b/home/ebisu/fortune/multimedia/document.nix
index 8be41e2..cc20606 100644
--- a/home/ebisu/fortune/multimedia/document.nix
+++ b/home/ebisu/fortune/multimedia/document.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
libreoffice-fresh
manga-cli
diff --git a/home/ebisu/fortune/network/tools/default.nix b/home/ebisu/fortune/network/tools/default.nix
index 8f5b102..30aa4b5 100644
--- a/home/ebisu/fortune/network/tools/default.nix
+++ b/home/ebisu/fortune/network/tools/default.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
imports = [
./http
./shark.nix
diff --git a/home/ebisu/fortune/network/tools/http/httpie.nix b/home/ebisu/fortune/network/tools/http/httpie.nix
index b917245..f27ef26 100644
--- a/home/ebisu/fortune/network/tools/http/httpie.nix
+++ b/home/ebisu/fortune/network/tools/http/httpie.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
httpie
httpie-desktop
diff --git a/home/ebisu/fortune/network/tools/shark.nix b/home/ebisu/fortune/network/tools/shark.nix
index 5305bdf..221ae9c 100644
--- a/home/ebisu/fortune/network/tools/shark.nix
+++ b/home/ebisu/fortune/network/tools/shark.nix
@@ -1,6 +1,8 @@
-{ pkgs
-, ...
-}: {
+{
+ pkgs,
+ ...
+}:
+{
home.packages = with pkgs; [
termshark
wireshark
diff --git a/home/ebisu/fortune/rice/bottom.nix b/home/ebisu/fortune/rice/bottom.nix
index 4acf218..b118920 100644
--- a/home/ebisu/fortune/rice/bottom.nix
+++ b/home/ebisu/fortune/rice/bottom.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
programs.bottom.enable = true;
xdg.configFile."bottom/bottom.toml".text = ''
diff --git a/home/ebisu/fortune/rice/glances.nix b/home/ebisu/fortune/rice/glances.nix
index cda5a63..120ed04 100644
--- a/home/ebisu/fortune/rice/glances.nix
+++ b/home/ebisu/fortune/rice/glances.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
glances
];
diff --git a/home/ebisu/fortune/rice/gtk.nix b/home/ebisu/fortune/rice/gtk.nix
index 0e4f13c..933fc54 100644
--- a/home/ebisu/fortune/rice/gtk.nix
+++ b/home/ebisu/fortune/rice/gtk.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
gtk = {
enable = true;
@@ -32,4 +33,4 @@
};
home.sessionVariables.GTK_THEME = "WhiteSur-Dark";
-} \ No newline at end of file
+}
diff --git a/home/ebisu/fortune/scripts/default.nix b/home/ebisu/fortune/scripts/default.nix
index 192e3b6..8855d54 100644
--- a/home/ebisu/fortune/scripts/default.nix
+++ b/home/ebisu/fortune/scripts/default.nix
@@ -1,13 +1,13 @@
{ pkgs, ... }:
let
scriptDir = ./scripts;
- generateScripts = builtins.listToAttrs (builtins.map
- (name: {
+ generateScripts = builtins.listToAttrs (
+ builtins.map (name: {
inherit name;
value = pkgs.writeShellScriptBin name (builtins.readFile "${scriptDir}/${name}");
- })
- (builtins.attrNames (builtins.readDir scriptDir)));
+ }) (builtins.attrNames (builtins.readDir scriptDir))
+ );
in
{
home.packages = builtins.attrValues generateScripts;
diff --git a/home/ebisu/fortune/system/bitwarden.nix b/home/ebisu/fortune/system/bitwarden.nix
index 2ac188f..2e5cb32 100644
--- a/home/ebisu/fortune/system/bitwarden.nix
+++ b/home/ebisu/fortune/system/bitwarden.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
bitwarden-desktop
# bitwarden-cli
diff --git a/home/ebisu/fortune/system/opengl.nix b/home/ebisu/fortune/system/opengl.nix
index cabb8f9..b1efc8e 100644
--- a/home/ebisu/fortune/system/opengl.nix
+++ b/home/ebisu/fortune/system/opengl.nix
@@ -1,7 +1,8 @@
-{ pkgs
-, config
-, inputs
-, ...
+{
+ pkgs,
+ config,
+ inputs,
+ ...
}:
let
nixGLIntel = inputs.nixGL.packages.${pkgs.system}.nixGLIntel;
diff --git a/home/ebisu/fortune/system/peripheral.nix b/home/ebisu/fortune/system/peripheral.nix
index f05379c..7b91dfe 100644
--- a/home/ebisu/fortune/system/peripheral.nix
+++ b/home/ebisu/fortune/system/peripheral.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
# openrgb
solaar
diff --git a/home/ebisu/fortune/system/shell/scripting/charmbracelet.nix b/home/ebisu/fortune/system/shell/scripting/charmbracelet.nix
index e3b78df..c75a156 100644
--- a/home/ebisu/fortune/system/shell/scripting/charmbracelet.nix
+++ b/home/ebisu/fortune/system/shell/scripting/charmbracelet.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
gum
mods
diff --git a/home/ebisu/fortune/system/shell/scripting/ripgrep.nix b/home/ebisu/fortune/system/shell/scripting/ripgrep.nix
index 00de07f..75ce241 100644
--- a/home/ebisu/fortune/system/shell/scripting/ripgrep.nix
+++ b/home/ebisu/fortune/system/shell/scripting/ripgrep.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
programs.ripgrep.enable = true;
home.packages = with pkgs; [
diff --git a/home/ebisu/fortune/system/shell/starship.nix b/home/ebisu/fortune/system/shell/starship.nix
index 0088038..1e6510a 100644
--- a/home/ebisu/fortune/system/shell/starship.nix
+++ b/home/ebisu/fortune/system/shell/starship.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
starship
];
diff --git a/home/ebisu/fortune/system/terminal/foot.nix b/home/ebisu/fortune/system/terminal/foot.nix
index ed0820b..28d1b11 100644
--- a/home/ebisu/fortune/system/terminal/foot.nix
+++ b/home/ebisu/fortune/system/terminal/foot.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
programs.foot = {
enable = true;
diff --git a/home/ebisu/home.nix b/home/ebisu/home.nix
index ea8c6c7..9c9c711 100644
--- a/home/ebisu/home.nix
+++ b/home/ebisu/home.nix
@@ -1,7 +1,8 @@
-{ config
-, pkgs
-, inputs
-, ...
+{
+ config,
+ pkgs,
+ inputs,
+ ...
}:
let
username = "ebisu";