treewide: format using nixfmt-rfc-style

This commit is contained in:
Leonardo Eugênio 2024-05-30 16:54:58 -03:00
parent 5218277b3e
commit 15c5e33060
98 changed files with 1930 additions and 990 deletions

View file

@ -68,11 +68,14 @@
nixos-conf-editor.url = "github:vlinkz/nixos-conf-editor"; nixos-conf-editor.url = "github:vlinkz/nixos-conf-editor";
nix-software-center.url = "github:vlinkz/nix-software-center"; nix-software-center.url = "github:vlinkz/nix-software-center";
}; };
outputs = inputs: outputs =
inputs:
let let
nixpkgsConfig = { nixpkgsConfig = {
inherit system; inherit system;
config = { allowUnfree = true; }; config = {
allowUnfree = true;
};
overlays = old_overlays.all; overlays = old_overlays.all;
}; };
@ -85,8 +88,11 @@
old_overlays = (import ./overlays { inherit packages inputs; }); old_overlays = (import ./overlays { inherit packages inputs; });
specialArgs = { inherit inputs; }; specialArgs = {
common_modules = [ inherit inputs;
};
common_modules =
[
{ nixpkgs.pkgs = pkgs; } { nixpkgs.pkgs = pkgs; }
./system/configuration.nix ./system/configuration.nix
./system/secrets.nix ./system/secrets.nix
@ -106,7 +112,9 @@
home-manager.backupFileExtension = "bkp"; home-manager.backupFileExtension = "bkp";
# Optionally, use home-manager.extraSpecialArgs to pass # Optionally, use home-manager.extraSpecialArgs to pass
# arguments to home.nix # arguments to home.nix
home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.extraSpecialArgs = {
inherit inputs;
};
} }
] ]
++ lib.optional (desktop == "gnome") ./system/gnome.nix ++ lib.optional (desktop == "gnome") ./system/gnome.nix
@ -144,11 +152,16 @@
}; };
pixie = lib.nixosSystem { pixie = lib.nixosSystem {
inherit system specialArgs; inherit system specialArgs;
modules = [ ./hosts/pixie.nix ] ++ common_modules ++ [{ modules =
[ ./hosts/pixie.nix ]
++ common_modules
++ [
{
packages.media-packages.enable = lib.mkOverride 0 false; packages.media-packages.enable = lib.mkOverride 0 false;
programs.steam.enable = lib.mkOverride 0 false; programs.steam.enable = lib.mkOverride 0 false;
services.flatpak.enable = lib.mkOverride 0 false; services.flatpak.enable = lib.mkOverride 0 false;
}]; }
];
}; };
phantom = lib.nixosSystem { phantom = lib.nixosSystem {
inherit system specialArgs; inherit system specialArgs;

View file

@ -1,13 +1,32 @@
{ config, lib, pkgs, modulesPath, ... }: {
config,
lib,
pkgs,
modulesPath,
...
}:
let let
btrfs_options = [ "compress=zstd:3" "noatime" "x-systemd.device-timeout=0" ]; btrfs_options = [
btrfs_ssd = [ "ssd" "discard=async" ]; "compress=zstd:3"
"noatime"
"x-systemd.device-timeout=0"
];
btrfs_ssd = [
"ssd"
"discard=async"
];
in in
{ {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = boot.initrd.availableKernelModules = [
[ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; "xhci_pci"
"ahci"
"nvme"
"usb_storage"
"usbhid"
"sd_mod"
];
boot.initrd.kernelModules = [ "i915" ]; boot.initrd.kernelModules = [ "i915" ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
@ -18,8 +37,7 @@ in
options = [ "subvol=@" ] ++ btrfs_options ++ btrfs_ssd; options = [ "subvol=@" ] ++ btrfs_options ++ btrfs_ssd;
}; };
boot.initrd.luks.devices."luks-d6573cf8-25f0-4ffc-8046-ac3a4db1e964".device = boot.initrd.luks.devices."luks-d6573cf8-25f0-4ffc-8046-ac3a4db1e964".device = "/dev/disk/by-uuid/d6573cf8-25f0-4ffc-8046-ac3a4db1e964";
"/dev/disk/by-uuid/d6573cf8-25f0-4ffc-8046-ac3a4db1e964";
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/97EB-7DB5"; device = "/dev/disk/by-uuid/97EB-7DB5";
@ -37,8 +55,7 @@ in
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
hardware.cpu.intel.updateMicrocode = hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
lib.mkDefault config.hardware.enableRedistributableFirmware;
networking.hostName = "double-rainbow"; # Define your hostname. networking.hostName = "double-rainbow"; # Define your hostname.
} }

View file

@ -1,15 +1,30 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: {
config,
lib,
pkgs,
modulesPath,
...
}:
let let
btrfs_options = [ "compress=zstd:3" "noatime" "x-systemd.device-timeout=0" ]; btrfs_options = [
"compress=zstd:3"
"noatime"
"x-systemd.device-timeout=0"
];
in in
{ {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = boot.initrd.availableKernelModules = [
[ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ]; "xhci_pci"
"ahci"
"usb_storage"
"sd_mod"
"rtsx_usb_sdmmc"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
@ -45,10 +60,12 @@ in
options = [ "subvol=@swap" ] ++ btrfs_options; options = [ "subvol=@swap" ] ++ btrfs_options;
}; };
swapDevices = [{ swapDevices = [
{
device = "/swap/swapfile"; device = "/swap/swapfile";
size = (1024 * 8) + (1024 * 2); # RAM size + 2 GB size = (1024 * 8) + (1024 * 2); # RAM size + 2 GB
}]; }
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # 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 # (the default) this is the recommended approach. When using systemd-networkd it's
@ -59,7 +76,6 @@ in
# networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
hardware.cpu.intel.updateMicrocode = hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
lib.mkDefault config.hardware.enableRedistributableFirmware;
networking.hostName = "i15"; # Define your hostname. networking.hostName = "i15"; # Define your hostname.
} }

View file

@ -1,21 +1,38 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: {
config,
lib,
pkgs,
modulesPath,
...
}:
let let
btrfs_options = [ "compress=zstd:3" "noatime" "x-systemd.device-timeout=0" ]; btrfs_options = [
btrfs_ssd = [ "ssd" "discard=async" ]; "compress=zstd:3"
"noatime"
"x-systemd.device-timeout=0"
];
btrfs_ssd = [
"ssd"
"discard=async"
];
in in
{ {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = boot.initrd.availableKernelModules = [
[ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; "nvme"
"xhci_pci"
"ahci"
"usb_storage"
"usbhid"
"sd_mod"
];
hardware.opentabletdriver.enable = true; hardware.opentabletdriver.enable = true;
boot.extraModulePackages = with config.boot.kernelPackages; [ boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
zenpower
];
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = [ "amdgpu" ];
boot.kernelModules = [ boot.kernelModules = [
"kvm-amd" "kvm-amd"
@ -88,22 +105,34 @@ in
fileSystems."/home/lelgenio/Games" = { fileSystems."/home/lelgenio/Games" = {
device = "/dev/disk/by-label/BTRFS_DATA"; device = "/dev/disk/by-label/BTRFS_DATA";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@games" "nofail" ] ++ btrfs_options; options = [
"subvol=@games"
"nofail"
] ++ btrfs_options;
}; };
fileSystems."/home/lelgenio/Downloads/Torrents" = { fileSystems."/home/lelgenio/Downloads/Torrents" = {
device = "/dev/disk/by-label/BTRFS_DATA"; device = "/dev/disk/by-label/BTRFS_DATA";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@torrents" "nofail" ] ++ btrfs_options; options = [
"subvol=@torrents"
"nofail"
] ++ btrfs_options;
}; };
fileSystems."/home/lelgenio/Música" = { fileSystems."/home/lelgenio/Música" = {
device = "/dev/disk/by-label/BTRFS_DATA"; device = "/dev/disk/by-label/BTRFS_DATA";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@music" "nofail" ] ++ btrfs_options; options = [
"subvol=@music"
"nofail"
] ++ btrfs_options;
}; };
fileSystems."/home/lelgenio/.local/mount/data" = { fileSystems."/home/lelgenio/.local/mount/data" = {
device = "/dev/disk/by-label/BTRFS_DATA"; device = "/dev/disk/by-label/BTRFS_DATA";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@data" "nofail" ] ++ btrfs_options; options = [
"subvol=@data"
"nofail"
] ++ btrfs_options;
}; };
fileSystems."/home/lelgenio/.local/mount/bigboy" = { fileSystems."/home/lelgenio/.local/mount/bigboy" = {
device = "/dev/disk/by-label/BTRFS_BIGBOY"; device = "/dev/disk/by-label/BTRFS_BIGBOY";
@ -113,12 +142,18 @@ in
fileSystems."/home/lelgenio/projects" = { fileSystems."/home/lelgenio/projects" = {
device = "/dev/disk/by-label/BTRFS_BIGBOY"; device = "/dev/disk/by-label/BTRFS_BIGBOY";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@projects" "nofail" ] ++ btrfs_options ++ btrfs_ssd; options = [
"subvol=@projects"
"nofail"
] ++ btrfs_options ++ btrfs_ssd;
}; };
fileSystems."/var/lib/docker" = { fileSystems."/var/lib/docker" = {
device = "/dev/disk/by-label/BTRFS_BIGBOY"; device = "/dev/disk/by-label/BTRFS_BIGBOY";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@docker" "nofail" ] ++ btrfs_options ++ btrfs_ssd; options = [
"subvol=@docker"
"nofail"
] ++ btrfs_options ++ btrfs_ssd;
}; };
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@ -128,8 +163,7 @@ in
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp4s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
powerManagement.cpuFreqGovernor = "ondemand"; powerManagement.cpuFreqGovernor = "ondemand";
hardware.cpu.amd.updateMicrocode = hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
lib.mkDefault config.hardware.enableRedistributableFirmware;
networking.hostName = "monolith"; # Define your hostname. networking.hostName = "monolith"; # Define your hostname.
# Fix broken suspend with Logitech USB dongle # Fix broken suspend with Logitech USB dongle
@ -146,8 +180,10 @@ in
# with the exception of `"subvol=swap"`, the other options are repeated in my other `fileSystem` mounts # with the exception of `"subvol=swap"`, the other options are repeated in my other `fileSystem` mounts
options = [ "subvol=swap" ] ++ btrfs_options ++ btrfs_ssd; options = [ "subvol=swap" ] ++ btrfs_options ++ btrfs_ssd;
}; };
swapDevices = [{ swapDevices = [
{
device = "/swap/swapfile"; device = "/swap/swapfile";
size = (1024 * 16) + (1024 * 2); # RAM size + 2 GB size = (1024 * 16) + (1024 * 2); # RAM size + 2 GB
}]; }
];
} }

View file

@ -1,4 +1,10 @@
{ config, pkgs, inputs, ... }: { {
config,
pkgs,
inputs,
...
}:
{
imports = [ imports = [
./vpsadminos.nix ./vpsadminos.nix
inputs.agenix.nixosModules.default inputs.agenix.nixosModules.default
@ -49,7 +55,12 @@
enable = true; enable = true;
dates = "04:40"; dates = "04:40";
operation = "switch"; operation = "switch";
flags = [ "--update-input" "nixpkgs" "--no-write-lock-file" "-L" ]; flags = [
"--update-input"
"nixpkgs"
"--no-write-lock-file"
"-L"
];
flake = "git+https://git.lelgenio.com/lelgenio/nixos-config#phantom"; flake = "git+https://git.lelgenio.com/lelgenio/nixos-config#phantom";
}; };
@ -57,4 +68,3 @@
system.stateVersion = "23.05"; # Never change this system.stateVersion = "23.05"; # Never change this
} }

View file

