notohh/snowflake
notohh/snowflake
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases Packages Wiki Activity

treewide: alejandra formatting

Browse source
This commit is contained in:
notohh 2023-04-23 17:45:37 -04:00
parent 6c78218c04
commit 6009bc78f5
Signed by: notohh
GPG key ID: BD47506D475EE86D
42 changed files with 929 additions and 902 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
flake.nix
View file

@ -9,8 +9,13 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = { self, nixpkgs, home-manager, hyprland, ... }@inputs: outputs = {
let self,
nixpkgs,
home-manager,
hyprland,
...
} @ inputs: let
system = "x86_64-linux"; system = "x86_64-linux";
lib = nixpkgs.lib; lib = nixpkgs.lib;
in { in {
@ -19,12 +24,11 @@
inherit system; inherit system;
modules = [ modules = [
./hosts/tsuki ./hosts/tsuki
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = {inherit inputs;};
inherit inputs;
};
home-manager.users.notoh = { home-manager.users.notoh = {
imports = [ imports = [
hyprland.homeManagerModules.default hyprland.homeManagerModules.default
@ -38,14 +42,11 @@
inherit system; inherit system;
modules = [ modules = [
./hosts/hime ./hosts/hime
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.oh = { home-manager.users.oh = {imports = [./hosts/hime/home.nix];};
imports = [
./hosts/hime/home.nix
];
};
} }
]; ];
}; };
@ -53,13 +54,12 @@
inherit system; inherit system;
modules = [ modules = [
./hosts/sutakku ./hosts/sutakku
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.oh = { home-manager.users.oh = {
imports = [ imports = [./hosts/sutakku/home.nix];
./hosts/sutakku/home.nix
];
}; };
} }
]; ];

6
home/default.nix
View file

@ -1,7 +1,4 @@
{ {pkgs, ...}: {
pkgs,
...
}: {
imports = [ imports = [
./neofetch ./neofetch
./nushell ./nushell
@ -16,5 +13,6 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
bat bat
croc croc
alejandra
]; ];
} }

4
home/direnv/default.nix
View file

@ -1,6 +1,4 @@
{ {...}: {
...
}: {
programs.direnv = { programs.direnv = {
enable = true; enable = true;
enableNushellIntegration = true; enableNushellIntegration = true;

6
home/dunst/config.nix
View file

@ -1,6 +1,4 @@
{ {...}: {
...
}: {
global = { global = {
frame_color = "#f5c2e7"; frame_color = "#f5c2e7";
frame_width = "4"; frame_width = "4";
@ -20,7 +18,7 @@
background = "#1E1E2E"; background = "#1E1E2E";
foreground = "#CDD6F4"; foreground = "#CDD6F4";
}; };
urgency_critical ={ urgency_critical = {
background = "#1E1E2E"; background = "#1E1E2E";
foreground = "#CDD6F4"; foreground = "#CDD6F4";
frame_color = "#FAB387"; frame_color = "#FAB387";

4
home/dunst/default.nix
View file

@ -1,6 +1,4 @@
{ {...}: {
...
}: {
services.dunst = { services.dunst = {
enable = true; enable = true;
waylandDisplay = "DP-2"; waylandDisplay = "DP-2";

7
home/git/default.nix
View file

@ -1,8 +1,5 @@
{ {pkgs, ...}: {
pkgs, home.packages = with pkgs; [gh];
...
}: {
home.packages = with pkgs; [ gh ];
programs.git = { programs.git = {
enable = true; enable = true;

6
home/gtk/default.nix
View file

@ -1,8 +1,4 @@
{ {pkgs, ...}: {
pkgs,
...
}: {
home.pointerCursor = { home.pointerCursor = {
package = pkgs.bibata-cursors; package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic"; name = "Bibata-Modern-Classic";

4
home/helix/default.nix
View file

@ -1,6 +1,4 @@
{ {...}: {
...
}: {
imports = [ imports = [
./themes/catppuccin_mocha.nix ./themes/catppuccin_mocha.nix
]; ];

178
home/helix/themes/catppuccin_mocha.nix
View file

@ -1,6 +1,4 @@
{ {...}: {
...
}: {
programs.helix = { programs.helix = {
themes.catppuccin_mocha = let themes.catppuccin_mocha = let
transparent = "none"; transparent = "none";
@ -45,24 +43,39 @@
"string" = green; "string" = green;
"string.regexp" = peach; "string.regexp" = peach;
"string.special" = blue; "string.special" = blue;
"comment" = {fg = maroon; modifiers = ["italic"]; }; "comment" = {
fg = maroon;
modifiers = ["italic"];
};
"variable" = "text"; "variable" = "text";
"variable.parameter" = {fg = maroon; modifiers = ["italic"]; }; "variable.parameter" = {
fg = maroon;
modifiers = ["italic"];
};
"variable.builtin" = red; "variable.builtin" = red;
"variable.other.member" = teal; "variable.other.member" = teal;
"label" = sapphire; "label" = sapphire;
"punctuation" = overlay2; "punctuation" = overlay2;
"punctuation.special" = sky; "punctuation.special" = sky;
"keyword" = mauve; "keyword" = mauve;
"keyword.control.conditional" = {fg = mauve; modifiers = ["italic"]; }; "keyword.control.conditional" = {
fg = mauve;
modifiers = ["italic"];
};
"operator" = sky; "operator" = sky;
"function" = blue; "function" = blue;
"function.macro" = mauve; "function.macro" = mauve;
"tag" = mauve; "tag" = mauve;
"attribute" = blue; "attribute" = blue;
"namespace" = {fg = blue; modifiers = ["italic"]; }; "namespace" = {
fg = blue;
modifiers = ["italic"];
};
"special" = blue; "special" = blue;
"markup.heading.marker" = {fg = peach; modifiers = ["bold"]; }; "markup.heading.marker" = {
fg = peach;
modifiers = ["bold"];
};
"markup.heading.1" = lavender; "markup.heading.1" = lavender;
"markup.heading.2" = mauve; "markup.heading.2" = mauve;
"markup.heading.3" = green; "markup.heading.3" = green;
@ -70,47 +83,130 @@
"markup.heading.5" = pink; "markup.heading.5" = pink;
"markup.heading.6" = teal; "markup.heading.6" = teal;
"markup.list" = mauve; "markup.list" = mauve;
"markup.bold" = { modifiers = ["bold"]; }; "markup.bold" = {modifiers = ["bold"];};
"markup.italic" = { modifiers = ["italic"]; }; "markup.italic" = {modifiers = ["italic"];};
"markup.link.url" = {fg = rosewater; modifiers = ["italic" "underlined"]; }; "markup.link.url" = {
fg = rosewater;
modifiers = ["italic" "underlined"];
};
"markup.link.text" = blue; "markup.link.text" = blue;
"markup.raw" = flamingo; "markup.raw" = flamingo;
"diff.plus" = green; "diff.plus" = green;
"diff.minus" = red; "diff.minus" = red;
"diff.delta" = blue; "diff.delta" = blue;
"ui.background" = {fg = surface1; }; "ui.background" = {fg = surface1;};
"ui.linenr" = { fg = surface1; }; "ui.linenr" = {fg = surface1;};
"ui.linenr.selected" = { fg = lavender; }; "ui.linenr.selected" = {fg = lavender;};
"ui.statusline" = { fg = subtext1; bg = mantle; }; "ui.statusline" = {
"ui.statusline.inactive" = { fg = surface2; bg = mantle; }; fg = subtext1;
"ui.statusline.normal" = { fg = base; bg = lavender; modifiers = ["bold"]; }; bg = mantle;
"ui.statusline.insert" = { fg = base; bg = green; modifiers = ["bold"]; }; };
"ui.statusline.select" = { fg = base; bg = flamingo; modifiers = ["bold"]; }; "ui.statusline.inactive" = {
"ui.popup" = { fg = text; bg = surface0; }; fg = surface2;
"ui.window" = { fg = crust; }; bg = mantle;
"ui.help" = { fg = overlay2; bg = surface0; }; };
"ui.bufferline" = { fg = subtext0; bg = mantle; }; "ui.statusline.normal" = {
"ui.bufferline.active" = { fg = mauve; bg = base; underline = {color = mauve; style = "line"; }; }; fg = base;
"ui.bufferline.background" = { bg = crust; }; bg = lavender;
modifiers = ["bold"];
};
"ui.statusline.insert" = {
fg = base;
bg = green;
modifiers = ["bold"];
};
"ui.statusline.select" = {
fg = base;
bg = flamingo;
modifiers = ["bold"];
};
"ui.popup" = {
fg = text;
bg = surface0;
};
"ui.window" = {fg = crust;};
"ui.help" = {
fg = overlay2;
bg = surface0;
};
"ui.bufferline" = {
fg = subtext0;
bg = mantle;
};
"ui.bufferline.active" = {
fg = mauve;
bg = base;
underline = {
color = mauve;
style = "line";
};
};
"ui.bufferline.background" = {bg = crust;};
"ui.text" = text; "ui.text" = text;
"ui.text.focus" = { fg = text; bg = surface0; modifiers = ["bold"]; }; "ui.text.focus" = {
"ui.text.inactive" = { fg = overlay1; }; fg = text;
bg = surface0;
modifiers = ["bold"];
};
"ui.text.inactive" = {fg = overlay1;};
"ui.virtual" = overlay0; "ui.virtual" = overlay0;
"ui.virtual.ruler" = { bg = surface0; }; "ui.virtual.ruler" = {bg = surface0;};
"ui.virtual.indent-guide" = surface0; "ui.virtual.indent-guide" = surface0;
"ui.virtual.inlay-hint" = { fg = surface1; bg = mantle; }; "ui.virtual.inlay-hint" = {
"ui.selection" = { bg = surface1; }; fg = surface1;
"ui.cursor" = { fg = base; bg = secondary_cursor; }; bg = mantle;
"ui.cursor.primary" = { fg = base; bg = rosewater; }; };
"ui.cursor.match" = { fg = peach; modifiers = ["bold"]; }; "ui.selection" = {bg = surface1;};
"ui.cursorline.primary" = { bg = cursorline; }; "ui.cursor" = {
"ui.highlight" = { bg = surface1; modifiers = ["bold"]; }; fg = base;
"ui.menu" = { fg = overlay2; bg = surface0; }; bg = secondary_cursor;
"ui.menu.selected" = { fg = text; bg = surface1; modifiers = ["bold"]; }; };
"diagnostic.error" = { underline = { color = red; style = "curl"; }; }; "ui.cursor.primary" = {
"diagnostic.warning" = { underline = { color = yellow; style = "curl"; }; }; fg = base;
"diagnostic.info" = { underline = { color = sky; style = "curl"; }; }; bg = rosewater;
"diagnostic.hint" = { underline = { color = teal; style = "curl"; }; }; };
"ui.cursor.match" = {
fg = peach;
modifiers = ["bold"];
};
"ui.cursorline.primary" = {bg = cursorline;};
"ui.highlight" = {
bg = surface1;
modifiers = ["bold"];
};
"ui.menu" = {
fg = overlay2;
bg = surface0;
};
"ui.menu.selected" = {
fg = text;
bg = surface1;
modifiers = ["bold"];
};
"diagnostic.error" = {
underline = {
color = red;
style = "curl";
};
};
"diagnostic.warning" = {
underline = {
color = yellow;
style = "curl";
};
};
"diagnostic.info" = {
underline = {
color = sky;
style = "curl";
};
};
"diagnostic.hint" = {
underline = {
color = teal;
style = "curl";
};
};
"error" = red; "error" = red;
"warning" = yellow; "warning" = yellow;

20
home/lazygit/default.nix
View file

@ -1,20 +1,18 @@
{ {...}: {
...
}: {
programs.lazygit = { programs.lazygit = {
enable = true; enable = true;
settings = { settings = {
windowSize = "normal"; windowSize = "normal";
gui.theme = { gui.theme = {
lightTheme = false; lightTheme = false;
activeBorderColor = [ "#a6e3a1" "bold" ]; activeBorderColor = ["#a6e3a1" "bold"];
inactiveBorderColor = [ "#cdd6f4" ]; inactiveBorderColor = ["#cdd6f4"];
optionsTextColor = [ "#89b4fa" ]; optionsTextColor = ["#89b4fa"];
selectedLineBgColor = [ "#313244" ]; selectedLineBgColor = ["#313244"];
selectedRangeByColor = [ "#313244" ]; selectedRangeByColor = ["#313244"];
cherryPickedCommitBgColor = [ "#94e2d5" ]; cherryPickedCommitBgColor = ["#94e2d5"];
cherryPickedCommitFgColor = [ "#89b4fa" ]; cherryPickedCommitFgColor = ["#89b4fa"];
unstagedChangesColor = [ "red" ]; unstagedChangesColor = ["red"];
}; };
}; };
}; };

5
home/lf/default.nix
View file

@ -1,7 +1,4 @@
{ {pkgs, ...}: {
pkgs,
...
}: {
programs.lf = { programs.lf = {
enable = true; enable = true;
settings = { settings = {

6
home/librewolf/default.nix
View file

@ -1,6 +1,4 @@
{ {...}: {
...
}: {
programs.librewolf = { programs.librewolf = {
enable = true; enable = true;
settings = { settings = {
@ -40,4 +38,4 @@
"application/x-extension-xht" = ["librewolf.desktop"]; "application/x-extension-xht" = ["librewolf.desktop"];
}; };
}; };
} }

2
home/neofetch/default.nix
View file

@ -6,5 +6,5 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
neofetch neofetch
]; ];
xdg.configFile."neofetch/config.conf".source =./config.conf; xdg.configFile."neofetch/config.conf".source = ./config.conf;
} }

4
home/nushell/default.nix
View file

@ -1,6 +1,4 @@
{ {...}: {
...
}: {
programs.nushell = { programs.nushell = {
enable = true; enable = true;
configFile.source = ./config.nu; configFile.source = ./config.nu;

1
home/starship/default.nix
View file

@ -93,7 +93,6 @@
style = "bg:#e05a75 fg:#11111b"; style = "bg:#e05a75 fg:#11111b";
format = "[ $time ]($style)"; format = "[ $time ]($style)";
}; };
}; };
}; };
} }

5
home/waybar/default.nix
View file

@ -3,13 +3,12 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: let
let
compileSCSS = name: source: "${pkgs.runCommandLocal name {} '' compileSCSS = name: source: "${pkgs.runCommandLocal name {} ''
mkdir -p $out mkdir -p $out
${lib.getExe pkgs.sassc} -t expanded '${source}' > $out/${name}.css ${lib.getExe pkgs.sassc} -t expanded '${source}' > $out/${name}.css
''}/${name}.css"; ''}/${name}.css";
in { in {
programs.waybar = { programs.waybar = {
enable = true; enable = true;
package = inputs.hyprland.packages.${pkgs.system}.waybar-hyprland; package = inputs.hyprland.packages.${pkgs.system}.waybar-hyprland;

12
home/wayland/default.nix
View file

@ -1,9 +1,4 @@
{ {pkgs, ...}: let
pkgs,
...
}:
let
dbus-hyprland-environment = pkgs.writeTextFile { dbus-hyprland-environment = pkgs.writeTextFile {
name = "dbus-hyprland-environment"; name = "dbus-hyprland-environment";
destination = "/bin/dbus-hyprland-environment"; destination = "/bin/dbus-hyprland-environment";
@ -14,9 +9,7 @@ let
systemctl --user start pipewire wireplumber pipewire-media-session xdg-desktop-portal xdg-desktop-portal-hyprland systemctl --user start pipewire wireplumber pipewire-media-session xdg-desktop-portal xdg-desktop-portal-hyprland
''; '';
}; };
in in {
{
imports = [ imports = [
../../modules/greetd.nix ../../modules/greetd.nix
]; ];
@ -69,5 +62,4 @@ let
environment.etc."greetd/environments".text = '' environment.etc."greetd/environments".text = ''
Hyprland Hyprland
''; '';
} }

150
home/wayland/hyprland/config.nix
View file

@ -1,13 +1,11 @@
{ {...}: {
...
}: {
wayland.windowManager.hyprland.extraConfig = '' wayland.windowManager.hyprland.extraConfig = ''
monitor = HDMI-A-1,1920x1080,5760x0,1 #right monitor = HDMI-A-1,1920x1080,5760x0,1 #right
monitor = DP-2,1920x1080,1920x0,1 #left monitor = DP-2,1920x1080,1920x0,1 #left
monitor = DP-3,1920x1080@144,3840x0,1 #middle monitor = DP-3,1920x1080@144,3840x0,1 #middle
input { input {
kb_layout = us kb_layout = us
kb_variant = kb_variant =
@ -19,9 +17,9 @@ input {
sensitivity = -0.5 # -1.0 - 1.0, 0 means no modification. sensitivity = -0.5 # -1.0 - 1.0, 0 means no modification.
force_no_accel = true force_no_accel = true
} }
general { general {
gaps_in = 6 gaps_in = 6
gaps_out = 15 gaps_out = 15
@ -30,9 +28,9 @@ general {
col.inactive_border = rgb(6c7086) col.inactive_border = rgb(6c7086)
layout = dwindle layout = dwindle
} }
decoration { decoration {
rounding = 8 rounding = 8
@ -54,9 +52,9 @@ decoration {
shadow_offset = 0 5 shadow_offset = 0 5
shadow_render_power = 4 shadow_render_power = 4
col.shadow = rgba(00000099) col.shadow = rgba(00000099)
} }
animations { animations {
enabled = yes enabled = yes
@ -67,96 +65,96 @@ animations {
animation = border, 1, 10, default animation = border, 1, 10, default
animation = fade, 1, 7, default animation = fade, 1, 7, default
animation = workspaces, 1, 6, default animation = workspaces, 1, 6, default
} }
dwindle { dwindle {
pseudotile = yes pseudotile = yes
preserve_split = yes preserve_split = yes
} }
master { master {
new_is_master = true new_is_master = true
} }
gestures { gestures {
workspace_swipe = off workspace_swipe = off
} }
device:epic mouse V1 { device:epic mouse V1 {
sensitivity = -0.5 sensitivity = -0.5
} }
exec-once = waybar & dunst exec-once = waybar & dunst
exec-once = swww init exec-once = swww init
exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
exec-once = /nix/store/gjbi20m2wz9xhm18ifmcdl45cpgd7hpz-polkit-gnome-0.105/libexec/polkit-gnome-authentication-agent-1 exec-once = /nix/store/gjbi20m2wz9xhm18ifmcdl45cpgd7hpz-polkit-gnome-0.105/libexec/polkit-gnome-authentication-agent-1
# swayidle / lock # swayidle / lock
exec-once = ~/.local/bin/lock exec-once = ~/.local/bin/lock
#windowrules #windowrules
windowrulev2 = noshadow, floating:0 windowrulev2 = noshadow, floating:0
windowrulev2 = float, title:^(Volume Control)$ windowrulev2 = float, title:^(Volume Control)$
windowrulev2 = float, title:^(Picture-in-Picture)$ windowrulev2 = float, title:^(Picture-in-Picture)$
windowrulev2 = float, title:^(RuneLite)$ windowrulev2 = float, title:^(RuneLite)$
windowrulev2 = move 500 300, title:^(RuneLite)$ windowrulev2 = move 500 300, title:^(RuneLite)$
windowrulev2 = size 810 580, title:^(RuneLite)$ windowrulev2 = size 810 580, title:^(RuneLite)$
windowrulev2 = float, title:^(Steam)$ windowrulev2 = float, title:^(Steam)$
windowrulev2 = float, title:^(Cryptomator)$ windowrulev2 = float, title:^(Cryptomator)$
windowrulev2 = fullscreen, title:^(wlogout)$ windowrulev2 = fullscreen, title:^(wlogout)$
windowrulev2 = float, title:^(wlogout)$ windowrulev2 = float, title:^(wlogout)$
#binds #binds
$mainMod = SUPER $mainMod = SUPER
bind = $mainMod, Return, exec, wezterm bind = $mainMod, Return, exec, wezterm
bind = $mainMod, Q, killactive, bind = $mainMod, Q, killactive,
bind = $mainMod, V, togglefloating, bind = $mainMod, V, togglefloating,
bind = $mainMod, R, exec, rofi -modi run -show drun bind = $mainMod, R, exec, rofi -modi run -show drun
bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, P, pseudo, # dwindle
bind = $mainMod, J, togglesplit, # dwindle bind = $mainMod, J, togglesplit, # dwindle
bind =, Print, exec, grim -g "$(slurp -d)" bind =, Print, exec, grim -g "$(slurp -d)"
bind = $mainMod, left, movefocus, l bind = $mainMod, left, movefocus, l
bind = $mainMod, right, movefocus, r bind = $mainMod, right, movefocus, r
bind = $mainMod, up, movefocus, u bind = $mainMod, up, movefocus, u
bind = $mainMod, down, movefocus, d bind = $mainMod, down, movefocus, d
bind = $mainMod, 1, workspace, 1 bind = $mainMod, 1, workspace, 1
bind = $mainMod, 2, workspace, 2 bind = $mainMod, 2, workspace, 2
bind = $mainMod, 3, workspace, 3 bind = $mainMod, 3, workspace, 3
bind = $mainMod, 4, workspace, 4 bind = $mainMod, 4, workspace, 4
bind = $mainMod, 5, workspace, 5 bind = $mainMod, 5, workspace, 5
bind = $mainMod, 6, workspace, 6 bind = $mainMod, 6, workspace, 6
bind = $mainMod, 7, workspace, 7 bind = $mainMod, 7, workspace, 7
bind = $mainMod, 8, workspace, 8 bind = $mainMod, 8, workspace, 8
bind = $mainMod, 9, workspace, 9 bind = $mainMod, 9, workspace, 9
bind = $mainMod, 0, workspace, 10 bind = $mainMod, 0, workspace, 10
bind = $mainMod SHIFT, 1, movetoworkspace, 1 bind = $mainMod SHIFT, 1, movetoworkspace, 1
bind = $mainMod SHIFT, 2, movetoworkspace, 2 bind = $mainMod SHIFT, 2, movetoworkspace, 2
bind = $mainMod SHIFT, 3, movetoworkspace, 3 bind = $mainMod SHIFT, 3, movetoworkspace, 3
bind = $mainMod SHIFT, 4, movetoworkspace, 4 bind = $mainMod SHIFT, 4, movetoworkspace, 4
bind = $mainMod SHIFT, 5, movetoworkspace, 5 bind = $mainMod SHIFT, 5, movetoworkspace, 5
bind = $mainMod SHIFT, 6, movetoworkspace, 6 bind = $mainMod SHIFT, 6, movetoworkspace, 6
bind = $mainMod SHIFT, 7, movetoworkspace, 7 bind = $mainMod SHIFT, 7, movetoworkspace, 7
bind = $mainMod SHIFT, 8, movetoworkspace, 8 bind = $mainMod SHIFT, 8, movetoworkspace, 8
bind = $mainMod SHIFT, 9, movetoworkspace, 9 bind = $mainMod SHIFT, 9, movetoworkspace, 9
bind = $mainMod SHIFT, 0, movetoworkspace, 10 bind = $mainMod SHIFT, 0, movetoworkspace, 10
bind = $mainMod, mouse_down, workspace, e+1 bind = $mainMod, mouse_down, workspace, e+1
bind = $mainMod, mouse_up, workspace, e-1 bind = $mainMod, mouse_up, workspace, e-1
bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:272, movewindow
bindm = $mainMod, mouse:273, resizewindow bindm = $mainMod, mouse:273, resizewindow
''; '';
} }

4
home/wayland/hyprland/default.nix
View file

@ -1,6 +1,4 @@
{ {...}: {
...
}: {
imports = [./config.nix]; imports = [./config.nix];
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {

8
home/wezterm/default.nix
View file

@ -1,6 +1,4 @@
{ {...}: {
...
}: {
programs.wezterm = { programs.wezterm = {
enable = true; enable = true;
extraConfig = '' extraConfig = ''
@ -27,7 +25,7 @@
left = 0, left = 0,
right = 0, right = 0,
} }
} }
''; '';
}; };
} }

4
home/zathura/default.nix
View file

@ -1,6 +1,4 @@
{ {...}: {
...
}: {
programs.zathura = { programs.zathura = {
enable = true; enable = true;
extraConfig = '' extraConfig = ''

4
home/zellij/default.nix
View file

@ -1,6 +1,4 @@
{ {...}: {
...
}: {
imports = [ imports = [
./layouts.nix ./layouts.nix
]; ];

8
home/zellij/layouts.nix
View file

@ -1,6 +1,4 @@
{ {...}: {
...
}: {
home.file.".config/zellij/snowflake.kdl".text = '' home.file.".config/zellij/snowflake.kdl".text = ''
layout { layout {
tab name="main" { tab name="main" {
@ -36,7 +34,7 @@
plugin location="zellij:status-bar" plugin location="zellij:status-bar"
} }
} }
} }
''; '';
@ -61,7 +59,7 @@
plugin location="zellij:status-bar" plugin location="zellij:status-bar"
} }
} }
} }
''; '';
} }

4
home/zoxide/default.nix
View file

@ -1,6 +1,4 @@
{ {...}: {
...
}: {
programs.zoxide = { programs.zoxide = {
enable = true; enable = true;
enableNushellIntegration = true; enableNushellIntegration = true;

18
hosts/hime/default.nix
View file

@ -1,9 +1,5 @@
{ {pkgs, ...}: {
pkgs, imports = [
...
}: {
imports =
[
./hardware-configuration.nix ./hardware-configuration.nix
../../modules ../../modules
]; ];
@ -31,22 +27,21 @@
settings = { settings = {
PasswordAuthentication = true; PasswordAuthentication = true;
}; };
}; };
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
users ={ users = {
defaultUserShell = pkgs.nushell; defaultUserShell = pkgs.nushell;
users.oh = { users.oh = {
isNormalUser = true; isNormalUser = true;
description = "oh"; description = "oh";
extraGroups = [ "networkmanager" "wheel" ]; extraGroups = ["networkmanager" "wheel"];
packages = with pkgs; [ packages = with pkgs; [
hugo hugo
yt-dlp yt-dlp
]; ];
}; };
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
docker-compose docker-compose
@ -54,5 +49,4 @@
python3Full python3Full
nfs-utils nfs-utils
]; ];
} }

40
hosts/hime/hardware-configuration.nix
View file

@ -1,34 +1,38 @@
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ (modulesPath + "/profiles/qemu-guest.nix") lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
]; ];
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ ]; boot.kernelModules = [];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/154e6059-35f9-49bb-b049-085b325ac997"; device = "/dev/disk/by-uuid/154e6059-35f9-49bb-b049-085b325ac997";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/home/oh/nas" = fileSystems."/home/oh/nas" = {
{ device = "192.168.1.71:/volume1/hime"; device = "192.168.1.71:/volume1/hime";
fsType = "nfs"; fsType = "nfs";
}; };
fileSystems."/home/oh/docker/nextcloud" = fileSystems."/home/oh/docker/nextcloud" = {
{ device = "192.168.1.71:/volume1/nextcloud"; device = "192.168.1.71:/volume1/nextcloud";
fsType = "nfs"; fsType = "nfs";
}; };
fileSystems."/home/oh/docker/stash/data" = fileSystems."/home/oh/docker/stash/data" = {
{ device = "192.168.1.71:/volume1/stash"; device = "192.168.1.71:/volume1/stash";
fsType = "nfs"; fsType = "nfs";
}; };
swapDevices = swapDevices = [
[ { device = "/dev/disk/by-uuid/15978bb3-da9b-4ec2-bd35-1716dd97812b"; } {device = "/dev/disk/by-uuid/15978bb3-da9b-4ec2-bd35-1716dd97812b";}
]; ];
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;

11
hosts/hime/home.nix
View file

@ -1,10 +1,11 @@
{config, pkgs, ...}:
{ {
config,
imports = [ pkgs,
...
}: {
imports = [
../../home ../../home
]; ];
systemd.user.startServices = "sd-switch"; systemd.user.startServices = "sd-switch";
programs.home-manager.enable = true; programs.home-manager.enable = true;

13
hosts/sutakku/default.nix
View file

@ -1,8 +1,9 @@
{ config, pkgs, ... }:
{ {
imports = config,
[ pkgs,
...
}: {
imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../../modules ../../modules
]; ];
@ -31,9 +32,9 @@
users.oh = { users.oh = {
isNormalUser = true; isNormalUser = true;
description = "oh"; description = "oh";
extraGroups = [ "networkmanager" "wheel" ]; extraGroups = ["networkmanager" "wheel"];
};
}; };
};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wget wget

31
hosts/sutakku/hardware-configuration.nix
View file

@ -1,30 +1,33 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ (modulesPath + "/profiles/qemu-guest.nix") lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
]; ];
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ ]; boot.kernelModules = [];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/dae21f73-2c6b-4959-90cc-07fb77c2a880"; device = "/dev/disk/by-uuid/dae21f73-2c6b-4959-90cc-07fb77c2a880";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/media" = fileSystems."/media" = {
{
device = "192.168.1.71:/volume1/media"; device = "192.168.1.71:/volume1/media";
fsType = "nfs"; fsType = "nfs";
}; };
swapDevices = swapDevices = [
[ { device = "/dev/disk/by-uuid/990dd47b-fa78-4636-844e-83cc638052dc"; } {device = "/dev/disk/by-uuid/990dd47b-fa78-4636-844e-83cc638052dc";}
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

11
hosts/sutakku/home.nix
View file

@ -1,10 +1,11 @@
{config, pkgs, ...}:
{ {
config,
imports = [ pkgs,
...
}: {
imports = [
../../home ../../home
]; ];
systemd.user.startServices = "sd-switch"; systemd.user.startServices = "sd-switch";
programs.home-manager.enable = true; programs.home-manager.enable = true;

13
hosts/tsuki/default.nix
View file

@ -3,8 +3,7 @@
pkgs, pkgs,
... ...
}: { }: {
imports = imports = [
[
./hardware-configuration.nix ./hardware-configuration.nix
../../home/wayland ../../home/wayland
../../modules ../../modules
@ -24,8 +23,8 @@
}; };
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback.out ]; boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback.out];
boot.kernelModules = [ "v4l2loopback" "kvm-intel" ]; boot.kernelModules = ["v4l2loopback" "kvm-intel"];
virtualisation.libvirtd.enable = true; virtualisation.libvirtd.enable = true;
@ -36,7 +35,7 @@
services = { services = {
xserver = { xserver = {
enable = true; enable = true;
videoDrivers = [ "nvidia" ]; videoDrivers = ["nvidia"];
layout = "us"; layout = "us";
xkbVariant = ""; xkbVariant = "";
}; };
@ -94,9 +93,9 @@
users.notoh = { users.notoh = {
isNormalUser = true; isNormalUser = true;
description = "notoh"; description = "notoh";
extraGroups = [ "networkmanager" "wheel" "disk" "video" ]; extraGroups = ["networkmanager" "wheel" "disk" "video"];
};
}; };
};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wget wget

44
hosts/tsuki/hardware-configuration.nix
View file

@ -1,44 +1,48 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ (modulesPath + "/installer/scan/not-detected.nix") lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/7d098aab-1968-4605-a9a7-b1627941c1ff"; device = "/dev/disk/by-uuid/7d098aab-1968-4605-a9a7-b1627941c1ff";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot/efi" = fileSystems."/boot/efi" = {
{ device = "/dev/disk/by-uuid/C356-B67C"; device = "/dev/disk/by-uuid/C356-B67C";
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/hdd" = fileSystems."/hdd" = {
{ device = "/dev/disk/by-uuid/e2e4c4f3-51df-4020-b557-a7cf684de85b"; device = "/dev/disk/by-uuid/e2e4c4f3-51df-4020-b557-a7cf684de85b";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/ssd" = fileSystems."/ssd" = {
{ device = "/dev/disk/by-uuid/9e5a189d-7435-45d7-aef6-cdee4de2428d"; device = "/dev/disk/by-uuid/9e5a189d-7435-45d7-aef6-cdee4de2428d";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/nas" = fileSystems."/nas" = {
{ device = "192.168.1.71:/volume1/tsuki"; device = "192.168.1.71:/volume1/tsuki";
fsType = "nfs"; fsType = "nfs";
}; };
swapDevices = swapDevices = [
[ { device = "/dev/disk/by-uuid/2f5e2c64-99b8-4fa0-943c-c9dd45c84fdc"; } {device = "/dev/disk/by-uuid/2f5e2c64-99b8-4fa0-943c-c9dd45c84fdc";}
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

10
hosts/tsuki/home.nix
View file

@ -1,9 +1,5 @@
{ {pkgs, ...}: {
pkgs, imports = [
...
}: {
imports = [
../../home ../../home
../../home/librewolf ../../home/librewolf
../../home/wezterm ../../home/wezterm
@ -15,7 +11,7 @@ imports = [
../../home/waybar ../../home/waybar
../../home/wayland/hyprland ../../home/wayland/hyprland
../../modules/swayidle.nix ../../modules/swayidle.nix
]; ];
systemd.user.startServices = "sd-switch"; systemd.user.startServices = "sd-switch";
programs.home-manager.enable = true; programs.home-manager.enable = true;

4
modules/default.nix
View file

@ -1,6 +1,4 @@
{ {...}: {
...
}: {
imports = [ imports = [
./security.nix ./security.nix
./networking.nix ./networking.nix

15
modules/fonts.nix
View file

@ -1,8 +1,4 @@
{ {pkgs, ...}: {
pkgs,
...
}: {
fonts = { fonts = {
enableDefaultFonts = false; enableDefaultFonts = false;
fontDir.enable = true; fontDir.enable = true;
@ -22,14 +18,13 @@
enable = true; enable = true;
allowBitmaps = true; allowBitmaps = true;
defaultFonts = { defaultFonts = {
monospace = [ "JetBrainsMono Nerd Font" "Twitter Color Emoji" ]; monospace = ["JetBrainsMono Nerd Font" "Twitter Color Emoji"];
serif = [ "Noto Serif" "Twitter Color Emoji" ]; serif = ["Noto Serif" "Twitter Color Emoji"];
sansSerif = [ "Noto Sans" "Twitter Color Emoji" ]; sansSerif = ["Noto Sans" "Twitter Color Emoji"];
emoji = [ "Twitter Color Emoji" ]; emoji = ["Twitter Color Emoji"];
}; };
hinting.style = "hintfull"; hinting.style = "hintfull";
}; };
}; };
} }

6
modules/greetd.nix
View file

@ -1,6 +1,4 @@
{ {...}: {
...
}: {
services.greetd = { services.greetd = {
enable = true; enable = true;
settings = rec { settings = rec {
@ -12,5 +10,3 @@
}; };
}; };
} }

6
modules/networking.nix
View file

@ -1,9 +1,7 @@
{ {...}: {
...
}: {
networking = { networking = {
networkmanager.enable = true; networkmanager.enable = true;
nameservers = [ "1.1.1.1" ]; nameservers = ["1.1.1.1"];
firewall = { firewall = {
enable = true; enable = true;
}; };

6
modules/nix.nix
View file

@ -1,8 +1,4 @@
{ {pkgs, ...}: {
pkgs,
...
}: {
nixpkgs = { nixpkgs = {
config = { config = {
allowUnfree = true; allowUnfree = true;

1
modules/security.nix
View file

@ -48,4 +48,3 @@
defaults.email = "github@notohh.dev"; defaults.email = "github@notohh.dev";
}; };
} }

4
modules/swayidle.nix
View file

@ -1,6 +1,4 @@
{ {...}: {
...
}: {
home.file.".local/bin/lock" = { home.file.".local/bin/lock" = {
executable = true; executable = true;
text = '' text = ''

6
modules/system.nix
View file

@ -1,7 +1,4 @@
{ {...}: {
...
}: {
documentation = { documentation = {
enable = true; enable = true;
doc.enable = false; doc.enable = false;
@ -36,5 +33,4 @@
system.autoUpgrade.enable = false; system.autoUpgrade.enable = false;
system.stateVersion = "23.05"; # no touchy system.stateVersion = "23.05"; # no touchy
} }

10
pkgs/chatterino7/default.nix
View file

@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-qgSJPP4yhIKNhLNjS8mSupw98YyCqevKqLTGnONFAKk="; sha256 = "sha256-qgSJPP4yhIKNhLNjS8mSupw98YyCqevKqLTGnONFAKk=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = with pkgs; [ cmake pkg-config libsForQt5.qt5.wrapQtAppsHook ]; nativeBuildInputs = with pkgs; [cmake pkg-config libsForQt5.qt5.wrapQtAppsHook];
buildInputs = with pkgs; [ libsForQt5.qt5.qtbase libsForQt5.qt5.qtsvg libsForQt5.qt5.qtmultimedia libsForQt5.qt5.qtimageformats libsForQt5.qt5.qttools boost openssl libsecret ]; buildInputs = with pkgs; [libsForQt5.qt5.qtbase libsForQt5.qt5.qtsvg libsForQt5.qt5.qtmultimedia libsForQt5.qt5.qtimageformats libsForQt5.qt5.qttools boost openssl libsecret];
configurationPhase = '' configurationPhase = ''
mkdir build && cd build mkdir build && cd build
cmake .. cmake ..
@ -22,10 +22,12 @@ stdenv.mkDerivation rec {
buildPhase = '' buildPhase = ''
make make
''; '';
installPhase = '' installPhase =
''
mkdir -p "$out/bin" mkdir -p "$out/bin"
mv "bin/chatterino" "$out/bin" mv "bin/chatterino" "$out/bin"
'' + '' ''
+ ''
mkdir -p $out/share/icons/hicolor/256x256/apps mkdir -p $out/share/icons/hicolor/256x256/apps
cp $src/resources/icon.png $out/share/icons/hicolor/256x256/apps/chatterino.png cp $src/resources/icon.png $out/share/icons/hicolor/256x256/apps/chatterino.png
''; '';