extern/nix-config
1
0
Fork 1
mirror of https://github.com/donovanglover/nix-config.git synced 2025-06-24 19:51:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

nix: Format with alejandra

Browse Source 
Alejandra is written in Rust, has more tests than nixfmt, and handles
non-trivial code examples in Nix better.
This commit is contained in:
Donovan Glover 2023-06-05 20:37:52 -04:00
parent 1077200205
commit 3119b789f8
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
41 changed files with 1773 additions and 1698 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
common.nix
View File

@ -1,6 +1,12 @@
{ pkgs, lib, hypr-contrib, nix-gaming, ... }:
let VARIABLES = import ./variables.nix; in {
{
pkgs,
lib,
hypr-contrib,
nix-gaming,
...
}: let
VARIABLES = import ./variables.nix;
in {
imports = [
./modules
./containers/rar.nix
@ -9,12 +15,11 @@ let VARIABLES = import ./variables.nix; in {
# locale
i18n.defaultLocale = "ja_JP.UTF-8";
i18n.supportedLocales =
[ "ja_JP.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" "fr_FR.UTF-8/UTF-8" ];
i18n.supportedLocales = ["ja_JP.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" "fr_FR.UTF-8/UTF-8"];
# nix
nix.package = pkgs.nixFlakes;
nix.settings.experimental-features = [ "nix-command" "flakes" "repl-flake" ];
nix.settings.experimental-features = ["nix-command" "flakes" "repl-flake"];
hardware.opengl.driSupport32Bit = true;
@ -36,8 +41,8 @@ let VARIABLES = import ./variables.nix; in {
environment.systemPackages = with pkgs; [
hypr-contrib.packages."${VARIABLES.system}".grimblast
nix-gaming.packages."${VARIABLES.system}".osu-stable
(pkgs.callPackage ./packages/waycorner { })
(pkgs.callPackage ./packages/srb2 { })
(pkgs.callPackage ./packages/waycorner {})
(pkgs.callPackage ./packages/srb2 {})
slade
typespeed
osu-lazer-bin
@ -72,7 +77,8 @@ let VARIABLES = import ./variables.nix; in {
bacon
];
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
"osu-lazer-bin"
"vmware-workstation"
];
@ -85,7 +91,7 @@ let VARIABLES = import ./variables.nix; in {
NODE_OPTIONS = "--max_old_space_size=16384";
};
environment.defaultPackages = [ ];
environment.defaultPackages = [];
system.stateVersion = "22.11";
# home-manager
@ -93,7 +99,8 @@ let VARIABLES = import ./variables.nix; in {
useGlobalPkgs = true;
useUserPackages = true;
sharedModules = [{
sharedModules = [
{
home.stateVersion = "22.11";
editorconfig = {
@ -127,7 +134,8 @@ let VARIABLES = import ./variables.nix; in {
};
};
};
}];
}
];
};
# systemd
@ -149,7 +157,7 @@ let VARIABLES = import ./variables.nix; in {
isNormalUser = true;
uid = 1000;
password = "user";
extraGroups = [ "wheel" "networkmanager" ];
extraGroups = ["wheel" "networkmanager"];
};
};
@ -171,7 +179,7 @@ let VARIABLES = import ./variables.nix; in {
wifi.macAddress = "random";
ethernet.macAddress = "random";
unmanaged = [ "interface-name:ve-*" ];
unmanaged = ["interface-name:ve-*"];
};
useHostResolvConf = true;
@ -189,8 +197,7 @@ let VARIABLES = import ./variables.nix; in {
restrictNetwork = true;
};
virtualisation.qemu.options =
[ "-device virtio-vga-gl" "-display sdl,gl=on,show-cursor=off" "-full-screen" ];
virtualisation.qemu.options = ["-device virtio-vga-gl" "-display sdl,gl=on,show-cursor=off" "-full-screen"];
environment.sessionVariables = {
WLR_NO_HARDWARE_CURSORS = "1";
@ -203,12 +210,12 @@ let VARIABLES = import ./variables.nix; in {
enableExcludeWrapper = false;
};
networking.firewall.allowedTCPPorts = [ 11918 ];
networking.firewall.allowedTCPPorts = [11918];
networking = {
nat = {
enable = true;
internalInterfaces = [ "ve-+" ];
internalInterfaces = ["ve-+"];
externalInterface = "wg-mullvad";
forwardPorts = [

13
containers/rar.nix
View File

@ -9,7 +9,11 @@
};
};
config = { pkgs, lib, ... }: {
config = {
pkgs,
lib,
...
}: {
programs = {
fish.enable = true;
neovim.enable = true;
@ -28,13 +32,13 @@
};
environment = {
shells = with pkgs; [ fish ];
shells = with pkgs; [fish];
variables = {
TERM = "xterm-kitty";
};
defaultPackages = [ ];
defaultPackages = [];
};
environment.systemPackages = with pkgs; [
@ -43,7 +47,8 @@
unrar
];
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
"rar"
"unrar"
];

18
containers/wine.nix
View File

@ -1,8 +1,6 @@
{ config, ... }:
let hostCfg = config; in
{
{config, ...}: let
hostCfg = config;
in {
containers.wine = {
privateNetwork = true;
@ -24,7 +22,11 @@ let hostCfg = config; in
};
};
config = { pkgs, lib, ... }: {
config = {
pkgs,
lib,
...
}: {
programs = {
fish.enable = true;
neovim.enable = true;
@ -43,13 +45,13 @@ let hostCfg = config; in
};
environment = {
shells = with pkgs; [ fish ];
shells = with pkgs; [fish];
variables = {
TERM = "xterm-kitty";
};
defaultPackages = [ ];
defaultPackages = [];
};
environment.systemPackages = with pkgs; [

10
flake.nix
View File

@ -1,5 +1,13 @@
{
outputs = { self, nixpkgs, home-manager, hyprland, stylix, nix-gaming, ... }@attrs: let
outputs = {
self,
nixpkgs,
home-manager,
hyprland,
stylix,
nix-gaming,
...
} @ attrs: let
VARIABLES = import ./variables.nix;
in {
formatter."${VARIABLES.system}" = nixpkgs.legacyPackages."${VARIABLES.system}".alejandra;

30
hardware-configuration.nix
View File

@ -1,28 +1,32 @@
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [];
fileSystems."/" =
{ device = "/dev/disk/by-label/nixos";
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";
fsType = "btrfs";
};
boot.initrd.luks.devices."root".device = "/dev/disk/by-label/nixos-luks";
fileSystems."/boot" =
{ device = "/dev/disk/by-label/boot";
fileSystems."/boot" = {
device = "/dev/disk/by-label/boot";
fsType = "vfat";
};
swapDevices = [ ];
swapDevices = [];
networking.useDHCP = lib.mkDefault true;

16
modules/default.nix
View File

@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
imports = [
./feh
./kitty
@ -126,18 +124,20 @@
swww
kickoff
greetd.tuigreet
(pkgs.callPackage ../packages/nwg-dock { })
(pkgs.callPackage ../packages/hyprland-autorename-workspaces { })
(pkgs.callPackage ../packages/nwg-dock {})
(pkgs.callPackage ../packages/hyprland-autorename-workspaces {})
];
home-manager.sharedModules = [{
home-manager.sharedModules = [
{
programs.bat.enable = true;
}];
}
];
programs.htop = {
enable = true;
package = pkgs."htop-vim";
settings = { tree_view = 1; };
settings = {tree_view = 1;};
};
services.greetd = {

6
modules/dual-function-keys/default.nix
View File

@ -1,9 +1,7 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
services.interception-tools = {
enable = true;
plugins = [ pkgs.interception-tools-plugins.dual-function-keys ];
plugins = [pkgs.interception-tools-plugins.dual-function-keys];
udevmonConfig = ''
- JOB: "${pkgs.interception-tools}/bin/intercept -g $DEVNODE | ${pkgs.interception-tools-plugins.dual-function-keys}/bin/dual-function-keys -c /etc/dual-function-keys.yaml | ${pkgs.interception-tools}/bin/uinput -d $DEVNODE"
DEVICE:

12
modules/dunst/default.nix
View File

@ -1,9 +1,8 @@
{ pkgs, ... }:
{pkgs, ...}: {
environment.systemPackages = [pkgs.libnotify];
{
environment.systemPackages = [ pkgs.libnotify ];
home-manager.sharedModules = [{
home-manager.sharedModules = [
{
services.dunst = {
enable = true;
@ -26,5 +25,6 @@
};
};
};
}];
}
];
}

12
modules/fcitx5-mozc/default.nix
View File

@ -1,10 +1,9 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
i18n.inputMethod.enabled = "fcitx5";
i18n.inputMethod.fcitx5.addons = [ pkgs.fcitx5-mozc ];
i18n.inputMethod.fcitx5.addons = [pkgs.fcitx5-mozc];
home-manager.sharedModules = [{
home-manager.sharedModules = [
{
xdg.configFile."mozc/ibus_config.textproto".force = true;
xdg.configFile."mozc/ibus_config.textproto".text = ''
engines {
@ -169,5 +168,6 @@
# Trigger Key
TriggerKey=
'';
}];
}
];
}

14
modules/feh/default.nix
View File

@ -1,11 +1,12 @@
{
home-manager.sharedModules = [{
home-manager.sharedModules = [
{
programs.feh = {
enable = true;
keybindings = {
next_img = [ "k" "Right" ];
prev_img = [ "j" "Left" ];
next_img = ["k" "Right"];
prev_img = ["j" "Left"];
quit = "q";
toggle_fullscreen = "f";
@ -24,8 +25,8 @@
jump_back = "L";
scroll_left = "b";
scroll_right = "n";
scroll_up = [ "u" "Up" ];
scroll_down = [ "d" "Down" ];
scroll_up = ["u" "Up"];
scroll_down = ["d" "Down"];
zoom_default = "o";
zoom_fill = "p";
toggle_auto_zoom = "m";
@ -75,5 +76,6 @@
menu_select = null;
};
};
}];
}
];
}

27
modules/fish-starship/default.nix
View File

@ -1,16 +1,13 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
users.defaultUserShell = pkgs.fish;
environment.shells = [ pkgs.fish ];
environment.shells = [pkgs.fish];
programs.fish = {
enable = true;
shellAliases = {
ls = "exa --group-directories-first -I 'lost+found'";
tree =
"exa --group-directories-first --all --long --tree -I 'node_modules|.git|public|lost+found'";
tree = "exa --group-directories-first --all --long --tree -I 'node_modules|.git|public|lost+found'";
mv = "mv -i";
cp = "cp -ia";
rg = "rg --max-columns=2000";
@ -37,8 +34,7 @@
gra = "git remote add";
gre = "git remote --verbose"; # List all remotes
grh = "git reset HEAD";
grr =
"git reset --hard HEAD~"; # Remove the last commit and all changes with it
grr = "git reset --hard HEAD~"; # Remove the last commit and all changes with it
gs = "git status";
gst = "git stash";
gstp = "git stash pop";
@ -53,15 +49,12 @@
yu = "yarn upgrade-interactive";
dl = "yt-dlp";
vol =
"wpctl set-volume '@DEFAULT_AUDIO_SINK@'"; # Change the volume, e.g. vol 10%+, vol 10%-, vol 100%
vol = "wpctl set-volume '@DEFAULT_AUDIO_SINK@'"; # Change the volume, e.g. vol 10%+, vol 10%-, vol 100%
nf = "tput reset; and neofetch --size 56%";
df = "df --human-readable --type=ext4 --total";
du = "du --human-readable --summarize";
jis =
"recode shift_jis..utf8"; # Easily convert shift_jis-encoded files to utf8
utf16 =
"recode utf16..utf8"; # Rarely, some files from Japan are utf16 instead
jis = "recode shift_jis..utf8"; # Easily convert shift_jis-encoded files to utf8
utf16 = "recode utf16..utf8"; # Rarely, some files from Japan are utf16 instead
jp = "LANG=ja_JP.UTF-8 LC_ALL=ja_JP.UTF-8";
c = "tput reset"; # Clear the terminal completely
@ -74,7 +67,8 @@
};
};
home-manager.sharedModules = [{
home-manager.sharedModules = [
{
xdg.configFile."fish/config.fish".text = ''
set -U fish_greeting ""
@ -132,7 +126,8 @@
end
end
'';
}];
}
];
programs.starship = {
enable = true;

12
modules/fonts/default.nix
View File

@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
fonts = {
enableDefaultFonts = true;
fonts = with pkgs; [
@ -15,12 +13,12 @@
];
fontconfig = {
defaultFonts = {
serif = [ "Noto Serif CJK JP" "Noto Serif" ];
sansSerif = [ "Noto Sans CJK JP" "Noto Sans" ];
monospace = [ "Noto Mono CJK JP" "Noto Mono" ];
serif = ["Noto Serif CJK JP" "Noto Serif"];
sansSerif = ["Noto Sans CJK JP" "Noto Sans"];
monospace = ["Noto Mono CJK JP" "Noto Mono"];
};
allowBitmaps = false;
hinting = { style = "hintfull"; };
hinting = {style = "hintfull";};
};
};
}

13
modules/git/default.nix
View File

@ -1,10 +1,8 @@
{ pkgs, ... }:
{pkgs, ...}: {
environment.systemPackages = with pkgs; [tig git];
{
environment.systemPackages = with pkgs; [ tig git ];
home-manager.sharedModules = [{
home-manager.sharedModules = [
{
xdg.configFile."tig/config".text = ''
color cursor black green bold
color title-focus black blue bold
@ -57,5 +55,6 @@
diff-so-fancy.enable = true;
};
}];
}
];
}

6
modules/gpg/default.nix
View File

@ -1,5 +1,6 @@
{
home-manager.sharedModules = [{
home-manager.sharedModules = [
{
programs.gpg = {
enable = true;
# homedir = "${config.xdg.dataHome}/gnupg"
@ -21,5 +22,6 @@
defaultCacheTtl = 43200;
maxCacheTtl = 43200;
};
}];
}
];
}

12
modules/hyprland/default.nix
View File

@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
programs.hyprland.enable = true;
services.udisks2 = {
enable = true;
@ -14,10 +12,11 @@
services.xserver = {
enable = true;
displayManager.lightdm.enable = false;
excludePackages = [ pkgs.xterm ];
excludePackages = [pkgs.xterm];
};
home-manager.sharedModules = [{
home-manager.sharedModules = [
{
xdg.configFile."hypr/hyprland.conf".text = ''
env=XCURSOR_SIZE,24
env=BROWSER,librewolf
@ -247,5 +246,6 @@
};
services.udiskie.enable = true;
}];
}
];
}

12
modules/joshuto/default.nix
View File

@ -1,11 +1,10 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
environment.systemPackages = [
(pkgs.callPackage ../../packages/joshuto { })
(pkgs.callPackage ../../packages/joshuto {})
];
home-manager.sharedModules = [{
home-manager.sharedModules = [
{
xdg.configFile."joshuto/joshuto.toml".text = ''
[display]
automatically_count_files = true
@ -24,5 +23,6 @@
xdg.configFile."joshuto/preview.sh".source = ./preview.sh;
xdg.configFile."joshuto/kitty-show.sh".source = ./kitty-show.sh;
xdg.configFile."joshuto/kitty-remove.sh".source = ./kitty-remove.sh;
}];
}
];
}

6
modules/kitty/default.nix
View File

@ -1,5 +1,6 @@
{
home-manager.sharedModules = [{
home-manager.sharedModules = [
{
programs.kitty = {
enable = true;
@ -26,5 +27,6 @@
map g scroll_to start
map G scroll_to end
'';
}];
}
];
}

6
modules/librewolf/default.nix
View File

@ -1,5 +1,6 @@
{
home-manager.sharedModules = [{
home-manager.sharedModules = [
{
programs.librewolf = {
enable = true;
@ -17,5 +18,6 @@
"sidebar.position_start" = false;
};
};
}];
}
];
}

13
modules/mpv/default.nix
View File

@ -1,7 +1,6 @@
{ pkgs, ... }:
{
home-manager.sharedModules = [{
{pkgs, ...}: {
home-manager.sharedModules = [
{
programs.mpv = {
enable = true;
config = {
@ -18,8 +17,7 @@
sub-file-paths = "subs:subtitles:字幕";
fullscreen = "yes";
title = "\${filename} - mpv";
script-opts =
"osc-title=\${filename},osc-boxalpha=150,osc-showfullscreen=no,osc-boxvideo=yes";
script-opts = "osc-title=\${filename},osc-boxalpha=150,osc-showfullscreen=no,osc-boxvideo=yes";
osc = "no";
osd-on-seek = "no";
osd-bar = "no";
@ -33,5 +31,6 @@
thumbnail
];
};
}];
}
];
}

24
modules/ncmpcpp/default.nix
View File

@ -1,7 +1,6 @@
{ pkgs, ... }:
{
home-manager.sharedModules = [{
{pkgs, ...}: {
home-manager.sharedModules = [
{
services.mpd = {
enable = true;
musicDirectory = "/home/user/Music";
@ -23,7 +22,7 @@
}
{
key = "h";
command = [ "previous_column" "jump_to_parent_directory" ];
command = ["previous_column" "jump_to_parent_directory"];
}
{
key = "j";
@ -35,23 +34,23 @@
}
{
key = "l";
command = [ "next_column" "enter_directory" "play_item" ];
command = ["next_column" "enter_directory" "play_item"];
}
{
key = "H";
command = [ "select_item" "scroll_down" ];
command = ["select_item" "scroll_down"];
}
{
key = "J";
command = [ "move_sort_order_down" "move_selected_items_down" ];
command = ["move_sort_order_down" "move_selected_items_down"];
}
{
key = "K";
command = [ "move_sort_order_up" "move_selected_items_up" ];
command = ["move_sort_order_up" "move_selected_items_up"];
}
{
key = "L";
command = [ "select_item" "scroll_up" ];
command = ["select_item" "scroll_up"];
}
{
key = "'";
@ -145,7 +144,8 @@
mpd_crossfade_time = 3;
};
};
}];
}
];
environment.systemPackages = with pkgs; [ mpc-cli ];
environment.systemPackages = with pkgs; [mpc-cli];
}

10
modules/neovim/default.nix
View File

@ -1,9 +1,8 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
programs.neovim.enable = true;
home-manager.sharedModules = [{
home-manager.sharedModules = [
{
programs.neovim = {
enable = true;
extraConfig = ''
@ -176,5 +175,6 @@
neoformat
];
};
}];
}
];
}

6
modules/piper/default.nix
View File

@ -1,7 +1,5 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
services.ratbagd.enable = true;
environment.systemPackages = [ pkgs.piper ];
environment.systemPackages = [pkgs.piper];
}

4
modules/pipewire/default.nix
View File

@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
services.pipewire = {
enable = true;

12
modules/qutebrowser/default.nix
View File

@ -1,7 +1,6 @@
{ pkgs, ... }:
{
home-manager.sharedModules = [{
{pkgs, ...}: {
home-manager.sharedModules = [
{
programs.qutebrowser = {
enable = true;
package = pkgs.qutebrowser-qt6;
@ -29,7 +28,7 @@
headers.accept_language = "ja-JP,en-US";
};
editor.command = [ "kitty" "-e" "nvim" "{}" ];
editor.command = ["kitty" "-e" "nvim" "{}"];
};
keyBindings = {
@ -137,5 +136,6 @@
}
'';
};
}];
}
];
}

18
modules/rofi/default.nix
View File

@ -1,13 +1,16 @@
{ pkgs, lib, ... }:
{
home-manager.sharedModules = [{
pkgs,
lib,
...
}: {
home-manager.sharedModules = [
{
programs.rofi = {
enable = true;
package = (pkgs.callPackage ../../packages/rofi/wrapper.nix {
rofi-unwrapped = (pkgs.callPackage ../../packages/rofi/wayland.nix { });
});
package = pkgs.callPackage ../../packages/rofi/wrapper.nix {
rofi-unwrapped = pkgs.callPackage ../../packages/rofi/wayland.nix {};
};
cycle = false;
@ -29,5 +32,6 @@
theme = lib.mkForce ./launchpad.rasi;
};
}];
}
];
}

4
modules/stylix/default.nix
View File

@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
stylix.image = ./wallpaper.png;
stylix.polarity = "dark";
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/monokai.yaml";

12
modules/swaylock/default.nix
View File

@ -1,9 +1,8 @@
{ pkgs, ... }:
{pkgs, ...}: {
security.pam.services.swaylock = {};
{
security.pam.services.swaylock = { };
home-manager.sharedModules = [{
home-manager.sharedModules = [
{
programs.swaylock = {
package = pkgs."swaylock-effects";
settings = {
@ -19,5 +18,6 @@
fade-in = 1;
};
};
}];
}
];
}

12
modules/thunar/default.nix
View File

@ -1,22 +1,22 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
programs.thunar.enable = true;
services.tumbler.enable = true; # Thumbnail support
environment.systemPackages = with pkgs; [
xfce.exo # Open with kitty support
glib
(pkgs.callPackage ../../packages/go-thumbnailer { })
(pkgs.callPackage ../../packages/go-thumbnailer {})
];
services.gvfs.enable = true; # Trash support
services.gnome.gnome-keyring.enable = true; # Mount support
home-manager.sharedModules = [{
home-manager.sharedModules = [
{
xdg.configFile."xfce4/helpers.rc".text = ''
TerminalEmulator=kitty
TerminalEmulatorDismissed=true
'';
}];
}
];
}

25
modules/waybar/default.nix
View File

@ -1,10 +1,13 @@
{ lib, pkgs, ... }:
{
home-manager.sharedModules = [{
lib,
pkgs,
...
}: {
home-manager.sharedModules = [
{
programs.waybar = {
enable = true;
package = (pkgs.callPackage ../../packages/waybar { });
package = pkgs.callPackage ../../packages/waybar {};
settings = {
mainBar = {
@ -13,9 +16,8 @@
width = 45;
spacing = 8;
modules-left = [ "wlr/workspaces" "custom/new-workspace" ];
modules-right =
[ "tray" "wireplumber" "backlight" "battery" "clock" ];
modules-left = ["wlr/workspaces" "custom/new-workspace"];
modules-right = ["tray" "wireplumber" "backlight" "battery" "clock"];
tray = {
icon-size = 24;
@ -44,13 +46,13 @@
format = "{icon}";
tooltip-format = "{volume}% {node_name}";
format-muted = "";
format-icons = [ "" "" ];
format-icons = ["" ""];
};
battery = {
"format" = "{icon}";
"tooltip-format" = "{capacity}% {timeTo}";
"format-icons" = [ "" "" "" "" "" ];
"format-icons" = ["" "" "" "" ""];
};
clock = {
@ -71,7 +73,7 @@
backlight = {
"format" = "{icon}";
"format-icons" = [ "" "" ];
"format-icons" = ["" ""];
};
"custom/new-workspace" = {
@ -150,5 +152,6 @@
}
'';
};
}];
}
];
}

6
modules/xdg-user-dirs/default.nix
View File

@ -1,5 +1,6 @@
{
home-manager.sharedModules = [{
home-manager.sharedModules = [
{
xdg.userDirs = {
enable = true;
@ -15,5 +16,6 @@
};
xdg.configFile."user-dirs.locale".text = "ja_JP";
}];
}
];
}

6
modules/zathura/default.nix
View File

@ -1,5 +1,6 @@
{
home-manager.sharedModules = [{
home-manager.sharedModules = [
{
programs.zathura = {
enable = true;
@ -11,5 +12,6 @@
scroll-step = 120;
};
};
}];
}
];
}

14
packages/go-thumbnailer/default.nix
View File

@ -1,10 +1,10 @@
{ lib
, buildGoModule
, fetchFromGitHub
, pkg-config
, vips
{
lib,
buildGoModule,
fetchFromGitHub,
pkg-config,
vips,
}:
buildGoModule rec {
pname = "go-thumbnailer";
version = "0.1.0";
@ -36,6 +36,6 @@ buildGoModule rec {
description = "A cover thumbnailer written in Go for performance and reliability.";
homepage = "https://github.com/donovanglover/go-thumbnailer";
license = licenses.mit;
maintainers = [ ];
maintainers = [];
};
}

9
packages/hyprland-autorename-workspaces/default.nix
View File

@ -1,5 +1,8 @@
{ lib, rustPlatform, fetchFromGitHub }:
{
lib,
rustPlatform,
fetchFromGitHub,
}:
rustPlatform.buildRustPackage rec {
pname = "hyprland-autoname-workspaces";
version = "1.0.0";
@ -17,6 +20,6 @@ rustPlatform.buildRustPackage rec {
description = "Automatically rename the workspaces with icons of started applications";
homepage = "https://github.com/hyprland-community/hyprland-autoname-workspaces";
license = licenses.isc;
maintainers = with maintainers; [ donovanglover ];
maintainers = with maintainers; [donovanglover];
};
}

9
packages/joshuto/default.nix
View File

@ -1,5 +1,8 @@
{ lib, rustPlatform, fetchFromGitHub }:
{
lib,
rustPlatform,
fetchFromGitHub,
}:
rustPlatform.buildRustPackage rec {
pname = "joshuto";
version = "493af3185092036cbbae81ae620b101f66cf4e9a";
@ -17,6 +20,6 @@ rustPlatform.buildRustPackage rec {
description = "Ranger-like terminal file manager written in Rust";
homepage = "https://github.com/kamiyaa/joshuto";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ figsoda totoroot ];
maintainers = with maintainers; [figsoda totoroot];
};
}

22
packages/nwg-dock/default.nix
View File

@ -1,11 +1,11 @@
{ lib
, buildGoModule
, fetchFromGitHub
, pkg-config
, gtk3
, gtk-layer-shell
{
lib,
buildGoModule,
fetchFromGitHub,
pkg-config,
gtk3,
gtk-layer-shell,
}:
buildGoModule rec {
pname = "nwg-dock-hyprland";
version = "0.1.2";
@ -19,16 +19,16 @@ buildGoModule rec {
vendorSha256 = "sha256-GhcrIVnZRbiGTfeUAWvslOVWDZmoL0ZRnjgTtQgxe2Q=";
ldflags = [ "-s" "-w" ];
ldflags = ["-s" "-w"];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk3 gtk-layer-shell ];
nativeBuildInputs = [pkg-config];
buildInputs = [gtk3 gtk-layer-shell];
meta = with lib; {
description = "GTK3-based dock for hyprland";
homepage = "https://github.com/nwg-piotr/nwg-dock-hyprland";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ dit7ya ];
maintainers = with maintainers; [dit7ya];
};
}

54
packages/rofi/default.nix
View File

@ -1,28 +1,28 @@
{ stdenv
, lib
, fetchFromGitHub
, meson
, ninja
, pkg-config
, libxkbcommon
, pango
, which
, git
, cairo
, libxcb
, xcbutil
, xcbutilwm
, xcbutilxrm
, xcb-util-cursor
, libstartup_notification
, bison
, flex
, librsvg
, check
, glib
, buildPackages
{
stdenv,
lib,
fetchFromGitHub,
meson,
ninja,
pkg-config,
libxkbcommon,
pango,
which,
git,
cairo,
libxcb,
xcbutil,
xcbutilwm,
xcbutilxrm,
xcb-util-cursor,
libstartup_notification,
bison,
flex,
librsvg,
check,
glib,
buildPackages,
}:
stdenv.mkDerivation rec {
pname = "rofi-unwrapped";
version = "1.7.5";
@ -41,8 +41,8 @@ stdenv.mkDerivation rec {
sed -i 's/~root/~nobody/g' test/helper-expand.c
'';
depsBuildBuild = [ buildPackages.stdenv.cc pkg-config glib ];
nativeBuildInputs = [ meson ninja pkg-config flex bison ];
depsBuildBuild = [buildPackages.stdenv.cc pkg-config glib];
nativeBuildInputs = [meson ninja pkg-config flex bison];
buildInputs = [
libxkbcommon
pango
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
description = "Window switcher, run dialog and dmenu replacement";
homepage = "https://github.com/davatorium/rofi";
license = licenses.mit;
maintainers = with maintainers; [ bew ];
maintainers = with maintainers; [bew];
platforms = with platforms; linux;
};
}

22
packages/rofi/wayland.nix
View File

@ -1,12 +1,12 @@
{ stdenv
, lib
, fetchFromGitHub
, rofi-unwrapped
, wayland-scanner
, wayland-protocols
, wayland
{
stdenv,
lib,
fetchFromGitHub,
rofi-unwrapped,
wayland-scanner,
wayland-protocols,
wayland,
}:
rofi-unwrapped.overrideAttrs (oldAttrs: rec {
pname = "rofi-wayland-unwrapped";
version = "git";
@ -19,14 +19,14 @@ rofi-unwrapped.overrideAttrs (oldAttrs: rec {
sha256 = "sha256-8IfHpaVFGeWqyw+tLjNtg+aWwAHhSA5PuXJYjpoht2E=";
};
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-scanner ];
buildInputs = oldAttrs.buildInputs ++ [ wayland wayland-protocols ];
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [wayland-scanner];
buildInputs = oldAttrs.buildInputs ++ [wayland wayland-protocols];
meta = with lib; {
description = "Window switcher, run dialog and dmenu replacement for Wayland";
homepage = "https://github.com/lbonn/rofi";
license = licenses.mit;
maintainers = with maintainers; [ bew ];
maintainers = with maintainers; [bew];
platforms = with platforms; linux;
};
})

28
packages/rofi/wrapper.nix
View File

@ -1,14 +1,26 @@
{ symlinkJoin, lib, rofi-unwrapped, makeWrapper, wrapGAppsHook, gdk-pixbuf, hicolor-icon-theme, theme ? null, plugins ? [], symlink-dmenu ? false }:
{
symlinkJoin,
lib,
rofi-unwrapped,
makeWrapper,
wrapGAppsHook,
gdk-pixbuf,
hicolor-icon-theme,
theme ? null,
plugins ? [],
symlink-dmenu ? false,
}:
symlinkJoin {
name = "rofi-${rofi-unwrapped.version}";
paths = [
paths =
[
rofi-unwrapped.out
] ++ (lib.forEach plugins (p: p.out));
]
++ (lib.forEach plugins (p: p.out));
nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
buildInputs = [ gdk-pixbuf ];
nativeBuildInputs = [makeWrapper wrapGAppsHook];
buildInputs = [gdk-pixbuf];
preferLocalBuild = true;
passthru.unwrapped = rofi-unwrapped;
@ -36,7 +48,9 @@ symlinkJoin {
--prefix XDG_DATA_DIRS : $out/share
'';
meta = rofi-unwrapped.meta // {
meta =
rofi-unwrapped.meta
// {
priority = (rofi-unwrapped.meta.priority or 0) - 1;
};
}

55
packages/srb2/default.nix
View File

@ -1,32 +1,30 @@
{ lib
, stdenv
, fetchurl
, fetchFromGitHub
, cmake
, curl
, nasm
, libopenmpt
, p7zip
, libgme
, libpng
, SDL2
, SDL2_mixer
, zlib
, unzip
, makeWrapper
, makeDesktopItem
, copyDesktopItems
}:
let
{
lib,
stdenv,
fetchurl,
fetchFromGitHub,
cmake,
curl,
nasm,
libopenmpt,
p7zip,
libgme,
libpng,
SDL2,
SDL2_mixer,
zlib,
unzip,
makeWrapper,
makeDesktopItem,
copyDesktopItems,
}: let
version = "2.2.11";
# Normal assets found on the official release
assets = stdenv.mkDerivation rec {
pname = "srb2-data";
inherit version;
nativeBuildInputs = [ unzip ];
nativeBuildInputs = [unzip];
src = fetchurl {
url = "https://github.com/STJr/SRB2/releases/download/SRB2_release_${version}/SRB2-v${lib.replaceStrings ["."] [""] version}-Full.zip";
sha256 = "sha256-KsJIkCczD/HyIwEy5dI3zsHbWFCMBaCoCHizfupFoWM=";
@ -37,9 +35,8 @@ let
cp -r *pk3 *dta *dat models/ $out/share/srb2/
'';
};
in stdenv.mkDerivation rec {
in
stdenv.mkDerivation rec {
pname = "srb2";
inherit version;
@ -89,7 +86,7 @@ in stdenv.mkDerivation rec {
comment = meta.description;
desktopName = name;
genericName = name;
categories = [ "Game" ];
categories = ["Game"];
})
];
@ -110,6 +107,6 @@ in stdenv.mkDerivation rec {
homepage = "https://www.srb2.org/";
platforms = platforms.linux;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ zeratax ];
maintainers = with maintainers; [zeratax];
};
}
}

118
packages/waybar/default.nix
View File

@ -1,39 +1,56 @@
{ lib
, stdenv
, fetchFromGitHub
, meson
, pkg-config
, ninja
, wrapGAppsHook
, wayland
, wlroots
, gtkmm3
, libsigcxx
, jsoncpp
, scdoc
, spdlog
, gtk-layer-shell
, howard-hinnant-date
, libinotify-kqueue
, libxkbcommon
, evdevSupport ? true, libevdev
, inputSupport ? true, libinput
, jackSupport ? true, libjack2
, mpdSupport ? true, libmpdclient
, mprisSupport ? stdenv.isLinux, playerctl ? false
, nlSupport ? true, libnl
, pulseSupport ? true, libpulseaudio
, rfkillSupport ? true
, runTests ? true, catch2_3
, sndioSupport ? true, sndio
, swaySupport ? true, sway
, traySupport ? true, libdbusmenu-gtk3
, udevSupport ? true, udev
, upowerSupport ? true, upower
, wireplumberSupport ? true, wireplumber
, withMediaPlayer ? mprisSupport && false, glib, gobject-introspection, python3
{
lib,
stdenv,
fetchFromGitHub,
meson,
pkg-config,
ninja,
wrapGAppsHook,
wayland,
wlroots,
gtkmm3,
libsigcxx,
jsoncpp,
scdoc,
spdlog,
gtk-layer-shell,
howard-hinnant-date,
libinotify-kqueue,
libxkbcommon,
evdevSupport ? true,
libevdev,
inputSupport ? true,
libinput,
jackSupport ? true,
libjack2,
mpdSupport ? true,
libmpdclient,
mprisSupport ? stdenv.isLinux,
playerctl ? false,
nlSupport ? true,
libnl,
pulseSupport ? true,
libpulseaudio,
rfkillSupport ? true,
runTests ? true,
catch2_3,
sndioSupport ? true,
sndio,
swaySupport ? true,
sway,
traySupport ? true,
libdbusmenu-gtk3,
udevSupport ? true,
udev,
upowerSupport ? true,
upower,
wireplumberSupport ? true,
wireplumber,
withMediaPlayer ? mprisSupport && false,
glib,
gobject-introspection,
python3,
}:
stdenv.mkDerivation rec {
pname = "waybar";
version = "0.9.18";
@ -45,9 +62,15 @@ stdenv.mkDerivation rec {
hash = "sha256-bnaYNa1jb7kZ1mtMzeOQqz4tmBG1w5YXlQWoop1Q0Yc=";
};
nativeBuildInputs = [
meson ninja pkg-config scdoc wrapGAppsHook
] ++ lib.optional withMediaPlayer gobject-introspection;
nativeBuildInputs =
[
meson
ninja
pkg-config
scdoc
wrapGAppsHook
]
++ lib.optional withMediaPlayer gobject-introspection;
propagatedBuildInputs = lib.optionals withMediaPlayer [
glib
@ -58,7 +81,7 @@ stdenv.mkDerivation rec {
strictDeps = false;
buildInputs = with lib;
[ wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ]
[wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon]
++ optional (!stdenv.isLinux) libinotify-kqueue
++ optional evdevSupport libevdev
++ optional inputSupport libinput
@ -74,11 +97,17 @@ stdenv.mkDerivation rec {
++ optional upowerSupport upower
++ optional wireplumberSupport wireplumber;
nativeCheckInputs = [ catch2_3 ];
nativeCheckInputs = [catch2_3];
doCheck = runTests;
mesonFlags = (lib.mapAttrsToList
(option: enable: "-D${option}=${if enable then "enabled" else "disabled"}")
mesonFlags =
(
lib.mapAttrsToList
(option: enable: "-D${option}=${
if enable
then "enabled"
else "disabled"
}")
{
dbusmenu-gtk = traySupport;
jack = jackSupport;
@ -94,7 +123,8 @@ stdenv.mkDerivation rec {
upower_glib = upowerSupport;
wireplumber = wireplumberSupport;
}
) ++ [
)
++ [
"-Dsystemd=disabled"
"-Dgtk-layer-shell=enabled"
"-Dman-pages=enabled"
@ -118,7 +148,7 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/alexays/waybar/releases/tag/${version}";
description = "Highly customizable Wayland bar for Sway and Wlroots based compositors";
license = licenses.mit;
maintainers = with maintainers; [ FlorianFranzen minijackson synthetica lovesegfault rodrgz ];
maintainers = with maintainers; [FlorianFranzen minijackson synthetica lovesegfault rodrgz];
platforms = platforms.unix;
homepage = "https://github.com/alexays/waybar";
};

16
packages/waycorner/default.nix
View File

@ -1,10 +1,10 @@
{ lib
, makeWrapper
, rustPlatform
, pkg-config
, fetchFromGitHub
, wayland
,
{
lib,
makeWrapper,
rustPlatform,
pkg-config,
fetchFromGitHub,
wayland,
}:
rustPlatform.buildRustPackage rec {
pname = "waycorner";
@ -35,6 +35,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/AndreasBackx/waycorner";
platforms = platforms.linux;
license = licenses.mit;
maintainers = with maintainers; [ NotAShelf ];
maintainers = with maintainers; [NotAShelf];
};
}