@ -1,10 +1,14 @@
{ pkgs, inputs, config, ... }: { {
pkgs,
inputs,
config,
...
}:
{
# It's important to let Digital Ocean set the hostname so we get rDNS to work # It's important to let Digital Ocean set the hostname so we get rDNS to work
networking.hostName = ""; networking.hostName = "";
imports = [ imports = [ inputs.nixos-mailserver.nixosModules.mailserver ];
inputs.nixos-mailserver.nixosModules.mailserver
];
mailserver = { mailserver = {
enable = true; enable = true;
@ -22,7 +26,11 @@
loginAccounts = { loginAccounts = {
"lelgenio@lelgenio.com" = { "lelgenio@lelgenio.com" = {
hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS"; hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS";
aliases = [ "postmaster@lelgenio.com" "lelgenio@lelgenio.xyz" "lelgenio@lelgenio.xyz" ]; aliases = [
"postmaster@lelgenio.com"
"lelgenio@lelgenio.xyz"
"lelgenio@lelgenio.xyz"
];
}; };
"noreply@git.lelgenio.com" = { "noreply@git.lelgenio.com" = {
hashedPassword = "$2b$05$TmR1R7ZwXfec7yrOfeBL7u3ZtyXf0up5dEO6uMWSvb/O7LPEm.j0."; hashedPassword = "$2b$05$TmR1R7ZwXfec7yrOfeBL7u3ZtyXf0up5dEO6uMWSvb/O7LPEm.j0.";
@ -50,5 +58,4 @@
$config['plugins'] = [ "carddav", "archive" ]; $config['plugins'] = [ "carddav", "archive" ];
''; '';
}; };
} }

View file

@ -1,4 +1,9 @@
{ lib, pkgs, config, ... }: {
lib,
pkgs,
config,
...
}:
let let
cfg = config.services.forgejo; cfg = config.services.forgejo;
srv = cfg.settings.server; srv = cfg.settings.server;

View file

@ -1,7 +1,14 @@
{ config, pkgs, inputs, ... }: { {
swapDevices = [{ config,
pkgs,
inputs,
...
}:
{
swapDevices = [
{
device = "/swap/swapfile"; device = "/swap/swapfile";
size = (1024 * 2); # 2 GB size = (1024 * 2); # 2 GB
}];
} }
];
}

View file

@ -1,4 +1,10 @@
{ config, pkgs, inputs, ... }: { {
config,
pkgs,
inputs,
...
}:
{
services.mastodon = { services.mastodon = {
enable = true; enable = true;
configureNginx = true; configureNginx = true;

View file

@ -1,4 +1,10 @@
{ config, pkgs, inputs, ... }: { {
config,
pkgs,
inputs,
...
}:
{
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud27; package = pkgs.nextcloud27;
@ -22,6 +28,4 @@
group = "nextcloud"; group = "nextcloud";
}; };
}; };
} }

View file

@ -1,4 +1,10 @@
{ config, pkgs, lib, ... }: { {
config,
pkgs,
lib,
...
}:
{
services.nginx = { services.nginx = {
enable = true; enable = true;
recommendedProxySettings = true; recommendedProxySettings = true;
@ -8,10 +14,20 @@
}; };
# Redirect *lelgenio.xyz -> *lelgenio.com # Redirect *lelgenio.xyz -> *lelgenio.com
services.nginx.virtualHosts = lib.mapAttrs' services.nginx.virtualHosts =
(key: value: lib.nameValuePair "${key}lelgenio.xyz" value) lib.mapAttrs' (key: value: lib.nameValuePair "${key}lelgenio.xyz" value)
( (
lib.genAttrs [ "" "social." "blog." "cloud." "mail." "git." "syncthing." ] (name: { lib.genAttrs
[
""
"social."
"blog."
"cloud."
"mail."
"git."
"syncthing."
]
(name: {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
locations."/".return = "301 $scheme://${name}lelgenio.com$request_uri"; locations."/".return = "301 $scheme://${name}lelgenio.com$request_uri";
@ -23,6 +39,8 @@
defaults.email = "lelgenio@disroot.org"; defaults.email = "lelgenio@disroot.org";
}; };
networking.firewall.allowedTCPPorts = [ 80 443 ]; networking.firewall.allowedTCPPorts = [
80
443
];
} }

View file

@ -1,4 +1,10 @@
{ config, pkgs, inputs, ... }: { {
config,
pkgs,
inputs,
...
}:
{
services.syncthing = { services.syncthing = {
enable = true; enable = true;
@ -14,11 +20,10 @@
proxyPass = "http://127.0.0.1:8384"; proxyPass = "http://127.0.0.1:8384";
extraConfig = extraConfig =
# required when the target is also TLS server with multiple hosts # required when the target is also TLS server with multiple hosts
"proxy_ssl_server_name on;" + "proxy_ssl_server_name on;"
+
# required when the server wants to use HTTP Authentication # required when the server wants to use HTTP Authentication
"proxy_pass_header Authorization;" "proxy_pass_header Authorization;";
;
}; };
}; };
} }

View file

@ -1,8 +1,12 @@
{ pkgs, ... }: { { pkgs, ... }:
{
security.rtkit.enable = true; security.rtkit.enable = true;
services.openssh = { services.openssh = {
enable = true; enable = true;
ports = [ 9022 22 ]; ports = [
9022
22
];
settings = { settings = {
PasswordAuthentication = false; PasswordAuthentication = false;
KbdInteractiveAuthentication = false; KbdInteractiveAuthentication = false;
@ -15,7 +19,15 @@
isNormalUser = true; isNormalUser = true;
description = "Leonardo Eugênio"; description = "Leonardo Eugênio";
hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A"; hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A";
extraGroups = [ "networkmanager" "wheel" "docker" "adbusers" "bluetooth" "corectrl" "vboxusers" ]; extraGroups = [
"networkmanager"
"wheel"
"docker"
"adbusers"
"bluetooth"
"corectrl"
"vboxusers"
];
shell = pkgs.fish; shell = pkgs.fish;
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15"
@ -32,7 +44,5 @@
programs.fish.enable = true; programs.fish.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [ git ];
git
];
} }

View file

@ -6,7 +6,12 @@
# #
# https://github.com/vpsfreecz/vpsadminos/blob/staging/os/lib/nixos-container/vpsadminos.nix # https://github.com/vpsfreecz/vpsadminos/blob/staging/os/lib/nixos-container/vpsadminos.nix
{ config, pkgs, lib, ... }: {
config,
pkgs,
lib,
...
}:
with lib; with lib;
let let
nameservers = [ nameservers = [
@ -22,16 +27,19 @@ in
systemd.services.systemd-sysctl.enable = false; systemd.services.systemd-sysctl.enable = false;
systemd.services.systemd-oomd.enable = false; systemd.services.systemd-oomd.enable = false;
systemd.sockets."systemd-journald-audit".enable = false; systemd.sockets."systemd-journald-audit".enable = false;
systemd.mounts = [{ where = "/sys/kernel/debug"; enable = false; }]; systemd.mounts = [
{
where = "/sys/kernel/debug";
enable = false;
}
];
systemd.services.rpc-gssd.enable = false; systemd.services.rpc-gssd.enable = false;
# Due to our restrictions in /sys, the default systemd-udev-trigger fails # Due to our restrictions in /sys, the default systemd-udev-trigger fails
# on accessing PCI devices, etc. Override it to match only network devices. # on accessing PCI devices, etc. Override it to match only network devices.
# In addition, boot.isContainer prevents systemd-udev-trigger.service from # In addition, boot.isContainer prevents systemd-udev-trigger.service from
# being enabled at all, so add it explicitly. # being enabled at all, so add it explicitly.
systemd.additionalUpstreamSystemUnits = [ systemd.additionalUpstreamSystemUnits = [ "systemd-udev-trigger.service" ];
"systemd-udev-trigger.service"
];
systemd.services.systemd-udev-trigger.serviceConfig.ExecStart = [ systemd.services.systemd-udev-trigger.serviceConfig.ExecStart = [
"" ""
"-udevadm trigger --subsystem-match=net --action=add" "-udevadm trigger --subsystem-match=net --action=add"

View file

@ -1,4 +1,10 @@
{ config, pkgs, inputs, ... }: { {
config,
pkgs,
inputs,
...
}:
{
services.writefreely = { services.writefreely = {
enable = true; enable = true;
acme.enable = true; acme.enable = true;
@ -22,4 +28,3 @@
}; };
}; };
} }

View file

@ -1,13 +1,25 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: {
config,
lib,
pkgs,
modulesPath,
...
}:
{ {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = boot.initrd.availableKernelModules = [
[ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; "nvme"
"xhci_pci"
"ahci"
"usb_storage"
"usbhid"
"sd_mod"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
@ -18,8 +30,7 @@
options = [ "subvol=nixos" ]; options = [ "subvol=nixos" ];
}; };
boot.initrd.luks.devices."pixie".device = boot.initrd.luks.devices."pixie".device = "/dev/disk/by-uuid/f4ae5858-d2d6-4cd1-a054-bf5147a9a928";
"/dev/disk/by-uuid/f4ae5858-d2d6-4cd1-a054-bf5147a9a928";
fileSystems."/home" = { fileSystems."/home" = {
device = "/dev/mapper/pixie"; device = "/dev/mapper/pixie";
@ -46,8 +57,7 @@
# networking.interfaces.enp4s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
# networking.interfaces.veth74f3ffc.useDHCP = lib.mkDefault true; # networking.interfaces.veth74f3ffc.useDHCP = lib.mkDefault true;
hardware.cpu.amd.updateMicrocode = hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
lib.mkDefault config.hardware.enableRedistributableFirmware;
networking.hostName = "pixie"; # Define your hostname. networking.hostName = "pixie"; # Define your hostname.
} }

View file

@ -1,16 +1,34 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: {
config,
lib,
pkgs,
modulesPath,
...
}:
let let
btrfs_options = [ "compress=zstd:3" "noatime" "x-systemd.device-timeout=0" ]; btrfs_options = [
btrfs_ssd = [ "ssd" "discard=async" ]; "compress=zstd:3"
"noatime"
"x-systemd.device-timeout=0"
];
btrfs_ssd = [
"ssd"
"discard=async"
];
in in
{ {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = boot.initrd.availableKernelModules = [
[ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; "xhci_pci"
"ahci"
"usb_storage"
"usbhid"
"sd_mod"
];
boot.initrd.kernelModules = [ "i915" ]; boot.initrd.kernelModules = [ "i915" ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
@ -46,10 +64,12 @@ in
options = [ "subvol=@swap" ] ++ btrfs_ssd; options = [ "subvol=@swap" ] ++ btrfs_ssd;
}; };
swapDevices = [{ swapDevices = [
{
device = "/swap/swapfile"; device = "/swap/swapfile";
size = (1024 * 8); size = (1024 * 8);
}]; }
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # 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 # (the default) this is the recommended approach. When using systemd-networkd it's
@ -59,8 +79,7 @@ in
# networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
hardware.cpu.intel.updateMicrocode = hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
lib.mkDefault config.hardware.enableRedistributableFirmware;
networking.hostName = "rainbow"; # Define your hostname. networking.hostName = "rainbow"; # Define your hostname.
} }

View file

@ -1,4 +1,5 @@
{ inputs, packages, ... }: rec { { inputs, packages, ... }:
rec {
all = [ all = [
scripts scripts
sway sway
@ -13,7 +14,8 @@
sway = (import ./sway.nix); sway = (import ./sway.nix);
themes = (final: prev: { themes = (
final: prev: {
material-wifi-icons = final.stdenv.mkDerivation rec { material-wifi-icons = final.stdenv.mkDerivation rec {
name = "material-wifi-icons"; name = "material-wifi-icons";
src = inputs.material-wifi-icons; src = inputs.material-wifi-icons;
@ -22,22 +24,40 @@
''; '';
}; };
papirus_red = (final.papirus-icon-theme.override { color = "red"; }); papirus_red = (final.papirus-icon-theme.override { color = "red"; });
orchis_theme_compact = (final.orchis-theme.override { orchis_theme_compact = (
final.orchis-theme.override {
border-radius = 0; border-radius = 0;
tweaks = [ "compact" "solid" ]; tweaks = [
}); "compact"
nerdfonts_fira_hack = (final.nerdfonts.override { fonts = [ "FiraCode" "Hack" ]; }); "solid"
}); ];
}
);
nerdfonts_fira_hack = (
final.nerdfonts.override {
fonts = [
"FiraCode"
"Hack"
];
}
);
}
);
new-packages = (final: prev: packages // { new-packages = (
final: prev:
packages
// {
dhist = inputs.dhist.packages.${prev.system}.dhist; dhist = inputs.dhist.packages.${prev.system}.dhist;
demoji = inputs.demoji.packages.${prev.system}.default; demoji = inputs.demoji.packages.${prev.system}.default;
tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher; tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher;
maildir-notify-daemon = inputs.maildir-notify-daemon.packages.${prev.system}.default; maildir-notify-daemon = inputs.maildir-notify-daemon.packages.${prev.system}.default;
wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default; wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default;
}); }
);
patches = (final: prev: { patches = (
final: prev: {
bemenu = prev.bemenu.overrideAttrs (o: { bemenu = prev.bemenu.overrideAttrs (o: {
postPatch = '' postPatch = ''
substituteInPlace lib/renderers/wayland/window.c \ substituteInPlace lib/renderers/wayland/window.c \
@ -46,8 +66,7 @@
}); });
mySway = prev.sway.override { mySway = prev.sway.override {
sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: { sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
patches = old.patches patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
}); });
}; };
mangohud = prev.mangohud.overrideAttrs (o: { mangohud = prev.mangohud.overrideAttrs (o: {
@ -58,13 +77,13 @@
}) })
]; ];
}); });
}); }
);
variables = (final: prev: { variables = (final: prev: { uservars = import ../user/variables.nix; });
uservars = import ../user/variables.nix;
});
lib_extended = (final: prev: { lib_extended = (
final: prev: {
lib = prev.lib // rec { lib = prev.lib // rec {
# Utility function # Utility function
# Input: [{v1=1;} {v2=2;}] # Input: [{v1=1;} {v2=2;}]
@ -76,5 +95,6 @@
# Output: {v1=1;v2=2;} # Output: {v1=1;v2=2;}
forEachMerge = list: func: mergeAttrsSet (prev.lib.forEach list func); forEachMerge = list: func: mergeAttrsSet (prev.lib.forEach list func);
}; };
}); }
);
} }

View file

@ -1,11 +1,12 @@
{ lib {
, mkYarnPackage lib,
, fetchFromGitHub mkYarnPackage,
, fetchYarnDeps fetchFromGitHub,
, testers fetchYarnDeps,
, writeText testers,
, runCommand writeText,
, blade-formatter runCommand,
blade-formatter,
}: }:
mkYarnPackage rec { mkYarnPackage rec {
@ -40,13 +41,15 @@ mkYarnPackage rec {
Hello world! Hello world!
@endif @endif
''; '';
actual = runCommand "actual" actual =
runCommand "actual"
{ {
nativeBuildInputs = [ blade-formatter ]; nativeBuildInputs = [ blade-formatter ];
base = writeText "base" '' base = writeText "base" ''
@if( true ) Hello world! @endif @if( true ) Hello world! @endif
''; '';
} '' }
''
blade-formatter $base > $out blade-formatter $base > $out
''; '';
}; };

View file

@ -1,11 +1,12 @@
{ lib {
, rustPlatform lib,
, fetchFromGitHub rustPlatform,
, pkg-config fetchFromGitHub,
, openssl pkg-config,
, zlib openssl,
, stdenv zlib,
, Security ? null stdenv,
Security ? null,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -22,9 +23,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-hOB84u55ishahIFSqBnqccqH3OlC9J8mCYzsd23jTyA="; cargoSha256 = "sha256-hOB84u55ishahIFSqBnqccqH3OlC9J8mCYzsd23jTyA=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
Security
];
meta = with lib; { meta = with lib; {
description = "Check all the things."; description = "Check all the things.";

View file

@ -1,7 +1,8 @@
# Custom packages, that can be defined similarly to ones from nixpkgs # Custom packages, that can be defined similarly to ones from nixpkgs
# You can build them using 'nix build .#example' or (legacy) 'nix-build -A example' # You can build them using 'nix build .#example' or (legacy) 'nix-build -A example'
{ pkgs, inputs }: { { pkgs, inputs }:
{
blade-formatter = pkgs.callPackage ./blade-formatter { }; blade-formatter = pkgs.callPackage ./blade-formatter { };
cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { }; cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { };
lipsum = pkgs.callPackage ./lipsum.nix { inherit inputs; }; lipsum = pkgs.callPackage ./lipsum.nix { inherit inputs; };

View file

@ -1,6 +1,7 @@
{ lib {
, buildNpmPackage lib,
, fetchFromGitHub buildNpmPackage,
fetchFromGitHub,
}: }:
buildNpmPackage rec { buildNpmPackage rec {

View file

@ -11,9 +11,7 @@ pkgs.stdenv.mkDerivation rec {
wrapGAppsHook wrapGAppsHook
]; ];
makeFlags = [ makeFlags = [ "PRG=${pname}" ];
"PRG=${pname}"
];
installPhase = '' installPhase = ''
install -Dm 755 "$pname" "$out/bin/$pname" install -Dm 755 "$pname" "$out/bin/$pname"
@ -21,4 +19,3 @@ pkgs.stdenv.mkDerivation rec {
glib-compile-schemas "$out/share/glib-2.0/schemas/" glib-compile-schemas "$out/share/glib-2.0/schemas/"
''; '';
} }

View file

@ -1,8 +1,10 @@
(final: prev: (
final: prev:
with prev; with prev;
let let
import_script = (_: path: import (path) { inherit pkgs lib; }); import_script = (_: path: import (path) { inherit pkgs lib; });
create_script = (name: text: runtimeInputs: create_script = (
name: text: runtimeInputs:
let let
script_body = pkgs.writeTextFile { script_body = pkgs.writeTextFile {
inherit name; inherit name;
@ -16,44 +18,117 @@ let
inherit name runtimeInputs; inherit name runtimeInputs;
text = ''exec ${script_body} "$@"''; text = ''exec ${script_body} "$@"'';
checkPhase = ""; checkPhase = "";
})); })
create_scripts = );
lib.mapAttrs (name: deps: create_script name ./${name} deps); create_scripts = lib.mapAttrs (name: deps: create_script name ./${name} deps);
pass = pkgs.pass.withExtensions (ex: with ex; [ pass = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]);
pass-otp
]);
in in
create_scripts create_scripts {
{
br = [ ]; br = [ ];
bmenu = [ final.bemenu final.dhist fish j4-dmenu-desktop jq sway ]; bmenu = [
down_meme = [ wl-clipboard yt-dlp libnotify ]; final.bemenu
wl-copy-file = [ wl-clipboard fish ]; final.dhist
fish
j4-dmenu-desktop
jq
sway
];
down_meme = [
wl-clipboard
yt-dlp
libnotify
];
wl-copy-file = [
wl-clipboard
fish
];
_diffr = [ diffr ]; _diffr = [ diffr ];
_thunar-terminal = [ final.terminal ]; _thunar-terminal = [ final.terminal ];
_sway_idle_toggle = [ final.swayidle ]; _sway_idle_toggle = [ final.swayidle ];
kak-pager = [ fish final._diffr ]; kak-pager = [
fish
final._diffr
];
kak-man-pager = [ final.kak-pager ]; kak-man-pager = [ final.kak-pager ];
helix-pager = [ fish final._diffr ]; helix-pager = [
fish
final._diffr
];
helix-man-pager = [ final.helix-pager ]; helix-man-pager = [ final.helix-pager ];
musmenu = [ mpc-cli final.wdmenu trash-cli xdg-user-dirs libnotify sd wl-clipboard ]; musmenu = [
showkeys = mpc-cli
[ ]; # This will not work unless programs.wshowkeys is enabled systemwide final.wdmenu
trash-cli
xdg-user-dirs
libnotify
sd
wl-clipboard
];
showkeys = [ ]; # This will not work unless programs.wshowkeys is enabled systemwide
terminal = [ alacritty ]; terminal = [ alacritty ];
playerctl-status = [ playerctl ]; playerctl-status = [ playerctl ];
pass-export = [ pass2csv gnupg ]; pass-export = [
wpass = [ final.wdmenu fd pass sd wl-clipboard wtype ]; pass2csv
screenshotsh = gnupg
[ capitaine-cursors grim slurp jq sway wl-clipboard xdg-user-dirs ]; ];
volumesh = [ pulseaudio libnotify ]; wpass = [
pulse_sink = [ pulseaudio pamixer final.wdmenu ]; final.wdmenu
color_picker = [ grim slurp wl-clipboard libnotify imagemagick ]; fd
dzadd = [ procps libnotify final.wdmenu jq mpv pqiv python3Packages.deemix mpc-cli final.mpdDup ]; pass
mpdDup = [ mpc-cli perl ]; sd
readQrCode = [ grim zbar wl-clipboard ]; wl-clipboard
} // lib.mapAttrs import_script { wtype
];
screenshotsh = [
capitaine-cursors
grim
slurp
jq
sway
wl-clipboard
xdg-user-dirs
];
volumesh = [
pulseaudio
libnotify
];
pulse_sink = [
pulseaudio
pamixer
final.wdmenu
];
color_picker = [
grim
slurp
wl-clipboard
libnotify
imagemagick
];
dzadd = [
procps
libnotify
final.wdmenu
jq
mpv
pqiv
python3Packages.deemix
mpc-cli
final.mpdDup
];
mpdDup = [
mpc-cli
perl
];
readQrCode = [
grim
zbar
wl-clipboard
];
}
// lib.mapAttrs import_script {
wdmenu = ./wdmenu.nix; wdmenu = ./wdmenu.nix;
wlauncher = ./wlauncher.nix; wlauncher = ./wlauncher.nix;
_gpg-unlock = ./_gpg-unlock.nix; _gpg-unlock = ./_gpg-unlock.nix;
}) }
)

View file

@ -2,8 +2,12 @@ let
main_ssh_public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15"; main_ssh_public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15";
in in
{ {
"rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [ main_ssh_public_key ]; "rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [
"monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [ main_ssh_public_key ]; main_ssh_public_key
];
"monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [
main_ssh_public_key
];
"gitlab-runner-thoreb-telemetria-registrationConfigFile.age".publicKeys = [ main_ssh_public_key ]; "gitlab-runner-thoreb-telemetria-registrationConfigFile.age".publicKeys = [ main_ssh_public_key ];
"monolith-forgejo-runner-token.age".publicKeys = [ main_ssh_public_key ]; "monolith-forgejo-runner-token.age".publicKeys = [ main_ssh_public_key ];
"lelgenio-cachix.age".publicKeys = [ main_ssh_public_key ]; "lelgenio-cachix.age".publicKeys = [ main_ssh_public_key ];

View file

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
services.blueman.enable = true; services.blueman.enable = true;
hardware.bluetooth = { hardware.bluetooth = {
enable = true; enable = true;
@ -8,7 +9,9 @@
# Discoverable = true; # Discoverable = true;
AlwaysPairable = true; AlwaysPairable = true;
}; };
Policy = { AutoEnable = true; }; Policy = {
AutoEnable = true;
};
}; };
}; };
} }

