extern/nix-config
1
0
Fork 1
mirror of https://github.com/donovanglover/nix-config.git synced 2025-06-20 17:57:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

treewide: Switch from alejandra to nixpkgs-fmt

Browse Source 
Neither nixfmt nor alejandra support the "standard" way to syntax
highlight multi-line strings in Nix, so nixpkgs-fmt is the only viable
solution.
This commit is contained in:
Donovan Glover 2023-06-11 09:33:54 -04:00
parent 09f2ce62de
commit 43a07cc8d9
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
35 changed files with 247 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
containers/rar.nix
View File

@ -1,6 +1,7 @@
let let
VARIABLES = import ../src/variables.nix; VARIABLES = import ../src/variables.nix;
in { in
{
containers.rar = { containers.rar = {
privateNetwork = true; privateNetwork = true;
@ -11,51 +12,51 @@ in {
}; };
}; };
config = { config =
pkgs, { pkgs
lib, , lib
... , ...
}: { }: {
programs = { programs = {
fish.enable = true; fish.enable = true;
neovim.enable = true; neovim.enable = true;
starship.enable = true; starship.enable = true;
};
users = {
defaultUserShell = pkgs.fish;
mutableUsers = false;
allowNoPasswordLogin = true;
users.user = {
isNormalUser = true;
home = "/home/user";
};
};
environment = {
shells = with pkgs; [fish];
variables = {
TERM = "xterm-kitty";
}; };
defaultPackages = []; users = {
}; defaultUserShell = pkgs.fish;
mutableUsers = false;
allowNoPasswordLogin = true;
environment.systemPackages = with pkgs; [ users.user = {
kitty isNormalUser = true;
rar home = "/home/user";
unrar };
]; };
nixpkgs.config.allowUnfreePredicate = pkg: environment = {
builtins.elem (lib.getName pkg) [ shells = with pkgs; [ fish ];
"rar"
"unrar" variables = {
TERM = "xterm-kitty";
};
defaultPackages = [ ];
};
environment.systemPackages = with pkgs; [
kitty
rar
unrar
]; ];
system.stateVersion = VARIABLES.stateVersion; nixpkgs.config.allowUnfreePredicate = pkg:
}; builtins.elem (lib.getName pkg) [
"rar"
"unrar"
];
system.stateVersion = VARIABLES.stateVersion;
};
}; };
} }

118
containers/wine.nix
View File

@ -1,7 +1,9 @@
{config, ...}: let { config, ... }:
let
VARIABLES = import ../src/variables.nix; VARIABLES = import ../src/variables.nix;
hostCfg = config; hostCfg = config;
in { in
{
containers.wine = { containers.wine = {
privateNetwork = true; privateNetwork = true;
@ -23,64 +25,64 @@ in {
}; };
}; };
config = { config =
pkgs, { pkgs
lib, , lib
... , ...
}: { }: {
programs = { programs = {
fish.enable = true; fish.enable = true;
neovim.enable = true; neovim.enable = true;
starship.enable = true; starship.enable = true;
};
users = {
defaultUserShell = pkgs.fish;
mutableUsers = false;
allowNoPasswordLogin = true;
users.user = {
isNormalUser = true;
home = "/home/user";
};
};
environment = {
shells = with pkgs; [fish];
variables = {
TERM = "xterm-kitty";
}; };
defaultPackages = []; users = {
defaultUserShell = pkgs.fish;
mutableUsers = false;
allowNoPasswordLogin = true;
users.user = {
isNormalUser = true;
home = "/home/user";
};
};
environment = {
shells = with pkgs; [ fish ];
variables = {
TERM = "xterm-kitty";
};
defaultPackages = [ ];
};
environment.systemPackages = with pkgs; [
kitty
wine-staging
winetricks
];
environment.sessionVariables = {
WAYLAND_DISPLAY = "wayland-1";
QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
SDL_VIDEODRIVER = "wayland";
CLUTTER_BACKEND = "wayland";
MOZ_ENABLE_WAYLAND = "1";
XDG_RUNTIME_DIR = "/run/user/1000";
DISPLAY = ":0";
};
services.xserver.enable = true;
hardware.opengl = {
enable = true;
extraPackages = hostCfg.hardware.opengl.extraPackages;
driSupport32Bit = true;
};
system.stateVersion = VARIABLES.stateVersion;
}; };
environment.systemPackages = with pkgs; [
kitty
wine-staging
winetricks
];
environment.sessionVariables = {
WAYLAND_DISPLAY = "wayland-1";
QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
SDL_VIDEODRIVER = "wayland";
CLUTTER_BACKEND = "wayland";
MOZ_ENABLE_WAYLAND = "1";
XDG_RUNTIME_DIR = "/run/user/1000";
DISPLAY = ":0";
};
services.xserver.enable = true;
hardware.opengl = {
enable = true;
extraPackages = hostCfg.hardware.opengl.extraPackages;
driSupport32Bit = true;
};
system.stateVersion = VARIABLES.stateVersion;
};
}; };
} }

