Compare commits

..

47 commits

Author SHA1 Message Date
Leonardo Eugênio 056899d344 configuration: extract nixos config into more files 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 276658b73c kdeconect: update config 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 884e2dcf89 gnome: update autologin config 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 82e5246293 scripts: add pass export script 2024-05-28 00:38:37 -03:00
Leonardo Eugênio ae6354806e qutebrowser: don't install if not the default browser 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 337df8cc99 monolith: disable virtualbox while it's borked 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 6c34b71580 flake: update to 24.05 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 7a5f26cca5 Revert "sshd: disable until xz is secure"
This reverts commit b0d1b2fbff.
2024-05-28 00:38:37 -03:00
Leonardo Eugênio 29e5b92702 sway: don't require rebuilding sway dependencies 2024-05-28 00:38:37 -03:00
Leonardo Eugênio d795d1fc6b sway: set godot windows to floating 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 7232b41cf6 sway: autostart corectrl 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 518f075e79 git: enable lfs 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 92d4323155 update: pass arguments to ./switch 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 952b367f22 monolith: add gpu crash work-around 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 405bbee2bf sway: enable adaptive sync 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 9632aba595 forgejo-runner: update runner token and url 2024-05-28 00:38:37 -03:00
Leonardo Eugênio a7f5a40a43 firefox: add i dont care about cookies 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 56e0f9230e ssh: update hostnames 2024-05-28 00:38:37 -03:00
Leonardo Eugênio e8a24dcbe7 sway: make gaming windows floating by default 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 12d91be692 update 2024-05-28 00:38:37 -03:00
Leonardo Eugênio b2354df152 firefox: add substitoot extension 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 02f6f2c5d9 monolith: enable all features of corectrl 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 4f29961c4c monolith: add forgejo runner 2024-05-28 00:38:37 -03:00
Leonardo Eugênio a2d3fc0667 sshd: disable until xz is secure 2024-05-28 00:38:37 -03:00
Leonardo Eugênio fc60ae8fed sway: add more env vars to dbus activation 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 42b554c87f flake: update lockfile 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 85ec5290d0 syncthing: way for tray 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 9740163109 kdenlive: fix theme 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 01a3efdd1d theme: improve qt theming 2024-05-28 00:38:37 -03:00
Leonardo Eugênio f6d8c5e76b syncthing: enable tray icon 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 07d7f551f9 mangohud: install patch to fix keybind crash 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 51524ccd8a gpg: simplify config 2024-05-28 00:38:37 -03:00
Leonardo Eugênio c26cea6183 update 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 2433d75e85 lsp: replace rnix-lsp with nil 2024-05-28 00:38:37 -03:00
Leonardo Eugênio ea25b5d28e update 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 5c5bff3a65 btop: enable gpu monitoring 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 45448b8102 update 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 80e84121dd kak-lsp: update config to new format 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 13f31c1b8e alacritty: update config 2024-05-28 00:38:37 -03:00
Leonardo Eugênio fad53f2613 update renamed xkb config 2024-05-28 00:38:37 -03:00
Leonardo Eugênio bffb3a75cc update 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 5975c82fd8 update 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 7aa4ccbc7e update 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 6d08d7b0f1 sway: disable adaptive sync 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 83a7ce70b5 update 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 487adbf911 update 2024-05-28 00:38:37 -03:00
Leonardo Eugênio 12cfafeb3e switch to nixpkgs unstable 2024-05-28 00:38:37 -03:00
100 changed files with 995 additions and 1953 deletions

View file

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

View file

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

View file

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

View file

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

View file