View file

@ -1,4 +1,11 @@
{ config, pkgs, lib, inputs, ... }: { {
config,
pkgs,
lib,
inputs,
...
}:
{
console = { console = {
font = "${pkgs.terminus_font}/share/consolefonts/ter-120n.psf.gz"; font = "${pkgs.terminus_font}/share/consolefonts/ter-120n.psf.gz";
packages = [ pkgs.terminus_font ]; packages = [ pkgs.terminus_font ];
@ -38,9 +45,7 @@
enable = true; enable = true;
theme = lib.mkIf (pkgs.uservars.desktop == "sway") "red_loader"; theme = lib.mkIf (pkgs.uservars.desktop == "sway") "red_loader";
themePackages = with pkgs; [ themePackages = with pkgs; [
(adi1090x-plymouth-themes.override { (adi1090x-plymouth-themes.override { selected_themes = [ "red_loader" ]; })
selected_themes = [ "red_loader" ];
})
]; ];
}; };
}; };

View file

@ -1,4 +1,10 @@
{ pkgs, lib, config, ... }: { {
pkgs,
lib,
config,
...
}:
{
services.cachix-watch-store = { services.cachix-watch-store = {
enable = true; enable = true;
cacheName = "lelgenio"; cacheName = "lelgenio";

View file

@ -1,7 +1,13 @@
# Edit this configuration file to define what should be installed on # Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, inputs, ... }: { {
config,
pkgs,
inputs,
...
}:
{
imports = [ imports = [
./gamemode.nix ./gamemode.nix
./cachix.nix ./cachix.nix

View file

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
services.flatpak.enable = true; services.flatpak.enable = true;
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
virtualisation.docker.autoPrune.enable = true; virtualisation.docker.autoPrune.enable = true;

View file

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
fonts.enableDefaultPackages = true; fonts.enableDefaultPackages = true;
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
noto-fonts noto-fonts

View file

@ -1,8 +1,16 @@
{ config, pkgs, inputs, ... }: { {
config,
pkgs,
inputs,
...
}:
{
programs.gamemode.enable = true; programs.gamemode.enable = true;
programs.gamemode.enableRenice = true; programs.gamemode.enableRenice = true;
programs.gamemode.settings = { programs.gamemode.settings = {
general = { renice = 10; }; general = {
renice = 10;
};
# Warning: GPU optimisations have the potential to damage hardware # Warning: GPU optimisations have the potential to damage hardware
gpu = { gpu = {

View file

@ -1,5 +1,7 @@
{ pkgs, lib, ... }: { { pkgs, lib, ... }:
mkNixRunner = registrationConfigFile: with lib; rec { {
mkNixRunner =
registrationConfigFile: with lib; rec {
# File should contain at least these two variables: # File should contain at least these two variables:
# `CI_SERVER_URL` # `CI_SERVER_URL`
# `REGISTRATION_TOKEN` # `REGISTRATION_TOKEN`
@ -26,7 +28,17 @@
. ${pkgs.nix}/etc/profile.d/nix.sh . ${pkgs.nix}/etc/profile.d/nix.sh
${pkgs.nix}/bin/nix-env -i ${concatStringsSep " " (with pkgs; [ nix cacert git openssh ])} ${pkgs.nix}/bin/nix-env -i ${
concatStringsSep " " (
with pkgs;
[
nix
cacert
git
openssh
]
)
}
''; '';
environmentVariables = { environmentVariables = {
ENV = "/etc/profile"; ENV = "/etc/profile";

View file

@ -1,7 +1,8 @@
# Edit this configuration file to define what should be installed on # Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, ... }: { { config, pkgs, ... }:
{
# Enable the X11 windowing system. # Enable the X11 windowing system.
services.xserver.enable = true; services.xserver.enable = true;
# Enable the GNOME Desktop Environment. # Enable the GNOME Desktop Environment.
@ -19,7 +20,10 @@
}; };
# services.xserver.displayManager.autologin.user = "lelgenio"; # services.xserver.displayManager.autologin.user = "lelgenio";
environment.systemPackages = with pkgs; with gnome; [ environment.systemPackages =
with pkgs;
with gnome;
[
gnome-tweaks gnome-tweaks
dconf-editor dconf-editor

View file

@ -1,6 +1,17 @@
{ lib, pkgs, config, ... }: {
lib,
pkgs,
config,
...
}:
let let
inherit (pkgs.uservars) key accent font theme desktop; inherit (pkgs.uservars)
key
accent
font
theme
desktop
;
cfg = config.login-manager.greetd; cfg = config.login-manager.greetd;
in in

View file

@ -1,4 +1,5 @@
{ config, pkgs, ... }: { { config, pkgs, ... }:
{
# Enable the X11 windowing system. # Enable the X11 windowing system.
services.xserver.enable = true; services.xserver.enable = true;
# Enable the KDE Desktop Environment. # Enable the KDE Desktop Environment.

View file

@ -1,4 +1,5 @@
{ pkgs, config, ... }: { { pkgs, config, ... }:
{
time.timeZone = "America/Sao_Paulo"; time.timeZone = "America/Sao_Paulo";
environment.variables.TZ = config.time.timeZone; environment.variables.TZ = config.time.timeZone;
i18n.defaultLocale = "pt_BR.utf8"; i18n.defaultLocale = "pt_BR.utf8";

View file

@ -1,6 +1,13 @@
{ config, pkgs, lib, ... }: {
let cfg = config.packages.media-packages; config,
in { pkgs,
lib,
...
}:
let
cfg = config.packages.media-packages;
in
{
options.packages.media-packages = { options.packages.media-packages = {
enable = lib.mkEnableOption "media packages"; enable = lib.mkEnableOption "media packages";
}; };

View file

@ -1,4 +1,5 @@
{ pkgs, config, ... }: { { pkgs, config, ... }:
{
services.gitea-actions-runner = { services.gitea-actions-runner = {
package = pkgs.forgejo-actions-runner; package = pkgs.forgejo-actions-runner;
instances.default = { instances.default = {

View file

@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }: {
config,
pkgs,
lib,
...
}:
let let
inherit (pkgs.callPackage ./gitlab-runner.nix { }) mkNixRunner; inherit (pkgs.callPackage ./gitlab-runner.nix { }) mkNixRunner;
in in
@ -15,7 +20,8 @@ in
# dockerPrivileged = true; # dockerPrivileged = true;
# }; # };
thoreb_builder = { thoreb_builder = {
registrationConfigFile = config.age.secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.path; registrationConfigFile =
config.age.secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
dockerImage = "debian"; dockerImage = "debian";
dockerPrivileged = true; dockerPrivileged = true;
}; };

View file

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Configure network proxy if necessary # Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.default = "http://user:password@proxy:port/";

View file

@ -1,4 +1,10 @@
{ config, pkgs, lib, ... }: { {
config,
pkgs,
lib,
...
}:
{
services.nix-serve = { services.nix-serve = {
enable = true; enable = true;
secretKeyFile = config.age.secrets.monolith-nix-serve-privkey.path; secretKeyFile = config.age.secrets.monolith-nix-serve-privkey.path;

View file

@ -1,7 +1,13 @@
{ lib, config, pkgs, inputs, ... }: {
lib,
config,
pkgs,
inputs,
...
}:
let let
collectFlakeInputs = input: collectFlakeInputs =
[ input ] ++ lib.concatMap collectFlakeInputs (builtins.attrValues (input.inputs or { })); input: [ input ] ++ lib.concatMap collectFlakeInputs (builtins.attrValues (input.inputs or { }));
in in
{ {
system.extraDependencies = collectFlakeInputs inputs.self; system.extraDependencies = collectFlakeInputs inputs.self;
@ -17,7 +23,10 @@ in
optimise.automatic = true; optimise.automatic = true;
settings = { settings = {
auto-optimise-store = true; auto-optimise-store = true;
trusted-users = [ "root" "@wheel" ]; trusted-users = [
"root"
"@wheel"
];
substituters = [ substituters = [
"https://cache.nixos.org" "https://cache.nixos.org"
"https://nix-community.cachix.org" "https://nix-community.cachix.org"

View file

@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }: {
config,
pkgs,
lib,
...
}:
let let
inherit (pkgs.callPackage ./gitlab-runner.nix { }) mkNixRunner; inherit (pkgs.callPackage ./gitlab-runner.nix { }) mkNixRunner;
in in
@ -15,7 +20,8 @@ in
# dockerPrivileged = true; # dockerPrivileged = true;
# }; # };
thoreb_builder = { thoreb_builder = {
registrationConfigFile = config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path; registrationConfigFile =
config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
dockerImage = "debian"; dockerImage = "debian";
dockerPrivileged = true; dockerPrivileged = true;
}; };

View file

@ -1,18 +1,13 @@
{ pkgs, ... }: { { pkgs, ... }:
{
age = { age = {
identityPaths = [ "/root/.ssh/id_rsa" ]; identityPaths = [ "/root/.ssh/id_rsa" ];
secrets.lelgenio-cachix.file = ../secrets/lelgenio-cachix.age; secrets.lelgenio-cachix.file = ../secrets/lelgenio-cachix.age;
secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = ../secrets/monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age;
../secrets/monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age; secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.file = ../secrets/gitlab-runner-thoreb-telemetria-registrationConfigFile.age;
secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.file = secrets.monolith-forgejo-runner-token.file = ../secrets/monolith-forgejo-runner-token.age;
../secrets/gitlab-runner-thoreb-telemetria-registrationConfigFile.age; secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = ../secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age;
secrets.monolith-forgejo-runner-token.file = secrets.monolith-nix-serve-privkey.file = ../secrets/monolith-nix-serve-privkey.age;
../secrets/monolith-forgejo-runner-token.age; secrets.phantom-forgejo-mailer-password.file = ../secrets/phantom-forgejo-mailer-password.age;
secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.file =
../secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age;
secrets.monolith-nix-serve-privkey.file =
../secrets/monolith-nix-serve-privkey.age;
secrets.phantom-forgejo-mailer-password.file =
../secrets/phantom-forgejo-mailer-password.age;
}; };
} }

View file

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
sound.enable = true; sound.enable = true;
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
services.pipewire = { services.pipewire = {

View file

@ -1,10 +1,7 @@
{ pkgs, ... }: { { pkgs, ... }:
{
specialisation.dark-theme.configuration = { specialisation.dark-theme.configuration = {
nixpkgs.overlays = [ nixpkgs.overlays = [ (final: prev: { uservars = prev.uservars; }) ];
(final: prev: {
uservars = prev.uservars;
})
];
}; };
specialisation.light-theme.configuration = { specialisation.light-theme.configuration = {
nixpkgs.overlays = [ nixpkgs.overlays = [

View file

@ -1,12 +1,22 @@
{ config, pkgs, inputs, ... }: { {
config,
pkgs,
inputs,
...
}:
{
programs.steam.enable = true; programs.steam.enable = true;
programs.steam.package = pkgs.steam.override { programs.steam.package = pkgs.steam.override {
extraLibraries = pkgs: with config.hardware.opengl; extraLibraries =
if pkgs.hostPlatform.is64bit pkgs:
then [ package ] ++ extraPackages with config.hardware.opengl;
else [ package32 ] ++ extraPackages32; if pkgs.hostPlatform.is64bit then
[ package ] ++ extraPackages
else
[ package32 ] ++ extraPackages32;
extraPkgs = pkgs: with pkgs; [ extraPkgs =
pkgs: with pkgs; [
capitaine-cursors capitaine-cursors
bibata-cursors bibata-cursors
mangohud mangohud

View file

@ -1,4 +1,10 @@
{ config, pkgs, inputs, ... }: { {
config,
pkgs,
inputs,
...
}:
{
programs.thunar = { programs.thunar = {
enable = true; enable = true;
plugins = with pkgs.xfce; [ plugins = with pkgs.xfce; [
@ -12,8 +18,7 @@
services.tumbler.enable = true; services.tumbler.enable = true;
environment.systemPackages = [ environment.systemPackages = [
( (pkgs.writeTextFile {
pkgs.writeTextFile {
name = "thumbs"; name = "thumbs";
text = '' text = ''
[Thumbnailer Entry] [Thumbnailer Entry]
@ -22,7 +27,6 @@
MimeType=application/x-krita; MimeType=application/x-krita;
''; '';
destination = "/share/thumbnailers/kra.thumbnailer"; destination = "/share/thumbnailers/kra.thumbnailer";
} })
)
]; ];
} }

View file

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
security.sudo.wheelNeedsPassword = false; security.sudo.wheelNeedsPassword = false;
# services.getty.autologinUser = "lelgenio"; # services.getty.autologinUser = "lelgenio";
@ -10,7 +11,15 @@
isNormalUser = true; isNormalUser = true;
description = "Leonardo Eugênio"; description = "Leonardo Eugênio";
hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A"; hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A";
extraGroups = [ "networkmanager" "wheel" "docker" "adbusers" "bluetooth" "corectrl" "vboxusers" ]; extraGroups = [
"networkmanager"
"wheel"
"docker"
"adbusers"
"bluetooth"
"corectrl"
"vboxusers"
];
shell = pkgs.fish; shell = pkgs.fish;
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15"

View file

@ -1,6 +1,16 @@
{ config, pkgs, lib, ... }: {
config,
pkgs,
lib,
...
}:
let let
inherit (pkgs.uservars) key theme accent font; inherit (pkgs.uservars)
key
theme
accent
font
;
inherit (theme) color; inherit (theme) color;
in in
{ {
@ -10,7 +20,9 @@ in
settings = { settings = {
font = { font = {
size = font.size.small; size = font.size.small;
normal = { family = font.mono; }; normal = {
family = font.mono;
};
}; };
colors = { colors = {
primary = { primary = {
@ -40,11 +52,11 @@ in
hints = { hints = {
alphabet = key.hints; alphabet = key.hints;
enabled = [{ enabled = [
{
regex = regex =
let let
mimes = mimes = "(mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)";
"(mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)";
# I fucking hate regex, look at this bullshit # I fucking hate regex, look at this bullshit
delimiters = ''^\\u0000-\\u001F\\u007F-\\u009F<>"\\s{-}\\^`''; delimiters = ''^\\u0000-\\u001F\\u007F-\\u009F<>"\\s{-}\\^`'';
# Kakoune uses these characters to represent whitespace, # Kakoune uses these characters to represent whitespace,
@ -62,9 +74,12 @@ in
key = "U"; key = "U";
mods = "Control|Shift"; mods = "Control|Shift";
}; };
}]; }
];
};
mouse = {
hide_when_typing = true;
}; };
mouse = { hide_when_typing = true; };
keyboard.bindings = [ keyboard.bindings = [
{ {
key = lib.toUpper key.up; key = lib.toUpper key.up;
@ -141,7 +156,9 @@ in
}; };
}; };
home.sessionVariables = { TERMINAL = "alacritty"; }; home.sessionVariables = {
TERMINAL = "alacritty";
};
# Look at this fucking bullshit: # Look at this fucking bullshit:
# https://gitlab.gnome.org/GNOME/glib/-/blob/20c4fcb2a7246a2b205649eae3ebda4296217afc/gio/gdesktopappinfo.c#L2702 # https://gitlab.gnome.org/GNOME/glib/-/blob/20c4fcb2a7246a2b205649eae3ebda4296217afc/gio/gdesktopappinfo.c#L2702

View file

@ -1,6 +1,17 @@
{ config, pkgs, lib, inputs, ... }: {
config,
pkgs,
lib,
inputs,
...
}:
let let
inherit (pkgs.uservars) key theme accent font; inherit (pkgs.uservars)
key
theme
accent
font
;
inherit (theme) color; inherit (theme) color;
in in
{ {

View file

@ -1,4 +1,11 @@
{ config, pkgs, lib, inputs, ... }: { {
config,
pkgs,
lib,
inputs,
...
}:
{
wayland.windowManager.sway = { wayland.windowManager.sway = {
extraConfig = '' extraConfig = ''
exec thunderbird exec thunderbird

View file

@ -1,4 +1,11 @@
{ config, pkgs, lib, inputs, ... }: { {
config,
pkgs,
lib,
inputs,
...
}:
{
xdg.desktopEntries = { xdg.desktopEntries = {
connect-controller = { connect-controller = {
name = "Connect Controller"; name = "Connect Controller";

View file

@ -1,4 +1,10 @@
{ config, pkgs, lib, ... }: { {
config,
pkgs,
lib,
...
}:
{
xdg.desktopEntries = { xdg.desktopEntries = {
kak = { kak = {
name = "Kakoune"; name = "Kakoune";
@ -8,7 +14,10 @@
terminal = true; terminal = true;
type = "Application"; type = "Application";
icon = "kak.desktop"; icon = "kak.desktop";
categories = [ "Utility" "TextEditor" ]; categories = [
"Utility"
"TextEditor"
];
startupNotify = true; startupNotify = true;
mimeType = [ mimeType = [
"text/english" "text/english"
@ -40,10 +49,15 @@
terminal = true; terminal = true;
type = "Application"; type = "Application";
icon = "mutt"; icon = "mutt";
categories = [ "Network" "Email" ]; categories = [
"Network"
"Email"
];
startupNotify = false; startupNotify = false;
mimeType = [ "x-scheme-handler/mailto" ]; mimeType = [ "x-scheme-handler/mailto" ];
settings = { Keywords = "Mail;E-mail;"; }; settings = {
Keywords = "Mail;E-mail;";
};
}; };
down_meme = { down_meme = {
name = "DownMeme"; name = "DownMeme";

View file

@ -1,6 +1,16 @@
{ config, pkgs, lib, font, ... }: {
let inherit (pkgs.uservars) desktop browser; config,
bugfixedFirefox = pkgs.firefox-esr-unwrapped // { requireSigning = false; allowAddonSideload = true; }; pkgs,
lib,
font,
...
}:
let
inherit (pkgs.uservars) desktop browser;
bugfixedFirefox = pkgs.firefox-esr-unwrapped // {
requireSigning = false;
allowAddonSideload = true;
};
in in
{ {
config = { config = {

View file

@ -1,6 +1,21 @@
{ config, pkgs, lib, ... }: {
let inherit (pkgs.uservars) key theme color accent font editor desktop; config,
in { pkgs,
lib,
...
}:
let
inherit (pkgs.uservars)
key
theme
color
accent
font
editor
desktop
;
in
{
config = { config = {
programs.fish = { programs.fish = {
enable = true; enable = true;
@ -34,10 +49,12 @@ in {
}; };
shellAbbrs = { shellAbbrs = {
off = "shutdown now"; off = "shutdown now";
v = { v =
{
"helix" = "hx"; "helix" = "hx";
"kakoune" = "kak"; "kakoune" = "kak";
}.${editor}; }
.${editor};
ns = "nix develop --command $SHELL"; ns = "nix develop --command $SHELL";
wcf = "wl-copy-file"; wcf = "wl-copy-file";
c = "cargo"; c = "cargo";
@ -64,7 +81,9 @@ in {
gr = "cd (git root)"; gr = "cd (git root)";
gri = "git rebase --interactive FETCH_HEAD"; gri = "git rebase --interactive FETCH_HEAD";
}; };
functions = { fish_greeting = ""; }; functions = {
fish_greeting = "";
};
}; };
programs = { programs = {
zoxide.enable = true; zoxide.enable = true;
@ -85,13 +104,18 @@ in {
}; };
# programs.command-not-found.enable = true; # programs.command-not-found.enable = true;
programs.nix-index.enable = true; programs.nix-index.enable = true;
home.packages = (with pkgs; with fishPlugins;[ home.packages = (
with pkgs;
with fishPlugins;
[
trash-cli trash-cli
wl-copy-file wl-copy-file
foreign-env foreign-env
] ++ (lib.optionals (desktop == "sway") [ ]
++ (lib.optionals (desktop == "sway") [
async-prompt async-prompt
done done
])); ])
);
}; };
} }

View file

@ -1,6 +1,17 @@
{ config, pkgs, lib, inputs, ... }: {
config,
pkgs,
lib,
inputs,
...
}:
let let
inherit (pkgs.uservars) key theme accent font; inherit (pkgs.uservars)
key
theme
accent
font
;
inherit (theme) color; inherit (theme) color;
colors = { colors = {
@ -15,22 +26,21 @@ let
makeOptList = lib.mapAttrsToList makeKeyValue colors; makeOptList = lib.mapAttrsToList makeKeyValue colors;
makeColorValue = lib.strings.concatStringsSep "," makeOptList; makeColorValue = lib.strings.concatStringsSep "," makeOptList;
color_opts = "--color=${makeColorValue}"; color_opts = "--color=${makeColorValue}";
preview_opts = preview_opts = "--preview '${pkgs.bat}/bin/bat --style=numbers --color=always {}'";
"--preview '${pkgs.bat}/bin/bat --style=numbers --color=always {}'";
in in
{ {
programs.fzf = { programs.fzf = {
enable = true; enable = true;
fileWidgetCommand = "${pkgs.fd}/bin/fd --type f"; fileWidgetCommand = "${pkgs.fd}/bin/fd --type f";
fileWidgetOptions = fileWidgetOptions = [ "--preview '${pkgs.bat}/bin/bat --style=numbers --color=always {}'" ];
[ "--preview '${pkgs.bat}/bin/bat --style=numbers --color=always {}'" ];
changeDirWidgetCommand = "${pkgs.fd}/bin/fd --type d"; changeDirWidgetCommand = "${pkgs.fd}/bin/fd --type d";
changeDirWidgetOptions = changeDirWidgetOptions = [ "--preview '${pkgs.eza}/bin/eza -T L3 | head -200'" ];
[ "--preview '${pkgs.eza}/bin/eza -T L3 | head -200'" ];
defaultOptions = [ color_opts preview_opts ]; defaultOptions = [
color_opts
preview_opts
];
}; };
} }

View file

@ -1,6 +1,13 @@
{ config, pkgs, lib, ... }: {
let inherit (pkgs.uservars) username mail; config,
in { pkgs,
lib,
...
}:
let
inherit (pkgs.uservars) username mail;
in
{
config = { config = {
programs.git = { programs.git = {
enable = true; enable = true;

View file

@ -1,4 +1,10 @@
{ pkgs, lib, inputs, ... }: lib.mkIf (pkgs.uservars.desktop == "gnome") { {
pkgs,
lib,
inputs,
...
}:
lib.mkIf (pkgs.uservars.desktop == "gnome") {
home.pointerCursor = { home.pointerCursor = {
name = "Adwaita"; name = "Adwaita";
@ -14,9 +20,7 @@
cursor-theme = "Adwaita"; cursor-theme = "Adwaita";
# color-scheme = "default"; # color-scheme = "default";
}; };
"org/gnome/desktop/wm/preferences" = lib.mkForce { "org/gnome/desktop/wm/preferences" = lib.mkForce { button-layout = "appmenu:close"; };
button-layout = "appmenu:close";
};
"org/gnome/desktop/input-sources" = { "org/gnome/desktop/input-sources" = {
xkb-options = [ "lv3:lsgt_switch" ]; xkb-options = [ "lv3:lsgt_switch" ];
}; };
@ -40,7 +44,9 @@
qt6Packages.qtstyleplugin-kvantum qt6Packages.qtstyleplugin-kvantum
]; ];
home.sessionVariables = { QT_QPA_PLATFORMTHEME = "qt5ct"; }; home.sessionVariables = {
QT_QPA_PLATFORMTHEME = "qt5ct";
};
xdg.defaultApplications = { xdg.defaultApplications = {
enable = true; enable = true;

View file

@ -1,4 +1,10 @@
{ config, pkgs, lib, ... }: { {
config,
pkgs,
lib,
...
}:
{
config = { config = {
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
@ -16,7 +22,9 @@
PartOf = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ];
After = [ "graphical-session.target" ]; After = [ "graphical-session.target" ];
}; };
Service = { ExecStart = "${pkgs._gpg-unlock}/bin/_gpg-unlock"; }; Service = {
ExecStart = "${pkgs._gpg-unlock}/bin/_gpg-unlock";
};
}; };
}; };
systemd.user.timers = { systemd.user.timers = {
@ -31,9 +39,10 @@
OnUnitActiveSec = "300"; OnUnitActiveSec = "300";
Unit = "gpg_unlock.service"; Unit = "gpg_unlock.service";
}; };
Install = { WantedBy = [ "sway-session.target" ]; }; Install = {
WantedBy = [ "sway-session.target" ];
};
}; };
}; };
}; };
} }

View file

@ -74,7 +74,9 @@ in
g.n = "goto_line_start"; g.n = "goto_line_start";
g.o = "goto_line_end"; g.o = "goto_line_end";
}; };
keys.insert = { "A-k" = "normal_mode"; }; keys.insert = {
"A-k" = "normal_mode";
};
}; };
languages.language = [ languages.language = [
{ {
@ -96,14 +98,29 @@ in
my-theme = { my-theme = {
"inherits" = "gruvbox"; "inherits" = "gruvbox";
"ui.menu" = "none"; "ui.menu" = "none";
"ui.background" = { bg = "none"; }; "ui.background" = {
bg = "none";
};
"ui.virtual.whitespace" = color.nontxt; "ui.virtual.whitespace" = color.nontxt;
"ui.cursor.primary" = { fg = accent.fg; bg = accent.color; }; "ui.cursor.primary" = {
"ui.cursorline.primary" = { bg = color.bg_dark; }; fg = accent.fg;
"ui.cursorcolumn.primary" = { modifiers = [ "bold" ]; }; bg = accent.color;
"ui.cursorline" = { bg = "none"; }; };
"ui.cursorcolumn" = { bg = "none"; }; "ui.cursorline.primary" = {
"ui.linenr.selected" = { fg = color.txt; }; bg = color.bg_dark;
};
"ui.cursorcolumn.primary" = {
modifiers = [ "bold" ];
};
"ui.cursorline" = {
bg = "none";
};
"ui.cursorcolumn" = {
bg = "none";
};
"ui.linenr.selected" = {
fg = color.txt;
};
function = color.normal.orange; function = color.normal.orange;
module = color.normal.brown; module = color.normal.brown;
@ -124,8 +141,6 @@ in
}; };
}; };
}; };
home.sessionVariables = lib.mkIf (editor == "helix") { home.sessionVariables = lib.mkIf (editor == "helix") { EDITOR = "hx"; };
EDITOR = "hx";
};
}; };
} }

View file

@ -1,4 +1,12 @@
{ config, pkgs, lib, inputs, osConfig, ... }: { {
config,
pkgs,
lib,
inputs,
osConfig,
...
}:
{
imports = [ imports = [
./controller.nix ./controller.nix
./waybar ./waybar
@ -70,9 +78,7 @@
comma comma
# System monitors # System monitors
(btop.override { (btop.override { cudaSupport = true; })
cudaSupport = true;
})
amdgpu_top amdgpu_top
inxi inxi
dmidecode dmidecode
@ -140,10 +146,11 @@
}; };
}; };
home.sessionVariables = { home.sessionVariables = {
VOLUME_CHANGE_SOUND = VOLUME_CHANGE_SOUND = "${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/audio-volume-change.oga";
"${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/audio-volume-change.oga"; };
programs.bash = {
enable = true;
}; };
programs.bash = { enable = true; };
xdg.defaultApplications = { xdg.defaultApplications = {
enable = true; enable = true;
@ -154,7 +161,8 @@
{ {
firefox = lib.mkDefault "firefox.desktop"; firefox = lib.mkDefault "firefox.desktop";
qutebrowser = lib.mkDefault "org.qutebrowser.qutebrowser.desktop"; qutebrowser = lib.mkDefault "org.qutebrowser.qutebrowser.desktop";
}.${pkgs.uservars.browser} }
.${pkgs.uservars.browser}
); );
document-viewer = lib.mkDefault "org.pwmt.zathura.desktop"; document-viewer = lib.mkDefault "org.pwmt.zathura.desktop";
file-manager = lib.mkDefault "thunar.desktop"; file-manager = lib.mkDefault "thunar.desktop";
@ -163,7 +171,9 @@
torrent-client = lib.mkDefault "torrent.desktop"; torrent-client = lib.mkDefault "torrent.desktop";
}; };
wayland.windowManager.sway.extraConfig = lib.optionalString (osConfig.networking.hostName or "" == "monolith") '' wayland.windowManager.sway.extraConfig =
lib.optionalString (osConfig.networking.hostName or "" == "monolith")
''
exec steam exec steam
exec obs --startreplaybuffer --disable-shutdown-check exec obs --startreplaybuffer --disable-shutdown-check
exec deluge-gtk exec deluge-gtk
@ -182,12 +192,16 @@
}; };
}; };
systemd.user.timers.rm-target = { systemd.user.timers.rm-target = {
Unit = { Description = "Remove directories named 'target'"; }; Unit = {
Description = "Remove directories named 'target'";
};
Timer = { Timer = {
OnCalendar = "weekly"; OnCalendar = "weekly";
Unit = "rm-target.service"; Unit = "rm-target.service";
}; };
Install = { WantedBy = [ "timers.target" ]; }; Install = {
WantedBy = [ "timers.target" ];
};
}; };
# This value determines the Home Manager release that your # This value determines the Home Manager release that your

View file

@ -1,4 +1,10 @@
{ config, pkgs, lib, ... }: { {
config,
pkgs,
lib,
...
}:
{
config = lib.mkIf (pkgs.uservars.desktop == "hyprland") { config = lib.mkIf (pkgs.uservars.desktop == "hyprland") {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = false; enable = false;
@ -122,6 +128,9 @@
''; '';
}; };
home.file.".config/eww".source = ./eww; home.file.".config/eww".source = ./eww;
home.packages = with pkgs; [ eww-wayland jq ]; home.packages = with pkgs; [
eww-wayland
jq
];
}; };
} }

View file

@ -1,4 +1,9 @@
{ pkgs, lib, color, accent }: {
pkgs,
lib,
color,
accent,
}:
let let
colors = lib.mapAttrs (_: lib.replaceStrings [ "#" ] [ "rgb:" ]) { colors = lib.mapAttrs (_: lib.replaceStrings [ "#" ] [ "rgb:" ]) {
accent_fg = accent.fg; accent_fg = accent.fg;
@ -94,8 +99,9 @@ with colors;
face global InlayHint ${bg_light}+buif face global InlayHint ${bg_light}+buif
# Lsp # Lsp
'' + ( ''
lib.concatStringsSep "\n" (lib.mapAttrsToList + (lib.concatStringsSep "\n" (
lib.mapAttrsToList
(name: color: '' (name: color: ''
face global HighlightDiagnostic${name} ${color},default+bu face global HighlightDiagnostic${name} ${color},default+bu
face global Diagnostic${name} ${color},default+bu face global Diagnostic${name} ${color},default+bu
@ -106,6 +112,5 @@ with colors;
Error = "red"; Error = "red";
Warning = "yellow"; Warning = "yellow";
Hint = "blue"; Hint = "blue";
}) }
) ))

View file

@ -1,6 +1,17 @@
{ config, pkgs, lib, ... }: {
config,
pkgs,
lib,
...
}:
let let
inherit (pkgs.uservars) key dmenu editor theme accent; inherit (pkgs.uservars)
key
dmenu
editor
theme
accent
;
inherit (theme) color; inherit (theme) color;
inherit (pkgs) kakounePlugins; inherit (pkgs) kakounePlugins;
inherit (pkgs.kakouneUtils) buildKakounePlugin; inherit (pkgs.kakouneUtils) buildKakounePlugin;
@ -74,8 +85,9 @@ in
}) })
]; ];
extraConfig = extraConfig =
lib.concatStringsSep "\n" lib.concatStringsSep "\n" (
(map (lib.readFile) ([ map (lib.readFile) (
[
./filetypes.kak ./filetypes.kak
./hooks.kak ./hooks.kak
./indent.kak ./indent.kak
@ -83,17 +95,29 @@ in
./lsp-config.kak ./lsp-config.kak
./usermode.kak ./usermode.kak
./git-mode.kak ./git-mode.kak
] ++ lib.optional (dmenu == "rofi") ./rofi-commands.kak)) + '' ]
++ lib.optional (dmenu == "rofi") ./rofi-commands.kak
)
)
+ ''
set global scrolloff 10,20 set global scrolloff 10,20
set global autoreload yes set global autoreload yes
set global startup_info_version 99999999 set global startup_info_version 99999999
'' + (import ./colors.nix { ''
inherit pkgs lib color accent; + (import ./colors.nix {
inherit
pkgs
lib
color
accent
;
}); });
}; };
home.file = { ".config/kak-lsp/kak-lsp.toml".source = ./kak-lsp.toml; }; home.file = {
".config/kak-lsp/kak-lsp.toml".source = ./kak-lsp.toml;
};
home.packages = with pkgs; [ home.packages = with pkgs; [
terminal terminal
ranger ranger
@ -123,4 +147,3 @@ in
}; };
}; };
} }

View file

@ -1,4 +1,11 @@
{ config, pkgs, lib, inputs, ... }: { {
config,
pkgs,
lib,
inputs,
...
}:
{
programs.lf = { programs.lf = {
enable = true; enable = true;
keybindings = { keybindings = {

View file

@ -1,5 +1,20 @@
{ config, pkgs, lib, inputs, ... }: {
let inherit (pkgs.uservars) key theme color accent font desktop editor; config,
pkgs,
lib,
inputs,
...
}:
let
inherit (pkgs.uservars)
key
theme
color
accent
font
desktop
editor
;
pagers = rec { pagers = rec {
kak = kakoune; kak = kakoune;
kakoune = { kakoune = {

View file

@ -1,6 +1,20 @@
{ config, pkgs, lib, font, ... }: {
let inherit (pkgs.uservars) key theme color accent font; config,
in { pkgs,
lib,
font,
...
}:
let
inherit (pkgs.uservars)
key
theme
color
accent
font
;
in
{
config = { config = {
programs.mangohud = { programs.mangohud = {
enable = true; enable = true;

View file

@ -1,4 +1,10 @@
{ config, pkgs, lib, font, ... }: {
config,
pkgs,
lib,
font,
...
}:
let let
inherit (pkgs.uservars) browser; inherit (pkgs.uservars) browser;
cfg = config.xdg.defaultApplications; cfg = config.xdg.defaultApplications;
@ -26,20 +32,21 @@ in
xdg.mimeApps = xdg.mimeApps =
let let
createMimeAssociation = (mime_prefix: application: mime_suffix: { createMimeAssociation = (
"${mime_prefix}/${mime_suffix}" = application; mime_prefix: application: mime_suffix: { "${mime_prefix}/${mime_suffix}" = application; }
}); );
createMimeAssociations = (mime_prefix: application: mime_suffixes: createMimeAssociations = (
lib.foldAttrs (n: _: n) { } mime_prefix: application: mime_suffixes:
(map (createMimeAssociation mime_prefix application) mime_suffixes)); lib.foldAttrs (n: _: n) { } (map (createMimeAssociation mime_prefix application) mime_suffixes)
);
mimes = simple mimes =
simple
// (createMimeAssociations "text" cfg.text-editor text_suffixes) // (createMimeAssociations "text" cfg.text-editor text_suffixes)
// (createMimeAssociations "image" cfg.image-viewer image_suffixes) // (createMimeAssociations "image" cfg.image-viewer image_suffixes)
// (createMimeAssociations "video" cfg.video-player video_suffixes) // (createMimeAssociations "video" cfg.video-player video_suffixes)
// (createMimeAssociations "application" cfg.archive-manager archive-suffixes) // (createMimeAssociations "application" cfg.archive-manager archive-suffixes);
;
simple = { simple = {
"inode/directory" = cfg.file-manager; "inode/directory" = cfg.file-manager;
@ -421,7 +428,6 @@ in
"x-theora+ogg" "x-theora+ogg"
]; ];
archive-suffixes = [ archive-suffixes = [
"bzip2" "bzip2"
"gzip" "gzip"
@ -487,6 +493,5 @@ in
enable = true; enable = true;
defaultApplications = mimes; defaultApplications = mimes;
}; };
}; };
} }

View file

@ -1,4 +1,10 @@
{ lib, pkgs, config, ... }: { {
lib,
pkgs,
config,
...
}:
{
config = lib.mkIf (pkgs.uservars.desktop != "gnome") { config = lib.mkIf (pkgs.uservars.desktop != "gnome") {
services.mpd = { services.mpd = {
enable = true; enable = true;

View file

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
config = { config = {
programs.mpv = { programs.mpv = {
enable = true; enable = true;
@ -6,8 +7,7 @@
# ytdl-format='best'; # ytdl-format='best';
# ytdl_path = "yt-dlp"; # ytdl_path = "yt-dlp";
ytdl-format = "bestvideo[height<=1080][vcodec!=vp9]+bestaudio/best"; ytdl-format = "bestvideo[height<=1080][vcodec!=vp9]+bestaudio/best";
ytdl-raw-options = ytdl-raw-options = "cookies=~/.cache/cookies-youtube-com.txt,mark-watched=";
"cookies=~/.cache/cookies-youtube-com.txt,mark-watched=";
osd-fractions = true; osd-fractions = true;
save-position-on-quit = true; save-position-on-quit = true;
keep-open = true; keep-open = true;

View file

@ -1,10 +1,15 @@
{ config, pkgs, lib, inputs, ... }: { {
config,
pkgs,
lib,
inputs,
...
}:
{
config = { config = {
programs.password-store = { programs.password-store = {
enable = true; enable = true;
package = pkgs.pass.withExtensions (ex: with ex; [ package = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]);
pass-otp
]);
}; };
services = { services = {
pass-secret-service.enable = true; pass-secret-service.enable = true;

View file

@ -1,4 +1,10 @@
{ config, pkgs, lib, ... }: { {
config,
pkgs,
lib,
...
}:
{
# RNNoise is a noise supperssion neural network # RNNoise is a noise supperssion neural network
# Here we use it as a plugin for pipewire to create a virtual microphone # Here we use it as a plugin for pipewire to create a virtual microphone
config = { config = {

View file

@ -1,8 +1,21 @@
{ config, pkgs, lib, inputs, ... }: {
config,
pkgs,
lib,
inputs,
...
}:
let let
inherit (pkgs.uservars) key theme color accent font; inherit (pkgs.uservars)
key
theme
color
accent
font
;
make_direction_binds = lib.imap0 (idx: direction: make_direction_binds = lib.imap0 (
idx: direction:
let let
sign = if (idx < 2) then 1 else -1; sign = if (idx < 2) then 1 else -1;
axis = if ((lib.mod idx 2) != 0) then "y" else "x"; axis = if ((lib.mod idx 2) != 0) then "y" else "x";
@ -15,8 +28,8 @@ let
montage_mode_shift_${axis}(${toString (sign * -1)}) montage_mode_shift_${axis}(${toString (sign * -1)})
} }
} }
''); ''
);
in in
{ {
# My bemenu wrapper # My bemenu wrapper
@ -45,7 +58,12 @@ in
<Left> { goto_file_relative(-1) } <Left> { goto_file_relative(-1) }
<Right> { goto_file_relative(1); } <Right> { goto_file_relative(1); }
${lib.concatStrings (make_direction_binds [ "left" "up" "right" "down" ])} ${lib.concatStrings (make_direction_binds [
"left"
"up"
"right"
"down"
])}
${key.tabL} { goto_file_relative(-1) } ${key.tabL} { goto_file_relative(-1) }
${key.tabR} { goto_file_relative(1); } ${key.tabR} { goto_file_relative(1); }
@ -54,10 +72,7 @@ in
d { send_keys(6) } d { send_keys(6) }
y { send_keys(8) } y { send_keys(8) }
${if (key.layout == "colemak") then ${if (key.layout == "colemak") then "\n t { toggle_scale_mode(0) }\n " else ""}
"\n t { toggle_scale_mode(0) }\n "
else
""}
# vim: ft=ini # vim: ft=ini
''; '';

View file

@ -1,6 +1,18 @@
{ config, pkgs, lib, font, ... }: {
config,
pkgs,
lib,
font,
...
}:
let let
inherit (pkgs.uservars) key theme accent font browser; inherit (pkgs.uservars)
key
theme
accent
font
browser
;
inherit (theme) color; inherit (theme) color;
in in
{ {
@ -38,9 +50,12 @@ in
}; };
in in
{ {
bar = { bg = color.bg; }; bar = {
bg = color.bg;
};
pinned = tabs_defaults; pinned = tabs_defaults;
} // tabs_defaults; }
// tabs_defaults;
######################################################## ########################################################
# Completion for urls and commands # Completion for urls and commands
@ -48,10 +63,18 @@ in
completion = { completion = {
fg = color.txt; fg = color.txt;
even = { bg = color.bg; }; even = {
odd = { bg = color.bg; }; bg = color.bg;
scrollbar = { bg = color.bg_dark; }; };
match = { fg = accent.color; }; odd = {
bg = color.bg;
};
scrollbar = {
bg = color.bg_dark;
};
match = {
fg = accent.color;
};
category = { category = {
fg = color.txt; fg = color.txt;
bg = color.bg_dark; bg = color.bg_dark;
@ -68,7 +91,9 @@ in
top = color.bg_dark; top = color.bg_dark;
bottom = color.bg_dark; bottom = color.bg_dark;
}; };
match = { fg = color.txt; }; match = {
fg = color.txt;
};
}; };
}; };
}; };
@ -102,10 +127,16 @@ in
}; };
url = { url = {
success = { success = {
https = { fg = color.txt; }; https = {
http = { fg = color.normal.red; }; fg = color.txt;
};
http = {
fg = color.normal.red;
};
};
hover = {
fg = color.normal.cyan;
}; };
hover = { fg = color.normal.cyan; };
}; };
}; };
######################################################## ########################################################
@ -113,9 +144,15 @@ in
######################################################## ########################################################
downloads = { downloads = {
start = { bg = color.normal.blue; }; start = {
stop = { bg = color.normal.green; }; bg = color.normal.blue;
bar = { bg = color.bg; }; };
stop = {
bg = color.normal.green;
};
bar = {
bg = color.bg;
};
}; };
######################################################## ########################################################
@ -125,7 +162,9 @@ in
hints = { hints = {
fg = color.txt; fg = color.txt;
bg = color.bg; bg = color.bg;
match = { fg = accent.color; }; match = {
fg = accent.color;
};
}; };
######################################################## ########################################################
@ -135,7 +174,9 @@ in
keyhint = { keyhint = {
fg = color.txt; fg = color.txt;
bg = color.bg; bg = color.bg;
suffix = { fg = accent.color; }; suffix = {
fg = accent.color;
};
}; };
######################################################## ########################################################
@ -151,7 +192,9 @@ in
fg = accent.fg; fg = accent.fg;
bg = accent.color; bg = accent.color;
}; };
disabled = { fg = color.bg_light; }; disabled = {
fg = color.bg_light;
};
}; };
######################################################## ########################################################
@ -216,4 +259,3 @@ in
''; '';
}; };
} }

View file

@ -1,10 +1,18 @@
{ config, pkgs, lib, font, ... }: {
config,
pkgs,
lib,
font,
...
}:
let let
inherit (pkgs.uservars) theme; inherit (pkgs.uservars) theme;
inherit (theme) color; inherit (theme) color;
# ".config/qutebrowser/greasemonkey/darkreader.js".text = # ".config/qutebrowser/greasemonkey/darkreader.js".text =
darkThemeUserscript = enabled: pkgs.writeText "darkreader.js" '' darkThemeUserscript =
enabled:
pkgs.writeText "darkreader.js" ''
// ==UserScript== // ==UserScript==
// @name Dark Reader (Unofficial) // @name Dark Reader (Unofficial)
// @icon https://darkreader.org/images/darkreader-icon-256x256.png // @icon https://darkreader.org/images/darkreader-icon-256x256.png
@ -87,4 +95,3 @@ in
''; '';
}; };
} }

View file

@ -1,4 +1,10 @@
{ config, pkgs, lib, font, ... }: {
config,
pkgs,
lib,
font,
...
}:
let let
inherit (pkgs.uservars) key browser editor; inherit (pkgs.uservars) key browser editor;
in in
@ -59,7 +65,6 @@ in
"${key.insertMode}" = "mode-enter insert"; "${key.insertMode}" = "mode-enter insert";
}; };
}; };
settings = { settings = {
tabs.tree_tabs = true; tabs.tree_tabs = true;
@ -78,7 +83,8 @@ in
{ {
kakoune = "kak"; kakoune = "kak";
helix = "hx"; helix = "hx";
}.${editor} }
.${editor}
"{file}" "{file}"
"+{line}" "+{line}"
]; ];
@ -112,7 +118,9 @@ in
ExecStart = "${pkgs.qutebrowser}/bin/qutebrowser"; ExecStart = "${pkgs.qutebrowser}/bin/qutebrowser";
Restart = "on-failure"; Restart = "on-failure";
}; };
Install = { WantedBy = [ "sway-session.target" ]; }; Install = {
WantedBy = [ "sway-session.target" ];
};
}; };
}; };
home.file = { home.file = {
@ -149,4 +157,3 @@ in
}; };
}; };
} }

View file

@ -33,4 +33,3 @@ in
}; };
}; };
} }

View file

@ -1,4 +1,11 @@
{ config, pkgs, lib, inputs, ... }: { {
config,
pkgs,
lib,
inputs,
...
}:
{
xdg.configFile = { xdg.configFile = {
"ranger/rc.conf".source = ./rc.conf; "ranger/rc.conf".source = ./rc.conf;
"ranger/rifle.conf".source = ./rifle.conf; "ranger/rifle.conf".source = ./rifle.conf;

View file

@ -1,6 +1,17 @@
{ config, pkgs, lib, font, ... }: {
config,
pkgs,
lib,
font,
...
}:
let let
inherit (pkgs.uservars) key theme accent font; inherit (pkgs.uservars)
key
theme
accent
font
;
inherit (theme) color; inherit (theme) color;
in in
{ {
@ -42,14 +53,15 @@ in
}; };
"#window" = { "#window" = {
background-color = mkLiteral background-color = mkLiteral "${color.bg}${lib.toHexString (theme.opacity * 255 / 100)}";
"${color.bg}${lib.toHexString (theme.opacity * 255 / 100)}";
# children = map mkLiteral [ "prompt" "entry" ]; # children = map mkLiteral [ "prompt" "entry" ];
border = mkLiteral "2px solid"; border = mkLiteral "2px solid";
border-color = mkLiteral accent.color; border-color = mkLiteral accent.color;
padding = 0; padding = 0;
}; };
"#inputbar" = { margin = mkLiteral "10px"; }; "#inputbar" = {
margin = mkLiteral "10px";
};
"#listview" = { "#listview" = {
# fixed-height=0; # fixed-height=0;
border = mkLiteral "2px solid 0px 0px"; border = mkLiteral "2px solid 0px 0px";
@ -78,9 +90,7 @@ in
margin-right = mkLiteral "20px"; margin-right = mkLiteral "20px";
size = 24; size = 24;
}; };
}; };
}; };
}; };
} }

View file

@ -1,6 +1,13 @@
{ config, pkgs, lib, ... }: {
let inherit (pkgs.uservars) username mail; config,
in { pkgs,
lib,
...
}:
let
inherit (pkgs.uservars) username mail;
in
{
config = { config = {
programs.ssh.enable = true; programs.ssh.enable = true;
programs.ssh.matchBlocks = { programs.ssh.matchBlocks = {

View file

@ -1,6 +1,16 @@
{ config, pkgs, lib, ... }: {
config,
pkgs,
lib,
...
}:
let let
inherit (pkgs.uservars) key accent font theme; inherit (pkgs.uservars)
key
accent
font
theme
;
inherit (theme) color; inherit (theme) color;
in in
{ {
@ -42,7 +52,13 @@ in
bg_color = color.bg_dark; bg_color = color.bg_dark;
alert = "#000000"; alert = "#000000";
client = border: background: text: indicator: childBorder: { client = border: background: text: indicator: childBorder: {
inherit border background text indicator childBorder; inherit
border
background
text
indicator
childBorder
;
}; };
in in
{ {
@ -79,9 +95,7 @@ in
}; };
# setup cursor based on home.pointerCursor # setup cursor based on home.pointerCursor
seat."*" = { seat."*" = {
xcursor_theme = "${config.home.pointerCursor.name} ${ xcursor_theme = "${config.home.pointerCursor.name} ${toString config.home.pointerCursor.size}";
toString config.home.pointerCursor.size
}";
hide_cursor = "when-typing enable"; hide_cursor = "when-typing enable";
}; };
}; };
@ -132,7 +146,10 @@ in
grim grim
swappy swappy
(tesseract5.override { (tesseract5.override {
enableLanguages = [ "eng" "por" ]; enableLanguages = [
"eng"
"por"
];
}) })
]; ];
}; };

View file

@ -1,6 +1,16 @@
{ config, pkgs, lib, ... }: {
config,
pkgs,
lib,
...
}:
let let
inherit (pkgs.uservars) key accent font theme; inherit (pkgs.uservars)
key
accent
font
theme
;
inherit (theme) color; inherit (theme) color;
in in
{ {
@ -26,11 +36,13 @@ in
{ {
profile = { profile = {
name = "nomad"; name = "nomad";
outputs = [{ outputs = [
{
criteria = "eDP-1"; criteria = "eDP-1";
status = "enable"; status = "enable";
position = "1920,312"; position = "1920,312";
}]; }
];
exec = [ "xrdb .Xresources" ]; exec = [ "xrdb .Xresources" ];
}; };
} }

View file

@ -1,6 +1,16 @@
{ config, pkgs, lib, ... }: {
config,
pkgs,
lib,
...
}:
let let
inherit (pkgs.uservars) key accent font theme; inherit (pkgs.uservars)
key
accent
font
theme
;
inherit (theme) color; inherit (theme) color;
in in
{ {
@ -48,6 +58,8 @@ in
ExecStart = "${pkgs.mako}/bin/mako"; ExecStart = "${pkgs.mako}/bin/mako";
Restart = "on-failure"; Restart = "on-failure";
}; };
Install = { WantedBy = [ "sway-session.target" ]; }; Install = {
WantedBy = [ "sway-session.target" ];
};
}; };
} }

View file

@ -1,20 +1,18 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
in
# inherit (pkgs.uservars) key accent font theme; # inherit (pkgs.uservars) key accent font theme;
# inherit (theme) color; # inherit (theme) color;
# inherit (pkgs) lib; # inherit (pkgs) lib;
# mod = "Mod4"; # mod = "Mod4";
# menu = "wlauncher"; # menu = "wlauncher";
# terminal = "alacritty"; # terminal = "alacritty";
# locked_binds = # locked_binds =
# lib.mapAttrs' (k: v: lib.nameValuePair "--locked ${k}" v); # lib.mapAttrs' (k: v: lib.nameValuePair "--locked ${k}" v);
# code_binds = # code_binds =
# lib.mapAttrs' (k: v: lib.nameValuePair "--to-code ${k}" v); # lib.mapAttrs' (k: v: lib.nameValuePair "--to-code ${k}" v);
# return_mode = lib.mapAttrs (k: v: "${v}; mode default"); # return_mode = lib.mapAttrs (k: v: "${v}; mode default");
# playerctl = "exec ${pkgs.playerctl}/bin/playerctl"; # playerctl = "exec ${pkgs.playerctl}/bin/playerctl";
in
{ {
wayland.windowManager.sway.config = { wayland.windowManager.sway.config = {
assigns = { assigns = {

View file

@ -1,6 +1,11 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
inherit (pkgs.uservars) key accent font theme; inherit (pkgs.uservars)
key
accent
font
theme
;
inherit (theme) color; inherit (theme) color;
inherit (pkgs) lib; inherit (pkgs) lib;
@ -21,29 +26,27 @@ let
# mod+1 to swich to workspace 1 # mod+1 to swich to workspace 1
# mod+shift+1 to move to workspace 1 # mod+shift+1 to move to workspace 1
workspace_binds = lib.forEachMerge (lib.range 1 10) (i: workspace_binds = lib.forEachMerge (lib.range 1 10) (
i:
let let
key = toString (lib.mod i 10); key = toString (lib.mod i 10);
workspaceNumber = toString i; workspaceNumber = toString i;
in in
{ {
"${mod}+${key}" = "workspace number ${workspaceNumber}"; "${mod}+${key}" = "workspace number ${workspaceNumber}";
"${mod}+Shift+${key}" = "${mod}+Shift+${key}" = "move container to workspace number ${workspaceNumber}";
"move container to workspace number ${workspaceNumber}"; }
}); );
prev_next_binds = prev_next_binds =
let let
maybe_window = key: maybe_window = key: if (lib.strings.hasInfix "button" key) then "--whole-window" else "";
if (lib.strings.hasInfix "button" key) then makePrevNextBindFunction = (
"--whole-window" prev_or_next:
else
"";
makePrevNextBindFunction = (prev_or_next:
map (key: { map (key: {
"${maybe_window key} ${mod}+${key}" = "${maybe_window key} ${mod}+${key}" = "workspace ${prev_or_next}_on_output";
"workspace ${prev_or_next}_on_output"; })
})); );
prev_binds = makePrevNextBindFunction "prev" [ prev_binds = makePrevNextBindFunction "prev" [
key.tabL key.tabL
"bracketleft" "bracketleft"
@ -67,19 +70,33 @@ let
# for every direction with both arrow keys and vim keys # for every direction with both arrow keys and vim keys
movement_binds = movement_binds =
let let
directions = [ "Left" "Up" "Right" "Down" ]; directions = [
"Left"
"Up"
"Right"
"Down"
];
makeVimKeys = (k: key.${lib.toLower k}); makeVimKeys = (k: key.${lib.toLower k});
makeArrowKeys = (k: k); makeArrowKeys = (k: k);
makeResizeCommand = direction: makeResizeCommand =
direction:
{ {
Left = "shrink width 20px"; Left = "shrink width 20px";
Up = "shrink height 20px"; Up = "shrink height 20px";
Right = "grow width 20px"; Right = "grow width 20px";
Down = "grow height 20px"; Down = "grow height 20px";
}.${direction}; }
.${direction};
in in
lib.forEachMerge [ makeVimKeys makeArrowKeys ] (prefixFun: lib.forEachMerge
lib.forEachMerge directions (direction: [
makeVimKeys
makeArrowKeys
]
(
prefixFun:
lib.forEachMerge directions (
direction:
let let
resize_cmd = makeResizeCommand direction; resize_cmd = makeResizeCommand direction;
keyBind = prefixFun direction; keyBind = prefixFun direction;
@ -94,9 +111,10 @@ let
# focus output # focus output
"${mod}+mod1+${keyBind}" = "focus output ${direction}"; "${mod}+mod1+${keyBind}" = "focus output ${direction}";
# Move workspace to output # Move workspace to output
"${mod}+mod1+Shift+${keyBind}" = "${mod}+mod1+Shift+${keyBind}" = "move workspace output ${direction}";
"move workspace output ${direction}"; }
})); )
);
parenting_binds = { parenting_binds = {
"${mod}+equal" = "focus parent"; "${mod}+equal" = "focus parent";
@ -116,8 +134,7 @@ let
XF86AudioRaiseVolume = "exec volumesh -i 10"; XF86AudioRaiseVolume = "exec volumesh -i 10";
XF86AudioLowerVolume = "exec volumesh -d 10"; XF86AudioLowerVolume = "exec volumesh -d 10";
XF86AudioMute = "exec volumesh -t"; XF86AudioMute = "exec volumesh -t";
XF86AudioMicMute = XF86AudioMicMute = "exec pactl set-source-mute @DEFAULT_SOURCE@ toggle";
"exec pactl set-source-mute @DEFAULT_SOURCE@ toggle";
# Control media # Control media
XF86AudioPlay = "exec playerctl play-pause"; XF86AudioPlay = "exec playerctl play-pause";
XF86AudioPause = "exec playerctl play-pause"; XF86AudioPause = "exec playerctl play-pause";
@ -136,8 +153,7 @@ let
# Screen area to file # Screen area to file
"Shift+Print" = "exec ${pkgs.screenshotsh}/bin/screenshotsh area"; "Shift+Print" = "exec ${pkgs.screenshotsh}/bin/screenshotsh area";
# Screen area to clipboard # Screen area to clipboard
"Control+Shift+Print" = "Control+Shift+Print" = "exec ${pkgs.screenshotsh}/bin/screenshotsh area-clip";
"exec ${pkgs.screenshotsh}/bin/screenshotsh area-clip";
# Focused monitor to clipboard # Focused monitor to clipboard
"Control+Print" = "exec ${pkgs.screenshotsh}/bin/screenshotsh clip"; "Control+Print" = "exec ${pkgs.screenshotsh}/bin/screenshotsh clip";
}; };
@ -155,8 +171,7 @@ let
"${mod}+Alt+x" = "exec pkill wl-crosshair || exec wl-crosshair"; "${mod}+Alt+x" = "exec pkill wl-crosshair || exec wl-crosshair";
"${mod}+x" = "kill"; "${mod}+x" = "kill";
"${mod}+m" = "mode audio"; "${mod}+m" = "mode audio";
"${mod}+escape" = "${mod}+escape" = "mode passthrough;exec notify-send 'Passthrough on'";
"mode passthrough;exec notify-send 'Passthrough on'";
"${mod}+ctrl+k" = "exec swaymsg input type:pointer events disabled"; "${mod}+ctrl+k" = "exec swaymsg input type:pointer events disabled";
"${mod}+ctrl+shift+k" = "exec swaymsg input type:pointer events enabled"; "${mod}+ctrl+shift+k" = "exec swaymsg input type:pointer events enabled";
"${mod}+f" = "fullscreen toggle"; "${mod}+f" = "fullscreen toggle";

View file

@ -1,6 +1,11 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
inherit (pkgs.uservars) key accent font theme; inherit (pkgs.uservars)
key
accent
font
theme
;
inherit (theme) color; inherit (theme) color;
inherit (pkgs) lib; inherit (pkgs) lib;
@ -8,10 +13,8 @@ let
menu = "wlauncher"; menu = "wlauncher";
terminal = "alacritty"; terminal = "alacritty";
locked = locked = lib.mapAttrs' (k: v: lib.nameValuePair "--locked ${k}" v);
lib.mapAttrs' (k: v: lib.nameValuePair "--locked ${k}" v); to-code = lib.mapAttrs' (k: v: lib.nameValuePair "--to-code ${k}" v);
to-code =
lib.mapAttrs' (k: v: lib.nameValuePair "--to-code ${k}" v);
quit-mode = lib.mapAttrs (k: v: "${v}; mode default"); quit-mode = lib.mapAttrs (k: v: "${v}; mode default");
playerctl = "exec ${pkgs.playerctl}/bin/playerctl"; playerctl = "exec ${pkgs.playerctl}/bin/playerctl";
@ -20,20 +23,32 @@ in
{ {
wayland.windowManager.sway.config.modes = { wayland.windowManager.sway.config.modes = {
audio = audio =
(bind_group [ to-code locked ] { (bind_group
[
to-code
locked
]
{
${key.tabR} = "exec volumesh -i 10"; ${key.tabR} = "exec volumesh -i 10";
${key.tabL} = "exec volumesh -d 10"; ${key.tabL} = "exec volumesh -d 10";
${key.right} = "exec mpc next"; ${key.right} = "exec mpc next";
${key.left} = "exec mpc prev"; ${key.left} = "exec mpc prev";
${key.up} = "exec volumesh --mpd -i 10"; ${key.up} = "exec volumesh --mpd -i 10";
${key.down} = "exec volumesh --mpd -d 10"; ${key.down} = "exec volumesh --mpd -d 10";
}) // }
(bind_group [ locked quit-mode ] { )
// (bind_group
[
locked
quit-mode
]
{
"space" = "exec mpc toggle"; "space" = "exec mpc toggle";
"escape" = ""; "escape" = "";
"q" = ""; "q" = "";
}) // }
(bind_group [ quit-mode ] { )
// (bind_group [ quit-mode ] {
"m" = "exec volumesh -t"; "m" = "exec volumesh -t";
"s" = "exec ${pkgs.pulse_sink}/bin/pulse_sink"; "s" = "exec ${pkgs.pulse_sink}/bin/pulse_sink";
@ -47,28 +62,38 @@ in
"Ctrl+s" = "exec ${pkgs.musmenu}/bin/musmenu psave"; "Ctrl+s" = "exec ${pkgs.musmenu}/bin/musmenu psave";
"Ctrl+o" = "exec ${pkgs.musmenu}/bin/musmenu pload"; "Ctrl+o" = "exec ${pkgs.musmenu}/bin/musmenu pload";
"Ctrl+d" = "exec ${pkgs.musmenu}/bin/musmenu pdelete"; "Ctrl+d" = "exec ${pkgs.musmenu}/bin/musmenu pdelete";
}) // })
{ // {
"p" = "mode playerctl"; "p" = "mode playerctl";
"Ctrl+c" = "exec musmenu pclear"; "Ctrl+c" = "exec musmenu pclear";
} };
;
playerctl = playerctl =
(bind_group [ to-code locked ] { (bind_group
[
to-code
locked
]
{
${key.left} = "${playerctl} previous"; ${key.left} = "${playerctl} previous";
${key.right} = "${playerctl} next"; ${key.right} = "${playerctl} next";
${key.up} = "${playerctl} volume 10+"; ${key.up} = "${playerctl} volume 10+";
${key.down} = "${playerctl} volume 10-"; ${key.down} = "${playerctl} volume 10-";
${key.tabR} = "${playerctl} volume 10+"; ${key.tabR} = "${playerctl} volume 10+";
${key.tabL} = "${playerctl} volume 10-"; ${key.tabL} = "${playerctl} volume 10-";
}) // }
(bind_group [ to-code quit-mode ] { )
// (bind_group
[
to-code
quit-mode
]
{
"space" = "${playerctl} play-pause"; "space" = "${playerctl} play-pause";
"escape" = ""; "escape" = "";
"q" = ""; "q" = "";
}) }
; );
passthrough = { passthrough = {
"${mod}+escape" = "mode default;exec notify-send 'Passthrough off'"; "${mod}+escape" = "mode default;exec notify-send 'Passthrough off'";

View file

@ -1,6 +1,16 @@
{ config, pkgs, lib, ... }: {
config,
pkgs,
lib,
...
}:
let let
inherit (pkgs.uservars) key accent font theme; inherit (pkgs.uservars)
key
accent
font
theme
;
inherit (theme) color; inherit (theme) color;
asScript = filename: text: toString (pkgs.writeShellScript filename text); asScript = filename: text: toString (pkgs.writeShellScript filename text);

View file

@ -1,6 +1,16 @@
{ config, pkgs, lib, ... }: {
config,
pkgs,
lib,
...
}:
let let
inherit (pkgs.uservars) key accent font theme; inherit (pkgs.uservars)
key
accent
font
theme
;
inherit (theme) color; inherit (theme) color;
in in
{ {

View file

@ -1,17 +1,28 @@
{ config, pkgs, lib, inputs, ... }: {
config,
pkgs,
lib,
inputs,
...
}:
let let
inherit (pkgs.uservars) theme font desktop; inherit (pkgs.uservars) theme font desktop;
inherit (theme) color gtk_theme icon_theme cursor_theme; inherit (theme)
color
gtk_theme
icon_theme
cursor_theme
;
in in
lib.mkIf (desktop == "sway") lib.mkIf (desktop == "sway") {
{
home.pointerCursor = { home.pointerCursor = {
name = cursor_theme; name = cursor_theme;
size = 24; size = 24;
package = pkgs.bibata-cursors; package = pkgs.bibata-cursors;
gtk.enable = true; gtk.enable = true;
}; };
gtk = { gtk =
{
enable = true; enable = true;
font = { font = {
name = font.interface; name = font.interface;
@ -25,13 +36,17 @@ lib.mkIf (desktop == "sway")
name = icon_theme; name = icon_theme;
package = pkgs.papirus_red; package = pkgs.papirus_red;
}; };
} // ( }
// (
let let
shared.extraConfig = { shared.extraConfig = {
gtk-decoration-layout = "menu:"; gtk-decoration-layout = "menu:";
}; };
in in
{ gtk4 = shared; gtk3 = shared; } {
gtk4 = shared;
gtk3 = shared;
}
); );
qt = { qt = {
enable = true; enable = true;

View file

@ -1,4 +1,5 @@
{ ... }: { { ... }:
{
services.syncthing = { services.syncthing = {
enable = true; enable = true;
tray = { tray = {

View file

@ -1,8 +1,12 @@
{ pkgs, ... }: { { pkgs, ... }:
{
home.packages = with pkgs; [ home.packages = with pkgs; [
_thunar-terminal _thunar-terminal
(xfce.thunar.override { (xfce.thunar.override {
thunarPlugins = with pkgs.xfce; [ thunar-volman thunar-archive-plugin ]; thunarPlugins = with pkgs.xfce; [
thunar-volman
thunar-archive-plugin
];
}) })
]; ];

View file

@ -1,19 +1,23 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
let let
inherit (pkgs.uservars) nextcloud; inherit (pkgs.uservars) nextcloud;
pass_cmd = (pkgs.writeShellScript "get_pass" '' pass_cmd = (
pkgs.writeShellScript "get_pass" ''
pass "${nextcloud.pass}" | head -n1 pass "${nextcloud.pass}" | head -n1
''); ''
);
in in
{ {
systemd.user.services.vdirsyncer = { systemd.user.services.vdirsyncer = {
Unit.Description = "vdirsyncer calendar and contacts synchronization"; Unit.Description = "vdirsyncer calendar and contacts synchronization";
Service = { Service = {
Type = "oneshot"; Type = "oneshot";
ExecStart = toString (pkgs.writeShellScript "run-vdirsyncer" '' ExecStart = toString (
pkgs.writeShellScript "run-vdirsyncer" ''
${pkgs.coreutils}/bin/yes | ${pkgs.vdirsyncer}/bin/vdirsyncer discover ${pkgs.coreutils}/bin/yes | ${pkgs.vdirsyncer}/bin/vdirsyncer discover
${pkgs.coreutils}/bin/yes | ${pkgs.vdirsyncer}/bin/vdirsyncer sync ${pkgs.coreutils}/bin/yes | ${pkgs.vdirsyncer}/bin/vdirsyncer sync
''); ''
);
}; };
}; };
systemd.user.timers.vdirsyncer = { systemd.user.timers.vdirsyncer = {
@ -76,10 +80,8 @@ in
''; '';
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
vdirsyncer vdirsyncer
todoman todoman
]; ];
} }

View file

@ -1,4 +1,5 @@
{ pkgs, config, ... }: { { pkgs, config, ... }:
{
programs.vscode = { programs.vscode = {
enable = true; enable = true;

View file

@ -1,6 +1,18 @@
{ config, osConfig, pkgs, lib, font, ... }: {
config,
osConfig,
pkgs,
lib,
font,
...
}:
let let
inherit (pkgs.uservars) key theme accent font; inherit (pkgs.uservars)
key
theme
accent
font
;
inherit (theme) color; inherit (theme) color;
in in
{ {
@ -9,9 +21,14 @@ in
enable = true; enable = true;
systemd.enable = true; systemd.enable = true;
systemd.target = "sway-session.target"; systemd.target = "sway-session.target";
settings = [{ settings = [
{
layer = "top"; layer = "top";
modules-left = [ "sway/workspaces" "sway/mode" "sway/window" ]; modules-left = [
"sway/workspaces"
"sway/mode"
"sway/window"
];
modules-center = [ "clock" ]; modules-center = [ "clock" ];
modules-right = lib.flatten [ modules-right = lib.flatten [
"sway/language" "sway/language"
@ -36,14 +53,27 @@ in
format-plugged = ""; format-plugged = "";
format-full = ""; format-full = "";
format-warning = "{icon} {time}"; format-warning = "{icon} {time}";
format-icons = [ "" "" "" "" "" "" ]; format-icons = [
""
""
""
""
""
""
];
}; };
network = { network = {
interval = 5; interval = 5;
tooltip = false; tooltip = false;
on-click = "terminal -e iwd"; on-click = "terminal -e iwd";
format-wifi = "{icon}"; format-wifi = "{icon}";
format-icons = [ "" "" "" "" "" ]; format-icons = [
""
""
""
""
""
];
format-ethernet = "󰈀"; format-ethernet = "󰈀";
format-linked = "󰈀"; format-linked = "󰈀";
format-disconnected = ""; format-disconnected = "";
@ -67,7 +97,9 @@ in
default = ""; default = "";
}; };
}; };
"sway/window" = { max-length = 40; }; "sway/window" = {
max-length = 40;
};
"tray" = { "tray" = {
"spacing" = 7; "spacing" = 7;
"icon-size" = 19; "icon-size" = 19;
@ -123,7 +155,9 @@ in
interval = 1; interval = 1;
tooltip = false; tooltip = false;
}; };
"sway/language" = { format = "{short} {variant}"; }; "sway/language" = {
format = "{short} {variant}";
};
"custom/caffeine" = { "custom/caffeine" = {
format = "{}"; format = "{}";
exec = "systemctl --user status swayidle > /dev/null && echo 󰒲 || echo 󰒳"; exec = "systemctl --user status swayidle > /dev/null && echo 󰒲 || echo 󰒳";
@ -152,27 +186,46 @@ in
format-bluetooth-muted = "󰝟"; format-bluetooth-muted = "󰝟";
format-muted = "󰝟"; format-muted = "󰝟";
format-icons = { format-icons = {
"rtp-sink" = "rtp-sink" = [
[ "󰕿" "󰖀" "󰕾" ]; "󰕿"
"alsa_output.usb-C-Media_Electronics_Inc._USB_Audio_Device-00.analog-stereo" = "󰖀"
[ " 󰕿" " 󰖀" " 󰕾" ]; "󰕾"
"alsa_output.pci-0000_09_00.4.analog-stereo" = ];
[ " 󰕿" " 󰖀" " 󰕾" ]; "alsa_output.usb-C-Media_Electronics_Inc._USB_Audio_Device-00.analog-stereo" = [
headphone = [ " 󰕿" " 󰖀" " 󰕾" ]; " 󰕿"
" 󰖀"
" 󰕾"
];
"alsa_output.pci-0000_09_00.4.analog-stereo" = [
" 󰕿"
" 󰖀"
" 󰕾"
];
headphone = [
" 󰕿"
" 󰖀"
" 󰕾"
];
handsfree = ""; handsfree = "";
headset = ""; headset = "";
phone = ""; phone = "";
portable = ""; portable = "";
car = ""; car = "";
default = [ "󰕿" "󰖀" "󰕾" ]; default = [
"󰕿"
"󰖀"
"󰕾"
];
}; };
on-click = "pavucontrol"; on-click = "pavucontrol";
on-click-right = "${pkgs.pulse_sink}/bin/pulse_sink"; on-click-right = "${pkgs.pulse_sink}/bin/pulse_sink";
on-scroll-up = "${pkgs.volumesh}/bin/volumesh -i 10"; on-scroll-up = "${pkgs.volumesh}/bin/volumesh -i 10";
on-scroll-down = "${pkgs.volumesh}/bin/volumesh -d 10"; on-scroll-down = "${pkgs.volumesh}/bin/volumesh -d 10";
}; };
}]; }
style = builtins.readFile (pkgs.substituteAll { ];
style = builtins.readFile (
pkgs.substituteAll {
src = ./style.css; src = ./style.css;
accent_color = accent.color; accent_color = accent.color;
@ -186,7 +239,8 @@ in
font_size_big = "${toString font.size.big}px"; font_size_big = "${toString font.size.big}px";
font_size_medium = "${toString font.size.medium}px"; font_size_medium = "${toString font.size.medium}px";
}); }
);
}; };
home.packages = with pkgs; [ waybar ]; home.packages = with pkgs; [ waybar ];
}; };

View file

@ -1,4 +1,10 @@
{ config, pkgs, lib, inputs, ... }: {
config,
pkgs,
lib,
inputs,
...
}:
let let
HOME = config.home.homeDirectory; HOME = config.home.homeDirectory;
in in

View file

@ -1,6 +1,17 @@
{ config, pkgs, lib, font, ... }: {
config,
pkgs,
lib,
font,
...
}:
let let
inherit (pkgs.uservars) key accent font theme; inherit (pkgs.uservars)
key
accent
font
theme
;
inherit (theme) color; inherit (theme) color;
in in
{ {