50
flake.nix
View File

@ -1,30 +1,32 @@
{ {
outputs = { outputs =
self, { self
nixpkgs, , nixpkgs
home-manager, , home-manager
hyprland, , hyprland
stylix, , stylix
nix-gaming, , nix-gaming
crystal-flake, , crystal-flake
... , ...
} @ attrs: let } @ attrs:
VARIABLES = import ./src/variables.nix; let
in { VARIABLES = import ./src/variables.nix;
formatter."${VARIABLES.system}" = nixpkgs.legacyPackages."${VARIABLES.system}".alejandra; in
{
formatter."${VARIABLES.system}" = nixpkgs.legacyPackages."${VARIABLES.system}".alejandra;
nixosConfigurations."${VARIABLES.hostname}" = nixpkgs.lib.nixosSystem { nixosConfigurations."${VARIABLES.hostname}" = nixpkgs.lib.nixosSystem {
system = VARIABLES.system; system = VARIABLES.system;
specialArgs = attrs; specialArgs = attrs;
modules = [ modules = [
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
hyprland.nixosModules.default hyprland.nixosModules.default
stylix.nixosModules.stylix stylix.nixosModules.stylix
nix-gaming.nixosModules.pipewireLowLatency nix-gaming.nixosModules.pipewireLowLatency
./src/main.nix ./src/main.nix
]; ];
};
}; };
};
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";

19
hosts/laptop.nix
View File

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

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

@ -1,7 +1,7 @@
{pkgs, ...}: { { pkgs, ... }: {
services.interception-tools = { services.interception-tools = {
enable = true; enable = true;
plugins = [pkgs.interception-tools-plugins.dual-function-keys]; plugins = [ pkgs.interception-tools-plugins.dual-function-keys ];
udevmonConfig = '' 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" - 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: DEVICE:

4
modules/dunst/default.nix
View File

@ -1,5 +1,5 @@
{pkgs, ...}: { { pkgs, ... }: {
environment.systemPackages = [pkgs.libnotify]; environment.systemPackages = [ pkgs.libnotify ];
home-manager.sharedModules = [ home-manager.sharedModules = [
{ {

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

@ -1,6 +1,6 @@
{pkgs, ...}: { { pkgs, ... }: {
i18n.inputMethod.enabled = "fcitx5"; i18n.inputMethod.enabled = "fcitx5";
i18n.inputMethod.fcitx5.addons = [pkgs.fcitx5-mozc]; i18n.inputMethod.fcitx5.addons = [ pkgs.fcitx5-mozc ];
home-manager.sharedModules = [ home-manager.sharedModules = [
{ {

8
modules/feh/default.nix
View File

@ -5,8 +5,8 @@
enable = true; enable = true;
keybindings = { keybindings = {
next_img = ["k" "Right"]; next_img = [ "k" "Right" ];
prev_img = ["j" "Left"]; prev_img = [ "j" "Left" ];
quit = "q"; quit = "q";
toggle_fullscreen = "f"; toggle_fullscreen = "f";
@ -25,8 +25,8 @@
jump_back = "L"; jump_back = "L";
scroll_left = "b"; scroll_left = "b";
scroll_right = "n"; scroll_right = "n";
scroll_up = ["u" "Up"]; scroll_up = [ "u" "Up" ];
scroll_down = ["d" "Down"]; scroll_down = [ "d" "Down" ];
zoom_default = "o"; zoom_default = "o";
zoom_fill = "p"; zoom_fill = "p";
toggle_auto_zoom = "m"; toggle_auto_zoom = "m";

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

@ -1,8 +1,10 @@
{pkgs, ...}: let { pkgs, ... }:
let
VARIABLES = import ../../src/variables.nix; VARIABLES = import ../../src/variables.nix;
in { in
{
users.defaultUserShell = pkgs.fish; users.defaultUserShell = pkgs.fish;
environment.shells = [pkgs.fish]; environment.shells = [ pkgs.fish ];
programs.fish = { programs.fish = {
enable = true; enable = true;

10
modules/fonts/default.nix
View File

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

8
modules/git/default.nix
View File

@ -1,7 +1,9 @@
{pkgs, ...}: let { pkgs, ... }:
let
VARIABLES = import ../../src/variables.nix; VARIABLES = import ../../src/variables.nix;
in { in
environment.systemPackages = with pkgs; [tig git]; {
environment.systemPackages = with pkgs; [ tig git ];
home-manager.sharedModules = [ home-manager.sharedModules = [
{ {

8
modules/hyprland/default.nix
View File

@ -1,6 +1,8 @@
{pkgs, ...}: let { pkgs, ... }:
let
VARIABLES = import ../../src/variables.nix; VARIABLES = import ../../src/variables.nix;
in { in
{
programs.hyprland.enable = true; programs.hyprland.enable = true;
services.udisks2 = { services.udisks2 = {
enable = true; enable = true;
@ -14,7 +16,7 @@ in {
services.xserver = { services.xserver = {
enable = true; enable = true;
displayManager.lightdm.enable = false; displayManager.lightdm.enable = false;
excludePackages = [pkgs.xterm]; excludePackages = [ pkgs.xterm ];
}; };
home-manager.sharedModules = [ home-manager.sharedModules = [

2
modules/joshuto/default.nix
View File

@ -1,4 +1,4 @@
{pkgs, ...}: { { pkgs, ... }: {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
joshuto joshuto
]; ];

3
modules/kitty/default.nix
View File

@ -1,6 +1,7 @@
let let
VARIABLES = import ../../src/variables.nix; VARIABLES = import ../../src/variables.nix;
in { in
{
home-manager.sharedModules = [ home-manager.sharedModules = [
{ {
programs.kitty = { programs.kitty = {

3
modules/mime-apps/default.nix
View File

@ -1,6 +1,7 @@
let let
VARIABLES = import ../../src/variables.nix; VARIABLES = import ../../src/variables.nix;
in { in
{
home-manager.sharedModules = [ home-manager.sharedModules = [
{ {
xdg.mimeApps = { xdg.mimeApps = {

2
modules/mpv/default.nix
View File

@ -1,4 +1,4 @@
{pkgs, ...}: { { pkgs, ... }: {
home-manager.sharedModules = [ home-manager.sharedModules = [
{ {
programs.mpv = { programs.mpv = {

20
modules/ncmpcpp/default.nix
View File

@ -1,6 +1,8 @@
{pkgs, ...}: let { pkgs, ... }:
let
VARIABLES = import ../../src/variables.nix; VARIABLES = import ../../src/variables.nix;
in { in
{
home-manager.sharedModules = [ home-manager.sharedModules = [
{ {
services.mpd = { services.mpd = {
@ -24,7 +26,7 @@ in {
} }
{ {
key = "h"; key = "h";
command = ["previous_column" "jump_to_parent_directory"]; command = [ "previous_column" "jump_to_parent_directory" ];
} }
{ {
key = "j"; key = "j";
@ -36,23 +38,23 @@ in {
} }
{ {
key = "l"; key = "l";
command = ["next_column" "enter_directory" "play_item"]; command = [ "next_column" "enter_directory" "play_item" ];
} }
{ {
key = "H"; key = "H";
command = ["select_item" "scroll_down"]; command = [ "select_item" "scroll_down" ];
} }
{ {
key = "J"; key = "J";
command = ["move_sort_order_down" "move_selected_items_down"]; command = [ "move_sort_order_down" "move_selected_items_down" ];
} }
{ {
key = "K"; key = "K";
command = ["move_sort_order_up" "move_selected_items_up"]; command = [ "move_sort_order_up" "move_selected_items_up" ];
} }
{ {
key = "L"; key = "L";
command = ["select_item" "scroll_up"]; command = [ "select_item" "scroll_up" ];
} }
{ {
key = "'"; key = "'";
@ -149,5 +151,5 @@ in {
} }
]; ];
environment.systemPackages = with pkgs; [mpc-cli]; environment.systemPackages = with pkgs; [ mpc-cli ];
} }

6
modules/neovim/default.nix
View File

@ -1,4 +1,5 @@
{pkgs, ...}: let { pkgs, ... }:
let
vim-nix-rummik = pkgs.vimUtils.buildVimPluginFrom2Nix { vim-nix-rummik = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "vim-nix"; pname = "vim-nix";
version = "0def8020f152a51c011a707680780dac61a8989a"; version = "0def8020f152a51c011a707680780dac61a8989a";
@ -9,7 +10,8 @@
sha256 = "sha256-Q+Jx6/MgeE2hsd/a6FqfXpAOaRcNymZW6t75hYCcH4E="; sha256 = "sha256-Q+Jx6/MgeE2hsd/a6FqfXpAOaRcNymZW6t75hYCcH4E=";
}; };
}; };
in { in
{
programs.neovim.enable = true; programs.neovim.enable = true;
home-manager.sharedModules = [ home-manager.sharedModules = [

4
modules/piper/default.nix
View File

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

2
modules/pipewire/default.nix
View File

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

10
modules/qutebrowser/default.nix
View File

@ -1,4 +1,4 @@
{pkgs, ...}: { { pkgs, ... }: {
home-manager.sharedModules = [ home-manager.sharedModules = [
{ {
programs.qutebrowser = { programs.qutebrowser = {
@ -30,12 +30,12 @@
fileselect = { fileselect = {
handler = "external"; handler = "external";
folder.command = ["kitty" "-e" "joshuto" "--output-file" "{}"]; folder.command = [ "kitty" "-e" "joshuto" "--output-file" "{}" ];
multiple_files.command = ["kitty" "-e" "joshuto" "--output-file" "{}"]; multiple_files.command = [ "kitty" "-e" "joshuto" "--output-file" "{}" ];
single_file.command = ["kitty" "-e" "joshuto" "--output-file" "{}"]; single_file.command = [ "kitty" "-e" "joshuto" "--output-file" "{}" ];
}; };
editor.command = ["kitty" "-e" "nvim" "{}"]; editor.command = [ "kitty" "-e" "nvim" "{}" ];
}; };
keyBindings = { keyBindings = {

2
modules/rofi/default.nix
View File

@ -1,4 +1,4 @@
{lib, ...}: { { lib, ... }: {
home-manager.sharedModules = [ home-manager.sharedModules = [
{ {
programs.rofi = { programs.rofi = {

2
modules/stylix/default.nix
View File

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

4
modules/swaylock/default.nix
View File

@ -1,5 +1,5 @@
{pkgs, ...}: { { pkgs, ... }: {
security.pam.services.swaylock = {}; security.pam.services.swaylock = { };
home-manager.sharedModules = [ home-manager.sharedModules = [
{ {

4
modules/thunar/default.nix
View File

@ -1,11 +1,11 @@
{pkgs, ...}: { { pkgs, ... }: {
programs.thunar.enable = true; programs.thunar.enable = true;
services.tumbler.enable = true; # Thumbnail support services.tumbler.enable = true; # Thumbnail support
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
xfce.exo # Open with kitty support xfce.exo # Open with kitty support
glib glib
(pkgs.callPackage ../../packages/go-thumbnailer {}) (pkgs.callPackage ../../packages/go-thumbnailer { })
]; ];
services.gvfs.enable = true; # Trash support services.gvfs.enable = true; # Trash support

17
modules/waybar/default.nix
View File

@ -1,7 +1,6 @@
{ { lib
lib, , hyprland
hyprland, , ...
...
}: { }: {
home-manager.sharedModules = [ home-manager.sharedModules = [
{ {
@ -16,8 +15,8 @@
width = 45; width = 45;
spacing = 8; spacing = 8;
modules-left = ["wlr/workspaces" "custom/new-workspace"]; modules-left = [ "wlr/workspaces" "custom/new-workspace" ];
modules-right = ["tray" "wireplumber" "backlight" "battery" "clock"]; modules-right = [ "tray" "wireplumber" "backlight" "battery" "clock" ];
tray = { tray = {
icon-size = 24; icon-size = 24;
@ -46,13 +45,13 @@
format = "{icon}"; format = "{icon}";
tooltip-format = "{volume}% {node_name}"; tooltip-format = "{volume}% {node_name}";
format-muted = ""; format-muted = "";
format-icons = ["" ""]; format-icons = [ "" "" ];
}; };
battery = { battery = {
"format" = "{icon}"; "format" = "{icon}";
"tooltip-format" = "{capacity}% {timeTo}"; "tooltip-format" = "{capacity}% {timeTo}";
"format-icons" = ["" "" "" "" ""]; "format-icons" = [ "" "" "" "" "" ];
}; };
clock = { clock = {
@ -73,7 +72,7 @@
backlight = { backlight = {
"format" = "{icon}"; "format" = "{icon}";
"format-icons" = ["" ""]; "format-icons" = [ "" "" ];
}; };
"custom/new-workspace" = { "custom/new-workspace" = {

2
modules/waycorner/default.nix
View File

@ -1,4 +1,4 @@
{pkgs, ...}: { { pkgs, ... }: {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
waycorner waycorner
]; ];

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

@ -1,6 +1,7 @@
let let
VARIABLES = import ../../src/variables.nix; VARIABLES = import ../../src/variables.nix;
in { in
{
home-manager.sharedModules = [ home-manager.sharedModules = [
{ {
xdg.userDirs = { xdg.userDirs = {

2
overlays/alejandra/default.nix
View File

@ -2,7 +2,7 @@
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
alejandra = prev.alejandra.overrideAttrs (old: { alejandra = prev.alejandra.overrideAttrs (old: {
patches = (old.patches or []) ++ [./remove-ads.patch]; patches = (old.patches or [ ]) ++ [ ./remove-ads.patch ];
}); });
}) })
]; ];

2
overlays/joshuto/default.nix
View File

@ -1,4 +1,4 @@
{lib, ...}: { { lib, ... }: {
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
joshuto = prev.joshuto.overrideAttrs (oldAttrs: rec { joshuto = prev.joshuto.overrideAttrs (oldAttrs: rec {

2
overlays/kitty/default.nix
View File

@ -2,7 +2,7 @@
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
kitty = prev.kitty.overrideAttrs (old: { kitty = prev.kitty.overrideAttrs (old: {
patches = (old.patches or []) ++ [./fix-duplicate-lines.patch]; patches = (old.patches or [ ]) ++ [ ./fix-duplicate-lines.patch ];
}); });
}) })
]; ];

6
overlays/rofi/default.nix
View File

@ -1,4 +1,4 @@
{pkgs, ...}: { { pkgs, ... }: {
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
rofi-unwrapped = prev.rofi-unwrapped.overrideAttrs (oldAttrs: rec { rofi-unwrapped = prev.rofi-unwrapped.overrideAttrs (oldAttrs: rec {
@ -12,8 +12,8 @@
sha256 = "sha256-8IfHpaVFGeWqyw+tLjNtg+aWwAHhSA5PuXJYjpoht2E="; sha256 = "sha256-8IfHpaVFGeWqyw+tLjNtg+aWwAHhSA5PuXJYjpoht2E=";
}; };
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.wayland-scanner]; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.wayland-scanner ];
buildInputs = oldAttrs.buildInputs ++ [pkgs.wayland pkgs.wayland-protocols]; buildInputs = oldAttrs.buildInputs ++ [ pkgs.wayland pkgs.wayland-protocols ];
}); });
}) })
]; ];

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

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

39
src/main.nix
View File

@ -1,15 +1,16 @@
{ { pkgs
pkgs, , lib
lib, , hypr-contrib
hypr-contrib, , nix-gaming
nix-gaming, , crystal-flake
crystal-flake, , nixpkgs-hyprland-autoname-workspaces
nixpkgs-hyprland-autoname-workspaces, , nixpkgs-srb2
nixpkgs-srb2, , ...
... }:
}: let let
VARIABLES = import ./variables.nix; VARIABLES = import ./variables.nix;
in { in
{
imports = [ imports = [
"${VARIABLES.hostHardwareConfiguration}" "${VARIABLES.hostHardwareConfiguration}"
../overlays ../overlays
@ -24,7 +25,7 @@ in {
# nix # nix
nix.package = pkgs.nixFlakes; nix.package = pkgs.nixFlakes;
nix.settings.experimental-features = ["nix-command" "flakes" "repl-flake"]; nix.settings.experimental-features = [ "nix-command" "flakes" "repl-flake" ];
nix.settings.auto-optimise-store = true; nix.settings.auto-optimise-store = true;
hardware.opengl.driSupport32Bit = true; hardware.opengl.driSupport32Bit = true;
@ -205,7 +206,7 @@ in {
NODE_OPTIONS = "--max_old_space_size=16384"; NODE_OPTIONS = "--max_old_space_size=16384";
}; };
environment.defaultPackages = []; environment.defaultPackages = [ ];
system.stateVersion = VARIABLES.stateVersion; system.stateVersion = VARIABLES.stateVersion;
# home-manager # home-manager
@ -278,7 +279,7 @@ in {
isNormalUser = true; isNormalUser = true;
uid = 1000; uid = 1000;
password = "user"; password = "user";
extraGroups = ["wheel" "networkmanager"]; extraGroups = [ "wheel" "networkmanager" ];
}; };
}; };
@ -300,7 +301,7 @@ in {
wifi.macAddress = "random"; wifi.macAddress = "random";
ethernet.macAddress = "random"; ethernet.macAddress = "random";
unmanaged = ["interface-name:ve-*"]; unmanaged = [ "interface-name:ve-*" ];
}; };
useHostResolvConf = true; useHostResolvConf = true;
@ -318,7 +319,7 @@ in {
restrictNetwork = true; 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 = { environment.sessionVariables = {
WLR_NO_HARDWARE_CURSORS = "1"; WLR_NO_HARDWARE_CURSORS = "1";
@ -331,12 +332,12 @@ in {
enableExcludeWrapper = false; enableExcludeWrapper = false;
}; };
networking.firewall.allowedTCPPorts = [11918]; networking.firewall.allowedTCPPorts = [ 11918 ];
networking = { networking = {
nat = { nat = {
enable = true; enable = true;
internalInterfaces = ["ve-+"]; internalInterfaces = [ "ve-+" ];
externalInterface = "wg-mullvad"; externalInterface = "wg-mullvad";
forwardPorts = [ forwardPorts = [
@ -360,7 +361,7 @@ in {
programs.htop = { programs.htop = {
enable = true; enable = true;
package = pkgs."htop-vim"; package = pkgs."htop-vim";
settings = {tree_view = 1;}; settings = { tree_view = 1; };
}; };
services.greetd = { services.greetd = {

2
src/variables.nix
View File

@ -5,7 +5,7 @@
hostHardwareConfiguration = ../hosts/laptop.nix; hostHardwareConfiguration = ../hosts/laptop.nix;
stateVersion = "22.11"; stateVersion = "22.11";
defaultLocale = "ja_JP.UTF-8"; defaultLocale = "ja_JP.UTF-8";
supportedLocales = ["ja_JP.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" "fr_FR.UTF-8/UTF-8"]; supportedLocales = [ "ja_JP.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" "fr_FR.UTF-8/UTF-8" ];
username = "user"; username = "user";
defaultBrowser = "librewolf"; defaultBrowser = "librewolf";
} }