dot013/nix
1
0
Fork 0
Code Issues Pull Requests Activity

chore: format the code

Browse Source
This commit is contained in:
Gustavo "Guz" L. de Mello
2024-04-08 16:37:51 -03:00
parent 5ce99497d7
commit 99b1cbec6b
15 changed files with 128 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
hosts/desktop/.desktop/default.nix
View File

@@ -1,12 +1,9 @@
{ config, ... }:
let
{config, ...}: let
cfg = config.desktop;
in
{
in {
imports = [
./scripts/desktop.nix
];
options.desktop = { };
config = { };
options.desktop = {};
config = {};
}

16
hosts/desktop/.desktop/scripts/desktop.nix
View File

@@ -1,7 +1,5 @@
{ pkgs, ... }:
let
desktop = pkgs.writeShellScriptBin "desktop" ''
{pkgs, ...}: let
desktop = pkgs.writeShellScriptBin "desktop" ''
function cat() {
echo $1 | ${pkgs.lolcat}/bin/lolcat
echo ""
@@ -14,7 +12,7 @@ let
if [[ "$env" -ne "" ]]; then
cat "Building the $env desktop!"
sudo nixos-rebuild switch --flake "$flakeDir#desktop@$env"
else
else
cat "Building the desktop!"
sudo nixos-rebuild switch --flake "$flakeDir#desktop@default"
fi
@@ -46,14 +44,12 @@ let
echo "Restarting zsh"
exec zsh
'';
in
{
imports = [ ];
options.desktop.cli = { };
in {
imports = [];
options.desktop.cli = {};
config = {
home.packages = [
desktop
];
};
}

6
hosts/desktop/default/configuration.nix
View File

@@ -1,10 +1,8 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
imports = [
../shared-configuration.nix
];
options.default.configuration = { };
options.default.configuration = {};
config = {
set-user.users = [
{

6
hosts/desktop/default/home.nix
View File

@@ -1,10 +1,8 @@
{ ... }:
{
{...}: {
imports = [
../shared-home.nix
];
options.default.home = { };
options.default.home = {};
config = {
librewolf.profiles.guz.isDefault = true;
};

15
hosts/desktop/gpu-configuration.nix
View File

@@ -1,11 +1,13 @@
{ config, pkgs, ... }:
{
imports = [ ];
options.shared.configuration.gpu = { };
config,
pkgs,
...
}: {
imports = [];
options.shared.configuration.gpu = {};
config = {
boot.initrd.kernelModules = [ "amdgpu" ];
services.xserver.videoDrivers = [ "amdgpu" ];
boot.initrd.kernelModules = ["amdgpu"];
services.xserver.videoDrivers = ["amdgpu"];
environment = {
variables = {
@@ -25,6 +27,5 @@
driSupport = true;
driSupport32Bit = true;
};
};
}

44
hosts/desktop/hardware-configuration.nix
View File

@@ -1,33 +1,33 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ 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 = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [];
fileSystems."/" =
{
device = "/dev/disk/by-uuid/a97b3b84-be9f-4f71-9798-79ca792738fe";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/a97b3b84-be9f-4f71-9798-79ca792738fe";
fsType = "ext4";
};
fileSystems."/boot" =
{
device = "/dev/disk/by-uuid/88AB-2855";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/88AB-2855";
fsType = "vfat";
};
swapDevices =
[{ device = "/dev/disk/by-uuid/d890b8ef-5437-4ffc-9b1e-1324f623c2d1"; }];
swapDevices = [{device = "/dev/disk/by-uuid/d890b8ef-5437-4ffc-9b1e-1324f623c2d1";}];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's

6
hosts/desktop/keybinds.nix
View File

@@ -1,10 +1,8 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
imports = [
../../modules/home-manager/programs/hyprland.nix
];
options.keybinds = { };
options.keybinds = {};
config = {
hyprland.binds.keyboard = [
"$mod, C, killactive"

73
hosts/desktop/shared-configuration.nix
View File

@@ -1,6 +1,10 @@
{ config, pkgs, inputs, lib, ... }:
{
config,
pkgs,
inputs,
lib,
...
}: {
imports = [
../../modules/nih
../../modules/nixos/config/host.nix
@@ -10,9 +14,8 @@
./hardware-configuration.nix
./gpu-configuration.nix
];
options.shared.configuration = { };
options.shared.configuration = {};
config = {
nih = {
enable = true;
ip = "192.168.1.13";
@@ -20,11 +23,14 @@
networking = {
interface = "enp6s0";
wireless = false;
tailscale.enable = true;
};
users.test = {
username = "test";
};
serives = {
tailscale.enable = true;
};
users.test = {
programs.hyprland = {
enable = true;
@@ -45,8 +51,8 @@
}
];
windowRules = {
"class:^(org.inkscape.Inkscape)$" = [ "float" ];
"class:^(org.inkscape.Inkscape)$,title:(.*)(- Inkscape)$" = [ "tile" ];
"class:^(org.inkscape.Inkscape)$" = ["float"];
"class:^(org.inkscape.Inkscape)$,title:(.*)(- Inkscape)$" = ["tile"];
};
workspaces = [
# First monitor
@@ -121,8 +127,8 @@
my-fonts.user = "guz";
my-fonts.fonts = with pkgs; [
fira-code
(nerdfonts.override { fonts = [ "FiraCode" ]; })
(google-fonts.override { fonts = [ "Gloock" "Cinzel" "Red Hat Display" ]; })
(nerdfonts.override {fonts = ["FiraCode"];})
(google-fonts.override {fonts = ["Gloock" "Cinzel" "Red Hat Display"];})
(stdenv.mkDerivation rec {
pname = "calsans";
version = "1.0.0";
@@ -145,7 +151,7 @@
];
programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; [ ];
programs.nix-ld.libraries = with pkgs; [];
virtualisation.waydroid.enable = true;
@@ -192,11 +198,12 @@
wl-clipboard
];
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"steam"
"steam-original"
"steam-run"
];
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
"steam"
"steam-original"
"steam-run"
];
programs.steam = {
enable = true;
};
@@ -219,7 +226,7 @@
services.flatpak.enable = true;
environment.pathsToLink = [ " /share/zsh " ];
environment.pathsToLink = [" /share/zsh "];
services.tailscale = {
enable = true;
@@ -233,21 +240,19 @@
services.blueman.enable = true;
# hardware.pulseaudio.enable = true;
services.interception-tools =
let
device = "/dev/input/by-id/usb-BY_Tech_Gaming_Keyboard-event-kbd";
in
{
enable = true;
plugins = [ pkgs.interception-tools-plugins.caps2esc ];
udevmonConfig = ''
- JOB: "${pkgs.interception-tools}/bin/intercept -g ${device} | ${pkgs.interception-tools-plugins.caps2esc}/bin/caps2esc -m 2 | ${pkgs.interception-tools}/bin/uinput -d ${device}"
DEVICE:
EVENTS:
EV_KEY: [[KEY_CAPSLOCK, KEY_ESC]]
LINK: ${device}
'';
};
services.interception-tools = let
device = "/dev/input/by-id/usb-BY_Tech_Gaming_Keyboard-event-kbd";
in {
enable = true;
plugins = [pkgs.interception-tools-plugins.caps2esc];
udevmonConfig = ''
- JOB: "${pkgs.interception-tools}/bin/intercept -g ${device} | ${pkgs.interception-tools-plugins.caps2esc}/bin/caps2esc -m 2 | ${pkgs.interception-tools}/bin/uinput -d ${device}"
DEVICE:
EVENTS:
EV_KEY: [[KEY_CAPSLOCK, KEY_ESC]]
LINK: ${device}
'';
};
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
@@ -277,9 +282,3 @@
system.stateVersion = "23.11"; # Did you read the comment?
};
}

26
hosts/desktop/shared-home.nix
View File

@@ -1,23 +1,25 @@
{ config, pkgs, inputs, ... }:
{
config,
pkgs,
inputs,
...
}: {
imports = [
../../modules/home-manager/theme.nix
../../modules/home-manager/programs/librewolf
../../modules/home-manager/programs/krita
../../modules/home-manager/programs/davinci.nix
../../modules/home-manager/programs/obs.nix
../../modules/home-manager/programs/obsidian.nix
../../modules/home-manager/packages/nixx.nix
../../modules/home-manager/packages/nixi.nix
../../modules/home-manager/programs-old/librewolf
../../modules/home-manager/programs-old/krita
../../modules/home-manager/programs-old/davinci.nix
../../modules/home-manager/programs-old/obs.nix
../../modules/home-manager/programs-old/obsidian.nix
../../modules/home-manager/packages-old/nixx.nix
../../modules/home-manager/packages-old/nixi.nix
./terminal.nix
./wm.nix
./keybinds.nix
./.desktop
];
options.shared.home = { };
options.shared.home = {};
config = {
programs.bash = {
enable = true;
initExtra = ''
@@ -95,7 +97,7 @@
## Fonts
fira-code
(nerdfonts.override { fonts = [ "FiraCode" ]; })
(nerdfonts.override {fonts = ["FiraCode"];})
];
# Home Manager is pretty good at managing dotfiles. The primary way to manage

10
hosts/desktop/terminal.nix
View File

@@ -1,6 +1,9 @@
{ config, inputs, pkgs, ... }:
{
config,
inputs,
pkgs,
...
}: {
imports = [
../../modules/home-manager/programs/lf.nix
../../modules/home-manager/programs/starship.nix
@@ -8,7 +11,7 @@
../../modules/home-manager/programs/wezterm.nix
../../modules/home-manager/programs/zsh.nix
];
options.terminal = { };
options.terminal = {};
config = {
lf.enable = true;
@@ -39,6 +42,5 @@
enableZshIntegration = true;
nix-direnv.enable = true;
};
};
}

27
hosts/desktop/wm.nix
View File

@@ -1,6 +1,9 @@
{ config, lib, pkgs, ... }:
let
{
config,
lib,
pkgs,
...
}: let
cfg = config.wm;
wm-boot = pkgs.writeShellScriptBin "wm-boot" ''
eww="${pkgs.eww-wayland}/bin/eww"
@@ -24,20 +27,19 @@ let
$swww img "${builtins.toPath cfg.wallpaper}"
'';
in
{
in {
imports = [
../../modules/home-manager/programs/hyprland.nix
../../modules/home-manager/programs/eww
];
options.wm = with lib; with lib.types; {
options.wm = with lib;
with lib.types; {
wallpaper = mkOption {
default = ../../static/guz-wallpaper-default.png;
type = path;
};
};
config = {
eww.enable = true;
hyprland.enable = true;
@@ -64,8 +66,8 @@ in
}
];
hyprland.windowRules = {
"class:^(org.inkscape.Inkscape)$" = [ "float" ];
"class:^(org.inkscape.Inkscape)$,title:(.*)(- Inkscape)$" = [ "tile" ];
"class:^(org.inkscape.Inkscape)$" = ["float"];
"class:^(org.inkscape.Inkscape)$,title:(.*)(- Inkscape)$" = ["tile"];
};
hyprland.workspaces = [
# First monitor
@@ -120,17 +122,16 @@ in
genericName = "Web Browser";
exec = "${pkgs.librewolf}/bin/librewolf %U";
terminal = false;
categories = [ "Application" "Network" "WebBrowser" ];
mimeType = [ "text/html" "text/xml" ];
categories = ["Application" "Network" "WebBrowser"];
mimeType = ["text/html" "text/xml"];
};
davinci = {
name = "Davinci Resolve";
genericName = "Video Editor";
exec = "${pkgs.davinci-resolve}/bin/davinci-resolve %U";
terminal = false;
categories = [ "Application" "Video" ];
categories = ["Application" "Video"];
};
};
};
}

6
hosts/desktop/work/configuration.nix
View File

@@ -1,10 +1,8 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
imports = [
../shared-configuration.nix
];
options.work.configuration = { };
options.work.configuration = {};
config = {
set-user.users = [
{

6
hosts/desktop/work/home.nix
View File

@@ -1,10 +1,8 @@
{ inputs, ... }:
{
{inputs, ...}: {
imports = [
../shared-home.nix
];
options.work.home = { };
options.work.home = {};
config = {
theme.accent = "94e2d5";
wm.wallpaper = ../../../static/guz-wallpaper-work.png;

12
modules/home-manager/packages/nixi.nix
View File

@@ -1,6 +1,4 @@
{ pkgs, ... }:
let
{pkgs, ...}: let
nixi = pkgs.writeShellScriptBin "nixi" ''
# npm-like command for nix
function nix-shell() {
@@ -9,14 +7,12 @@ let
}
nix-shell $1
'';
in
{
imports = [ ];
options.nixi = { };
in {
imports = [];
options.nixi = {};
config = {
home.packages = [
nixi
];
};
}

12
modules/home-manager/packages/nixx.nix
View File

@@ -1,6 +1,4 @@
{ pkgs, ... }:
let
{pkgs, ...}: let
nixx = pkgs.writeShellScriptBin "nixx" ''
# npx-like command for nix
function nix-run() {
@@ -9,14 +7,12 @@ let
}
nix-run $1
'';
in
{
imports = [ ];
options.nixx = { };
in {
imports = [];
options.nixx = {};
config = {
home.packages = [
nixx
];
};
}