youwen/liminalOS
1
0
Fork 0
mirror of https://github.com/youwen5/liminalOS.git synced 2025-06-20 05:59:51 -07:00
Code Issues Projects Releases Packages Wiki Activity

chore: switch to alejandra and format

Browse source
This commit is contained in:
Youwen Wu 2024-08-16 06:42:35 -07:00
parent 9062a9d3ed
commit 26439134dd
Signed by: youwen
GPG key ID: 865658ED1FE61EC3
29 changed files with 342 additions and 315 deletions
Download patch file Download diff file Expand all files Collapse all files

10
users/youwen/common/core.nix
View file

@ -1,4 +1,4 @@
{ pkgs, ... }: {
{pkgs, ...}: {
home.file.".essentials" = {
source = ./essentials;
recursive = true;
@ -15,7 +15,7 @@
'';
};
programs.fzf = { enable = true; };
programs.fzf = {enable = true;};
programs.git = {
enable = true;
@ -57,7 +57,7 @@
programs.gh = {
enable = true;
extensions = [ pkgs.github-copilot-cli ];
extensions = [pkgs.github-copilot-cli];
};
programs.oh-my-posh = {
@ -68,7 +68,6 @@
useTheme = "gruvbox";
};
programs.direnv.enable = true;
programs.fish = {
@ -79,8 +78,7 @@
};
functions = {
update-nixos = {
description =
"Update the system flake and attempt to build and switch to the new configuration.";
description = "Update the system flake and attempt to build and switch to the new configuration.";
body = ''
cd /etc/nixos
nix flake update

2
users/youwen/common/default.nix
View file

@ -1 +1 @@
{ imports = [ ./core.nix ]; }
{imports = [./core.nix];}

8
users/youwen/darwin/darwin-home.nix
View file

@ -1,6 +1,9 @@
{ inputs, config, pkgs, ... }:
{
inputs,
config,
pkgs,
...
}: {
home.username = "youwen";
home.homeDirectory = "/Users/youwen";
@ -79,5 +82,4 @@
# Let home Manager install and manage itself.
programs.home-manager.enable = true;
}

1
users/youwen/linux/desktop/default.nix
View file

@ -7,4 +7,3 @@
../waybar/desktop
];
}

6
users/youwen/linux/home.nix
View file

@ -1,6 +1,8 @@
{ config, pkgs, ... }:
{
config,
pkgs,
...
}: {
home.username = "youwen";
home.homeDirectory = "/home/youwen";

20
users/youwen/linux/hyprland/common.nix
View file

@ -1,9 +1,8 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
wayland.windowManager.hyprland = {
enable = true;
settings = {
exec-once = [ "waypaper --restore" ];
exec-once = ["waypaper --restore"];
"$mod" = "SUPER";
"$Left" = "Y";
"$Right" = "O";
@ -164,8 +163,7 @@
"ignorezero,swaync-control-center"
"blur,logout_dialog"
];
monitor =
[ "DP-1,2560x1440@165,1920x0,auto" "HDMI-A-1,1920x1080@60,0x0,1" ];
monitor = ["DP-1,2560x1440@165,1920x0,auto" "HDMI-A-1,1920x1080@60,0x0,1"];
dwindle = {
pseudotile = "yes";
preserve_split = "yes";
@ -189,7 +187,7 @@
"workspaces, 1, 5, wind"
];
};
general = {
gaps_in = "3";
gaps_out = "8";
@ -284,17 +282,15 @@
services.hypridle = {
enable = true;
settings = {
lock_cmd =
"pidof hyprlock || hyprlock"; # avoid starting multiple hyprlock instances.
lock_cmd = "pidof hyprlock || hyprlock"; # avoid starting multiple hyprlock instances.
before_sleep_cmd = "loginctl lock-session"; # lock before suspend.
after_sleep_cmd =
"hyprctl dispatch dpms on"; # to avoid having to press a key twice to turn on the display.
after_sleep_cmd = "hyprctl dispatch dpms on"; # to avoid having to press a key twice to turn on the display.
};
};
xdg.portal = {
enable = true;
configPackages = [ pkgs.xdg-desktop-portal-hyprland ];
extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
configPackages = [pkgs.xdg-desktop-portal-hyprland];
extraPortals = [pkgs.xdg-desktop-portal-hyprland];
};
}

2
users/youwen/linux/hyprland/desktop/default.nix
View file

@ -1 +1 @@
{ imports = [ ../common.nix ]; }
{imports = [../common.nix];}

4
users/youwen/linux/hyprland/laptop/default.nix
View file

@ -1,5 +1,5 @@
{ lib, ... }: {
imports = [ ../common.nix ];
{lib, ...}: {
imports = [../common.nix];
wayland.windowManager.hyprland.settings.input.touchpad = {
natural_scroll = true;
disable_while_typing = true;

6
users/youwen/linux/laptop/default.nix
View file

@ -1,8 +1,6 @@
{ pkgs, ... }: {
imports =
[ ../theming ../home.nix ../programs ../hyprland/laptop ../waybar/laptop ];
{pkgs, ...}: {
imports = [../theming ../home.nix ../programs ../hyprland/laptop ../waybar/laptop];
# some overrides for laptop specifically
programs.kitty.settings.font_size = pkgs.lib.mkForce 11;
}

6
users/youwen/linux/packages/aarch-64/default.nix
View file

@ -1,3 +1,3 @@
{ pkgs, ... }:
let createCommon = import ../common-packages.nix;
in { home.packages = ((createCommon pkgs) ++ [ ]); }
{pkgs, ...}: let
createCommon = import ../common-packages.nix;
in {home.packages = (createCommon pkgs) ++ [];}

24
users/youwen/linux/packages/x86_64/default.nix
View file

@ -1,13 +1,15 @@
{ pkgs, ... }:
let createCommon = import ../common-packages.nix;
{pkgs, ...}: let
createCommon = import ../common-packages.nix;
in {
home.packages = ((createCommon pkgs) ++ (with pkgs; [
spotify
bitwarden-desktop
modrinth-app
lutris
wine
sbctl
r2modman
]));
home.packages =
(createCommon pkgs)
++ (with pkgs; [
spotify
bitwarden-desktop
modrinth-app
lutris
wine
sbctl
r2modman
]);
}

4
users/youwen/linux/programs/default.nix
View file

@ -15,8 +15,8 @@
action_alias = "kitty_scrollback_nvim kitten /home/youwen/.local/share/nvim/lazy/kitty-scrollback.nvim/python/kitty_scrollback_nvim.py";
};
keybindings = {
"kitty_mod+h" = "kitty_scrollback_nvim";
"kitty_mod+g" = "kitty_scrollback_nvim --config ksb_builtin_last_cmd_output";
"kitty_mod+h" = "kitty_scrollback_nvim";
"kitty_mod+g" = "kitty_scrollback_nvim --config ksb_builtin_last_cmd_output";
};
};

10
users/youwen/linux/theming/default.nix
View file

@ -1,5 +1,5 @@
{ pkgs, ... }: {
imports = [ ./catppuccin.nix ];
{pkgs, ...}: {
imports = [./catppuccin.nix];
gtk = {
enable = true;
@ -8,7 +8,7 @@
name = "Bibata-Modern-Ice";
size = 26;
};
iconTheme = { name = "Papirus-Dark"; };
iconTheme = {name = "Papirus-Dark";};
};
qt = {
@ -23,8 +23,6 @@
theme=GraphiteNordDark
'';
"Kvantum/GraphiteNord".source =
"${pkgs.graphite-kde-theme}/share/Kvantum/GraphiteNord";
"Kvantum/GraphiteNord".source = "${pkgs.graphite-kde-theme}/share/Kvantum/GraphiteNord";
};
}

26
users/youwen/linux/waybar/desktop/default.nix
View file

@ -9,21 +9,21 @@
width = 1600;
reload-style-on-change = true;
margin = "10px 0px 0px 0px";
modules-left = [ "hyprland/window" "hyprland/workspaces" ];
modules-right = [ "backlight" "group/adjustable" "custom/weather" ];
modules-center = [ "network" "group/hardware" "clock" ];
modules-left = ["hyprland/window" "hyprland/workspaces"];
modules-right = ["backlight" "group/adjustable" "custom/weather"];
modules-center = ["network" "group/hardware" "clock"];
"hyprland/workspaces" = {
active-only = false;
all-outputs = false;
format = "{icon}";
persistent-workspaces = {
eDP-1 = [ 1 ];
DP-1 = [ 2 3 4 5 ];
eDP-1 = [1];
DP-1 = [2 3 4 5];
};
};
"group/hardware" = {
orientation = "inherit";
modules = [ "cpu" "memory" "battery" ];
modules = ["cpu" "memory" "battery"];
};
"group/adjustable" = {
orientation = "inherit";
@ -31,7 +31,7 @@
transition-duration = 500;
transition-left-to-right = true;
};
modules = [ "pulseaudio" "mpris" ];
modules = ["pulseaudio" "mpris"];
};
"custom/weather" = {
orientation = "horizontal";
@ -51,12 +51,12 @@
# format-paused = " 󰏤 {title} ";
# format-stopped = "Nothing Playing";
# };
tray = { spacing = 10; };
clock = { format = "{:%a %b %d, %I:%M %p} "; };
tray = {spacing = 10;};
clock = {format = "{:%a %b %d, %I:%M %p} ";};
backlight = {
device = "intel_backlight";
format = "{percent}% {icon}";
format-icons = [ "󰃞" "󰃠" ];
format-icons = ["󰃞" "󰃠"];
};
battery = {
states = {
@ -65,9 +65,9 @@
critical = 10;
};
format = "{capacity}% {icon}";
format-icons = [ "󰁻" "󰁽" "󰁿" "󰂀" "󰁹" ];
format-icons = ["󰁻" "󰁽" "󰁿" "󰂀" "󰁹"];
};
"hyprland/window" = { format = "{class}"; };
"hyprland/window" = {format = "{class}";};
network = {
format-wifi = "{essid} ";
format-linked = "{ifname} (No IP) ";
@ -81,7 +81,7 @@
format-muted = " {format_source}";
format-source = "{volume}% ";
format-source-muted = "";
format-icons = { default = [ "" "" "" ]; };
format-icons = {default = ["" "" ""];};
};
};
};

26
users/youwen/linux/waybar/laptop/default.nix
View file

@ -9,23 +9,21 @@
# width = 1000;
reload-style-on-change = true;
margin = "5px 0px 0px 0px";
modules-left =
[ "hyprland/window" "hyprland/workspaces" "network" "clock" ];
modules-right =
[ "group/hardware" "backlight" "group/adjustable" "custom/weather" ];
modules-left = ["hyprland/window" "hyprland/workspaces" "network" "clock"];
modules-right = ["group/hardware" "backlight" "group/adjustable" "custom/weather"];
# modules-center = [ "network" "group/hardware" "clock" ];
"hyprland/workspaces" = {
active-only = false;
all-outputs = false;
format = "{icon}";
persistent-workspaces = {
eDP-1 = [ 1 ];
DP-1 = [ 2 3 4 5 ];
eDP-1 = [1];
DP-1 = [2 3 4 5];
};
};
"group/hardware" = {
orientation = "inherit";
modules = [ "cpu" "battery" ];
modules = ["cpu" "battery"];
};
"group/adjustable" = {
orientation = "inherit";
@ -33,7 +31,7 @@
transition-duration = 500;
transition-left-to-right = true;
};
modules = [ "pulseaudio" "mpris" ];
modules = ["pulseaudio" "mpris"];
};
"custom/weather" = {
orientation = "horizontal";
@ -53,12 +51,12 @@
# format-paused = " 󰏤 {title} ";
# format-stopped = "Nothing Playing";
# };
tray = { spacing = 10; };
clock = { format = "{:%a %b %d, %I:%M %p} "; };
tray = {spacing = 10;};
clock = {format = "{:%a %b %d, %I:%M %p} ";};
backlight = {
device = "intel_backlight";
format = "{percent}% {icon}";
format-icons = [ "󰃞" "󰃠" ];
format-icons = ["󰃞" "󰃠"];
};
battery = {
states = {
@ -67,9 +65,9 @@
critical = 10;
};
format = "{capacity}% {icon}";
format-icons = [ "󰁻" "󰁽" "󰁿" "󰂀" "󰁹" ];
format-icons = ["󰁻" "󰁽" "󰁿" "󰂀" "󰁹"];
};
"hyprland/window" = { format = "{class}"; };
"hyprland/window" = {format = "{class}";};
network = {
format-wifi = "{essid} ";
format-linked = "{ifname} (No IP) ";
@ -83,7 +81,7 @@
format-muted = " {format_source}";
format-source = "{volume}% ";
format-source-muted = "";
format-icons = { default = [ "" "" "" ]; };
format-icons = {default = ["" "" ""];};
};
};
};