formatted nix files using alejandra
This commit is contained in:
pagedmov
@@ -1,7 +1,7 @@
|
||||
{
|
||||
host,
|
||||
nur,
|
||||
nixvim,
|
||||
nixvim,
|
||||
self,
|
||||
inputs,
|
||||
username,
|
||||
|
||||
@@ -5,11 +5,13 @@
|
||||
}: {
|
||||
fonts.fontconfig.enable = true;
|
||||
home.packages = with pkgs; [
|
||||
(nerdfonts.override { fonts = [
|
||||
"JetBrainsMono"
|
||||
"CascadiaCode"
|
||||
"NerdFontsSymbolsOnly"
|
||||
]; })
|
||||
(nerdfonts.override {
|
||||
fonts = [
|
||||
"JetBrainsMono"
|
||||
"CascadiaCode"
|
||||
"NerdFontsSymbolsOnly"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
gtk = {
|
||||
@@ -20,14 +22,14 @@
|
||||
accent = "frostblue4";
|
||||
};
|
||||
};
|
||||
#cursorTheme = {
|
||||
# name = "Bibata-Modern-Ice";
|
||||
# package = pkgs.bibata-cursors;
|
||||
# size = 16;
|
||||
#};
|
||||
#font = {
|
||||
# name = "Iosevka Nerd Font";
|
||||
# package = pkgs.nerdfonts.override {fonts = ["Iosevka"];};
|
||||
#};
|
||||
#cursorTheme = {
|
||||
# name = "Bibata-Modern-Ice";
|
||||
# package = pkgs.bibata-cursors;
|
||||
# size = 16;
|
||||
#};
|
||||
#font = {
|
||||
# name = "Iosevka Nerd Font";
|
||||
# package = pkgs.nerdfonts.override {fonts = ["Iosevka"];};
|
||||
#};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,17 +2,18 @@
|
||||
username,
|
||||
host,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
desktop = (host == "oganesson");
|
||||
screenshot_bind = if desktop then [ # My laptop does not have a printscreen button
|
||||
"super, print, exec, grimblast copy area"
|
||||
] else [
|
||||
"super, insert, exec, grimblast copy area"
|
||||
];
|
||||
in
|
||||
{
|
||||
}: let
|
||||
desktop = host == "oganesson";
|
||||
screenshot_bind =
|
||||
if desktop
|
||||
then [
|
||||
# My laptop does not have a printscreen button
|
||||
"super, print, exec, grimblast copy area"
|
||||
]
|
||||
else [
|
||||
"super, insert, exec, grimblast copy area"
|
||||
];
|
||||
in {
|
||||
wayland.windowManager.hyprland = {
|
||||
settings = {
|
||||
monitor =
|
||||
@@ -81,8 +82,8 @@ in
|
||||
gaps_in = 4;
|
||||
gaps_out = 8;
|
||||
border_size = 2;
|
||||
#"col.inactive_border" = "0xff${scheme.base01}";
|
||||
#"col.active_border" = "0xff${scheme.base0F}";
|
||||
#"col.inactive_border" = "0xff${scheme.base01}";
|
||||
#"col.active_border" = "0xff${scheme.base0F}";
|
||||
border_part_of_window = false;
|
||||
no_border_on_floating = false;
|
||||
};
|
||||
@@ -168,46 +169,48 @@ in
|
||||
"workspaces, 1, 4, easeOutCubic, fade" # styles: slide, slidevert, fade, slidefade, slidefadevert
|
||||
];
|
||||
|
||||
bind = [
|
||||
"super, up, exec, pactl set-sink-volume @default_sink@ +10%"
|
||||
"super, down, exec, pactl set-sink-volume @default_sink@ -10%"
|
||||
"super, t, exec, swaync-client -t -sw"
|
||||
"super, a, exec, firefox"
|
||||
"super, q, exec, kitty --title Kitty"
|
||||
"super shift, q, exec, [float;size 40% 30%;move onscreen cursor -50% -50%] kitty --title Kitty"
|
||||
"super, c, killactive,"
|
||||
"super, e, exec, nemo"
|
||||
"super, p, exec, [float;size 40% 25%;move onscreen cursor] [ ! -f /tmp/keyringfile ] && kitty toolbelt"
|
||||
"super shift, m, exit,"
|
||||
"super, m, exec, fuzzel"
|
||||
"super, r, exec, neovide"
|
||||
"super, b, togglesplit, # dwindle"
|
||||
"super, f, togglefloating"
|
||||
"super, g, fullscreen"
|
||||
"super, h, movefocus, l"
|
||||
"super, l, movefocus, r"
|
||||
"super, k, movefocus, u"
|
||||
"super, j, movefocus, d"
|
||||
"super shift, h, movewindow, l"
|
||||
"super shift, l, movewindow, r"
|
||||
"super shift, k, movewindow, u"
|
||||
"super shift, j, movewindow, d"
|
||||
"super, d, exec, switchmon"
|
||||
"super, 1, exec, hyprctl 'dispatch workspace 1'"
|
||||
"super, 2, exec, hyprctl 'dispatch workspace 2'"
|
||||
"super, 3, exec, hyprctl 'dispatch workspace 3'"
|
||||
"super, 4, exec, hyprctl 'dispatch workspace 4'"
|
||||
"super, 5, exec, hyprctl 'dispatch workspace 5'"
|
||||
"super, 6, exec, hyprctl 'dispatch workspace 6'"
|
||||
"super shift, 1, movetoworkspace, 1"
|
||||
"super shift, 2, movetoworkspace, 2"
|
||||
"super shift, 3, movetoworkspace, 3"
|
||||
"super shift, 4, movetoworkspace, 4"
|
||||
"super shift, 5, movetoworkspace, 5"
|
||||
"super shift, 6, movetoworkspace, 6"
|
||||
"super, s, togglespecialworkspace, magic"
|
||||
"super shift, s, movetoworkspace, special:magic"
|
||||
] ++ screenshot_bind;
|
||||
bind =
|
||||
[
|
||||
"super, up, exec, pactl set-sink-volume @default_sink@ +10%"
|
||||
"super, down, exec, pactl set-sink-volume @default_sink@ -10%"
|
||||
"super, t, exec, swaync-client -t -sw"
|
||||
"super, a, exec, firefox"
|
||||
"super, q, exec, kitty --title Kitty"
|
||||
"super shift, q, exec, [float;size 40% 30%;move onscreen cursor -50% -50%] kitty --title Kitty"
|
||||
"super, c, killactive,"
|
||||
"super, e, exec, nemo"
|
||||
"super, p, exec, [float;size 40% 25%;move onscreen cursor] [ ! -f /tmp/keyringfile ] && kitty toolbelt"
|
||||
"super shift, m, exit,"
|
||||
"super, m, exec, fuzzel"
|
||||
"super, r, exec, neovide"
|
||||
"super, b, togglesplit, # dwindle"
|
||||
"super, f, togglefloating"
|
||||
"super, g, fullscreen"
|
||||
"super, h, movefocus, l"
|
||||
"super, l, movefocus, r"
|
||||
"super, k, movefocus, u"
|
||||
"super, j, movefocus, d"
|
||||
"super shift, h, movewindow, l"
|
||||
"super shift, l, movewindow, r"
|
||||
"super shift, k, movewindow, u"
|
||||
"super shift, j, movewindow, d"
|
||||
"super, d, exec, switchmon"
|
||||
"super, 1, exec, hyprctl 'dispatch workspace 1'"
|
||||
"super, 2, exec, hyprctl 'dispatch workspace 2'"
|
||||
"super, 3, exec, hyprctl 'dispatch workspace 3'"
|
||||
"super, 4, exec, hyprctl 'dispatch workspace 4'"
|
||||
"super, 5, exec, hyprctl 'dispatch workspace 5'"
|
||||
"super, 6, exec, hyprctl 'dispatch workspace 6'"
|
||||
"super shift, 1, movetoworkspace, 1"
|
||||
"super shift, 2, movetoworkspace, 2"
|
||||
"super shift, 3, movetoworkspace, 3"
|
||||
"super shift, 4, movetoworkspace, 4"
|
||||
"super shift, 5, movetoworkspace, 5"
|
||||
"super shift, 6, movetoworkspace, 6"
|
||||
"super, s, togglespecialworkspace, magic"
|
||||
"super shift, s, movetoworkspace, special:magic"
|
||||
]
|
||||
++ screenshot_bind;
|
||||
bindm = [
|
||||
"super, mouse:272, movewindow"
|
||||
"super, mouse:273, resizewindow"
|
||||
|
||||
@@ -2,9 +2,8 @@
|
||||
inputs,
|
||||
host,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
imports =
|
||||
[(import ./hyprland.nix)]
|
||||
++ [(import ./config.nix)];
|
||||
++ [(import ./config.nix)];
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
scheme,
|
||||
scheme,
|
||||
...
|
||||
}: let
|
||||
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
|
||||
@@ -21,23 +21,23 @@ in {
|
||||
hidePodcasts
|
||||
shuffle # shuffle+ (special characters are sanitized out of extension names)
|
||||
];
|
||||
#colorScheme = "custom";
|
||||
#colorScheme = "custom";
|
||||
|
||||
#customColorScheme = {
|
||||
# text = scheme.base06;
|
||||
# subtext = scheme.base04;
|
||||
# sidebar-text = scheme.base04;
|
||||
# main = scheme.base00;
|
||||
# sidebar = scheme.base01;
|
||||
# shadow = scheme.base01;
|
||||
# selected-row = scheme.base08;
|
||||
# button = scheme.base0D;
|
||||
# button-active = scheme.base0C;
|
||||
# button-disabled = scheme.base02;
|
||||
# tab-active = scheme.base0E;
|
||||
# notification = scheme.base0A;
|
||||
# notification-error = scheme.base09;
|
||||
# misc = scheme.base0F;
|
||||
#};
|
||||
#customColorScheme = {
|
||||
# text = scheme.base06;
|
||||
# subtext = scheme.base04;
|
||||
# sidebar-text = scheme.base04;
|
||||
# main = scheme.base00;
|
||||
# sidebar = scheme.base01;
|
||||
# shadow = scheme.base01;
|
||||
# selected-row = scheme.base08;
|
||||
# button = scheme.base0D;
|
||||
# button-active = scheme.base0C;
|
||||
# button-disabled = scheme.base02;
|
||||
# tab-active = scheme.base0E;
|
||||
# notification = scheme.base0A;
|
||||
# notification-error = scheme.base09;
|
||||
# misc = scheme.base0F;
|
||||
#};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,19 +1,17 @@
|
||||
{
|
||||
pkgs,
|
||||
scheme,
|
||||
wallpaper,
|
||||
scheme,
|
||||
wallpaper,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
}: {
|
||||
stylix = {
|
||||
enable = true;
|
||||
autoEnable = true;
|
||||
targets = {
|
||||
# fzf.enable = true;
|
||||
# kitty.enable = true;
|
||||
# vesktop.enable = true;
|
||||
waybar.enable = false;
|
||||
};
|
||||
targets = {
|
||||
# fzf.enable = true;
|
||||
# kitty.enable = true;
|
||||
# vesktop.enable = true;
|
||||
waybar.enable = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -2,24 +2,23 @@
|
||||
pkgs,
|
||||
host,
|
||||
...
|
||||
}:
|
||||
let
|
||||
desktop = (host == "oganesson");
|
||||
extraFigletFonts = pkgs.fetchFromGitHub {
|
||||
owner = "xero";
|
||||
repo = "figlet-fonts";
|
||||
rev = "master";
|
||||
sha256 = "sha256-dAs7N66D2Fpy4/UB5Za1r2qb1iSAJR6TMmau1asxgtY=";
|
||||
};
|
||||
toilet-extrafonts = pkgs.toilet.overrideAttrs (oldAttrs: {
|
||||
buildInputs = oldAttrs.buildInputs or [] ++ [extraFigletFonts];
|
||||
}: let
|
||||
desktop = host == "oganesson";
|
||||
extraFigletFonts = pkgs.fetchFromGitHub {
|
||||
owner = "xero";
|
||||
repo = "figlet-fonts";
|
||||
rev = "master";
|
||||
sha256 = "sha256-dAs7N66D2Fpy4/UB5Za1r2qb1iSAJR6TMmau1asxgtY=";
|
||||
};
|
||||
toilet-extrafonts = pkgs.toilet.overrideAttrs (oldAttrs: {
|
||||
buildInputs = oldAttrs.buildInputs or [] ++ [extraFigletFonts];
|
||||
|
||||
installPhase = ''
|
||||
make install PREFIX=$out
|
||||
mkdir -p $out/share/figlet
|
||||
cp -r ${extraFigletFonts}/* $out/share/figlet
|
||||
'';
|
||||
});
|
||||
installPhase = ''
|
||||
make install PREFIX=$out
|
||||
mkdir -p $out/share/figlet
|
||||
cp -r ${extraFigletFonts}/* $out/share/figlet
|
||||
'';
|
||||
});
|
||||
|
||||
desktop_pkgs =
|
||||
if desktop
|
||||
@@ -37,9 +36,9 @@ in {
|
||||
[
|
||||
chafa
|
||||
nemo
|
||||
flavours
|
||||
ags
|
||||
sassc
|
||||
flavours
|
||||
ags
|
||||
sassc
|
||||
gtk3
|
||||
sqlite
|
||||
gimp
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
{
|
||||
host,
|
||||
...
|
||||
}:
|
||||
{host, ...}:
|
||||
# Grocery list:
|
||||
# Clock
|
||||
# CPU/MEM meters
|
||||
@@ -11,33 +8,37 @@ host,
|
||||
# secondary monitor will have a vertical bar on the left side
|
||||
# Can contain more info with two bars
|
||||
let
|
||||
desktop = (host == "oganesson");
|
||||
desktop = host == "oganesson";
|
||||
workspaces = {
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
"1" = "一";
|
||||
"2" = "二";
|
||||
"3" = "三";
|
||||
"4" = "四";
|
||||
"5" = "五";
|
||||
"6" = "六";
|
||||
};
|
||||
persistent-workspaces = if desktop then {
|
||||
"HDMI-A-1" = [ 1 2 3 ];
|
||||
"DP-1" = [ 4 5 6 ];
|
||||
} else {
|
||||
"eDP-1" = [ 1 2 3 4 ];
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
"1" = "一";
|
||||
"2" = "二";
|
||||
"3" = "三";
|
||||
"4" = "四";
|
||||
"5" = "五";
|
||||
"6" = "六";
|
||||
};
|
||||
persistent-workspaces =
|
||||
if desktop
|
||||
then {
|
||||
"HDMI-A-1" = [1 2 3];
|
||||
"DP-1" = [4 5 6];
|
||||
}
|
||||
else {
|
||||
"eDP-1" = [1 2 3 4];
|
||||
};
|
||||
};
|
||||
monitors = if desktop then [
|
||||
"DP-1"
|
||||
"HDMI-A-1"
|
||||
] else [
|
||||
"eDP-1"
|
||||
];
|
||||
|
||||
in
|
||||
{
|
||||
monitors =
|
||||
if desktop
|
||||
then [
|
||||
"DP-1"
|
||||
"HDMI-A-1"
|
||||
]
|
||||
else [
|
||||
"eDP-1"
|
||||
];
|
||||
in {
|
||||
programs.waybar.settings.mainBar = {
|
||||
layer = "bottom";
|
||||
output = builtins.elemAt monitors 0;
|
||||
@@ -45,7 +46,10 @@ in
|
||||
name = "mainBar";
|
||||
margin-left = 8;
|
||||
margin-top = 5;
|
||||
margin-right = if desktop then 8 else 5;
|
||||
margin-right =
|
||||
if desktop
|
||||
then 8
|
||||
else 5;
|
||||
mode = "dock";
|
||||
"gtk-layer-shell" = true;
|
||||
|
||||
@@ -81,7 +85,7 @@ in
|
||||
waves = false;
|
||||
noise_reduction = 0.77;
|
||||
input_delay = 2;
|
||||
format-icons = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█" ];
|
||||
format-icons = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
|
||||
};
|
||||
|
||||
"group/hardware" = {
|
||||
@@ -121,7 +125,15 @@ in
|
||||
rotate = 270;
|
||||
format = "{icon}";
|
||||
format-icons = [
|
||||
"" "" "" "" "" "" "" "" ""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
};
|
||||
|
||||
@@ -130,7 +142,15 @@ in
|
||||
rotate = 270;
|
||||
format = "{icon}";
|
||||
format-icons = [
|
||||
"" "" "" "" "" "" "" "" ""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
max-length = 10;
|
||||
tooltip-format = "RAM: {used:0.1f} GB / {total:0.1f} GB";
|
||||
@@ -141,7 +161,15 @@ in
|
||||
rotate = 270;
|
||||
format = "{icon}";
|
||||
format-icons = [
|
||||
"" "" "" "" "" "" "" "" ""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
tooltip-format = "CPU: {usage:0.1f}%";
|
||||
};
|
||||
@@ -182,15 +210,16 @@ in
|
||||
format = "{:%I:%M %p}";
|
||||
tooltip = false;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
};
|
||||
|
||||
# ------------------------------------------
|
||||
# ------------------------------------------
|
||||
|
||||
programs.waybar.settings.sideBar = {
|
||||
layer = "bottom";
|
||||
output = if desktop then builtins.elemAt monitors 1 else builtins.elemAt monitors 0;
|
||||
output =
|
||||
if desktop
|
||||
then builtins.elemAt monitors 1
|
||||
else builtins.elemAt monitors 0;
|
||||
position = "right";
|
||||
margin-top = 8;
|
||||
margin-right = 5;
|
||||
@@ -199,12 +228,15 @@ in
|
||||
mode = "dock";
|
||||
"gtk-layer-shell" = true;
|
||||
|
||||
modules-left = if desktop then [
|
||||
"hyprland/workspaces"
|
||||
] else [
|
||||
"group/brightness"
|
||||
"battery"
|
||||
];
|
||||
modules-left =
|
||||
if desktop
|
||||
then [
|
||||
"hyprland/workspaces"
|
||||
]
|
||||
else [
|
||||
"group/brightness"
|
||||
"battery"
|
||||
];
|
||||
modules-center = [
|
||||
];
|
||||
modules-right = [
|
||||
@@ -257,7 +289,15 @@ in
|
||||
tooltip-format-charging = "{capacity}%\nTil full: {time}";
|
||||
format = "{icon}";
|
||||
format-icons = [
|
||||
"" "" "" "" "" "" "" "" ""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
format-charging = "";
|
||||
};
|
||||
|
||||
@@ -1,33 +1,27 @@
|
||||
{
|
||||
scheme,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
bg = {
|
||||
darkester = scheme.base00;
|
||||
darkest = scheme.base01;
|
||||
darker = scheme.base02;
|
||||
dark = scheme.base03;
|
||||
};
|
||||
fg = {
|
||||
lightester = scheme.base07;
|
||||
lightest = scheme.base06;
|
||||
lighter = scheme.base05;
|
||||
light = scheme.base04;
|
||||
};
|
||||
colors = {
|
||||
color0 = scheme.base08;
|
||||
color1 = scheme.base09;
|
||||
color2 = scheme.base0A;
|
||||
color3 = scheme.base0B;
|
||||
color4 = scheme.base0C;
|
||||
color5 = scheme.base0D;
|
||||
color6 = scheme.base0E;
|
||||
color7 = scheme.base0F;
|
||||
};
|
||||
in
|
||||
{
|
||||
{scheme, ...}: let
|
||||
bg = {
|
||||
darkester = scheme.base00;
|
||||
darkest = scheme.base01;
|
||||
darker = scheme.base02;
|
||||
dark = scheme.base03;
|
||||
};
|
||||
fg = {
|
||||
lightester = scheme.base07;
|
||||
lightest = scheme.base06;
|
||||
lighter = scheme.base05;
|
||||
light = scheme.base04;
|
||||
};
|
||||
colors = {
|
||||
color0 = scheme.base08;
|
||||
color1 = scheme.base09;
|
||||
color2 = scheme.base0A;
|
||||
color3 = scheme.base0B;
|
||||
color4 = scheme.base0C;
|
||||
color5 = scheme.base0D;
|
||||
color6 = scheme.base0E;
|
||||
color7 = scheme.base0F;
|
||||
};
|
||||
in {
|
||||
programs.waybar.style = ''
|
||||
* {
|
||||
border: none;
|
||||
|
||||
@@ -1,111 +1,109 @@
|
||||
{ self, ...}:
|
||||
|
||||
{
|
||||
{self, ...}: {
|
||||
home.file.".config/neofetch/config.conf".text = ''
|
||||
username=$(whoami)
|
||||
name_length=''${#username}
|
||||
total_width=40
|
||||
side_length=$(( (total_width - name_length - 2) / 2 ))
|
||||
username=$(whoami)
|
||||
name_length=''${#username}
|
||||
total_width=40
|
||||
side_length=$(( (total_width - name_length - 2) / 2 ))
|
||||
|
||||
top_line=$(printf "─%.0s" $(seq 1 $side_length))
|
||||
top_line="$top_line $username "
|
||||
top_line+=$(printf "─%.0s" $(seq 1 $side_length))
|
||||
top_line=$(printf "─%.0s" $(seq 1 $side_length))
|
||||
top_line="$top_line $username "
|
||||
top_line+=$(printf "─%.0s" $(seq 1 $side_length))
|
||||
|
||||
if (( (total_width - name_length) % 2 != 0 )); then
|
||||
top_line+="─"
|
||||
fi
|
||||
if (( (total_width - name_length) % 2 != 0 )); then
|
||||
top_line+="─"
|
||||
fi
|
||||
|
||||
print_info() {
|
||||
prin "┌$top_line┐"
|
||||
info " " distro
|
||||
info " " kernel
|
||||
info " " wm
|
||||
info " " shell
|
||||
info " " term
|
||||
info " " term_font
|
||||
info " " packages
|
||||
prin "└────────────────────────────────────────┘"
|
||||
info cols
|
||||
prin "\n \n \n \n \n ''${cl3} \n \n ''${cl5} \n \n ''${cl2} \n \n ''${cl6} \n \n ''${cl4} \n \n ''${cl1} \n \n ''${cl7} \n \n ''${cl0}"
|
||||
}
|
||||
print_info() {
|
||||
prin "┌$top_line┐"
|
||||
info " " distro
|
||||
info " " kernel
|
||||
info " " wm
|
||||
info " " shell
|
||||
info " " term
|
||||
info " " term_font
|
||||
info " " packages
|
||||
prin "└────────────────────────────────────────┘"
|
||||
info cols
|
||||
prin "\n \n \n \n \n ''${cl3} \n \n ''${cl5} \n \n ''${cl2} \n \n ''${cl6} \n \n ''${cl4} \n \n ''${cl1} \n \n ''${cl7} \n \n ''${cl0}"
|
||||
}
|
||||
|
||||
kernel_shorthand="on"
|
||||
distro_shorthand="on"
|
||||
os_arch="off"
|
||||
uptime_shorthand="on"
|
||||
memory_percent="on"
|
||||
package_managers="off"
|
||||
shell_path="off"
|
||||
shell_version="on"
|
||||
speed_type="bios_limit"
|
||||
speed_shorthand="on"
|
||||
gtk_shorthand="on"
|
||||
gtk2="on"
|
||||
gtk3="on"
|
||||
colors=(distro)
|
||||
bold="on"
|
||||
underline_enabled="on"
|
||||
underline_char="-"
|
||||
separator=" "
|
||||
color_blocks="off"
|
||||
block_range=(0 15) # Colorblocks
|
||||
kernel_shorthand="on"
|
||||
distro_shorthand="on"
|
||||
os_arch="off"
|
||||
uptime_shorthand="on"
|
||||
memory_percent="on"
|
||||
package_managers="off"
|
||||
shell_path="off"
|
||||
shell_version="on"
|
||||
speed_type="bios_limit"
|
||||
speed_shorthand="on"
|
||||
gtk_shorthand="on"
|
||||
gtk2="on"
|
||||
gtk3="on"
|
||||
colors=(distro)
|
||||
bold="on"
|
||||
underline_enabled="on"
|
||||
underline_char="-"
|
||||
separator=" "
|
||||
color_blocks="off"
|
||||
block_range=(0 15) # Colorblocks
|
||||
|
||||
# Colors for custom colorblocks
|
||||
magenta="\033[1;35m"
|
||||
green="\033[1;32m"
|
||||
white="\033[1;37m"
|
||||
blue="\033[1;34m"
|
||||
red="\033[1;31m"
|
||||
black="\033[1;40;30m"
|
||||
yellow="\033[1;33m"
|
||||
cyan="\033[1;36m"
|
||||
reset="\033[0m"
|
||||
bgyellow="\033[1;43;33m"
|
||||
bgwhite="\033[1;47;37m"
|
||||
cl0="''${reset}"
|
||||
cl1="''${magenta}"
|
||||
cl2="''${green}"
|
||||
cl3="''${white}"
|
||||
cl4="''${blue}"
|
||||
cl5="''${red}"
|
||||
cl6="''${yellow}"
|
||||
cl7="''${cyan}"
|
||||
cl8="''${black}"
|
||||
cl9="''${bgyellow}"
|
||||
cl10="''${bgwhite}"
|
||||
# Colors for custom colorblocks
|
||||
magenta="\033[1;35m"
|
||||
green="\033[1;32m"
|
||||
white="\033[1;37m"
|
||||
blue="\033[1;34m"
|
||||
red="\033[1;31m"
|
||||
black="\033[1;40;30m"
|
||||
yellow="\033[1;33m"
|
||||
cyan="\033[1;36m"
|
||||
reset="\033[0m"
|
||||
bgyellow="\033[1;43;33m"
|
||||
bgwhite="\033[1;47;37m"
|
||||
cl0="''${reset}"
|
||||
cl1="''${magenta}"
|
||||
cl2="''${green}"
|
||||
cl3="''${white}"
|
||||
cl4="''${blue}"
|
||||
cl5="''${red}"
|
||||
cl6="''${yellow}"
|
||||
cl7="''${cyan}"
|
||||
cl8="''${black}"
|
||||
cl9="''${bgyellow}"
|
||||
cl10="''${bgwhite}"
|
||||
|
||||
block_width=4
|
||||
block_height=1
|
||||
block_width=4
|
||||
block_height=1
|
||||
|
||||
bar_char_elapsed="-"
|
||||
bar_char_total="="
|
||||
bar_border="on"
|
||||
bar_length=15
|
||||
bar_color_elapsed="distro"
|
||||
bar_color_total="distro"
|
||||
bar_char_elapsed="-"
|
||||
bar_char_total="="
|
||||
bar_border="on"
|
||||
bar_length=15
|
||||
bar_color_elapsed="distro"
|
||||
bar_color_total="distro"
|
||||
|
||||
cpu_display="on"
|
||||
memory_display="on"
|
||||
battery_display="on"
|
||||
disk_display="on"
|
||||
cpu_display="on"
|
||||
memory_display="on"
|
||||
battery_display="on"
|
||||
disk_display="on"
|
||||
|
||||
image_backend="kitty"
|
||||
image_source="${self}/assets/images/nixos-logo.png"
|
||||
image_size="250px"
|
||||
image_loop="off"
|
||||
image_backend="kitty"
|
||||
image_source="${self}/assets/images/nixos-logo.png"
|
||||
image_size="250px"
|
||||
image_loop="off"
|
||||
|
||||
aascii_distro="auto"
|
||||
ascii_colors=(distro)
|
||||
ascii_bold="on"
|
||||
aascii_distro="auto"
|
||||
ascii_colors=(distro)
|
||||
ascii_bold="on"
|
||||
|
||||
crop_mode="normal"
|
||||
crop_offset="center"
|
||||
crop_mode="normal"
|
||||
crop_offset="center"
|
||||
|
||||
gap=2
|
||||
gap=2
|
||||
|
||||
yoffset=0
|
||||
xoffset=0
|
||||
yoffset=0
|
||||
xoffset=0
|
||||
|
||||
stdout="off"
|
||||
stdout="off"
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
host,
|
||||
pkgs,
|
||||
pkgs,
|
||||
self,
|
||||
inputs,
|
||||
username,
|
||||
wallpaper,
|
||||
scheme,
|
||||
wallpaper,
|
||||
scheme,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
@@ -27,8 +27,8 @@ in {
|
||||
programs.home-manager.enable = true;
|
||||
imports = [
|
||||
./programs
|
||||
./environment
|
||||
./scripts
|
||||
./environment
|
||||
./scripts
|
||||
./files.nix
|
||||
];
|
||||
home = {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
host,
|
||||
nur,
|
||||
nixvim,
|
||||
nixvim,
|
||||
self,
|
||||
inputs,
|
||||
username,
|
||||
@@ -9,7 +9,7 @@
|
||||
home-manager,
|
||||
...
|
||||
}: let
|
||||
desktop = (host == "onagesson");
|
||||
desktop = host == "onagesson";
|
||||
desktop_modules =
|
||||
if desktop
|
||||
then [(import ./gaming)]
|
||||
@@ -28,5 +28,5 @@ in {
|
||||
++ [(import ./password-store.nix)]
|
||||
++ [(import ./autojump.nix)]
|
||||
++ [(import ./firefox.nix)]
|
||||
++ desktop_modules;
|
||||
++ desktop_modules;
|
||||
}
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
{pkgs, scheme, ...}: {
|
||||
{
|
||||
pkgs,
|
||||
scheme,
|
||||
...
|
||||
}: {
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
|
||||
|
||||
settings = {
|
||||
confirm_os_window_close = 0;
|
||||
window_padding_width = 4;
|
||||
@@ -31,40 +34,40 @@
|
||||
"ctrl+shift+right" = "no_op";
|
||||
};
|
||||
|
||||
extraConfig = ''
|
||||
background #${scheme.base00}
|
||||
foreground #${scheme.base05}
|
||||
selection_background #${scheme.base05}
|
||||
selection_foreground #${scheme.base00}
|
||||
url_color #${scheme.base04}
|
||||
cursor #${scheme.base05}
|
||||
active_border_color #${scheme.base03}
|
||||
inactive_border_color #${scheme.base01}
|
||||
active_tab_background #${scheme.base00}
|
||||
active_tab_foreground #${scheme.base05}
|
||||
inactive_tab_background #${scheme.base01}
|
||||
inactive_tab_foreground #${scheme.base04}
|
||||
tab_bar_background #${scheme.base01}
|
||||
extraConfig = ''
|
||||
background #${scheme.base00}
|
||||
foreground #${scheme.base05}
|
||||
selection_background #${scheme.base05}
|
||||
selection_foreground #${scheme.base00}
|
||||
url_color #${scheme.base04}
|
||||
cursor #${scheme.base05}
|
||||
active_border_color #${scheme.base03}
|
||||
inactive_border_color #${scheme.base01}
|
||||
active_tab_background #${scheme.base00}
|
||||
active_tab_foreground #${scheme.base05}
|
||||
inactive_tab_background #${scheme.base01}
|
||||
inactive_tab_foreground #${scheme.base04}
|
||||
tab_bar_background #${scheme.base01}
|
||||
|
||||
# normal
|
||||
color0 #${scheme.base01}
|
||||
color1 #${scheme.base08}
|
||||
color2 #${scheme.base0B}
|
||||
color3 #${scheme.base0A}
|
||||
color4 #${scheme.base0D}
|
||||
color5 #${scheme.base0E}
|
||||
color6 #${scheme.base0C}
|
||||
color7 #${scheme.base05}
|
||||
# normal
|
||||
color0 #${scheme.base01}
|
||||
color1 #${scheme.base08}
|
||||
color2 #${scheme.base0B}
|
||||
color3 #${scheme.base0A}
|
||||
color4 #${scheme.base0D}
|
||||
color5 #${scheme.base0E}
|
||||
color6 #${scheme.base0C}
|
||||
color7 #${scheme.base05}
|
||||
|
||||
# bright
|
||||
color8 #${scheme.base03}
|
||||
color9 #${scheme.base09}
|
||||
color10 #${scheme.base01}
|
||||
color11 #${scheme.base02}
|
||||
color12 #${scheme.base04}
|
||||
color13 #${scheme.base06}
|
||||
color14 #${scheme.base0F}
|
||||
color15 #${scheme.base07}
|
||||
'';
|
||||
# bright
|
||||
color8 #${scheme.base03}
|
||||
color9 #${scheme.base09}
|
||||
color10 #${scheme.base01}
|
||||
color11 #${scheme.base02}
|
||||
color12 #${scheme.base04}
|
||||
color13 #${scheme.base06}
|
||||
color14 #${scheme.base0F}
|
||||
color15 #${scheme.base07}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
pkgs,
|
||||
}:
|
||||
pkgs.writeShellScriptBin "splash" ''
|
||||
#!/bin/bash
|
||||
#!/bin/bash
|
||||
|
||||
echo "NixOS kernel ver. $(uname -a | awk '{print $3}') x86_64 GNU/Linux"
|
||||
date +"%A %B %-d %Y"
|
||||
echo
|
||||
echo " NixOS" | toilet -f 3d | lolcat -S 25
|
||||
echo "NixOS kernel ver. $(uname -a | awk '{print $3}') x86_64 GNU/Linux"
|
||||
date +"%A %B %-d %Y"
|
||||
echo
|
||||
echo " NixOS" | toilet -f 3d | lolcat -S 25
|
||||
echo
|
||||
''
|
||||
|
||||
@@ -1,83 +1,82 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
{pkgs, ...}:
|
||||
pkgs.writeShellScriptBin "toolbelt" ''
|
||||
hostname=$(cat /etc/hostname)
|
||||
hostname=$(cat /etc/hostname)
|
||||
|
||||
cliphistory() {
|
||||
selection=$(cliphist list | fzf --preview="
|
||||
index=\$(echo {} | awk '{print \$1}'); \
|
||||
mime=\$(cliphist decode \$index | file -i -); \
|
||||
if echo \"\$mime\" | grep -q 'image'; then \
|
||||
echo \$(cliphist list | rg \"^\$index\" | cut -d ' ' -f 2- | fmt -w 30); \
|
||||
else \
|
||||
cliphist decode \"\$index\" | fmt -w 30; \
|
||||
fi" --prompt="> " | awk '{print $1}')
|
||||
[ -z "$selection" ] && return 1
|
||||
cliphist decode "$selection" | wl-copy
|
||||
}
|
||||
btop_cmd() {
|
||||
if [ "$hostname" = 'oganesson' ]; then
|
||||
hyprctl dispatch resizeactive 20% 140% &&
|
||||
moveonscreen --center &&
|
||||
btop &&
|
||||
hyprctl dispatch resizeactive exact 40% 25% &&
|
||||
moveonscreen
|
||||
else
|
||||
hyprctl dispatch resizeactive exact 60% 68% &&
|
||||
moveonscreen --center &&
|
||||
btop &&
|
||||
hyprctl dispatch resizeactive exact 40% 25% &&
|
||||
moveonscreen
|
||||
fi
|
||||
}
|
||||
cliphistory() {
|
||||
selection=$(cliphist list | fzf --preview="
|
||||
index=\$(echo {} | awk '{print \$1}'); \
|
||||
mime=\$(cliphist decode \$index | file -i -); \
|
||||
if echo \"\$mime\" | grep -q 'image'; then \
|
||||
echo \$(cliphist list | rg \"^\$index\" | cut -d ' ' -f 2- | fmt -w 30); \
|
||||
else \
|
||||
cliphist decode \"\$index\" | fmt -w 30; \
|
||||
fi" --prompt="> " | awk '{print $1}')
|
||||
[ -z "$selection" ] && return 1
|
||||
cliphist decode "$selection" | wl-copy
|
||||
}
|
||||
btop_cmd() {
|
||||
if [ "$hostname" = 'oganesson' ]; then
|
||||
hyprctl dispatch resizeactive 20% 140% &&
|
||||
moveonscreen --center &&
|
||||
btop &&
|
||||
hyprctl dispatch resizeactive exact 40% 25% &&
|
||||
moveonscreen
|
||||
else
|
||||
hyprctl dispatch resizeactive exact 60% 68% &&
|
||||
moveonscreen --center &&
|
||||
btop &&
|
||||
hyprctl dispatch resizeactive exact 40% 25% &&
|
||||
moveonscreen
|
||||
fi
|
||||
}
|
||||
|
||||
running=true
|
||||
running=true
|
||||
|
||||
declare -A commands=(
|
||||
["Change Wallpaper"]="moveonscreen --center && if chpaper; then running=false; else moveonscreen; fi"
|
||||
["Change System Color Scheme"]="hyprctl dispatch resizeactive 10% 80% && moveonscreen --center && if chscheme; then running=false; else hyprctl dispatch resizeactive exact 40% 25% && moveonscreen; fi"
|
||||
["Open System Monitor"]="hyprctl dispatch resizeactive 20% 140% && moveonscreen --center && btop_cmd && hyprctl dispatch resizeactive exact 40% 25% && moveonscreen"
|
||||
["Open Volume Controls"]="hyprctl dispatch resizeactive 10% 80% && moveonscreen --center && alsamixer && hyprctl dispatch resizeactive exact 40% 25% && moveonscreen"
|
||||
["Open Keyring"]="hyprctl dispatch resizeactive -300 0 && moveonscreen && if keyring; then running=false; else hyprctl dispatch resizeactive exact 40% 25% && moveonscreen; fi"
|
||||
["View Clipboard History"]="hyprctl dispatch resizeactive 45% 120% && moveonscreen --center && if cliphistory;then running=false; else hyprctl dispatch resizeactive exact 40% 25% && moveonscreen; fi"
|
||||
)
|
||||
declare -A commands=(
|
||||
["Change Wallpaper"]="moveonscreen --center && if chpaper; then running=false; else moveonscreen; fi"
|
||||
["Change System Color Scheme"]="hyprctl dispatch resizeactive 10% 80% && moveonscreen --center && if chscheme; then running=false; else hyprctl dispatch resizeactive exact 40% 25% && moveonscreen; fi"
|
||||
["Open System Monitor"]="hyprctl dispatch resizeactive 20% 140% && moveonscreen --center && btop_cmd && hyprctl dispatch resizeactive exact 40% 25% && moveonscreen"
|
||||
["Open Volume Controls"]="hyprctl dispatch resizeactive 10% 80% && moveonscreen --center && alsamixer && hyprctl dispatch resizeactive exact 40% 25% && moveonscreen"
|
||||
["Open Keyring"]="hyprctl dispatch resizeactive -300 0 && moveonscreen && if keyring; then running=false; else hyprctl dispatch resizeactive exact 40% 25% && moveonscreen; fi"
|
||||
["View Clipboard History"]="hyprctl dispatch resizeactive 45% 120% && moveonscreen --center && if cliphistory;then running=false; else hyprctl dispatch resizeactive exact 40% 25% && moveonscreen; fi"
|
||||
)
|
||||
|
||||
ordered_commands=(
|
||||
"Open Keyring"
|
||||
"Open System Monitor"
|
||||
"Open Volume Controls"
|
||||
"Change Wallpaper"
|
||||
"Change System Color Scheme"
|
||||
"View Clipboard History"
|
||||
)
|
||||
ordered_commands=(
|
||||
"Open Keyring"
|
||||
"Open System Monitor"
|
||||
"Open Volume Controls"
|
||||
"Change Wallpaper"
|
||||
"Change System Color Scheme"
|
||||
"View Clipboard History"
|
||||
)
|
||||
|
||||
# Use fzf to select a command with preview
|
||||
while $running; do
|
||||
selected_command=$(printf "%s\n" "''${ordered_commands[@]}" | fzf --preview="
|
||||
cleaned_key=\$(echo {} | tr -d \"'\"); \
|
||||
echo \"Cleaned key: \$cleaned_key\"; \
|
||||
declare -A descriptions=(
|
||||
[\"Change Wallpaper\"]=\"Choose a wallpaper to switch to from the assets/wallpapers folder in the system flake directory. Requires rebuilding the system and restarting hyprpaper.\"
|
||||
[\"Change System Color Scheme\"]=\"Changes the base16 color scheme used by stylix to color system applications.\"
|
||||
[\"Open System Monitor\"]=\"Opens a btop window.\"
|
||||
[\"Open Volume Controls\"]=\"Opens alsamixer.\"
|
||||
[\"Open Keyring\"]=\"Opens a fuzzy finder with all of the paths held in ~/.password-store. Selecting one uses pass to copy that password to the clipboard. Password is cleared from clipboard history after 45 seconds.\"
|
||||
[\"View Clipboard History\"]=\"Opens clipboard history. Selecting an item copies it to the clipboard.\"
|
||||
); \
|
||||
if [[ -v descriptions[\$cleaned_key] ]]; then \
|
||||
clear; \
|
||||
echo \''${descriptions[\$cleaned_key]} | fmt -w 28; \
|
||||
else \
|
||||
clear; \
|
||||
echo \"No description available\"; \
|
||||
fi" --prompt="> ")
|
||||
# Use fzf to select a command with preview
|
||||
while $running; do
|
||||
selected_command=$(printf "%s\n" "''${ordered_commands[@]}" | fzf --preview="
|
||||
cleaned_key=\$(echo {} | tr -d \"'\"); \
|
||||
echo \"Cleaned key: \$cleaned_key\"; \
|
||||
declare -A descriptions=(
|
||||
[\"Change Wallpaper\"]=\"Choose a wallpaper to switch to from the assets/wallpapers folder in the system flake directory. Requires rebuilding the system and restarting hyprpaper.\"
|
||||
[\"Change System Color Scheme\"]=\"Changes the base16 color scheme used by stylix to color system applications.\"
|
||||
[\"Open System Monitor\"]=\"Opens a btop window.\"
|
||||
[\"Open Volume Controls\"]=\"Opens alsamixer.\"
|
||||
[\"Open Keyring\"]=\"Opens a fuzzy finder with all of the paths held in ~/.password-store. Selecting one uses pass to copy that password to the clipboard. Password is cleared from clipboard history after 45 seconds.\"
|
||||
[\"View Clipboard History\"]=\"Opens clipboard history. Selecting an item copies it to the clipboard.\"
|
||||
); \
|
||||
if [[ -v descriptions[\$cleaned_key] ]]; then \
|
||||
clear; \
|
||||
echo \''${descriptions[\$cleaned_key]} | fmt -w 28; \
|
||||
else \
|
||||
clear; \
|
||||
echo \"No description available\"; \
|
||||
fi" --prompt="> ")
|
||||
|
||||
|
||||
#Execute the selected command if selection is not empty
|
||||
if [[ -n $selected_command ]]; then
|
||||
eval "''${commands[$selected_command]}"
|
||||
else
|
||||
running=false
|
||||
fi
|
||||
done
|
||||
#Execute the selected command if selection is not empty
|
||||
if [[ -n $selected_command ]]; then
|
||||
eval "''${commands[$selected_command]}"
|
||||
else
|
||||
running=false
|
||||
fi
|
||||
done
|
||||
''
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
{
|
||||
pkgs,
|
||||
}:
|
||||
|
||||
{pkgs}:
|
||||
pkgs.writeShellScriptBin "viconf" ''
|
||||
#!/usr/bin/env bash
|
||||
|
||||
|
||||
@@ -41,19 +41,19 @@
|
||||
self = self;
|
||||
pkgs = pkgs;
|
||||
};
|
||||
moveonscreen = import ./wm-controls/moveonscreen.nix { pkgs = pkgs; };
|
||||
toolbelt = import ./commands/toolbelt.nix { pkgs = pkgs; };
|
||||
moveonscreen = import ./wm-controls/moveonscreen.nix {pkgs = pkgs;};
|
||||
toolbelt = import ./commands/toolbelt.nix {pkgs = pkgs;};
|
||||
viconf = import ./commands/viconf.nix {
|
||||
pkgs = pkgs;
|
||||
};
|
||||
chscheme = import ./wm-controls/chscheme.nix {
|
||||
pkgs = pkgs;
|
||||
};
|
||||
chpaper = import ./wm-controls/chpaper.nix { pkgs = pkgs; };
|
||||
chscheme = import ./wm-controls/chscheme.nix {
|
||||
pkgs = pkgs;
|
||||
};
|
||||
chpaper = import ./wm-controls/chpaper.nix {pkgs = pkgs;};
|
||||
in {
|
||||
home.packages = [
|
||||
chpaper
|
||||
chscheme
|
||||
chscheme
|
||||
keyring
|
||||
garbage-collect
|
||||
invoke
|
||||
|
||||
@@ -1,16 +1,15 @@
|
||||
{ pkgs }:
|
||||
|
||||
{pkgs}:
|
||||
pkgs.writeShellScriptBin "chpaper" ''
|
||||
paper="$\{self}/assets/wallpapers/$(find "$FLAKEPATH"/assets/wallpapers -exec basename {} \; | rg "\.\w+$" | fzf --preview "chafa -s 30x40 $FLAKEPATH/assets/wallpapers/{}")"
|
||||
[ "$paper" = "$\{self}/assets/wallpapers/" ] && echo "Cancelling wallpaper change" && exit 1
|
||||
echo "$paper" | xargs -I {} sed -i '/wallpaper =/s|"[^"]*"|"{}"|' "$FLAKEPATH"/flake.nix
|
||||
echo "Successfully changed wallpaper. Rebuild now?" && \
|
||||
select choice in "Yes" "No"; do
|
||||
case $choice in
|
||||
"Yes")
|
||||
rebuild;pkill -9 hyprpaper;exit 0;;
|
||||
"No")
|
||||
echo "Exiting...";exit 0;;
|
||||
esac
|
||||
done
|
||||
paper="$\{self}/assets/wallpapers/$(find "$FLAKEPATH"/assets/wallpapers -exec basename {} \; | rg "\.\w+$" | fzf --preview "chafa -s 30x40 $FLAKEPATH/assets/wallpapers/{}")"
|
||||
[ "$paper" = "$\{self}/assets/wallpapers/" ] && echo "Cancelling wallpaper change" && exit 1
|
||||
echo "$paper" | xargs -I {} sed -i '/wallpaper =/s|"[^"]*"|"{}"|' "$FLAKEPATH"/flake.nix
|
||||
echo "Successfully changed wallpaper. Rebuild now?" && \
|
||||
select choice in "Yes" "No"; do
|
||||
case $choice in
|
||||
"Yes")
|
||||
rebuild;pkill -9 hyprpaper;exit 0;;
|
||||
"No")
|
||||
echo "Exiting...";exit 0;;
|
||||
esac
|
||||
done
|
||||
''
|
||||
|
||||
@@ -1,42 +1,40 @@
|
||||
{
|
||||
pkgs,
|
||||
}:
|
||||
{pkgs}:
|
||||
pkgs.writeShellScriptBin "chscheme" ''
|
||||
selected_scheme=$(/usr/bin/env ls "$(nix-build '<nixpkgs>' -A base16-schemes)"/share/themes | \
|
||||
sed 's/\.yaml//g' | \
|
||||
fzf --preview 'cat $(nix-build "<nixpkgs>" -A base16-schemes)/share/themes/{}.yaml | \
|
||||
while IFS=": " read -r key value; do \
|
||||
if [[ $key =~ base0[0-9A-F] ]]; then \
|
||||
clean_value=$(echo $value | tr -d "\""); \
|
||||
r=$((16#''${clean_value:0:2})); \
|
||||
g=$((16#''${clean_value:2:2})); \
|
||||
b=$((16#''${clean_value:4:2})); \
|
||||
printf "\033[48;2;%d;%d;%dm %-20s %s \033[0m\n" $r $g $b $key $clean_value; \
|
||||
fi; \
|
||||
done')
|
||||
selected_scheme=$(/usr/bin/env ls "$(nix-build '<nixpkgs>' -A base16-schemes)"/share/themes | \
|
||||
sed 's/\.yaml//g' | \
|
||||
fzf --preview 'cat $(nix-build "<nixpkgs>" -A base16-schemes)/share/themes/{}.yaml | \
|
||||
while IFS=": " read -r key value; do \
|
||||
if [[ $key =~ base0[0-9A-F] ]]; then \
|
||||
clean_value=$(echo $value | tr -d "\""); \
|
||||
r=$((16#''${clean_value:0:2})); \
|
||||
g=$((16#''${clean_value:2:2})); \
|
||||
b=$((16#''${clean_value:4:2})); \
|
||||
printf "\033[48;2;%d;%d;%dm %-20s %s \033[0m\n" $r $g $b $key $clean_value; \
|
||||
fi; \
|
||||
done')
|
||||
|
||||
if [[ -z "$selected_scheme" ]]; then
|
||||
echo "Aborting color scheme change."
|
||||
exit 1
|
||||
fi
|
||||
if [[ -z "$selected_scheme" ]]; then
|
||||
echo "Aborting color scheme change."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "$selected_scheme" | xargs -I {} sed -i '/base16scheme\s*=\s*"/s/"[^"]*"/"{}"/' "$FLAKEPATH"/flake.nix
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Failed to change color scheme."
|
||||
exit 1
|
||||
fi
|
||||
echo "$selected_scheme" | xargs -I {} sed -i '/base16scheme\s*=\s*"/s/"[^"]*"/"{}"/' "$FLAKEPATH"/flake.nix
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Failed to change color scheme."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Successfully changed system color scheme. Rebuild now?"
|
||||
select choice in "Yes" "No"; do
|
||||
case $choice in
|
||||
"Yes")
|
||||
rebuild
|
||||
exit 0
|
||||
;;
|
||||
"No")
|
||||
echo "Exiting..."
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
done
|
||||
echo "Successfully changed system color scheme. Rebuild now?"
|
||||
select choice in "Yes" "No"; do
|
||||
case $choice in
|
||||
"Yes")
|
||||
rebuild
|
||||
exit 0
|
||||
;;
|
||||
"No")
|
||||
echo "Exiting..."
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
done
|
||||
''
|
||||
|
||||
@@ -1,77 +1,76 @@
|
||||
{ pkgs }:
|
||||
|
||||
{pkgs}:
|
||||
pkgs.writeShellScriptBin "moveonscreen" ''
|
||||
center_window=false
|
||||
if [[ $1 == "--center" ]]; then
|
||||
center_window=true
|
||||
fi
|
||||
center_window=false
|
||||
if [[ $1 == "--center" ]]; then
|
||||
center_window=true
|
||||
fi
|
||||
|
||||
cursor_pos=$(hyprctl cursorpos | sed 's/,//')
|
||||
cursor_x=$(echo "$cursor_pos" | awk '{print $1}')
|
||||
cursor_y=$(echo "$cursor_pos" | awk '{print $2}')
|
||||
cursor_pos=$(hyprctl cursorpos | sed 's/,//')
|
||||
cursor_x=$(echo "$cursor_pos" | awk '{print $1}')
|
||||
cursor_y=$(echo "$cursor_pos" | awk '{print $2}')
|
||||
|
||||
|
||||
window_info=$(hyprctl activewindow -j)
|
||||
window_width=$(echo "$window_info" | jq ".size[0]")
|
||||
window_height=$(echo "$window_info" | jq ".size[1]")
|
||||
window_info=$(hyprctl activewindow -j)
|
||||
window_width=$(echo "$window_info" | jq ".size[0]")
|
||||
window_height=$(echo "$window_info" | jq ".size[1]")
|
||||
|
||||
|
||||
if [ "$center_window" = true ]; then
|
||||
cursor_x=$((cursor_x - window_width / 2))
|
||||
cursor_y=$((cursor_y - window_height / 2))
|
||||
if [ "$center_window" = true ]; then
|
||||
cursor_x=$((cursor_x - window_width / 2))
|
||||
cursor_y=$((cursor_y - window_height / 2))
|
||||
|
||||
if (( cursor_x < 10 )); then
|
||||
cursor_x=10
|
||||
fi
|
||||
if (( cursor_y < 54 )); then
|
||||
cursor_y=54
|
||||
fi
|
||||
fi
|
||||
if (( cursor_x < 10 )); then
|
||||
cursor_x=10
|
||||
fi
|
||||
if (( cursor_y < 54 )); then
|
||||
cursor_y=54
|
||||
fi
|
||||
fi
|
||||
|
||||
monitors=$(hyprctl monitors -j)
|
||||
monitors=$(hyprctl monitors -j)
|
||||
|
||||
monitor_x_min=0
|
||||
monitor_x_max=0
|
||||
monitor_y_min=0
|
||||
monitor_y_max=0
|
||||
focused_monitor=-1
|
||||
monitor_x_min=0
|
||||
monitor_x_max=0
|
||||
monitor_y_min=0
|
||||
monitor_y_max=0
|
||||
focused_monitor=-1
|
||||
|
||||
for ((i = 0; i < $(echo "$monitors" | jq 'length'); i++)); do
|
||||
mon_x=$(echo "$monitors" | jq ".[$i].x")
|
||||
mon_y=$(echo "$monitors" | jq ".[$i].y")
|
||||
mon_width=$(echo "$monitors" | jq ".[$i].width")
|
||||
mon_height=$(echo "$monitors" | jq ".[$i].height")
|
||||
is_focused=$(echo "$monitors" | jq ".[$i].focused")
|
||||
for ((i = 0; i < $(echo "$monitors" | jq 'length'); i++)); do
|
||||
mon_x=$(echo "$monitors" | jq ".[$i].x")
|
||||
mon_y=$(echo "$monitors" | jq ".[$i].y")
|
||||
mon_width=$(echo "$monitors" | jq ".[$i].width")
|
||||
mon_height=$(echo "$monitors" | jq ".[$i].height")
|
||||
is_focused=$(echo "$monitors" | jq ".[$i].focused")
|
||||
|
||||
if [ "$is_focused" = true ]; then
|
||||
monitor_x_min=$((mon_x + 10))
|
||||
monitor_x_max=$((mon_x + mon_width - 10))
|
||||
monitor_y_min=$((mon_y + 10))
|
||||
monitor_y_max=$((mon_y + mon_height - 10))
|
||||
focused_monitor=$i
|
||||
break
|
||||
fi
|
||||
done
|
||||
if [ "$is_focused" = true ]; then
|
||||
monitor_x_min=$((mon_x + 10))
|
||||
monitor_x_max=$((mon_x + mon_width - 10))
|
||||
monitor_y_min=$((mon_y + 10))
|
||||
monitor_y_max=$((mon_y + mon_height - 10))
|
||||
focused_monitor=$i
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
if [ "$focused_monitor" -eq -1 ]; then
|
||||
exit 1
|
||||
fi
|
||||
if [ "$focused_monitor" -eq -1 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if (( cursor_x < monitor_x_min )); then
|
||||
adjusted_x=$monitor_x_min
|
||||
elif (( cursor_x + window_width > monitor_x_max )); then
|
||||
adjusted_x=$((monitor_x_max - window_width))
|
||||
else
|
||||
adjusted_x=$cursor_x
|
||||
fi
|
||||
if (( cursor_x < monitor_x_min )); then
|
||||
adjusted_x=$monitor_x_min
|
||||
elif (( cursor_x + window_width > monitor_x_max )); then
|
||||
adjusted_x=$((monitor_x_max - window_width))
|
||||
else
|
||||
adjusted_x=$cursor_x
|
||||
fi
|
||||
|
||||
if (( cursor_y < monitor_y_min )); then
|
||||
adjusted_y=$monitor_y_min
|
||||
elif (( cursor_y + window_height > monitor_y_max )); then
|
||||
adjusted_y=$((monitor_y_max - window_height))
|
||||
else
|
||||
adjusted_y=$cursor_y
|
||||
fi
|
||||
if (( cursor_y < monitor_y_min )); then
|
||||
adjusted_y=$monitor_y_min
|
||||
elif (( cursor_y + window_height > monitor_y_max )); then
|
||||
adjusted_y=$((monitor_y_max - window_height))
|
||||
else
|
||||
adjusted_y=$cursor_y
|
||||
fi
|
||||
|
||||
hyprctl dispatch moveactive exact "$adjusted_x $adjusted_y" > /dev/null 2>&1
|
||||
hyprctl dispatch moveactive exact "$adjusted_x $adjusted_y" > /dev/null 2>&1
|
||||
''
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
{config,inputs,scheme,wallpaper,username,...}:
|
||||
|
||||
{}
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
scheme,
|
||||
wallpaper,
|
||||
username,
|
||||
...
|
||||
}: {}
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
{ config, pkgs, username, ... }:
|
||||
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
username,
|
||||
...
|
||||
}: {
|
||||
systemd.user.tmpfiles.users."${username}".rules = [
|
||||
"d /home/${username}/media 0770 ${username} users -"
|
||||
"d /home/${username}/backup 0770 ${username} users -"
|
||||
@@ -10,6 +13,4 @@
|
||||
"d /home/${username}/inbox 0770 ${username} users -"
|
||||
"d /home/${username}/outbox 0770 ${username} users -"
|
||||
];
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -6,12 +6,11 @@
|
||||
username,
|
||||
host,
|
||||
...
|
||||
}: {
|
||||
}: {
|
||||
imports = [
|
||||
./hardware
|
||||
./software
|
||||
./environment
|
||||
../home/home-manager.nix
|
||||
];
|
||||
./hardware
|
||||
./software
|
||||
./environment
|
||||
../home/home-manager.nix
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
{
|
||||
inputs,
|
||||
nixpkgs,
|
||||
nixvim,
|
||||
nixvim,
|
||||
config,
|
||||
self,
|
||||
username,
|
||||
host,
|
||||
...
|
||||
}: {
|
||||
}: {
|
||||
imports =
|
||||
[(import ./sddm.nix)]
|
||||
[(import ./sddm.nix)]
|
||||
++ [(import ./issue.nix)]
|
||||
++ [(import ./stylix.nix)];
|
||||
++ [(import ./stylix.nix)];
|
||||
}
|
||||
|
||||
@@ -1,31 +1,29 @@
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
{...}: {
|
||||
environment.etc."issue".text = ''
|
||||
|
||||
\e[38;5;27m▓▓▓▓ \e[38;5;81m▒▒▒▒ ▒▒▒▒
|
||||
\e[38;5;27m▓▓▓▓ \e[38;5;81m▒▒▒▒ ▒▒▒▒ \e[38;5;27m ▓▓▓
|
||||
\e[38;5;27m▓▓▓▓ \e[38;5;81m▒▒▒▒▒▒▒▒ \e[38;5;27m ▓▓▓ ▓▓ ▓▓▓▓▓ \e[38;5;81m ▒▒▒▒▒▒▒▒▒ ▒▒▒▒▒▒▒▒▒
|
||||
\e[38;5;27m▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓\e[38;5;81m▒▒▒▒▒▒ \e[38;5;27m▓▓ \e[38;5;27m ▓▓▓▓▓ ▓▓▓▓ ▓▓▓ \e[38;5;81m ▒▒▒▒▒▒▒▒▒▒▒ ▒▒▒▒▒▒▒▒▒▒▒
|
||||
\e[38;5;27m▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓\e[38;5;81m▒▒▒▒ \e[38;5;27m▓▓▓ \e[38;5;27m ▓▓▓▓▓▓ ▓▓▓▓ \e[38;5;81m ▒▒▒▒▒ ▒▒▒▒▒ ▒▒▒▒ ▒▒▒▒▒
|
||||
\e[38;5;81m▒▒▒▒ \e[38;5;81m▒▒▒▒ \e[38;5;27m▓▓▓▓ \e[38;5;27m ▓▓▓▓▓▓▓ ▓▓▓▓ \e[38;5;81m ▒▒▒▒ ▒▒▒▒ ▒▒▒▒
|
||||
\e[38;5;81m▒▒▒▒ \e[38;5;81m▒▒▒▒\e[38;5;27m▓▓▓▓ \e[38;5;27m ▓▓▓▓▓▓▓▓ ▓▓▓▓ ▓▓▓▓ ▓▓▓ ▓▓▓ \e[38;5;81m ▒▒▒ ▒▒▒ ▒▒▒▒
|
||||
\e[38;5;81m▒▒▒▒▒▒▒▒▒▒▒ \e[38;5;81m▒▒\e[38;5;27m▓▓▓▓ \e[38;5;27m ▓▓▓▓ ▓▓▓▓ ▓▓▓▓ ▓▓▓▓ ▓▓▓▓ ▓▓▓▓ \e[38;5;81m ▒▒▒ ▒▒▒ ▒▒▒▒▒
|
||||
\e[38;5;81m ▒▒▒▒▒▒▒▒▒\e[38;5;27m \e[38;5;27m▓▓▓▓▓▓▓▓▓ \e[38;5;27m ▓▓▓▓ ▓▓▓▓ ▓▓▓▓ ▓▓▓ ▓▓▓▓ ▓▓▓▓ \e[38;5;81m ▒▒▒ ▒▒▒ ▒▒▒▒▒▒▒▒▒
|
||||
\e[38;5;81m▒▒▒▒\e[38;5;27m▓▓ \e[38;5;27m▓▓▓▓▓▓▓▓▓▓▓ \e[38;5;27m ▓▓▓▓ ▓▓▓▓ ▓▓▓▓ ▓▓▓ ▓▓▓▓▓▓▓▓ \e[38;5;81m ▒▒▒ ▒▒▒ ▒▒▒▒▒▒▒▒▒
|
||||
\e[38;5;81m▒▒▒▒\e[38;5;27m▓▓▓▓ \e[38;5;27m▓▓▓▓ \e[38;5;27m ▓▓▓▓ ▓▓▓▓ ▓▓▓▓ ▓▓▓ ▓▓▓▓▓▓ \e[38;5;81m ▒▒▒ ▒▒▒ ▒▒▒▒▒
|
||||
\e[38;5;81m▒▒▒▒ \e[38;5;27m▓▓▓▓ \e[38;5;27m▓▓▓▓ \e[38;5;27m ▓▓▓▓ ▓▓▓▓▓▓▓▓ ▓▓▓ ▓▓▓▓▓▓ \e[38;5;81m ▒▒▒ ▒▒▒ ▒▒▒▒
|
||||
\e[38;5;81m▒▒▒ \e[38;5;27m▓▓▓▓\e[38;5;81m▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ \e[38;5;27m ▓▓▓▓ ▓▓▓▓▓▓▓ ▓▓▓ ▓▓▓▓▓▓▓▓ \e[38;5;81m ▒▒▒▒ ▒▒▒▒ ▒▒▒▒
|
||||
\e[38;5;81m▒▒ \e[38;5;27m▓▓▓▓▓▓\e[38;5;81m▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ \e[38;5;27m ▓▓▓▓ ▓▓▓▓▓▓ ▓▓▓▓▓ ▓▓▓▓ ▓▓▓▓ \e[38;5;81m ▒▒▒▒▒ ▒▒▒▒▒ ▒▒▒▒▒ ▒▒▒▒▒
|
||||
\e[38;5;27m▓▓▓▓▓▓▓▓ \e[38;5;81m▒▒▒▒ \e[38;5;27m ▓▓▓▓ ▓▓▓▓▓ ▓▓▓▓▓ ▓▓▓▓ ▓▓▓▓ \e[38;5;81m ▒▒▒▒▒▒▒▒▒▒▒ ▒▒▒▒▒▒▒▒▒▒▒▒
|
||||
\e[38;5;27m▓▓▓▓ ▓▓▓▓ \e[38;5;81m▒▒▒▒ \e[38;5;27m ▓▓ ▓▓▓ ▓▓▓ ▓▓▓ ▓▓▓ \e[38;5;81m ▒▒▒▒▒▒▒▒▒ ▒▒▒▒▒▒▒▒▒
|
||||
\e[38;5;27m▓▓▓▓ ▓▓▓▓ \e[38;5;81m▒▒▒▒
|
||||
\e[38;5;27m▓▓▓▓ \e[38;5;81m▒▒▒▒ ▒▒▒▒
|
||||
\e[38;5;27m▓▓▓▓ \e[38;5;81m▒▒▒▒ ▒▒▒▒ \e[38;5;27m ▓▓▓
|
||||
\e[38;5;27m▓▓▓▓ \e[38;5;81m▒▒▒▒▒▒▒▒ \e[38;5;27m ▓▓▓ ▓▓ ▓▓▓▓▓ \e[38;5;81m ▒▒▒▒▒▒▒▒▒ ▒▒▒▒▒▒▒▒▒
|
||||
\e[38;5;27m▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓\e[38;5;81m▒▒▒▒▒▒ \e[38;5;27m▓▓ \e[38;5;27m ▓▓▓▓▓ ▓▓▓▓ ▓▓▓ \e[38;5;81m ▒▒▒▒▒▒▒▒▒▒▒ ▒▒▒▒▒▒▒▒▒▒▒
|
||||
\e[38;5;27m▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓\e[38;5;81m▒▒▒▒ \e[38;5;27m▓▓▓ \e[38;5;27m ▓▓▓▓▓▓ ▓▓▓▓ \e[38;5;81m ▒▒▒▒▒ ▒▒▒▒▒ ▒▒▒▒ ▒▒▒▒▒
|
||||
\e[38;5;81m▒▒▒▒ \e[38;5;81m▒▒▒▒ \e[38;5;27m▓▓▓▓ \e[38;5;27m ▓▓▓▓▓▓▓ ▓▓▓▓ \e[38;5;81m ▒▒▒▒ ▒▒▒▒ ▒▒▒▒
|
||||
\e[38;5;81m▒▒▒▒ \e[38;5;81m▒▒▒▒\e[38;5;27m▓▓▓▓ \e[38;5;27m ▓▓▓▓▓▓▓▓ ▓▓▓▓ ▓▓▓▓ ▓▓▓ ▓▓▓ \e[38;5;81m ▒▒▒ ▒▒▒ ▒▒▒▒
|
||||
\e[38;5;81m▒▒▒▒▒▒▒▒▒▒▒ \e[38;5;81m▒▒\e[38;5;27m▓▓▓▓ \e[38;5;27m ▓▓▓▓ ▓▓▓▓ ▓▓▓▓ ▓▓▓▓ ▓▓▓▓ ▓▓▓▓ \e[38;5;81m ▒▒▒ ▒▒▒ ▒▒▒▒▒
|
||||
\e[38;5;81m ▒▒▒▒▒▒▒▒▒\e[38;5;27m \e[38;5;27m▓▓▓▓▓▓▓▓▓ \e[38;5;27m ▓▓▓▓ ▓▓▓▓ ▓▓▓▓ ▓▓▓ ▓▓▓▓ ▓▓▓▓ \e[38;5;81m ▒▒▒ ▒▒▒ ▒▒▒▒▒▒▒▒▒
|
||||
\e[38;5;81m▒▒▒▒\e[38;5;27m▓▓ \e[38;5;27m▓▓▓▓▓▓▓▓▓▓▓ \e[38;5;27m ▓▓▓▓ ▓▓▓▓ ▓▓▓▓ ▓▓▓ ▓▓▓▓▓▓▓▓ \e[38;5;81m ▒▒▒ ▒▒▒ ▒▒▒▒▒▒▒▒▒
|
||||
\e[38;5;81m▒▒▒▒\e[38;5;27m▓▓▓▓ \e[38;5;27m▓▓▓▓ \e[38;5;27m ▓▓▓▓ ▓▓▓▓ ▓▓▓▓ ▓▓▓ ▓▓▓▓▓▓ \e[38;5;81m ▒▒▒ ▒▒▒ ▒▒▒▒▒
|
||||
\e[38;5;81m▒▒▒▒ \e[38;5;27m▓▓▓▓ \e[38;5;27m▓▓▓▓ \e[38;5;27m ▓▓▓▓ ▓▓▓▓▓▓▓▓ ▓▓▓ ▓▓▓▓▓▓ \e[38;5;81m ▒▒▒ ▒▒▒ ▒▒▒▒
|
||||
\e[38;5;81m▒▒▒ \e[38;5;27m▓▓▓▓\e[38;5;81m▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ \e[38;5;27m ▓▓▓▓ ▓▓▓▓▓▓▓ ▓▓▓ ▓▓▓▓▓▓▓▓ \e[38;5;81m ▒▒▒▒ ▒▒▒▒ ▒▒▒▒
|
||||
\e[38;5;81m▒▒ \e[38;5;27m▓▓▓▓▓▓\e[38;5;81m▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ \e[38;5;27m ▓▓▓▓ ▓▓▓▓▓▓ ▓▓▓▓▓ ▓▓▓▓ ▓▓▓▓ \e[38;5;81m ▒▒▒▒▒ ▒▒▒▒▒ ▒▒▒▒▒ ▒▒▒▒▒
|
||||
\e[38;5;27m▓▓▓▓▓▓▓▓ \e[38;5;81m▒▒▒▒ \e[38;5;27m ▓▓▓▓ ▓▓▓▓▓ ▓▓▓▓▓ ▓▓▓▓ ▓▓▓▓ \e[38;5;81m ▒▒▒▒▒▒▒▒▒▒▒ ▒▒▒▒▒▒▒▒▒▒▒▒
|
||||
\e[38;5;27m▓▓▓▓ ▓▓▓▓ \e[38;5;81m▒▒▒▒ \e[38;5;27m ▓▓ ▓▓▓ ▓▓▓ ▓▓▓ ▓▓▓ \e[38;5;81m ▒▒▒▒▒▒▒▒▒ ▒▒▒▒▒▒▒▒▒
|
||||
\e[38;5;27m▓▓▓▓ ▓▓▓▓ \e[38;5;81m▒▒▒▒
|
||||
|
||||
\e[1;32mSystem Maintainer\e[0m: Kyler Clay
|
||||
\e[1;32mContact\e[0m: kylerclay@proton.me
|
||||
470-403-8522
|
||||
\e[1;32mSystem Maintainer\e[0m: Kyler Clay
|
||||
\e[1;32mContact\e[0m: kylerclay@proton.me
|
||||
470-403-8522
|
||||
|
||||
Run '\e[1;35mnixos-help\e[0m' for the NixOS manual.
|
||||
Run '\e[1;35mHyprland\e[0m' to enter the desktop environment.
|
||||
'';
|
||||
Run '\e[1;35mnixos-help\e[0m' for the NixOS manual.
|
||||
Run '\e[1;35mHyprland\e[0m' to enter the desktop environment.
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -4,15 +4,17 @@
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
environment.systemPackages = [(
|
||||
pkgs.catppuccin-sddm.override {
|
||||
flavor = "mocha";
|
||||
font = "JetBrains Mono Nerd Font";
|
||||
fontSize = "14";
|
||||
loginBackground = true;
|
||||
background = "${self}/assets/wallpapers/dark-waves.jpg";
|
||||
}
|
||||
)];
|
||||
environment.systemPackages = [
|
||||
(
|
||||
pkgs.catppuccin-sddm.override {
|
||||
flavor = "mocha";
|
||||
font = "JetBrains Mono Nerd Font";
|
||||
fontSize = "14";
|
||||
loginBackground = true;
|
||||
background = "${self}/assets/wallpapers/dark-waves.jpg";
|
||||
}
|
||||
)
|
||||
];
|
||||
services.displayManager.sddm = {
|
||||
enable = true;
|
||||
wayland.enable = true;
|
||||
|
||||
@@ -1,24 +1,22 @@
|
||||
{
|
||||
pkgs,
|
||||
scheme,
|
||||
wallpaper,
|
||||
scheme,
|
||||
wallpaper,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
}: {
|
||||
stylix = {
|
||||
enable = true;
|
||||
base16Scheme = scheme;
|
||||
base16Scheme = scheme;
|
||||
image = wallpaper;
|
||||
polarity = "dark";
|
||||
autoEnable = true;
|
||||
opacity.terminal = 0.5;
|
||||
opacity.terminal = 0.5;
|
||||
targets = {
|
||||
console.enable = true;
|
||||
feh.enable = true;
|
||||
grub.enable = true;
|
||||
gtk.enable = true;
|
||||
nixos-icons.enable = true;
|
||||
gtk.enable = true;
|
||||
nixos-icons.enable = true;
|
||||
};
|
||||
cursor = {
|
||||
package = pkgs.bibata-cursors;
|
||||
@@ -37,12 +35,12 @@
|
||||
package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
|
||||
name = "JetBrains Mono Nerd Font";
|
||||
};
|
||||
sizes = {
|
||||
desktop = 10;
|
||||
applications = 14;
|
||||
terminal = 14;
|
||||
popups = 16;
|
||||
};
|
||||
sizes = {
|
||||
desktop = 10;
|
||||
applications = 14;
|
||||
terminal = 14;
|
||||
popups = 16;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,16 +1,14 @@
|
||||
|
||||
{
|
||||
inputs,
|
||||
nixpkgs,
|
||||
nixvim,
|
||||
nixvim,
|
||||
config,
|
||||
self,
|
||||
username,
|
||||
host,
|
||||
...
|
||||
}: {
|
||||
imports =
|
||||
[( import ./bootloader.nix )]
|
||||
++ [( import ./network.nix )];
|
||||
}: {
|
||||
imports =
|
||||
[(import ./bootloader.nix)]
|
||||
++ [(import ./network.nix)];
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
{host, ...}:
|
||||
let
|
||||
desktop = (host == "oganesson");
|
||||
in
|
||||
{
|
||||
{host, ...}: let
|
||||
desktop = host == "oganesson";
|
||||
in {
|
||||
networking = {
|
||||
networkmanager.enable = true;
|
||||
hostName =
|
||||
|
||||
@@ -6,18 +6,17 @@
|
||||
username,
|
||||
host,
|
||||
...
|
||||
}:
|
||||
let
|
||||
desktop = (host == "oganesson");
|
||||
desktop_modules = if desktop then
|
||||
[(import ./virtualization.nix)] ++ [(import ./gaming)]
|
||||
else [];
|
||||
in
|
||||
{
|
||||
}: let
|
||||
desktop = host == "oganesson";
|
||||
desktop_modules =
|
||||
if desktop
|
||||
then [(import ./virtualization.nix)] ++ [(import ./gaming)]
|
||||
else [];
|
||||
in {
|
||||
imports =
|
||||
[(import ./packages.nix)]
|
||||
++ [(import ./programs.nix)]
|
||||
++ [(import ./services.nix)]
|
||||
++ [(import ./nixvim)]
|
||||
++ desktop_modules;
|
||||
[(import ./packages.nix)]
|
||||
++ [(import ./programs.nix)]
|
||||
++ [(import ./services.nix)]
|
||||
++ [(import ./nixvim)]
|
||||
++ desktop_modules;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[(import ./steam.nix)]
|
||||
++ [(import ./gaming_pkgs.nix)];
|
||||
{...}: {
|
||||
imports =
|
||||
[(import ./steam.nix)]
|
||||
++ [(import ./gaming_pkgs.nix)];
|
||||
}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
snes9x-gtk
|
||||
];
|
||||
{pkgs, ...}: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
snes9x-gtk
|
||||
];
|
||||
}
|
||||
|
||||
@@ -3,10 +3,10 @@
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./plugins
|
||||
./options.nix
|
||||
./keymaps.nix
|
||||
./autocmd.nix
|
||||
];
|
||||
imports = [
|
||||
./plugins
|
||||
./options.nix
|
||||
./keymaps.nix
|
||||
./autocmd.nix
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,28 +1,30 @@
|
||||
{ scheme, config, ... }:
|
||||
|
||||
{
|
||||
scheme,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
programs.nixvim = {
|
||||
colorschemes.base16 = {
|
||||
enable = true;
|
||||
#colorscheme = {
|
||||
# base00 = "#${scheme.base00}";
|
||||
# base01 = "#${scheme.base01}";
|
||||
# base02 = "#${scheme.base02}";
|
||||
# base03 = "#${scheme.base03}";
|
||||
# base04 = "#${scheme.base04}";
|
||||
# base05 = "#${scheme.base05}";
|
||||
# base06 = "#${scheme.base06}";
|
||||
# base07 = "#${scheme.base07}";
|
||||
# base08 = "#${scheme.base08}";
|
||||
# base09 = "#${scheme.base09}";
|
||||
# base0A = "#${scheme.base0A}";
|
||||
# base0B = "#${scheme.base0B}";
|
||||
# base0C = "#${scheme.base0C}";
|
||||
# base0D = "#${scheme.base0D}";
|
||||
# base0E = "#${scheme.base0E}";
|
||||
# base0F = "#${scheme.base0F}";
|
||||
#};
|
||||
};
|
||||
colorschemes.base16 = {
|
||||
enable = true;
|
||||
#colorscheme = {
|
||||
# base00 = "#${scheme.base00}";
|
||||
# base01 = "#${scheme.base01}";
|
||||
# base02 = "#${scheme.base02}";
|
||||
# base03 = "#${scheme.base03}";
|
||||
# base04 = "#${scheme.base04}";
|
||||
# base05 = "#${scheme.base05}";
|
||||
# base06 = "#${scheme.base06}";
|
||||
# base07 = "#${scheme.base07}";
|
||||
# base08 = "#${scheme.base08}";
|
||||
# base09 = "#${scheme.base09}";
|
||||
# base0A = "#${scheme.base0A}";
|
||||
# base0B = "#${scheme.base0B}";
|
||||
# base0C = "#${scheme.base0C}";
|
||||
# base0D = "#${scheme.base0D}";
|
||||
# base0E = "#${scheme.base0E}";
|
||||
# base0F = "#${scheme.base0F}";
|
||||
#};
|
||||
};
|
||||
enable = true;
|
||||
diagnostics.signs = false;
|
||||
extraConfigLua = ''
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
{
|
||||
imports = [
|
||||
./alpha.nix
|
||||
./haskell.nix
|
||||
./vim-matchup.nix
|
||||
./coq.nix
|
||||
./barbar.nix
|
||||
./cmp.nix
|
||||
./lsp.nix
|
||||
./lualine.nix
|
||||
./plugins.nix
|
||||
./nvim-tree.nix
|
||||
./telescope.nix
|
||||
./extra_plugins.nix
|
||||
];
|
||||
imports = [
|
||||
./alpha.nix
|
||||
./haskell.nix
|
||||
./vim-matchup.nix
|
||||
./coq.nix
|
||||
./barbar.nix
|
||||
./cmp.nix
|
||||
./lsp.nix
|
||||
./lualine.nix
|
||||
./plugins.nix
|
||||
./nvim-tree.nix
|
||||
./telescope.nix
|
||||
./extra_plugins.nix
|
||||
];
|
||||
}
|
||||
|
||||
@@ -39,13 +39,13 @@
|
||||
};
|
||||
})
|
||||
#(pkgs.vimUtils.buildVimPlugin {
|
||||
#name = "nvim-ghost.nvim";
|
||||
#src = pkgs.fetchFromGitHub {
|
||||
#owner = "subnut";
|
||||
#repo = "nvim-ghost.nvim";
|
||||
#rev = "67cc8f38c69d271af1c2430ff5099766f3550eb8";
|
||||
#hash = "sha256-XldDgPqVeIfUjaRLVUMp88eHBHLzoVgOmT3gupPs+ao=";
|
||||
#};
|
||||
#name = "nvim-ghost.nvim";
|
||||
#src = pkgs.fetchFromGitHub {
|
||||
#owner = "subnut";
|
||||
#repo = "nvim-ghost.nvim";
|
||||
#rev = "67cc8f38c69d271af1c2430ff5099766f3550eb8";
|
||||
#hash = "sha256-XldDgPqVeIfUjaRLVUMp88eHBHLzoVgOmT3gupPs+ao=";
|
||||
#};
|
||||
#})
|
||||
];
|
||||
};
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ pkgs, ... }: {
|
||||
programs.nixvim = {
|
||||
extraPlugins = [
|
||||
(pkgs.vimUtils.buildVimPlugin {
|
||||
{pkgs, ...}: {
|
||||
programs.nixvim = {
|
||||
extraPlugins = [
|
||||
(pkgs.vimUtils.buildVimPlugin {
|
||||
name = "haskell-tools.nvim";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "mrcjkb";
|
||||
@@ -10,9 +10,9 @@
|
||||
hash = "sha256-f+M35EwAlHwjJ2Xs2u9FLnyH0FJT22D0LLShDXCbEEs=";
|
||||
};
|
||||
})
|
||||
];
|
||||
plugins = {
|
||||
haskell-scope-highlighting.enable = true;
|
||||
};
|
||||
};
|
||||
];
|
||||
plugins = {
|
||||
haskell-scope-highlighting.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,10 +14,10 @@
|
||||
nil_ls.enable = true;
|
||||
pyright.enable = true;
|
||||
sqls.enable = true;
|
||||
hls = {
|
||||
enable = true;
|
||||
installGhc = true;
|
||||
};
|
||||
hls = {
|
||||
enable = true;
|
||||
installGhc = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,29 +1,29 @@
|
||||
{
|
||||
programs.nixvim = {
|
||||
plugins = {
|
||||
dap = {
|
||||
dap = {
|
||||
enable = true;
|
||||
extensions.dap-ui.enable = true;
|
||||
};
|
||||
nix.enable = true;
|
||||
neoscroll.enable = true;
|
||||
endwise.enable = true;
|
||||
firenvim.enable = true;
|
||||
floaterm.enable = true;
|
||||
fugitive.enable = true;
|
||||
gitsigns.enable = true;
|
||||
indent-blankline.enable = true;
|
||||
lastplace.enable = true;
|
||||
markdown-preview.enable = true;
|
||||
marks.enable = true;
|
||||
nvim-surround.enable = true;
|
||||
rainbow-delimiters.enable = true;
|
||||
render-markdown.enable = true;
|
||||
rustaceanvim.enable = true;
|
||||
treesitter.enable = true;
|
||||
trim.enable = true;
|
||||
trouble.enable = true;
|
||||
web-devicons.enable = true;
|
||||
nix.enable = true;
|
||||
neoscroll.enable = true;
|
||||
endwise.enable = true;
|
||||
firenvim.enable = true;
|
||||
floaterm.enable = true;
|
||||
fugitive.enable = true;
|
||||
gitsigns.enable = true;
|
||||
indent-blankline.enable = true;
|
||||
lastplace.enable = true;
|
||||
markdown-preview.enable = true;
|
||||
marks.enable = true;
|
||||
nvim-surround.enable = true;
|
||||
rainbow-delimiters.enable = true;
|
||||
render-markdown.enable = true;
|
||||
rustaceanvim.enable = true;
|
||||
treesitter.enable = true;
|
||||
trim.enable = true;
|
||||
trouble.enable = true;
|
||||
web-devicons.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
alsa-utils
|
||||
bc
|
||||
cava
|
||||
cabal-install
|
||||
cabal-install
|
||||
clang
|
||||
clang-tools
|
||||
cliphist
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{pkgs, ...}: {
|
||||
{...}: {
|
||||
services = {
|
||||
pipewire = {
|
||||
enable = true;
|
||||
@@ -11,6 +11,9 @@
|
||||
dbus.enable = true;
|
||||
mullvad-vpn.enable = true;
|
||||
blueman.enable = true;
|
||||
openssh.enable = true;
|
||||
openssh = {
|
||||
enable = true;
|
||||
allowSFTP = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user