@ -1,10 +1,4 @@
{
config,
pkgs,
inputs,
...
}:
{
{ config, pkgs, inputs, ... }: {
imports = [
./vpsadminos.nix
inputs.agenix.nixosModules.default
@ -55,16 +49,10 @@
enable = true;
dates = "04:40";
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";
};
networking.firewall.allowedTCPPorts = [ 8745 ];
system.stateVersion = "23.05"; # Never change this
}

View file

@ -1,14 +1,10 @@
{
pkgs,
inputs,
config,
...
}:
{
{ pkgs, inputs, config, ... }: {
# It's important to let Digital Ocean set the hostname so we get rDNS to work
networking.hostName = "";
imports = [ inputs.nixos-mailserver.nixosModules.mailserver ];
imports = [
inputs.nixos-mailserver.nixosModules.mailserver
];
mailserver = {
enable = true;
@ -58,4 +54,5 @@
$config['plugins'] = [ "carddav", "archive" ];
'';
};
}

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,10 +1,4 @@
{
config,
pkgs,
inputs,
...
}:
{
{ config, pkgs, inputs, ... }: {
services.syncthing = {
enable = true;
@ -20,10 +14,11 @@
proxyPass = "http://127.0.0.1:8384";
extraConfig =
# 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
"proxy_pass_header Authorization;";
"proxy_pass_header Authorization;"
;
};
};
}

View file

@ -1,12 +1,8 @@
{ pkgs, ... }:
{
{ pkgs, ... }: {
security.rtkit.enable = true;
services.openssh = {
enable = true;
ports = [
9022
22
];
ports = [ 9022 22 ];
settings = {
PasswordAuthentication = false;
KbdInteractiveAuthentication = false;
@ -19,15 +15,7 @@
isNormalUser = true;
description = "Leonardo Eugênio";
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;
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"
@ -44,5 +32,7 @@
programs.fish.enable = true;
environment.systemPackages = with pkgs; [ git ];
environment.systemPackages = with pkgs; [
git
];
}

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,8 +1,7 @@
# 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'
{ pkgs, inputs }:
{
{ pkgs, inputs }: {
blade-formatter = pkgs.callPackage ./blade-formatter { };
cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { };
lipsum = pkgs.callPackage ./lipsum.nix { inherit inputs; };

View file

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

View file

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

View file

@ -1,10 +1,8 @@
(
final: prev:
(final: prev:
with prev;
let
import_script = (_: path: import (path) { inherit pkgs lib; });
create_script = (
name: text: runtimeInputs:
create_script = (name: text: runtimeInputs:
let
script_body = pkgs.writeTextFile {
inherit name;
@ -18,117 +16,44 @@
inherit name runtimeInputs;
text = ''exec ${script_body} "$@"'';
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-otp ]);
pass = pkgs.pass.withExtensions (ex: with ex; [
pass-otp
]);
in
create_scripts {
create_scripts
{
br = [ ];
bmenu = [
final.bemenu
final.dhist
fish
j4-dmenu-desktop
jq
sway
];
down_meme = [
wl-clipboard
yt-dlp
libnotify
];
wl-copy-file = [
wl-clipboard
fish
];
bmenu = [ final.bemenu final.dhist fish j4-dmenu-desktop jq sway ];
down_meme = [ wl-clipboard yt-dlp libnotify ];
wl-copy-file = [ wl-clipboard fish ];
_diffr = [ diffr ];
_thunar-terminal = [ final.terminal ];
_sway_idle_toggle = [ final.swayidle ];
kak-pager = [
fish
final._diffr
];
kak-pager = [ fish final._diffr ];
kak-man-pager = [ final.kak-pager ];
helix-pager = [
fish
final._diffr
];
helix-pager = [ fish final._diffr ];
helix-man-pager = [ final.helix-pager ];
musmenu = [
mpc-cli
final.wdmenu
trash-cli
xdg-user-dirs
libnotify
sd
wl-clipboard
];
showkeys = [ ]; # This will not work unless programs.wshowkeys is enabled systemwide
musmenu = [ mpc-cli final.wdmenu trash-cli xdg-user-dirs libnotify sd wl-clipboard ];
showkeys =
[ ]; # This will not work unless programs.wshowkeys is enabled systemwide
terminal = [ alacritty ];
playerctl-status = [ playerctl ];
pass-export = [
pass2csv
gnupg
];
wpass = [
final.wdmenu
fd
pass
sd
wl-clipboard
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 {
pass-export = [ pass2csv gnupg ];
wpass = [ final.wdmenu fd pass sd wl-clipboard 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;
wlauncher = ./wlauncher.nix;
_gpg-unlock = ./_gpg-unlock.nix;
}
)
})

View file

@ -2,12 +2,8 @@ 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";
in
{
"rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [
main_ssh_public_key
];
"monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [
main_ssh_public_key
];
"rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [ 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 ];
"monolith-forgejo-runner-token.age".publicKeys = [ main_ssh_public_key ];
"lelgenio-cachix.age".publicKeys = [ main_ssh_public_key ];

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,7 +1,5 @@
{ pkgs, lib, ... }:
{
mkNixRunner =
registrationConfigFile: with lib; rec {
{ pkgs, lib, ... }: {
mkNixRunner = registrationConfigFile: with lib; rec {
# File should contain at least these two variables:
# `CI_SERVER_URL`
# `REGISTRATION_TOKEN`
@ -28,17 +26,7 @@
. ${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 = {
ENV = "/etc/profile";

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,9 +1,4 @@
{
config,
pkgs,
lib,
...
}:
{ config, pkgs, lib, ... }:
let
inherit (pkgs.callPackage ./gitlab-runner.nix { }) mkNixRunner;
in
@ -20,8 +15,7 @@ in
# dockerPrivileged = true;
# };
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";
dockerPrivileged = true;
};

View file

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

View file

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

View file

@ -1,13 +1,7 @@
{
lib,
config,
pkgs,
inputs,
...
}:
{ lib, config, pkgs, inputs, ... }:
let
collectFlakeInputs =
input: [ input ] ++ lib.concatMap collectFlakeInputs (builtins.attrValues (input.inputs or { }));
collectFlakeInputs = input:
[ input ] ++ lib.concatMap collectFlakeInputs (builtins.attrValues (input.inputs or { }));
in
{
system.extraDependencies = collectFlakeInputs inputs.self;
@ -17,16 +11,13 @@ in
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 7d";
dates = "daily";
options = "--delete-older-than 3d";
};
optimise.automatic = true;
settings = {
auto-optimise-store = true;
trusted-users = [
"root"
"@wheel"
];
trusted-users = [ "root" "@wheel" ];
substituters = [
"https://cache.nixos.org"
"https://nix-community.cachix.org"

View file

@ -1,9 +1,4 @@
{
config,
pkgs,
lib,
...
}:
{ config, pkgs, lib, ... }:
let
inherit (pkgs.callPackage ./gitlab-runner.nix { }) mkNixRunner;
in
@ -20,8 +15,7 @@ in
# dockerPrivileged = true;
# };
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";
dockerPrivileged = true;
};

View file

@ -1,13 +1,18 @@
{ pkgs, ... }:
{
{ pkgs, ... }: {
age = {
identityPaths = [ "/root/.ssh/id_rsa" ];
secrets.lelgenio-cachix.file = ../secrets/lelgenio-cachix.age;
secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = ../secrets/monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age;
secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.file = ../secrets/gitlab-runner-thoreb-telemetria-registrationConfigFile.age;
secrets.monolith-forgejo-runner-token.file = ../secrets/monolith-forgejo-runner-token.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;
secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.file =
../secrets/monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age;
secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.file =
../secrets/gitlab-runner-thoreb-telemetria-registrationConfigFile.age;
secrets.monolith-forgejo-runner-token.file =
../secrets/monolith-forgejo-runner-token.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,5 +1,4 @@
{ pkgs, ... }:
{
{ pkgs, ... }: {
sound.enable = true;
hardware.pulseaudio.enable = false;
services.pipewire = {

View file

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

View file

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

View file

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

View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{ pkgs, ... }: {
security.sudo.wheelNeedsPassword = false;
# services.getty.autologinUser = "lelgenio";
@ -11,15 +10,7 @@
isNormalUser = true;
description = "Leonardo Eugênio";
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;
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"

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,10 +1,4 @@
{
config,
pkgs,
lib,
...
}:
{
{ config, pkgs, lib, ... }: {
config = {
services.gpg-agent = {
enable = true;
@ -22,9 +16,7 @@
PartOf = [ "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 = {
@ -39,10 +31,9 @@
OnUnitActiveSec = "300";
Unit = "gpg_unlock.service";
};
Install = {
WantedBy = [ "sway-session.target" ];
};
Install = { WantedBy = [ "sway-session.target" ]; };
};
};
};
}

View file

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

View file

@ -1,12 +1,4 @@
{
config,
pkgs,
lib,
inputs,
osConfig,
...
}:
{
{ config, pkgs, lib, inputs, osConfig, ... }: {
imports = [
./controller.nix
./waybar
@ -78,7 +70,9 @@
comma
# System monitors
(btop.override { cudaSupport = true; })
(btop.override {
cudaSupport = true;
})
amdgpu_top
inxi
dmidecode
@ -134,7 +128,7 @@
rust-analyzer # rust analyzer
blade-formatter
nixfmt-rfc-style
nixpkgs-fmt
];
fonts.fontconfig.enable = true;
@ -146,11 +140,10 @@
};
};
home.sessionVariables = {
VOLUME_CHANGE_SOUND = "${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/audio-volume-change.oga";
};
programs.bash = {
enable = true;
VOLUME_CHANGE_SOUND =
"${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/audio-volume-change.oga";
};
programs.bash = { enable = true; };
xdg.defaultApplications = {
enable = true;
@ -161,8 +154,7 @@
{
firefox = lib.mkDefault "firefox.desktop";
qutebrowser = lib.mkDefault "org.qutebrowser.qutebrowser.desktop";
}
.${pkgs.uservars.browser}
}.${pkgs.uservars.browser}
);
document-viewer = lib.mkDefault "org.pwmt.zathura.desktop";
file-manager = lib.mkDefault "thunar.desktop";
@ -171,9 +163,7 @@
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 obs --startreplaybuffer --disable-shutdown-check
exec deluge-gtk
@ -192,16 +182,12 @@
};
};
systemd.user.timers.rm-target = {
Unit = {
Description = "Remove directories named 'target'";
};
Unit = { Description = "Remove directories named 'target'"; };
Timer = {
OnCalendar = "weekly";
Unit = "rm-target.service";
};
Install = {
WantedBy = [ "timers.target" ];
};
Install = { WantedBy = [ "timers.target" ]; };
};
# This value determines the Home Manager release that your

View file

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

View file

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

View file

@ -1,17 +1,6 @@
{
config,
pkgs,
lib,
...
}:
{ config, pkgs, lib, ... }:
let
inherit (pkgs.uservars)
key
dmenu
editor
theme
accent
;
inherit (pkgs.uservars) key dmenu editor theme accent;
inherit (theme) color;
inherit (pkgs) kakounePlugins;
inherit (pkgs.kakouneUtils) buildKakounePlugin;
@ -85,9 +74,8 @@ in
})
];
extraConfig =
lib.concatStringsSep "\n" (
map (lib.readFile) (
[
lib.concatStringsSep "\n"
(map (lib.readFile) ([
./filetypes.kak
./hooks.kak
./indent.kak
@ -95,29 +83,17 @@ in
./lsp-config.kak
./usermode.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 autoreload yes
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; [
terminal
ranger
@ -147,3 +123,4 @@ in
};
};
}

View file

@ -12,7 +12,7 @@ hook global WinSetOption filetype=c %{
}
hook global WinSetOption filetype=nix %{
set buffer formatcmd 'nixfmt'
set buffer formatcmd 'nixpkgs-fmt'
}
hook global BufCreate .*\.html %{

View file

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

View file

@ -1,20 +1,5 @@
{
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 {
kak = kakoune;
kakoune = {

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,21 +1,8 @@
{
config,
pkgs,
lib,
inputs,
...
}:
{ config, pkgs, lib, inputs, ... }:
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
sign = if (idx < 2) then 1 else -1;
axis = if ((lib.mod idx 2) != 0) then "y" else "x";
@ -28,8 +15,8 @@ let
montage_mode_shift_${axis}(${toString (sign * -1)})
}
}
''
);
'');
in
{
# My bemenu wrapper
@ -58,12 +45,7 @@ in
<Left> { 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.tabR} { goto_file_relative(1); }
@ -72,7 +54,10 @@ in
d { send_keys(6) }
y { send_keys(8) }
${if (key.layout == "colemak") then "\n t { toggle_scale_mode(0) }\n " else ""}
${if (key.layout == "colemak") then
"\n t { toggle_scale_mode(0) }\n "
else
""}
# vim: ft=ini
'';

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,23 +1,19 @@
{ pkgs, lib, ... }:
let
inherit (pkgs.uservars) nextcloud;
pass_cmd = (
pkgs.writeShellScript "get_pass" ''
pass_cmd = (pkgs.writeShellScript "get_pass" ''
pass "${nextcloud.pass}" | head -n1
''
);
'');
in
{
systemd.user.services.vdirsyncer = {
Unit.Description = "vdirsyncer calendar and contacts synchronization";
Service = {
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 sync
''
);
'');
};
};
systemd.user.timers.vdirsyncer = {
@ -80,8 +76,10 @@ in
'';
};
home.packages = with pkgs; [
vdirsyncer
todoman
];
}

View file

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

View file

@ -9,18 +9,4 @@
"git.confirmSync": false,
"editor.suggest.snippetsPreventQuickSuggestions": false,
"update.mode": "none",
"intelephense.files.exclude": [
"**/.git/**",
"**/.svn/**",
"**/.hg/**",
"**/CVS/**",
"**/.DS_Store/**",
"**/node_modules/**",
"**/bower_components/**",
"**/vendor/**/{Tests,tests}/**",
"**/.history/**",
"**/vendor/**/vendor/**",
"**/.direnv/**"
],
"intelephense.format.braces": "k&r",
}

View file

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

View file

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

View file

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