Compare commits
1 commit
main
...
kak-tree-s
| Author | SHA1 | Date | |
|---|---|---|---|
|
75a1ec99a3 |
821
flake.lock
821
flake.lock
File diff suppressed because it is too large
Load diff
80
flake.nix
80
flake.nix
|
|
@ -2,39 +2,43 @@
|
||||||
description = "My system config";
|
description = "My system config";
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "nixpkgs/nixos-24.05";
|
nixpkgs.url = "nixpkgs/nixos-24.05";
|
||||||
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
|
|
||||||
|
|
||||||
home-manager.url = "github:nix-community/home-manager/release-24.05";
|
home-manager.url = "github:nix-community/home-manager/release-24.05";
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
vpsadminos.url = "github:vpsfreecz/vpsadminos";
|
|
||||||
|
|
||||||
nix-index-database = {
|
nix-index-database = {
|
||||||
url = "github:Mic92/nix-index-database";
|
url = "github:Mic92/nix-index-database";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
hyprland = {
|
||||||
|
url = "github:hyprwm/Hyprland";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
ranger-icons.url = "github:alexanderjeurissen/ranger_devicons";
|
ranger-icons.url = "github:alexanderjeurissen/ranger_devicons";
|
||||||
ranger-icons.flake = false;
|
ranger-icons.flake = false;
|
||||||
|
|
||||||
|
material-wifi-icons.url = "github:dcousens/material-wifi-icons";
|
||||||
|
material-wifi-icons.flake = false;
|
||||||
|
|
||||||
plymouth-themes.url = "github:adi1090x/plymouth-themes";
|
plymouth-themes.url = "github:adi1090x/plymouth-themes";
|
||||||
plymouth-themes.flake = false;
|
plymouth-themes.flake = false;
|
||||||
|
|
||||||
|
lipsum.url = "github:hannenz/lipsum";
|
||||||
|
lipsum.flake = false;
|
||||||
|
|
||||||
agenix = {
|
agenix = {
|
||||||
url = "github:ryantm/agenix";
|
url = "github:ryantm/agenix";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
inputs.home-manager.follows = "home-manager";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nixos-mailserver = {
|
nixos-mailserver = {
|
||||||
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
|
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
inputs.nixpkgs-24_05.follows = "nixpkgs";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
dzgui-nix = {
|
dzgui-nix = {
|
||||||
url = "github:lelgenio/dzgui-nix";
|
url = "github:lelgenio/dzgui-nix";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
tlauncher = {
|
tlauncher = {
|
||||||
|
|
@ -42,9 +46,6 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
disko.url = "github:nix-community/disko";
|
|
||||||
disko.inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
|
|
||||||
# my stuff
|
# my stuff
|
||||||
dhist = {
|
dhist = {
|
||||||
url = "github:lelgenio/dhist";
|
url = "github:lelgenio/dhist";
|
||||||
|
|
@ -54,34 +55,18 @@
|
||||||
url = "github:lelgenio/demoji";
|
url = "github:lelgenio/demoji";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
maildir-notify-daemon = {
|
||||||
|
url = "github:lelgenio/maildir-notify-daemon";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
wl-crosshair = {
|
wl-crosshair = {
|
||||||
url = "github:lelgenio/wl-crosshair";
|
url = "github:lelgenio/wl-crosshair";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
warthunder-leak-counter = {
|
|
||||||
url = "git+https://git.lelgenio.com/lelgenio/warthunder-leak-counter";
|
# gnome stuff
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
nixos-conf-editor.url = "github:vlinkz/nixos-conf-editor";
|
||||||
};
|
nix-software-center.url = "github:vlinkz/nix-software-center";
|
||||||
made-you-look = {
|
|
||||||
url = "git+https://git.lelgenio.com/lelgenio/made-you-look";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
catboy-spinner = {
|
|
||||||
url = "git+https://git.lelgenio.com/lelgenio/catboy-spinner";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
tomater = {
|
|
||||||
url = "git+https://git.lelgenio.com/lelgenio/tomater";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
youre-wrong = {
|
|
||||||
url = "git+https://git.lelgenio.com/lelgenio/youre-wrong";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
hello-fonts = {
|
|
||||||
url = "git+https://git.lelgenio.com/lelgenio/hello-fonts";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
outputs =
|
outputs =
|
||||||
inputs:
|
inputs:
|
||||||
|
|
@ -111,13 +96,15 @@
|
||||||
{ nixpkgs.pkgs = pkgs; }
|
{ nixpkgs.pkgs = pkgs; }
|
||||||
./system/configuration.nix
|
./system/configuration.nix
|
||||||
./system/secrets.nix
|
./system/secrets.nix
|
||||||
|
./system/specialisation.nix
|
||||||
./system/greetd.nix
|
./system/greetd.nix
|
||||||
{ login-manager.greetd.enable = desktop == "sway"; }
|
{ login-manager.greetd.enable = desktop == "sway" || desktop == "hyprland"; }
|
||||||
|
|
||||||
inputs.agenix.nixosModules.default
|
inputs.agenix.nixosModules.default
|
||||||
|
inputs.hyprland.nixosModules.default
|
||||||
inputs.dzgui-nix.nixosModules.default
|
inputs.dzgui-nix.nixosModules.default
|
||||||
|
{ programs.hyprland.enable = (desktop == "hyprland"); }
|
||||||
inputs.home-manager.nixosModules.home-manager
|
inputs.home-manager.nixosModules.home-manager
|
||||||
inputs.disko.nixosModules.disko
|
|
||||||
{
|
{
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
|
|
@ -134,24 +121,28 @@
|
||||||
++ lib.optional (desktop == "kde") ./system/kde.nix;
|
++ lib.optional (desktop == "kde") ./system/kde.nix;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
checks."${system}" = {
|
|
||||||
disko-format-i15 = pkgs.callPackage ./hosts/i15/partitions-test.nix { };
|
|
||||||
};
|
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
i15 = lib.nixosSystem {
|
i15 = lib.nixosSystem {
|
||||||
inherit system specialArgs;
|
inherit system specialArgs;
|
||||||
modules = [ ./hosts/i15 ] ++ common_modules;
|
modules = [ ./hosts/i15.nix ] ++ common_modules;
|
||||||
};
|
};
|
||||||
monolith = lib.nixosSystem {
|
monolith = lib.nixosSystem {
|
||||||
inherit system specialArgs;
|
inherit system specialArgs;
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/monolith
|
./hosts/monolith.nix
|
||||||
./system/monolith-gitlab-runner.nix
|
./system/monolith-gitlab-runner.nix
|
||||||
./system/monolith-forgejo-runner.nix
|
./system/monolith-forgejo-runner.nix
|
||||||
./system/nix-serve.nix
|
./system/nix-serve.nix
|
||||||
./system/steam.nix
|
./system/steam.nix
|
||||||
] ++ common_modules;
|
] ++ common_modules;
|
||||||
};
|
};
|
||||||
|
rainbow = lib.nixosSystem {
|
||||||
|
inherit system specialArgs;
|
||||||
|
modules = [
|
||||||
|
./hosts/rainbow.nix
|
||||||
|
./system/rainbow-gitlab-runner.nix
|
||||||
|
] ++ common_modules;
|
||||||
|
};
|
||||||
double-rainbow = lib.nixosSystem {
|
double-rainbow = lib.nixosSystem {
|
||||||
inherit system specialArgs;
|
inherit system specialArgs;
|
||||||
modules = [
|
modules = [
|
||||||
|
|
@ -174,10 +165,7 @@
|
||||||
};
|
};
|
||||||
phantom = lib.nixosSystem {
|
phantom = lib.nixosSystem {
|
||||||
inherit system specialArgs;
|
inherit system specialArgs;
|
||||||
modules = [
|
modules = [ ./hosts/phantom ];
|
||||||
{ nixpkgs.pkgs = pkgs; }
|
|
||||||
./hosts/phantom
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -44,13 +44,7 @@ in
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices = [ { device = "/swapfile"; } ];
|
swapDevices = [ ];
|
||||||
|
|
||||||
services.udev.extraRules = ''
|
|
||||||
# Force all disks to use mq-deadline scheduler
|
|
||||||
# For some reason "noop" is used by default which is kinda bad when io is saturated
|
|
||||||
ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ATTR{../queue/scheduler}="mq-deadline"
|
|
||||||
'';
|
|
||||||
|
|
||||||
# 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
|
||||||
|
|
|
||||||
|
|
@ -1,38 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
modulesPath,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
networking.hostName = "i15"; # Define your hostname.
|
|
||||||
|
|
||||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [
|
|
||||||
"xhci_pci"
|
|
||||||
"ahci"
|
|
||||||
"usb_storage"
|
|
||||||
"sd_mod"
|
|
||||||
"rtsx_usb_sdmmc"
|
|
||||||
];
|
|
||||||
boot.initrd.kernelModules = [ ];
|
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
|
||||||
boot.extraModulePackages = [ ];
|
|
||||||
|
|
||||||
disko.devices = (import ./partitions.nix { disks = [ "/dev/sda" ]; });
|
|
||||||
boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
|
||||||
|
|
||||||
swapDevices = [
|
|
||||||
{
|
|
||||||
device = "/swap/swapfile";
|
|
||||||
size = (1024 * 8) + (1024 * 2); # RAM size + 2 GB
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
networking.useDHCP = lib.mkDefault true;
|
|
||||||
|
|
||||||
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
|
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
}
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
pkgs.makeDiskoTest {
|
|
||||||
name = "test-disko-i15";
|
|
||||||
disko-config = ./partitions.nix;
|
|
||||||
enableOCR = true;
|
|
||||||
bootCommands = ''
|
|
||||||
machine.wait_for_text("[Pp]assphrase for")
|
|
||||||
machine.send_chars("secretsecret\n")
|
|
||||||
'';
|
|
||||||
extraTestScript = ''
|
|
||||||
machine.succeed("cryptsetup isLuks /dev/vda2");
|
|
||||||
machine.succeed("mountpoint /home");
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
|
|
@ -1,73 +0,0 @@
|
||||||
{
|
|
||||||
disks ? [ "/dev/sda" ],
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
btrfs_options = [
|
|
||||||
"compress=zstd:3"
|
|
||||||
"noatime"
|
|
||||||
];
|
|
||||||
in
|
|
||||||
{
|
|
||||||
disk.sda = {
|
|
||||||
type = "disk";
|
|
||||||
device = builtins.elemAt disks 0;
|
|
||||||
content = {
|
|
||||||
type = "table";
|
|
||||||
format = "gpt";
|
|
||||||
partitions = [
|
|
||||||
{
|
|
||||||
type = "partition";
|
|
||||||
name = "NIX_BOOT";
|
|
||||||
start = "1MiB";
|
|
||||||
end = "300MiB";
|
|
||||||
bootable = true;
|
|
||||||
content = {
|
|
||||||
type = "filesystem";
|
|
||||||
extraArgs = [
|
|
||||||
"-n"
|
|
||||||
"BOOT_I15"
|
|
||||||
];
|
|
||||||
format = "vfat";
|
|
||||||
mountpoint = "/boot";
|
|
||||||
# options = [ "defaults" ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
type = "partition";
|
|
||||||
name = "CRYPT_I15";
|
|
||||||
start = "300MiB";
|
|
||||||
end = "100%";
|
|
||||||
content = {
|
|
||||||
type = "luks";
|
|
||||||
name = "main";
|
|
||||||
keyFile = "/tmp/secret.key";
|
|
||||||
content = {
|
|
||||||
type = "btrfs";
|
|
||||||
extraArgs = [
|
|
||||||
"--label"
|
|
||||||
"ROOT_I15"
|
|
||||||
];
|
|
||||||
subvolumes =
|
|
||||||
let
|
|
||||||
mountOptions = btrfs_options;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
"/home" = {
|
|
||||||
inherit mountOptions;
|
|
||||||
};
|
|
||||||
"/nixos" = {
|
|
||||||
inherit mountOptions;
|
|
||||||
mountpoint = "/";
|
|
||||||
};
|
|
||||||
"/swap" = {
|
|
||||||
inherit mountOptions;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -20,12 +20,7 @@ let
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
|
||||||
./partition.nix
|
|
||||||
./amdgpu.nix
|
|
||||||
./factorio-server.nix
|
|
||||||
];
|
|
||||||
boot.initrd.availableKernelModules = [
|
boot.initrd.availableKernelModules = [
|
||||||
"nvme"
|
"nvme"
|
||||||
"xhci_pci"
|
"xhci_pci"
|
||||||
|
|
@ -37,30 +32,45 @@ in
|
||||||
|
|
||||||
hardware.opentabletdriver.enable = true;
|
hardware.opentabletdriver.enable = true;
|
||||||
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
|
||||||
|
|
||||||
boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
|
boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
|
||||||
|
|
||||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||||
boot.kernelModules = [
|
boot.kernelModules = [
|
||||||
"kvm-amd"
|
"kvm-amd"
|
||||||
"amdgpu"
|
"amdgpu"
|
||||||
"zenpower"
|
"zenpower"
|
||||||
];
|
];
|
||||||
|
boot.kernelParams = [
|
||||||
|
"video=DP-1:1920x1080@144"
|
||||||
|
# hibernation
|
||||||
|
"resume=LABEL=BTRFS_ROOT" # findmnt -o LABEL --noheadings /swap/
|
||||||
|
"resume_offset=36709632" # btrfs inspect-internal map-swapfile -r /swap/swapfile
|
||||||
|
];
|
||||||
systemd.sleep.extraConfig = ''
|
systemd.sleep.extraConfig = ''
|
||||||
HibernateDelaySec=30s
|
HibernateDelaySec=30s
|
||||||
SuspendState=mem
|
SuspendState=mem
|
||||||
'';
|
'';
|
||||||
|
|
||||||
fileSystems."/mnt/old" = {
|
hardware.opengl.driSupport = true;
|
||||||
|
# # For 32 bit applications
|
||||||
|
hardware.opengl.driSupport32Bit = true;
|
||||||
|
|
||||||
|
hardware.opengl.extraPackages = with pkgs; [
|
||||||
|
libva
|
||||||
|
libvdpau
|
||||||
|
vaapiVdpau
|
||||||
|
rocm-opencl-icd
|
||||||
|
rocm-opencl-runtime
|
||||||
|
rocmPackages.rocm-smi
|
||||||
|
];
|
||||||
|
|
||||||
|
fileSystems."/" = {
|
||||||
device = "/dev/disk/by-label/BTRFS_ROOT";
|
device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd;
|
options = [ "subvol=nixos" ] ++ btrfs_options ++ btrfs_ssd;
|
||||||
};
|
};
|
||||||
# boot.initrd.luks.reusePassphrases = true;
|
# boot.initrd.luks.reusePassphrases = true;
|
||||||
boot.initrd.luks.devices = {
|
boot.initrd.luks.devices = {
|
||||||
"old" = {
|
"main" = {
|
||||||
bypassWorkqueues = true;
|
bypassWorkqueues = true;
|
||||||
device = "/dev/disk/by-label/CRYPT_ROOT";
|
device = "/dev/disk/by-label/CRYPT_ROOT";
|
||||||
};
|
};
|
||||||
|
|
@ -68,21 +78,21 @@ in
|
||||||
bypassWorkqueues = true;
|
bypassWorkqueues = true;
|
||||||
device = "/dev/disk/by-label/CRYPT_DATA";
|
device = "/dev/disk/by-label/CRYPT_DATA";
|
||||||
};
|
};
|
||||||
# "bigboy" = {
|
"bigboy" = {
|
||||||
# bypassWorkqueues = true;
|
bypassWorkqueues = true;
|
||||||
# device = "/dev/disk/by-label/CRYPT_BIGBOY";
|
device = "/dev/disk/by-label/CRYPT_BIGBOY";
|
||||||
# };
|
};
|
||||||
|
};
|
||||||
|
boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
||||||
|
fileSystems."/boot/efi" = {
|
||||||
|
device = "/dev/disk/by-label/NIXBOOT";
|
||||||
|
fsType = "vfat";
|
||||||
|
};
|
||||||
|
fileSystems."/home" = {
|
||||||
|
device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||||
|
fsType = "btrfs";
|
||||||
|
options = [ "subvol=home" ] ++ btrfs_options ++ btrfs_ssd;
|
||||||
};
|
};
|
||||||
# boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
|
||||||
# fileSystems."/boot/efi" = {
|
|
||||||
# device = "/dev/disk/by-label/NIXBOOT";
|
|
||||||
# fsType = "vfat";
|
|
||||||
# };
|
|
||||||
# fileSystems."/home" = {
|
|
||||||
# device = "/dev/disk/by-label/BTRFS_ROOT";
|
|
||||||
# fsType = "btrfs";
|
|
||||||
# options = [ "subvol=home" ] ++ btrfs_options ++ btrfs_ssd;
|
|
||||||
# };
|
|
||||||
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";
|
||||||
|
|
@ -115,11 +125,27 @@ in
|
||||||
"nofail"
|
"nofail"
|
||||||
] ++ btrfs_options;
|
] ++ btrfs_options;
|
||||||
};
|
};
|
||||||
fileSystems."/home/lelgenio/.local/mount/old" = {
|
fileSystems."/home/lelgenio/.local/mount/bigboy" = {
|
||||||
device = "/dev/disk/by-label/BTRFS_ROOT";
|
device = "/dev/disk/by-label/BTRFS_BIGBOY";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd;
|
options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd;
|
||||||
};
|
};
|
||||||
|
fileSystems."/home/lelgenio/projects" = {
|
||||||
|
device = "/dev/disk/by-label/BTRFS_BIGBOY";
|
||||||
|
fsType = "btrfs";
|
||||||
|
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
|
# 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
|
||||||
|
|
@ -131,8 +157,6 @@ in
|
||||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
networking.hostName = "monolith"; # Define your hostname.
|
networking.hostName = "monolith"; # Define your hostname.
|
||||||
|
|
||||||
virtualisation.virtualbox.host.enable = true;
|
|
||||||
|
|
||||||
services.udev.extraRules = ''
|
services.udev.extraRules = ''
|
||||||
# Fix broken suspend with Logitech USB dongle
|
# Fix broken suspend with Logitech USB dongle
|
||||||
# `lsusb | grep Logitech` will return "vendor:product"
|
# `lsusb | grep Logitech` will return "vendor:product"
|
||||||
|
|
@ -142,23 +166,18 @@ in
|
||||||
ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ATTR{../queue/scheduler}="mq-deadline"
|
ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ATTR{../queue/scheduler}="mq-deadline"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
boot.tmp = {
|
|
||||||
cleanOnBoot = true;
|
|
||||||
useTmpfs = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# swap
|
# swap
|
||||||
# fileSystems."/swap" = {
|
fileSystems."/swap" = {
|
||||||
# device = "/dev/disk/by-label/BTRFS_ROOT";
|
device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||||
# fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
# # Note these options effect the entire BTRFS filesystem and not just this volume,
|
# Note these options effect the entire BTRFS filesystem and not just this volume,
|
||||||
# # 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
|
||||||
# }
|
}
|
||||||
# ];
|
];
|
||||||
}
|
}
|
||||||
|
|
@ -1,44 +0,0 @@
|
||||||
{ pkgs, lib, ... }:
|
|
||||||
let
|
|
||||||
undervoltGpu = pkgs.writeShellScript "undervolt-gpu" ''
|
|
||||||
set -xe
|
|
||||||
cd $1
|
|
||||||
echo "manual" > power_dpm_force_performance_level
|
|
||||||
echo "1" > pp_power_profile_mode
|
|
||||||
test -e pp_od_clk_voltage
|
|
||||||
echo "vo -120" > pp_od_clk_voltage
|
|
||||||
echo "c" > pp_od_clk_voltage
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
{
|
|
||||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
|
||||||
boot.kernelParams = [
|
|
||||||
"amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug
|
|
||||||
"video=DP-1:1920x1080@144"
|
|
||||||
"amdgpu.ppfeaturemask=0xfffd7fff" # enable undervolting
|
|
||||||
];
|
|
||||||
|
|
||||||
systemd.services.amd-fan-control = {
|
|
||||||
script = ''
|
|
||||||
${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 85
|
|
||||||
'';
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
hardware.opengl.driSupport = true;
|
|
||||||
# # For 32 bit applications
|
|
||||||
hardware.opengl.driSupport32Bit = true;
|
|
||||||
|
|
||||||
hardware.opengl.extraPackages = with pkgs; [
|
|
||||||
libva
|
|
||||||
libvdpau
|
|
||||||
vaapiVdpau
|
|
||||||
rocm-opencl-icd
|
|
||||||
rocm-opencl-runtime
|
|
||||||
rocmPackages.rocm-smi
|
|
||||||
];
|
|
||||||
|
|
||||||
services.udev.extraRules = ''
|
|
||||||
ACTION=="add", SUBSYSTEM=="hwmon", ATTR{name}=="amdgpu", ATTR{power1_cap}="186000000", RUN+="${undervoltGpu} %S%p/device"
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
{ config, pkgs, ... }:
|
|
||||||
{
|
|
||||||
services.factorio = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.factorio-headless; # I override this in ./pkgs
|
|
||||||
public = true;
|
|
||||||
lan = true;
|
|
||||||
openFirewall = true;
|
|
||||||
admins = [ "lelgenio" ];
|
|
||||||
extraSettingsFile = config.age.secrets.factorio-settings.path;
|
|
||||||
};
|
|
||||||
|
|
||||||
age.secrets.factorio-settings = {
|
|
||||||
file = ../../secrets/factorio-settings.age;
|
|
||||||
mode = "777";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,68 +0,0 @@
|
||||||
let
|
|
||||||
btrfs_options = [
|
|
||||||
"compress=zstd:3"
|
|
||||||
"noatime"
|
|
||||||
"x-systemd.device-timeout=0"
|
|
||||||
];
|
|
||||||
btrfs_ssd = btrfs_options ++ [
|
|
||||||
"ssd"
|
|
||||||
"discard=async"
|
|
||||||
];
|
|
||||||
in
|
|
||||||
{
|
|
||||||
disko.devices = {
|
|
||||||
disk = {
|
|
||||||
bigboy_disk = {
|
|
||||||
type = "disk";
|
|
||||||
device = "/dev/nvme0n1";
|
|
||||||
content = {
|
|
||||||
type = "gpt";
|
|
||||||
partitions = {
|
|
||||||
ESP = {
|
|
||||||
size = "2G";
|
|
||||||
type = "EF00";
|
|
||||||
content = {
|
|
||||||
type = "filesystem";
|
|
||||||
format = "vfat";
|
|
||||||
mountpoint = "/boot";
|
|
||||||
mountOptions = [ "defaults" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
luks = {
|
|
||||||
size = "100%";
|
|
||||||
content = {
|
|
||||||
type = "luks";
|
|
||||||
name = "bigboy";
|
|
||||||
# disable settings.keyFile if you want to use interactive password entry
|
|
||||||
passwordFile = "/tmp/secret.key"; # Interactive
|
|
||||||
# settings = {
|
|
||||||
# allowDiscards = true;
|
|
||||||
# keyFile = "/tmp/secret.key";
|
|
||||||
# };
|
|
||||||
# additionalKeyFiles = [ "/tmp/additionalSecret.key" ];
|
|
||||||
content = {
|
|
||||||
type = "btrfs";
|
|
||||||
extraArgs = [ "-f" ];
|
|
||||||
subvolumes = {
|
|
||||||
"/@nixos" = {
|
|
||||||
mountpoint = "/";
|
|
||||||
mountOptions = btrfs_ssd;
|
|
||||||
};
|
|
||||||
"/@home" = {
|
|
||||||
mountpoint = "/home";
|
|
||||||
mountOptions = btrfs_ssd;
|
|
||||||
};
|
|
||||||
"/@swap" = {
|
|
||||||
mountpoint = "/.swapvol";
|
|
||||||
swap.swapfile.size = "32G";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
{ pkgs, ... }:
|
|
||||||
{
|
|
||||||
users.users.davikiwi = {
|
|
||||||
isNormalUser = true;
|
|
||||||
description = "Davi";
|
|
||||||
hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A";
|
|
||||||
openssh.authorizedKeys.keys = [
|
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGgZDBnj+gVMHqoNvjpx2T/HqnxUDbLPshu+t7301gXd Davi@DESKTOP-EVHFGJ9"
|
|
||||||
];
|
|
||||||
extraGroups = [ "docker" ];
|
|
||||||
packages = with pkgs; [
|
|
||||||
(pkgs.python3.withPackages (python-pkgs: [
|
|
||||||
python-pkgs.pip
|
|
||||||
python-pkgs.wheel
|
|
||||||
]))
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."davikiwi.lelgenio.com" = {
|
|
||||||
enableACME = true;
|
|
||||||
forceSSL = true;
|
|
||||||
locations."/" = {
|
|
||||||
proxyPass = "http://127.0.0.1:24618";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
inputs.vpsadminos.nixosConfigurations.container
|
./vpsadminos.nix
|
||||||
inputs.agenix.nixosModules.default
|
inputs.agenix.nixosModules.default
|
||||||
../../system/nix.nix
|
../../system/nix.nix
|
||||||
./hardware-config.nix
|
./hardware-config.nix
|
||||||
|
|
@ -18,13 +18,8 @@
|
||||||
./writefreely.nix
|
./writefreely.nix
|
||||||
./email.nix
|
./email.nix
|
||||||
./forgejo.nix
|
./forgejo.nix
|
||||||
./invidious.nix
|
|
||||||
./davi.nix
|
|
||||||
./goofs.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
networking.hostName = "phantom";
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."lelgenio.com" = {
|
services.nginx.virtualHosts."lelgenio.com" = {
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
|
|
@ -56,23 +51,6 @@
|
||||||
identityPaths = [ "/root/.ssh/id_rsa" ];
|
identityPaths = [ "/root/.ssh/id_rsa" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
virtualisation.docker = {
|
|
||||||
enable = true;
|
|
||||||
daemon.settings = {
|
|
||||||
# needed by bitbucket runner ???
|
|
||||||
log-driver = "json-file";
|
|
||||||
log-opts = {
|
|
||||||
max-size = "10m";
|
|
||||||
max-file = "3";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
nix.settings = {
|
|
||||||
cores = 1;
|
|
||||||
max-jobs = 1;
|
|
||||||
};
|
|
||||||
|
|
||||||
system.autoUpgrade = {
|
system.autoUpgrade = {
|
||||||
enable = true;
|
enable = true;
|
||||||
dates = "04:40";
|
dates = "04:40";
|
||||||
|
|
@ -81,7 +59,7 @@
|
||||||
"--update-input"
|
"--update-input"
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
"--no-write-lock-file"
|
"--no-write-lock-file"
|
||||||
"--print-build-logs"
|
"-L"
|
||||||
];
|
];
|
||||||
flake = "git+https://git.lelgenio.com/lelgenio/nixos-config#phantom";
|
flake = "git+https://git.lelgenio.com/lelgenio/nixos-config#phantom";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,9 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
|
# 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 = {
|
mailserver = {
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,9 @@ in
|
||||||
virtualHosts.${cfg.settings.server.DOMAIN} = {
|
virtualHosts.${cfg.settings.server.DOMAIN} = {
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
|
extraConfig = ''
|
||||||
|
client_max_body_size 512M;
|
||||||
|
'';
|
||||||
locations."/".proxyPass = "http://localhost:${toString srv.HTTP_PORT}";
|
locations."/".proxyPass = "http://localhost:${toString srv.HTTP_PORT}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
@ -27,9 +30,6 @@ in
|
||||||
ENABLED = true;
|
ENABLED = true;
|
||||||
DEFAULT_ACTIONS_URL = "github";
|
DEFAULT_ACTIONS_URL = "github";
|
||||||
};
|
};
|
||||||
repository = {
|
|
||||||
ENABLE_PUSH_CREATE_USER = true;
|
|
||||||
};
|
|
||||||
server = {
|
server = {
|
||||||
DOMAIN = "git.lelgenio.com";
|
DOMAIN = "git.lelgenio.com";
|
||||||
HTTP_PORT = 3000;
|
HTTP_PORT = 3000;
|
||||||
|
|
@ -37,7 +37,7 @@ in
|
||||||
};
|
};
|
||||||
mailer = {
|
mailer = {
|
||||||
ENABLED = true;
|
ENABLED = true;
|
||||||
SMTP_ADDR = "lelgenio.com";
|
SMTP_ADDR = "mail.lelgenio.com";
|
||||||
FROM = "noreply@git.lelgenio.com";
|
FROM = "noreply@git.lelgenio.com";
|
||||||
USER = "noreply@git.lelgenio.com";
|
USER = "noreply@git.lelgenio.com";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,46 +0,0 @@
|
||||||
{ inputs, config, ... }:
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
inputs.warthunder-leak-counter.nixosModules.default
|
|
||||||
inputs.made-you-look.nixosModules.default
|
|
||||||
];
|
|
||||||
|
|
||||||
services.warthunder-leak-counter.enable = true;
|
|
||||||
services.nginx.virtualHosts."warthunder-leak-counter.lelgenio.com" = {
|
|
||||||
enableACME = true;
|
|
||||||
forceSSL = true;
|
|
||||||
locations."/" = {
|
|
||||||
proxyPass = "http://127.0.0.1:${toString config.services.warthunder-leak-counter.port}";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.made-you-look.enable = true;
|
|
||||||
services.nginx.virtualHosts."coolest-thing-ever.lelgenio.com" = {
|
|
||||||
enableACME = true;
|
|
||||||
forceSSL = true;
|
|
||||||
locations."/" = {
|
|
||||||
proxyPass = "http://127.0.0.1:${toString config.services.made-you-look.port}";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."catboy-spinner.lelgenio.com" = {
|
|
||||||
enableACME = true;
|
|
||||||
forceSSL = true;
|
|
||||||
root = inputs.catboy-spinner;
|
|
||||||
};
|
|
||||||
services.nginx.virtualHosts."tomater.lelgenio.com" = {
|
|
||||||
enableACME = true;
|
|
||||||
forceSSL = true;
|
|
||||||
root = inputs.tomater;
|
|
||||||
};
|
|
||||||
services.nginx.virtualHosts."youre-wrong.lelgenio.com" = {
|
|
||||||
enableACME = true;
|
|
||||||
forceSSL = true;
|
|
||||||
root = inputs.youre-wrong;
|
|
||||||
};
|
|
||||||
services.nginx.virtualHosts."hello-fonts.lelgenio.com" = {
|
|
||||||
enableACME = true;
|
|
||||||
forceSSL = true;
|
|
||||||
root = inputs.hello-fonts;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -5,12 +5,6 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
fileSystems."/var/lib/syncthing-data" = {
|
|
||||||
device = "172.16.130.7:/nas/5749/syncthinng_data";
|
|
||||||
fsType = "nfs";
|
|
||||||
options = [ "nofail" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices = [
|
swapDevices = [
|
||||||
{
|
{
|
||||||
device = "/swap/swapfile";
|
device = "/swap/swapfile";
|
||||||
|
|
|
||||||
|
|
@ -1,40 +0,0 @@
|
||||||
{
|
|
||||||
inputs,
|
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
# Replace with unstable, since 24.05 does not have sig-helper
|
|
||||||
disabledModules = [ "services/web-apps/invidious.nix" ];
|
|
||||||
imports = [ (inputs.nixpkgs-unstable + "/nixos/modules/services/web-apps/invidious.nix") ];
|
|
||||||
|
|
||||||
services.invidious = {
|
|
||||||
enable = true;
|
|
||||||
domain = "invidious.lelgenio.com";
|
|
||||||
nginx.enable = true;
|
|
||||||
port = 10601;
|
|
||||||
http3-ytproxy.enable = true;
|
|
||||||
sig-helper = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.unstable.inv-sig-helper;
|
|
||||||
};
|
|
||||||
# {
|
|
||||||
# "visitor_data": "...",
|
|
||||||
# "po_token": "..."
|
|
||||||
# }
|
|
||||||
extraSettingsFile = config.age.secrets.phantom-invidious-settings.path;
|
|
||||||
settings = {
|
|
||||||
force_resolve = "ipv6";
|
|
||||||
db = {
|
|
||||||
user = "invidious";
|
|
||||||
dbname = "invidious";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
age.secrets.phantom-invidious-settings = {
|
|
||||||
file = ../../secrets/phantom-invidious-settings.age;
|
|
||||||
mode = "666";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
};
|
};
|
||||||
streamingProcesses = 2;
|
streamingProcesses = 2;
|
||||||
extraConfig.SINGLE_USER_MODE = "true";
|
extraConfig.SINGLE_USER_MODE = "true";
|
||||||
mediaAutoRemove.olderThanDays = 5;
|
mediaAutoRemove.olderThanDays = 10;
|
||||||
};
|
};
|
||||||
|
|
||||||
age.secrets.phantom-mastodon-mailer-password = {
|
age.secrets.phantom-mastodon-mailer-password = {
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
{
|
{
|
||||||
services.nextcloud = {
|
services.nextcloud = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.nextcloud29;
|
package = pkgs.nextcloud27;
|
||||||
hostName = "cloud.lelgenio.com";
|
hostName = "cloud.lelgenio.com";
|
||||||
https = true;
|
https = true;
|
||||||
config = {
|
config = {
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,6 @@
|
||||||
recommendedTlsSettings = true;
|
recommendedTlsSettings = true;
|
||||||
recommendedOptimisation = true;
|
recommendedOptimisation = true;
|
||||||
recommendedGzipSettings = true;
|
recommendedGzipSettings = true;
|
||||||
clientMaxBodySize = "512M";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Redirect *lelgenio.xyz -> *lelgenio.com
|
# Redirect *lelgenio.xyz -> *lelgenio.com
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,6 @@
|
||||||
];
|
];
|
||||||
initialHashedPassword = "$y$j9T$E3aBBSSq0Gma8hZD9L7ov0$iCGDW4fqrXWfHO0qodBYYgMFA9CpIraoklHcPbJJrM3";
|
initialHashedPassword = "$y$j9T$E3aBBSSq0Gma8hZD9L7ov0$iCGDW4fqrXWfHO0qodBYYgMFA9CpIraoklHcPbJJrM3";
|
||||||
};
|
};
|
||||||
|
|
||||||
security.sudo.wheelNeedsPassword = false;
|
security.sudo.wheelNeedsPassword = false;
|
||||||
|
|
||||||
programs.fish.enable = true;
|
programs.fish.enable = true;
|
||||||
|
|
|
||||||
76
hosts/phantom/vpsadminos.nix
Normal file
76
hosts/phantom/vpsadminos.nix
Normal file
|
|
@ -0,0 +1,76 @@
|
||||||
|
# This file provides compatibility for NixOS to run in a container on vpsAdminOS
|
||||||
|
# hosts.
|
||||||
|
#
|
||||||
|
# If you're experiencing issues, try updating this file to the latest version
|
||||||
|
# from vpsAdminOS repository:
|
||||||
|
#
|
||||||
|
# https://github.com/vpsfreecz/vpsadminos/blob/staging/os/lib/nixos-container/vpsadminos.nix
|
||||||
|
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
with lib;
|
||||||
|
let
|
||||||
|
nameservers = [
|
||||||
|
"1.1.1.1"
|
||||||
|
"2606:4700:4700::1111"
|
||||||
|
];
|
||||||
|
in
|
||||||
|
{
|
||||||
|
networking.nameservers = mkDefault nameservers;
|
||||||
|
services.resolved = mkDefault { fallbackDns = nameservers; };
|
||||||
|
networking.dhcpcd.extraConfig = "noipv4ll";
|
||||||
|
|
||||||
|
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.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.services.systemd-udev-trigger.serviceConfig.ExecStart = [
|
||||||
|
""
|
||||||
|
"-udevadm trigger --subsystem-match=net --action=add"
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.isContainer = true;
|
||||||
|
boot.enableContainers = mkDefault true;
|
||||||
|
boot.loader.initScript.enable = true;
|
||||||
|
boot.specialFileSystems."/run/keys".fsType = mkForce "tmpfs";
|
||||||
|
boot.systemdExecutable = mkDefault "/run/current-system/systemd/lib/systemd/systemd systemd.unified_cgroup_hierarchy=0";
|
||||||
|
|
||||||
|
# Overrides for <nixpkgs/nixos/modules/virtualisation/container-config.nix>
|
||||||
|
documentation.enable = mkOverride 500 true;
|
||||||
|
documentation.nixos.enable = mkOverride 500 true;
|
||||||
|
networking.useHostResolvConf = mkOverride 500 false;
|
||||||
|
services.openssh.startWhenNeeded = mkOverride 500 false;
|
||||||
|
|
||||||
|
# Bring up the network, /ifcfg.{add,del} are supplied by the vpsAdminOS host
|
||||||
|
systemd.services.networking-setup = {
|
||||||
|
description = "Load network configuration provided by the vpsAdminOS host";
|
||||||
|
before = [ "network.target" ];
|
||||||
|
wantedBy = [ "network.target" ];
|
||||||
|
after = [ "network-pre.target" ];
|
||||||
|
path = [ pkgs.iproute2 ];
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
RemainAfterExit = true;
|
||||||
|
ExecStart = "${pkgs.bash}/bin/bash /ifcfg.add";
|
||||||
|
ExecStop = "${pkgs.bash}/bin/bash /ifcfg.del";
|
||||||
|
};
|
||||||
|
unitConfig.ConditionPathExists = "/ifcfg.add";
|
||||||
|
restartIfChanged = false;
|
||||||
|
};
|
||||||
|
}
|
||||||
85
hosts/rainbow.nix
Normal file
85
hosts/rainbow.nix
Normal file
|
|
@ -0,0 +1,85 @@
|
||||||
|
# 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,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
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.kernelModules = [ "i915" ];
|
||||||
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
|
fileSystems."/" = {
|
||||||
|
device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||||
|
fsType = "btrfs";
|
||||||
|
options = [ "subvol=@nixos" ] ++ btrfs_options ++ btrfs_ssd;
|
||||||
|
};
|
||||||
|
|
||||||
|
boot.initrd.luks.devices = {
|
||||||
|
"main" = {
|
||||||
|
bypassWorkqueues = true;
|
||||||
|
device = "/dev/disk/by-label/CRYPT_ROOT";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/home" = {
|
||||||
|
device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||||
|
fsType = "btrfs";
|
||||||
|
options = [ "subvol=@home" ] ++ btrfs_options ++ btrfs_ssd;
|
||||||
|
};
|
||||||
|
|
||||||
|
boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
||||||
|
fileSystems."/boot/efi" = {
|
||||||
|
device = "/dev/disk/by-uuid/DC3B-5753";
|
||||||
|
fsType = "vfat";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/swap" = {
|
||||||
|
device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||||
|
fsType = "btrfs";
|
||||||
|
options = [ "subvol=@swap" ] ++ btrfs_ssd;
|
||||||
|
};
|
||||||
|
|
||||||
|
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
|
||||||
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
|
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
|
networking.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
|
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
|
||||||
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
|
||||||
|
networking.hostName = "rainbow"; # Define your hostname.
|
||||||
|
}
|
||||||
63
install/i15.sh
Normal file
63
install/i15.sh
Normal file
|
|
@ -0,0 +1,63 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
set -xe
|
||||||
|
|
||||||
|
settle() {
|
||||||
|
udevadm trigger --subsystem-match=block
|
||||||
|
udevadm settle
|
||||||
|
}
|
||||||
|
|
||||||
|
lsblk
|
||||||
|
echo 'Enter the name of the device to WIPE and install (something like "sda"):'
|
||||||
|
read DRIVE_ID
|
||||||
|
|
||||||
|
echo 'Enter a passphrase to encrypt the disk:'
|
||||||
|
read -s DRIVE_PASSPHRASE
|
||||||
|
|
||||||
|
echo "Creating partition table..."
|
||||||
|
parted -s "/dev/${DRIVE_ID}" -- mklabel gpt
|
||||||
|
|
||||||
|
echo "Creating EFI system partition..."
|
||||||
|
parted -s "/dev/${DRIVE_ID}" -- mkpart ESP 1MiB 1GiB
|
||||||
|
parted -s "/dev/${DRIVE_ID}" -- set 1 boot on
|
||||||
|
mkfs.fat -F32 "/dev/${DRIVE_ID}1" -n NIX_BOOT
|
||||||
|
|
||||||
|
echo "Creating encrypted root partition..."
|
||||||
|
parted -s "/dev/${DRIVE_ID}" -- mkpart luks 1GiB 100%
|
||||||
|
echo "$DRIVE_PASSPHRASE" | cryptsetup --batch-mode luksFormat --label CRYPT_ROOT "/dev/${DRIVE_ID}2"
|
||||||
|
settle
|
||||||
|
echo "$DRIVE_PASSPHRASE" | cryptsetup luksOpen /dev/disk/by-label/CRYPT_ROOT "crypt_root"
|
||||||
|
|
||||||
|
echo "Creating btrfs partition..."
|
||||||
|
mkfs.btrfs --quiet --label NIX_ROOT /dev/mapper/"crypt_root"
|
||||||
|
MNTPOINT=$(mktemp -d)
|
||||||
|
mount /dev/mapper/"crypt_root" "$MNTPOINT"
|
||||||
|
|
||||||
|
echo "Creating subvolumes..."
|
||||||
|
btrfs subvolume create "$MNTPOINT"/@nixos
|
||||||
|
btrfs subvolume create "$MNTPOINT"/@home
|
||||||
|
btrfs subvolume create "$MNTPOINT"/@swap
|
||||||
|
|
||||||
|
echo "Closing btrfs partition..."
|
||||||
|
umount -Rl "$MNTPOINT"
|
||||||
|
rm -rf "$MNTPOINT"
|
||||||
|
|
||||||
|
echo "Mounting root btrfs submodule to '$MNTPOINT' ..."
|
||||||
|
MNTPOINT=$(mktemp -d)
|
||||||
|
mount /dev/disk/by-label/NIX_ROOT "$MNTPOINT" -o subvol=@nixos,noatime,compress=zstd
|
||||||
|
|
||||||
|
echo "Creating and mounting EFI system partition mountpoint..."
|
||||||
|
mkdir -p "$MNTPOINT/boot"
|
||||||
|
mount /dev/disk/by-label/NIX_BOOT "$MNTPOINT/boot"
|
||||||
|
|
||||||
|
echo "Creating home partition mountpoint..."
|
||||||
|
mkdir -p "$MNTPOINT/home"
|
||||||
|
mount /dev/disk/by-label/NIX_ROOT "$MNTPOINT/home" -o subvol=@home,noatime,compress=zstd
|
||||||
|
|
||||||
|
echo "Swapfile"
|
||||||
|
mkdir -p "$MNTPOINT/swap"
|
||||||
|
mount /dev/disk/by-label/NIX_ROOT "$MNTPOINT/swap" -o subvol=@swap,noatime
|
||||||
|
|
||||||
|
# echo "Installing system..."
|
||||||
|
nixos-generate-config --root "$MNTPOINT"
|
||||||
|
# nixos-install --root "$MNTPOINT"
|
||||||
|
|
@ -2,22 +2,26 @@
|
||||||
rec {
|
rec {
|
||||||
all = [
|
all = [
|
||||||
scripts
|
scripts
|
||||||
unstable
|
sway
|
||||||
themes
|
themes
|
||||||
new-packages
|
new-packages
|
||||||
patches
|
patches
|
||||||
lib_extended
|
lib_extended
|
||||||
disko
|
|
||||||
];
|
];
|
||||||
|
|
||||||
scripts = (import ../scripts);
|
scripts = (import ../scripts);
|
||||||
|
|
||||||
unstable = final: prev: {
|
sway = (import ./sway.nix);
|
||||||
unstable = import inputs.nixpkgs-unstable { inherit (final) system config; };
|
|
||||||
};
|
|
||||||
|
|
||||||
themes = (
|
themes = (
|
||||||
final: prev: {
|
final: prev: {
|
||||||
|
material-wifi-icons = final.stdenv.mkDerivation rec {
|
||||||
|
name = "material-wifi-icons";
|
||||||
|
src = inputs.material-wifi-icons;
|
||||||
|
installPhase = ''
|
||||||
|
install -D material-wifi.ttf $out/share/fonts/${name}
|
||||||
|
'';
|
||||||
|
};
|
||||||
papirus_red = (final.papirus-icon-theme.override { color = "red"; });
|
papirus_red = (final.papirus-icon-theme.override { color = "red"; });
|
||||||
orchis_theme_compact = (
|
orchis_theme_compact = (
|
||||||
final.orchis-theme.override {
|
final.orchis-theme.override {
|
||||||
|
|
@ -46,19 +50,32 @@ rec {
|
||||||
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;
|
||||||
wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default;
|
wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
patches = (
|
patches = (
|
||||||
final: prev: {
|
final: prev: {
|
||||||
|
bemenu = prev.bemenu.overrideAttrs (o: {
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace lib/renderers/wayland/window.c \
|
||||||
|
--replace ZWLR_LAYER_SHELL_V1_LAYER_TOP ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY
|
||||||
|
'';
|
||||||
|
});
|
||||||
mySway = prev.sway.override {
|
mySway = prev.sway.override {
|
||||||
withBaseWrapper = true;
|
|
||||||
withGtkWrapper = true;
|
|
||||||
sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
|
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: {
|
||||||
|
patches = o.patches ++ [
|
||||||
|
(prev.fetchpatch {
|
||||||
|
url = "https://github.com/flightlessmango/MangoHud/commit/95141de657e02577f1d3fab0ca12122bfb68bc56.patch";
|
||||||
|
hash = "sha256-a2tESliGBkfF7uYQn8TDgeFt07A9FOioI4VcTT7DC7A=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
});
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -77,13 +94,4 @@ rec {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
disko = final: prev: {
|
|
||||||
makeDiskoTest =
|
|
||||||
let
|
|
||||||
makeTest = import (prev.path + "/nixos/tests/make-test-python.nix");
|
|
||||||
eval-config = import (prev.path + "/nixos/lib/eval-config.nix");
|
|
||||||
in
|
|
||||||
(prev.callPackage "${inputs.disko}/tests/lib.nix" { inherit makeTest eval-config; }).makeDiskoTest;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
19
overlays/sway.nix
Normal file
19
overlays/sway.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
||||||
|
(pkgs: _: {
|
||||||
|
# bash script to let dbus know about important env variables and
|
||||||
|
# propogate them to relevent services run at the end of sway config
|
||||||
|
# see
|
||||||
|
# https://github.com/emersion/xdg-desktop-portal-wlr/wiki/"It-doesn't-work"-Troubleshooting-Checklist
|
||||||
|
# note: this is pretty much the same as /etc/sway/config.d/nixos.conf but also restarts
|
||||||
|
# some user services to make sure they have the correct environment variables
|
||||||
|
dbus-sway-environment = pkgs.writeTextFile {
|
||||||
|
name = "dbus-sway-environment";
|
||||||
|
destination = "/bin/dbus-sway-environment";
|
||||||
|
executable = true;
|
||||||
|
text = ''
|
||||||
|
systemctl --user import-environment
|
||||||
|
dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway SWAYSOCK
|
||||||
|
# systemctl --user stop pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr
|
||||||
|
# systemctl --user start pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
})
|
||||||
64
pkgs/blade-formatter/default.nix
Normal file
64
pkgs/blade-formatter/default.nix
Normal file
|
|
@ -0,0 +1,64 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
mkYarnPackage,
|
||||||
|
fetchFromGitHub,
|
||||||
|
fetchYarnDeps,
|
||||||
|
testers,
|
||||||
|
writeText,
|
||||||
|
runCommand,
|
||||||
|
blade-formatter,
|
||||||
|
}:
|
||||||
|
|
||||||
|
mkYarnPackage rec {
|
||||||
|
pname = "blade-formatter";
|
||||||
|
version = "1.38.2";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "shufo";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-JvILLw7Yp4g/dSsYtZ2ylmlXfS9t+2KADlBrYOJWTpg=";
|
||||||
|
};
|
||||||
|
|
||||||
|
packageJSON = ./package.json;
|
||||||
|
offlineCache = fetchYarnDeps {
|
||||||
|
yarnLock = "${src}/yarn.lock";
|
||||||
|
hash = "sha256-UFDxw3fYMzSUhZw+TCEh/dN7OioKI75LzKSnEwGPKDA=";
|
||||||
|
};
|
||||||
|
|
||||||
|
postBuild = "yarn build";
|
||||||
|
|
||||||
|
passthru.tests = {
|
||||||
|
version = testers.testVersion {
|
||||||
|
package = blade-formatter;
|
||||||
|
command = "blade-formatter --version";
|
||||||
|
};
|
||||||
|
|
||||||
|
simple = testers.testEqualContents {
|
||||||
|
assertion = "blade-formatter formats a basic blade file";
|
||||||
|
expected = writeText "expected" ''
|
||||||
|
@if (true)
|
||||||
|
Hello world!
|
||||||
|
@endif
|
||||||
|
'';
|
||||||
|
actual =
|
||||||
|
runCommand "actual"
|
||||||
|
{
|
||||||
|
nativeBuildInputs = [ blade-formatter ];
|
||||||
|
base = writeText "base" ''
|
||||||
|
@if( true ) Hello world! @endif
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
''
|
||||||
|
blade-formatter $base > $out
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Laravel Blade template formatter";
|
||||||
|
homepage = "https://github.com/shufo/blade-formatter";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ lelgenio ];
|
||||||
|
};
|
||||||
|
}
|
||||||
120
pkgs/blade-formatter/package.json
Executable file
120
pkgs/blade-formatter/package.json
Executable file
|
|
@ -0,0 +1,120 @@
|
||||||
|
{
|
||||||
|
"name": "blade-formatter",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 14.0.0"
|
||||||
|
},
|
||||||
|
"keywords": [
|
||||||
|
"php",
|
||||||
|
"formatter",
|
||||||
|
"laravel"
|
||||||
|
],
|
||||||
|
"version": "1.38.2",
|
||||||
|
"description": "An opinionated blade template formatter for Laravel",
|
||||||
|
"main": "./dist/bundle.cjs",
|
||||||
|
"types": "./dist/types/main.d.ts",
|
||||||
|
"type": "module",
|
||||||
|
"exports": {
|
||||||
|
".": {
|
||||||
|
"import": "./dist/bundle.js",
|
||||||
|
"require": "./dist/bundle.cjs",
|
||||||
|
"default": "./dist/bundle.js"
|
||||||
|
},
|
||||||
|
"./*": "./*"
|
||||||
|
},
|
||||||
|
"scripts": {
|
||||||
|
"build": "cross-env NODE_ENV=production node esbuild.js && cross-env NODE_ENV=production ESM_BUILD=true node esbuild.js",
|
||||||
|
"prepublish": "tsc src/main.ts --declaration --emitDeclarationOnly --outDir ./dist/types || true",
|
||||||
|
"watch": "node esbuild.js",
|
||||||
|
"test": "yarn run build && node --experimental-vm-modules node_modules/.bin/jest",
|
||||||
|
"lint": "eslint src -c .eslintrc.json --ext ts",
|
||||||
|
"fix": "prettier {src,__tests__}/**/*.ts --write",
|
||||||
|
"check_formatted": "prettier **/*.ts -c",
|
||||||
|
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
|
||||||
|
"prepare": "husky install",
|
||||||
|
"bin": "cross-env ./bin/blade-formatter.cjs"
|
||||||
|
},
|
||||||
|
"bin": {
|
||||||
|
"blade-formatter": "bin/blade-formatter.cjs"
|
||||||
|
},
|
||||||
|
"author": "Shuhei Hayashibara",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@prettier/plugin-php": "^0.19.7",
|
||||||
|
"@shufo/tailwindcss-class-sorter": "3.0.1",
|
||||||
|
"aigle": "^1.14.1",
|
||||||
|
"ajv": "^8.9.0",
|
||||||
|
"chalk": "^4.1.0",
|
||||||
|
"concat-stream": "^2.0.0",
|
||||||
|
"detect-indent": "^6.0.0",
|
||||||
|
"find-config": "^1.0.0",
|
||||||
|
"glob": "^8.0.1",
|
||||||
|
"html-attribute-sorter": "^0.4.3",
|
||||||
|
"ignore": "^5.1.8",
|
||||||
|
"js-beautify": "^1.14.8",
|
||||||
|
"lodash": "^4.17.19",
|
||||||
|
"php-parser": "3.1.5",
|
||||||
|
"prettier": "^2.2.0",
|
||||||
|
"tailwindcss": "^3.1.8",
|
||||||
|
"vscode-oniguruma": "1.7.0",
|
||||||
|
"vscode-textmate": "^7.0.1",
|
||||||
|
"xregexp": "^5.0.1",
|
||||||
|
"yargs": "^17.3.1"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@babel/core": "^7.6.4",
|
||||||
|
"@babel/plugin-transform-modules-commonjs": "^7.16.5",
|
||||||
|
"@babel/preset-env": "^7.13.12",
|
||||||
|
"@babel/preset-typescript": "^7.16.5",
|
||||||
|
"@types/concat-stream": "^2.0.0",
|
||||||
|
"@types/find-config": "^1.0.1",
|
||||||
|
"@types/fs-extra": "^11.0.0",
|
||||||
|
"@types/glob": "^8.0.0",
|
||||||
|
"@types/jest": "^29.0.0",
|
||||||
|
"@types/js-beautify": "^1.13.3",
|
||||||
|
"@types/lodash": "^4.14.178",
|
||||||
|
"@types/mocha": "^10.0.0",
|
||||||
|
"@types/node": "^18.0.0",
|
||||||
|
"@types/xregexp": "^4.4.0",
|
||||||
|
"@typescript-eslint/eslint-plugin": "^5.8.1",
|
||||||
|
"@typescript-eslint/parser": "^5.8.1",
|
||||||
|
"app-root-path": "^3.0.0",
|
||||||
|
"babel-jest": "^29.0.0",
|
||||||
|
"codecov": "^3.8.3",
|
||||||
|
"cross-env": "^7.0.3",
|
||||||
|
"esbuild": "^0.19.0",
|
||||||
|
"esbuild-node-externals": "^1.4.1",
|
||||||
|
"eslint": "^8.5.0",
|
||||||
|
"eslint-config-airbnb-base": "^15.0.0",
|
||||||
|
"eslint-config-airbnb-typescript": "^17.0.0",
|
||||||
|
"eslint-config-prettier": "^9.0.0",
|
||||||
|
"eslint-import-resolver-typescript": "^3.0.0",
|
||||||
|
"eslint-plugin-import": "^2.25.3",
|
||||||
|
"eslint-plugin-jest": "^26.0.0",
|
||||||
|
"eslint-plugin-prettier": "^5.0.0",
|
||||||
|
"fs-extra": "^11.0.0",
|
||||||
|
"husky": "^8.0.0",
|
||||||
|
"jest": "^29.0.0",
|
||||||
|
"lint-staged": ">=10",
|
||||||
|
"source-map-loader": "^4.0.0",
|
||||||
|
"ts-jest": "^29.0.0",
|
||||||
|
"ts-loader": "^9.2.6",
|
||||||
|
"ts-migrate": "^0.1.27",
|
||||||
|
"ts-node": "^10.4.0",
|
||||||
|
"typescript": "^5.0.0"
|
||||||
|
},
|
||||||
|
"repository": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/shufo/blade-formatter.git"
|
||||||
|
},
|
||||||
|
"files": [
|
||||||
|
"dist",
|
||||||
|
"src",
|
||||||
|
"bin",
|
||||||
|
"wasm",
|
||||||
|
"syntaxes",
|
||||||
|
"CHANGELOG.md"
|
||||||
|
],
|
||||||
|
"lint-staged": {
|
||||||
|
"*.ts": "yarn run fix"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -2,13 +2,10 @@
|
||||||
# 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 }:
|
||||||
rec {
|
{
|
||||||
|
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 { };
|
lipsum = pkgs.callPackage ./lipsum.nix { inherit inputs; };
|
||||||
emmet-cli = pkgs.callPackage ./emmet-cli.nix { };
|
emmet-cli = pkgs.callPackage ./emmet-cli.nix { };
|
||||||
material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { };
|
kak-tree-sitter = pkgs.callPackage ./kak-tree-sitter.nix { };
|
||||||
gnome-pass-search-provider = pkgs.callPackage ./gnome-pass-search-provider.nix { };
|
|
||||||
factorio-headless = pkgs.callPackage ./factorio-headless {
|
|
||||||
inherit (pkgs.unstable) factorio-headless;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
{ factorio-headless, pkgs }:
|
|
||||||
|
|
||||||
factorio-headless.overrideAttrs (_: rec {
|
|
||||||
version = "2.0.20";
|
|
||||||
src = pkgs.fetchurl {
|
|
||||||
name = "factorio_headless_x64-${version}.tar.xz";
|
|
||||||
url = "https://www.factorio.com/get-download/${version}/headless/linux64";
|
|
||||||
hash = "sha256-xKkB8vHb7btBZUVg20xvq2g6MMIDNOgF1O90DAQWUVo=";
|
|
||||||
};
|
|
||||||
})
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set -xe
|
|
||||||
|
|
||||||
cd "$(dirname $0)"
|
|
||||||
|
|
||||||
current_version="$(rg '^.*?version\s*=\s*"(.+)".*?$' --replace '$1' ./default.nix)"
|
|
||||||
current_hash="$(rg '^.*?hash\s*=\s*"(.+)".*?$' --replace '$1' ./default.nix)"
|
|
||||||
|
|
||||||
new_version="$(curl https://factorio.com/api/latest-releases | jq -r .stable.headless)"
|
|
||||||
new_hash="$(nix-hash --to-sri --type sha256 $(nix-prefetch-url --type sha256 https://www.factorio.com/get-download/${new_version}/headless/linux64))"
|
|
||||||
|
|
||||||
sd --fixed-strings "$current_version" "$new_version" ./default.nix
|
|
||||||
sd --fixed-strings "$current_hash" "$new_hash" ./default.nix
|
|
||||||
|
|
@ -1,64 +0,0 @@
|
||||||
{
|
|
||||||
stdenv,
|
|
||||||
fetchFromGitHub,
|
|
||||||
python3Packages,
|
|
||||||
wrapGAppsHook,
|
|
||||||
gtk3,
|
|
||||||
gobject-introspection,
|
|
||||||
gnome,
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
inherit (python3Packages)
|
|
||||||
dbus-python
|
|
||||||
pygobject3
|
|
||||||
fuzzywuzzy
|
|
||||||
levenshtein
|
|
||||||
;
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "gnome-pass-search-provider";
|
|
||||||
version = "1.4.0";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "jle64";
|
|
||||||
repo = "gnome-pass-search-provider";
|
|
||||||
rev = version;
|
|
||||||
hash = "sha256-PDR8fbDoT8IkHiTopQp0zd4DQg7JlacA6NdKYKYmrWw=";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
python3Packages.wrapPython
|
|
||||||
wrapGAppsHook
|
|
||||||
];
|
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
|
||||||
dbus-python
|
|
||||||
pygobject3
|
|
||||||
fuzzywuzzy
|
|
||||||
levenshtein
|
|
||||||
|
|
||||||
gtk3
|
|
||||||
gobject-introspection
|
|
||||||
];
|
|
||||||
|
|
||||||
env = {
|
|
||||||
LIBDIR = builtins.placeholder "out" + "/lib";
|
|
||||||
DATADIR = builtins.placeholder "out" + "/share";
|
|
||||||
};
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace conf/org.gnome.Pass.SearchProvider.service.{dbus,systemd} \
|
|
||||||
--replace-fail "/usr/lib" "$LIBDIR"
|
|
||||||
'';
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
bash ./install.sh
|
|
||||||
'';
|
|
||||||
|
|
||||||
postFixup = ''
|
|
||||||
makeWrapperArgs=( "''${gappsWrapperArgs[@]}" )
|
|
||||||
wrapPythonProgramsIn "$out/lib" "$out $propagatedBuildInputs"
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
33
pkgs/kak-tree-sitter.nix
Normal file
33
pkgs/kak-tree-sitter.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
||||||
|
{ lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, rustPlatform
|
||||||
|
}:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "kak-tree-sitter";
|
||||||
|
version = "0.5.4";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "hadronized";
|
||||||
|
repo = pname;
|
||||||
|
rev = "${pname}-v${version}";
|
||||||
|
hash = "sha256-ZJQE3Xx1Vo7G3uLP9eiZV6Gdsiij1WL/NqkUKSm7I/o=";
|
||||||
|
};
|
||||||
|
cargoHash = "sha256-IwdO+PNPLd0j6gwLzA5ojeGT9o/w9dswIQRGR6DbeAE=";
|
||||||
|
|
||||||
|
GIT_HEAD = version;
|
||||||
|
prePatch = ''
|
||||||
|
rm kak-tree-sitter/build.rs
|
||||||
|
rm ktsctl/build.rs
|
||||||
|
'';
|
||||||
|
|
||||||
|
cargoBuildFlags = [ "--package" pname ];
|
||||||
|
|
||||||
|
dontPatchELF = true;
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A server that interfaces tree-sitter with kakoune";
|
||||||
|
homepage = "https://github.com/hadronized/kak-tree-sitter";
|
||||||
|
license = with licenses; [ mit ];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -1,22 +1,11 @@
|
||||||
{
|
{ pkgs, inputs }:
|
||||||
stdenv,
|
pkgs.stdenv.mkDerivation rec {
|
||||||
fetchFromGitHub,
|
|
||||||
pkg-config,
|
|
||||||
vala,
|
|
||||||
wrapGAppsHook,
|
|
||||||
}:
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "lipsum";
|
pname = "lipsum";
|
||||||
version = "0.0.1";
|
version = "0.0.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = inputs.lipsum;
|
||||||
owner = "hannenz";
|
|
||||||
repo = "lipsum";
|
|
||||||
rev = "0fb31e6ede10fbd78d7652f5fb21670cddd8e3ed";
|
|
||||||
hash = "sha256-a6uv0tJulN9cAGWxvQr8B0PUJEY8Rx4e759xzS66Xlo=";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = with pkgs; [
|
||||||
pkg-config
|
pkg-config
|
||||||
vala
|
vala
|
||||||
wrapGAppsHook
|
wrapGAppsHook
|
||||||
|
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
{ stdenv, fetchFromGitHub }:
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "material-wifi-icons";
|
|
||||||
version = "0.0.1";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "dcousens";
|
|
||||||
repo = "material-wifi-icons";
|
|
||||||
rev = "2daf6b3d96d65beb2a3e37a9a53556aab3826d97";
|
|
||||||
hash = "sha256-KykU5J7SdpBDG+6rkD//XeHd+6pK3qabe+88RduhwKc=";
|
|
||||||
};
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
install -D material-wifi.ttf $out/share/fonts/${pname}
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
0
scripts/_diffr
Executable file → Normal file
0
scripts/_diffr
Executable file → Normal file
0
scripts/_sway_idle_toggle
Executable file → Normal file
0
scripts/_sway_idle_toggle
Executable file → Normal file
|
|
@ -1,50 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
DEVICE="$1" # eg: /sys/class/drm/card1/device
|
|
||||||
HWMON=$(echo "$DEVICE"/hwmon/hwmon*)
|
|
||||||
|
|
||||||
exit() {
|
|
||||||
echo "Setting controll to auto" >&2
|
|
||||||
echo 2 > "$HWMON/pwm1_enable"
|
|
||||||
}
|
|
||||||
|
|
||||||
trap exit EXIT INT
|
|
||||||
|
|
||||||
bail() {
|
|
||||||
echo "Error: $@" >&2
|
|
||||||
echo "Exiting..." >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
if ! [ -d $HWMON ]; then
|
|
||||||
bail "Invalid HWMON"
|
|
||||||
fi
|
|
||||||
|
|
||||||
TEMP_INPUT="$HWMON/temp2_input"
|
|
||||||
|
|
||||||
if ! [ -f $TEMP_INPUT ]; then
|
|
||||||
bail "Invalid TEMP_INPUT"
|
|
||||||
fi
|
|
||||||
|
|
||||||
MIN="$2"
|
|
||||||
MAX="$3"
|
|
||||||
|
|
||||||
echo "Running..." >&2
|
|
||||||
while true; do
|
|
||||||
TEMPERATURE_RAW=$(cat "$TEMP_INPUT")
|
|
||||||
TEMPERATURE="$(( $TEMPERATURE_RAW / 1000 ))"
|
|
||||||
# Remap from a number between 60_000..90_000 to 0..255
|
|
||||||
PWM=$(( ($TEMPERATURE - $MIN) * 255 / ($MAX - $MIN) ))
|
|
||||||
|
|
||||||
if [ "$PWM" -gt 255 ]; then
|
|
||||||
PWM=255
|
|
||||||
elif [ "$PWM" -lt 0 ]; then
|
|
||||||
PWM=0
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo 1 > "$HWMON/pwm1_enable"
|
|
||||||
echo "$PWM" > "$HWMON/pwm1"
|
|
||||||
sleep .1s
|
|
||||||
done
|
|
||||||
26
scripts/auto_connect_gamepad
Executable file
26
scripts/auto_connect_gamepad
Executable file
|
|
@ -0,0 +1,26 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
list_paired_controllers() {
|
||||||
|
bluetoothctl devices Paired | grep -i 'controller' | cut -d' ' -f2
|
||||||
|
}
|
||||||
|
|
||||||
|
count_connected_controllers() {
|
||||||
|
bluetoothctl devices Connected | grep -i 'controller' | wc -l
|
||||||
|
}
|
||||||
|
|
||||||
|
try_to_connect_to_all_controllers() {
|
||||||
|
list_paired_controllers | while read paired_controller; do
|
||||||
|
echo "Trying to connect to controller $paired_controller"
|
||||||
|
bluetoothctl connect "$paired_controller"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
echo "looping"
|
||||||
|
if test "$(count_connected_controllers)" -ne 0 ; then
|
||||||
|
echo "there is a controller connected, not attempting to connect to any other"
|
||||||
|
sleep 10s
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
try_to_connect_to_all_controllers
|
||||||
|
done
|
||||||
0
scripts/bmenu
Executable file → Normal file
0
scripts/bmenu
Executable file → Normal file
0
scripts/br
Executable file → Normal file
0
scripts/br
Executable file → Normal file
|
|
@ -1,38 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
CONTROLLER=$(find /sys/class/power_supply -maxdepth 1 -name '*controller*' || true)
|
|
||||||
|
|
||||||
if test -z "$CONTROLLER"; then
|
|
||||||
echo
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
CAPACITY=$(cat "$CONTROLLER/capacity")
|
|
||||||
|
|
||||||
echo -n ''
|
|
||||||
|
|
||||||
if test "$CAPACITY" -ge 90; then
|
|
||||||
echo ''
|
|
||||||
elif test "$CAPACITY" -ge 90; then
|
|
||||||
echo ''
|
|
||||||
elif test "$CAPACITY" -ge 80; then
|
|
||||||
echo ''
|
|
||||||
elif test "$CAPACITY" -ge 70; then
|
|
||||||
echo ''
|
|
||||||
elif test "$CAPACITY" -ge 60; then
|
|
||||||
echo ''
|
|
||||||
elif test "$CAPACITY" -ge 50; then
|
|
||||||
echo ''
|
|
||||||
elif test "$CAPACITY" -ge 40; then
|
|
||||||
echo ''
|
|
||||||
elif test "$CAPACITY" -ge 30; then
|
|
||||||
echo ''
|
|
||||||
elif test "$CAPACITY" -ge 20; then
|
|
||||||
echo ''
|
|
||||||
elif test "$CAPACITY" -ge 10; then
|
|
||||||
echo ''
|
|
||||||
else
|
|
||||||
echo ''
|
|
||||||
fi
|
|
||||||
|
|
@ -1,33 +1,34 @@
|
||||||
(
|
(
|
||||||
final: prev:
|
final: prev:
|
||||||
|
with prev;
|
||||||
let
|
let
|
||||||
lib = prev.lib;
|
import_script = (_: path: import (path) { inherit pkgs lib; });
|
||||||
|
create_script = (
|
||||||
importScript = (_: path: import (path) { inherit (final) pkgs lib; });
|
|
||||||
wrapScript =
|
|
||||||
name: text: runtimeInputs:
|
name: text: runtimeInputs:
|
||||||
final.runCommand name
|
let
|
||||||
{
|
script_body = pkgs.writeTextFile {
|
||||||
nativeBuildInputs = [ final.makeWrapper ];
|
inherit name;
|
||||||
meta.mainProgram = name;
|
executable = true;
|
||||||
}
|
text = ''
|
||||||
''
|
${builtins.readFile text}
|
||||||
mkdir -p $out/bin
|
|
||||||
cp ${text} $out/bin/${name}
|
|
||||||
wrapProgram $out/bin/${name} \
|
|
||||||
--suffix PATH : ${lib.makeBinPath runtimeInputs}
|
|
||||||
'';
|
'';
|
||||||
createScripts = lib.mapAttrs (name: deps: wrapScript name ./${name} deps);
|
};
|
||||||
|
|
||||||
myPass = final.pass.withExtensions (ex: with ex; [ pass-otp ]);
|
|
||||||
in
|
in
|
||||||
with final;
|
(pkgs.writeShellApplication {
|
||||||
createScripts {
|
inherit name runtimeInputs;
|
||||||
amd-fan-control = [ bash ];
|
text = ''exec ${script_body} "$@"'';
|
||||||
|
checkPhase = "";
|
||||||
|
})
|
||||||
|
);
|
||||||
|
create_scripts = lib.mapAttrs (name: deps: create_script name ./${name} deps);
|
||||||
|
|
||||||
|
pass = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]);
|
||||||
|
in
|
||||||
|
create_scripts {
|
||||||
br = [ ];
|
br = [ ];
|
||||||
bmenu = [
|
bmenu = [
|
||||||
bemenu
|
final.bemenu
|
||||||
dhist
|
final.dhist
|
||||||
fish
|
fish
|
||||||
j4-dmenu-desktop
|
j4-dmenu-desktop
|
||||||
jq
|
jq
|
||||||
|
|
@ -43,21 +44,21 @@
|
||||||
fish
|
fish
|
||||||
];
|
];
|
||||||
_diffr = [ diffr ];
|
_diffr = [ diffr ];
|
||||||
_thunar-terminal = [ terminal ];
|
_thunar-terminal = [ final.terminal ];
|
||||||
_sway_idle_toggle = [ swayidle ];
|
_sway_idle_toggle = [ final.swayidle ];
|
||||||
kak-pager = [
|
kak-pager = [
|
||||||
fish
|
fish
|
||||||
_diffr
|
final._diffr
|
||||||
];
|
];
|
||||||
kak-man-pager = [ kak-pager ];
|
kak-man-pager = [ final.kak-pager ];
|
||||||
helix-pager = [
|
helix-pager = [
|
||||||
fish
|
fish
|
||||||
_diffr
|
final._diffr
|
||||||
];
|
];
|
||||||
helix-man-pager = [ helix-pager ];
|
helix-man-pager = [ final.helix-pager ];
|
||||||
musmenu = [
|
musmenu = [
|
||||||
mpc-cli
|
mpc-cli
|
||||||
wdmenu
|
final.wdmenu
|
||||||
trash-cli
|
trash-cli
|
||||||
xdg-user-dirs
|
xdg-user-dirs
|
||||||
libnotify
|
libnotify
|
||||||
|
|
@ -70,12 +71,11 @@
|
||||||
pass-export = [
|
pass-export = [
|
||||||
pass2csv
|
pass2csv
|
||||||
gnupg
|
gnupg
|
||||||
sd
|
|
||||||
];
|
];
|
||||||
wpass = [
|
wpass = [
|
||||||
wdmenu
|
final.wdmenu
|
||||||
fd
|
fd
|
||||||
myPass
|
pass
|
||||||
sd
|
sd
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
wtype
|
wtype
|
||||||
|
|
@ -96,7 +96,7 @@
|
||||||
pulse_sink = [
|
pulse_sink = [
|
||||||
pulseaudio
|
pulseaudio
|
||||||
pamixer
|
pamixer
|
||||||
wdmenu
|
final.wdmenu
|
||||||
];
|
];
|
||||||
color_picker = [
|
color_picker = [
|
||||||
grim
|
grim
|
||||||
|
|
@ -108,13 +108,13 @@
|
||||||
dzadd = [
|
dzadd = [
|
||||||
procps
|
procps
|
||||||
libnotify
|
libnotify
|
||||||
wdmenu
|
final.wdmenu
|
||||||
jq
|
jq
|
||||||
mpv
|
mpv
|
||||||
pqiv
|
pqiv
|
||||||
python3Packages.deemix
|
python3Packages.deemix
|
||||||
mpc-cli
|
mpc-cli
|
||||||
mpdDup
|
final.mpdDup
|
||||||
];
|
];
|
||||||
mpdDup = [
|
mpdDup = [
|
||||||
mpc-cli
|
mpc-cli
|
||||||
|
|
@ -125,16 +125,10 @@
|
||||||
zbar
|
zbar
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
];
|
];
|
||||||
pint-fmt = [ ];
|
auto_connect_gamepad = [ bluez ];
|
||||||
powerplay-led-idle = [
|
|
||||||
bash
|
|
||||||
libinput
|
|
||||||
libratbag
|
|
||||||
];
|
|
||||||
vrr-fullscreen = [ ];
|
vrr-fullscreen = [ ];
|
||||||
controller-battery = [ ];
|
|
||||||
}
|
}
|
||||||
// lib.mapAttrs importScript {
|
// 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;
|
||||||
|
|
|
||||||
0
scripts/helix-pager
Executable file → Normal file
0
scripts/helix-pager
Executable file → Normal file
0
scripts/kak-pager
Executable file → Normal file
0
scripts/kak-pager
Executable file → Normal file
|
|
@ -8,6 +8,3 @@ pass2csv "$PASSWORD_STORE_DIR" "$HOME/passwords.csv" \
|
||||||
-f User '(user|login)(:\s*)?' \
|
-f User '(user|login)(:\s*)?' \
|
||||||
-f TOTP 'otpauth(:)?' \
|
-f TOTP 'otpauth(:)?' \
|
||||||
-f URL 'url(:\s*)?'
|
-f URL 'url(:\s*)?'
|
||||||
|
|
||||||
# Fix TOTP format for keepass
|
|
||||||
sd '"//totp/.*?secret=(.*?)(&.*?)?"' '"$1"' "$HOME/passwords.csv"
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
file="$(mktemp)"
|
|
||||||
cat - >"$file"
|
|
||||||
./vendor/bin/pint --quiet "$file"
|
|
||||||
cat "$file"
|
|
||||||
rm "$file"
|
|
||||||
0
scripts/playerctl-status
Executable file → Normal file
0
scripts/playerctl-status
Executable file → Normal file
|
|
@ -1,79 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# Constants
|
|
||||||
SECONDS_UNTIL_FADE=$(( 1 * 60))
|
|
||||||
SECONDS_UNTIL_OFF=$(( 6 * 60))
|
|
||||||
|
|
||||||
COLOR_ON=ff0000
|
|
||||||
COLOR_FADE=880000
|
|
||||||
COLOR_OFF=000000
|
|
||||||
|
|
||||||
# Logging
|
|
||||||
|
|
||||||
if [[ "$1" = "debug" ]]; then
|
|
||||||
echo "Running with debugging" >&2
|
|
||||||
DEBUG="true"
|
|
||||||
|
|
||||||
SECONDS_UNTIL_FADE=$(( 3 ))
|
|
||||||
SECONDS_UNTIL_OFF=$(( 5 ))
|
|
||||||
fi
|
|
||||||
|
|
||||||
log() {
|
|
||||||
if [[ "$DEBUG" = "true" ]]; then
|
|
||||||
echo "$@" >&2
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Implementation
|
|
||||||
|
|
||||||
main() {
|
|
||||||
CURRENT_STATE="UNKNOWN"
|
|
||||||
LAST_POINTER_MOTION="$(date +%s)"
|
|
||||||
|
|
||||||
if [ "$(ratbagctl list | wc -l)" -ne 1 ]; then
|
|
||||||
echo "Not exactly one device found, exiting..."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
DEVICE="$(ratbagctl list | cut -d: -f1)"
|
|
||||||
|
|
||||||
while true; do
|
|
||||||
while read line; do
|
|
||||||
LAST_POINTER_MOTION="$(date +%s)"
|
|
||||||
break
|
|
||||||
done < <(
|
|
||||||
timeout 5s \
|
|
||||||
libinput debug-events \
|
|
||||||
| grep POINTER_MOTION
|
|
||||||
)
|
|
||||||
TIME_SINCE_LAST=$(( "$(date +%s)" - "$LAST_POINTER_MOTION" ))
|
|
||||||
log "Last pointer motion was $TIME_SINCE_LAST seconds ago"
|
|
||||||
if [ "$TIME_SINCE_LAST" -gt "$SECONDS_UNTIL_OFF" ]; then
|
|
||||||
setState OFF "$COLOR_OFF"
|
|
||||||
elif [ "$TIME_SINCE_LAST" -gt "$SECONDS_UNTIL_FADE" ]; then
|
|
||||||
setState FADE "$COLOR_FADE"
|
|
||||||
else
|
|
||||||
setState ON "$COLOR_ON"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
setState() {
|
|
||||||
STATE="$1"
|
|
||||||
COLOR="$2"
|
|
||||||
MODE="$3"
|
|
||||||
|
|
||||||
if [[ "$STATE" = "$CURRENT_STATE" ]]; then
|
|
||||||
log "Already in $STATE state"
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
log "Changing state to $STATE"
|
|
||||||
CURRENT_STATE="$STATE"
|
|
||||||
|
|
||||||
ratbagctl "$DEVICE" led 0 set mode on
|
|
||||||
ratbagctl "$DEVICE" led 0 set color "$COLOR"
|
|
||||||
}
|
|
||||||
|
|
||||||
main
|
|
||||||
0
scripts/pulse_sink
Executable file → Normal file
0
scripts/pulse_sink
Executable file → Normal file
0
scripts/screenshotsh
Executable file → Normal file
0
scripts/screenshotsh
Executable file → Normal file
0
scripts/showkeys
Executable file → Normal file
0
scripts/showkeys
Executable file → Normal file
0
scripts/terminal
Executable file → Normal file
0
scripts/terminal
Executable file → Normal file
0
scripts/wl-copy-file
Executable file → Normal file
0
scripts/wl-copy-file
Executable file → Normal file
0
scripts/wpass
Executable file → Normal file
0
scripts/wpass
Executable file → Normal file
Binary file not shown.
Binary file not shown.
|
|
@ -1,16 +0,0 @@
|
||||||
age-encryption.org/v1
|
|
||||||
-> ssh-rsa BwwxHg
|
|
||||||
iTcgtxF1IxopbtF+aw7V8IQfH7tWiMk9lE/eWlVHVjeaRvER5W6Y3xZNOFCjtbqY
|
|
||||||
VwEyV6ibfZ4GJt1jRu2icEH/AnLUJFFGQnxu/K/rtoZ3tqSIk9WCBv3aPo4oZRiU
|
|
||||||
uaaxi2gD8qo1RLyl/Ij7Djw4i/isUOO1EON5sgx1d39k6qUD4Mak0DSU4EtGdTsr
|
|
||||||
OaxDAc0kAxhxZQOUH/QlKa0HLonaFcy1LHqvttOcw3UZuZnaYfZiPlcqe3USS9cm
|
|
||||||
96aIC5cS9pHr4JFrqRYvfpla2TY5jlCB/xBGw3KjGEIQoBPXSsJZA6BCMZyp00++
|
|
||||||
tdfS2aomt9HFmb1wZDS0jWAxkVF6nXXBbolFVih+58h0nYLljtHIQ3SizRoXY459
|
|
||||||
x3JE9NReHp2OO3SlIeO03Kv8YMBvj7nSSd1C1PMpu+hJ/eCXi1WQxD6QY+40muk6
|
|
||||||
KhqE3PZ8BCY2b+VpywUF5gVH28mo3jscqAzhf2dZ3SQlzldI+hFyKPxTdAqkfUOH
|
|
||||||
|
|
||||||
--- cinb+wzjVfTkpfm1CtFIFaepwoQVCj1MquB5rAC45Ew
|
|
||||||
¾
|
|
||||||
6
|
|
||||||
ZCþHS 0 7ïº ÖóýE¼X* Àq b=üOßí ÛÉwu¥¤³Pºþ¹ Ùçǖѳ/£ómv òÞ×Ë2VœÄ«
|
|
||||||
ÁŠxvç[“£‚µ£±”Ì‚A~ evdÓåÙ0¢ Œni³1Ò›¹Qý„"í@Ù¹§ÞÔ{KpÐ:åϵuµsÊÎBñò(X…r[ ÂQVg¢Tš¤°ðœîËï@Ä*ÇõÿíB «<>.§¯žhE鲟èÐë’÷½¥Žûzlz|kã`l8‘´8¼M›cch<63>îáZ`ƒ ?yeoƒ+ÈM-:/–À**ìè¦Ê cŸÎZD¡2Ñá¼é&·÷¾Ç¢ ¹£e¤ï*Hnç"Þ~+|ua(û6óËJ
|
|
||||||
Binary file not shown.
|
|
@ -12,11 +12,9 @@ in
|
||||||
"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 ];
|
||||||
"monolith-nix-serve-privkey.age".publicKeys = [ main_ssh_public_key ];
|
"monolith-nix-serve-privkey.age".publicKeys = [ main_ssh_public_key ];
|
||||||
"factorio-settings.age".publicKeys = [ main_ssh_public_key ];
|
|
||||||
"phantom-nextcloud.age".publicKeys = [ main_ssh_public_key ];
|
"phantom-nextcloud.age".publicKeys = [ main_ssh_public_key ];
|
||||||
"phantom-writefreely.age".publicKeys = [ main_ssh_public_key ];
|
"phantom-writefreely.age".publicKeys = [ main_ssh_public_key ];
|
||||||
"phantom-renawiki.age".publicKeys = [ main_ssh_public_key ];
|
"phantom-renawiki.age".publicKeys = [ main_ssh_public_key ];
|
||||||
"phantom-forgejo-mailer-password.age".publicKeys = [ main_ssh_public_key ];
|
"phantom-forgejo-mailer-password.age".publicKeys = [ main_ssh_public_key ];
|
||||||
"phantom-mastodon-mailer-password.age".publicKeys = [ main_ssh_public_key ];
|
"phantom-mastodon-mailer-password.age".publicKeys = [ main_ssh_public_key ];
|
||||||
"phantom-invidious-settings.age".publicKeys = [ main_ssh_public_key ];
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
5
switch
5
switch
|
|
@ -4,9 +4,10 @@ nix fmt
|
||||||
|
|
||||||
git --no-pager diff
|
git --no-pager diff
|
||||||
|
|
||||||
|
sudo nice ionice \
|
||||||
nixos-rebuild \
|
nixos-rebuild \
|
||||||
switch \
|
switch \
|
||||||
--use-remote-sudo \
|
--verbose \
|
||||||
--print-build-logs \
|
--print-build-logs \
|
||||||
--flake .# \
|
--flake .# \
|
||||||
"$@"
|
$@
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
settings = {
|
settings = {
|
||||||
General = {
|
General = {
|
||||||
DiscoverableTimeout = 0;
|
DiscoverableTimeout = 0;
|
||||||
Discoverable = true;
|
# Discoverable = true;
|
||||||
AlwaysPairable = true;
|
AlwaysPairable = true;
|
||||||
};
|
};
|
||||||
Policy = {
|
Policy = {
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,6 @@
|
||||||
./fonts.nix
|
./fonts.nix
|
||||||
./sound.nix
|
./sound.nix
|
||||||
./bluetooth.nix
|
./bluetooth.nix
|
||||||
./mouse.nix
|
|
||||||
./locale.nix
|
./locale.nix
|
||||||
./users.nix
|
./users.nix
|
||||||
./containers.nix
|
./containers.nix
|
||||||
|
|
@ -48,15 +47,6 @@
|
||||||
|
|
||||||
services.geoclue2.enable = true;
|
services.geoclue2.enable = true;
|
||||||
|
|
||||||
# Workaround for nm-wait-online hanging??
|
|
||||||
# Ref: https://github.com/NixOS/nixpkgs/issues/180175
|
|
||||||
systemd.services.NetworkManager-wait-online = {
|
|
||||||
serviceConfig.ExecStart = [
|
|
||||||
""
|
|
||||||
"${pkgs.networkmanager}/bin/nm-online -q"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.extraConfig = ''
|
systemd.extraConfig = ''
|
||||||
DefaultTimeoutStopSec=10s
|
DefaultTimeoutStopSec=10s
|
||||||
'';
|
'';
|
||||||
|
|
|
||||||
|
|
@ -1,26 +1,10 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
services.flatpak.enable = true;
|
services.flatpak.enable = true;
|
||||||
|
virtualisation.docker.enable = true;
|
||||||
virtualisation.docker = {
|
virtualisation.docker.autoPrune.enable = true;
|
||||||
enable = true;
|
virtualisation.docker.autoPrune.dates = "monthly";
|
||||||
autoPrune = {
|
virtualisation.docker.autoPrune.flags = [ "--all --volumes" ];
|
||||||
enable = true;
|
|
||||||
dates = "monthly";
|
|
||||||
flags = [
|
|
||||||
"--all"
|
|
||||||
"--volumes"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
daemon.settings = {
|
|
||||||
# needed by bitbucket runner ???
|
|
||||||
log-driver = "json-file";
|
|
||||||
log-opts = {
|
|
||||||
max-size = "10m";
|
|
||||||
max-file = "3";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.extra-container.enable = true;
|
programs.extra-container.enable = true;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
{ pkgs, lib, ... }:
|
{ pkgs, lib, ... }:
|
||||||
{
|
{
|
||||||
mkNixRunner =
|
mkNixRunner =
|
||||||
authenticationTokenConfigFile: with lib; rec {
|
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`
|
||||||
inherit authenticationTokenConfigFile; # 2
|
inherit registrationConfigFile; # 2
|
||||||
dockerImage = "alpine:3.18.2";
|
dockerImage = "alpine:3.18.2";
|
||||||
dockerAllowedImages = [ dockerImage ];
|
dockerAllowedImages = [ dockerImage ];
|
||||||
dockerVolumes = [
|
dockerVolumes = [
|
||||||
|
|
@ -47,5 +47,6 @@
|
||||||
PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin";
|
PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin";
|
||||||
NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt";
|
NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt";
|
||||||
};
|
};
|
||||||
|
tagList = [ "nix" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -30,8 +30,6 @@
|
||||||
|
|
||||||
hardware.opentabletdriver.enable = lib.mkForce false;
|
hardware.opentabletdriver.enable = lib.mkForce false;
|
||||||
|
|
||||||
programs.gpaste.enable = true;
|
|
||||||
|
|
||||||
# services.xserver.displayManager.autologin.user = "lelgenio";
|
# services.xserver.displayManager.autologin.user = "lelgenio";
|
||||||
environment.systemPackages =
|
environment.systemPackages =
|
||||||
with pkgs;
|
with pkgs;
|
||||||
|
|
@ -42,6 +40,5 @@
|
||||||
|
|
||||||
chrome-gnome-shell
|
chrome-gnome-shell
|
||||||
gnomeExtensions.quick-settings-audio-devices-hider
|
gnomeExtensions.quick-settings-audio-devices-hider
|
||||||
gnome-pass-search-provider
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -45,6 +45,7 @@ in
|
||||||
services.greetd =
|
services.greetd =
|
||||||
let
|
let
|
||||||
greetd_main_script = pkgs.writeShellScriptBin "main" ''
|
greetd_main_script = pkgs.writeShellScriptBin "main" ''
|
||||||
|
${pkgs.dbus-sway-environment}/bin/dbus-sway-environment
|
||||||
export XDG_CURRENT_DESKTOP=sway GTK_THEME="${theme.gtk_theme}" XCURSOR_THEME="${theme.cursor_theme}"
|
export XDG_CURRENT_DESKTOP=sway GTK_THEME="${theme.gtk_theme}" XCURSOR_THEME="${theme.cursor_theme}"
|
||||||
${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c ${desktop}
|
${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c ${desktop}
|
||||||
swaymsg exit
|
swaymsg exit
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,6 @@ in
|
||||||
gimp
|
gimp
|
||||||
inkscape
|
inkscape
|
||||||
krita
|
krita
|
||||||
kdePackages.breeze
|
|
||||||
kdePackages.kdenlive
|
kdePackages.kdenlive
|
||||||
pitivi
|
pitivi
|
||||||
blender-hip
|
blender-hip
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,20 @@ in
|
||||||
virtualisation.docker.enable = true;
|
virtualisation.docker.enable = true;
|
||||||
services.gitlab-runner = {
|
services.gitlab-runner = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.concurrent = 12;
|
settings.concurrent = 4;
|
||||||
services = {
|
services = {
|
||||||
|
# ci_test = {
|
||||||
|
# registrationConfigFile = "/srv/gitlab-runner/env/ci_test";
|
||||||
|
# dockerImage = "debian";
|
||||||
|
# dockerPrivileged = true;
|
||||||
|
# };
|
||||||
|
thoreb_builder = {
|
||||||
|
registrationConfigFile =
|
||||||
|
config.age.secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
|
||||||
|
dockerImage = "debian";
|
||||||
|
dockerPrivileged = true;
|
||||||
|
};
|
||||||
|
|
||||||
# runner for building in docker via host's nix-daemon
|
# runner for building in docker via host's nix-daemon
|
||||||
# nix store will be readable in runner, might be insecure
|
# nix store will be readable in runner, might be insecure
|
||||||
thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path;
|
thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path;
|
||||||
|
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
{
|
|
||||||
# Allow configuring Logitech Peripherals
|
|
||||||
services.ratbagd.enable = true;
|
|
||||||
|
|
||||||
# Sway does not undersand high resolution scroll wheels
|
|
||||||
# I don't need this, so I disable it
|
|
||||||
environment.etc."libinput/local-overrides.quirks".text = ''
|
|
||||||
[Logitech G502 X PLUS]
|
|
||||||
MatchUdevType=mouse
|
|
||||||
MatchBus=usb
|
|
||||||
MatchVendor=0x046D
|
|
||||||
MatchProduct=0x4099
|
|
||||||
AttrEventCode=-REL_WHEEL_HI_RES
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
|
|
@ -9,11 +9,6 @@
|
||||||
# Open kde connect ports
|
# Open kde connect ports
|
||||||
programs.kdeconnect.enable = true;
|
programs.kdeconnect.enable = true;
|
||||||
|
|
||||||
networking.firewall = {
|
|
||||||
enable = true;
|
|
||||||
logRefusedConnections = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Enable CUPS to print documents.
|
# Enable CUPS to print documents.
|
||||||
# services.printing.enable = true;
|
# services.printing.enable = true;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,7 @@ in
|
||||||
"https://cache.nixos.org"
|
"https://cache.nixos.org"
|
||||||
"https://nix-community.cachix.org"
|
"https://nix-community.cachix.org"
|
||||||
# "http://nixcache.lelgenio.1337.cx:5000"
|
# "http://nixcache.lelgenio.1337.cx:5000"
|
||||||
|
"https://hyprland.cachix.org"
|
||||||
"https://lelgenio.cachix.org"
|
"https://lelgenio.cachix.org"
|
||||||
"https://wegank.cachix.org"
|
"https://wegank.cachix.org"
|
||||||
"https://snowflakeos.cachix.org/"
|
"https://snowflakeos.cachix.org/"
|
||||||
|
|
@ -38,6 +39,7 @@ in
|
||||||
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||||
# "nixcache.lelgenio.1337.cx:zxCfx7S658llDgAUG0JVyNrlAdFVvPniSdDOkvfTPS8="
|
# "nixcache.lelgenio.1337.cx:zxCfx7S658llDgAUG0JVyNrlAdFVvPniSdDOkvfTPS8="
|
||||||
|
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
||||||
"lelgenio.cachix.org-1:W8tMlmDFLU/V+6DlChXjekxoHZpjgVHZpmusC4cueBc="
|
"lelgenio.cachix.org-1:W8tMlmDFLU/V+6DlChXjekxoHZpjgVHZpmusC4cueBc="
|
||||||
"wegank.cachix.org-1:xHignps7GtkPP/gYK5LvA/6UFyz98+sgaxBSy7qK0Vs="
|
"wegank.cachix.org-1:xHignps7GtkPP/gYK5LvA/6UFyz98+sgaxBSy7qK0Vs="
|
||||||
"snowflakeos.cachix.org-1:gXb32BL86r9bw1kBiw9AJuIkqN49xBvPd1ZW8YlqO70="
|
"snowflakeos.cachix.org-1:gXb32BL86r9bw1kBiw9AJuIkqN49xBvPd1ZW8YlqO70="
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,18 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.concurrent = 1;
|
settings.concurrent = 1;
|
||||||
services = {
|
services = {
|
||||||
|
# ci_test = {
|
||||||
|
# registrationConfigFile = "/srv/gitlab-runner/env/ci_test";
|
||||||
|
# dockerImage = "debian";
|
||||||
|
# dockerPrivileged = true;
|
||||||
|
# };
|
||||||
|
thoreb_builder = {
|
||||||
|
registrationConfigFile =
|
||||||
|
config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
|
||||||
|
dockerImage = "debian";
|
||||||
|
dockerPrivileged = true;
|
||||||
|
};
|
||||||
|
|
||||||
thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path;
|
thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path;
|
||||||
thoreb-itinerario-nix = mkNixRunner config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
|
thoreb-itinerario-nix = mkNixRunner config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
21
system/specialisation.nix
Normal file
21
system/specialisation.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
specialisation.dark-theme.configuration = {
|
||||||
|
nixpkgs.overlays = [ (final: prev: { uservars = prev.uservars; }) ];
|
||||||
|
};
|
||||||
|
specialisation.light-theme.configuration = {
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
(final: prev: {
|
||||||
|
uservars = prev.uservars // rec {
|
||||||
|
theme = prev.uservars.themes.light;
|
||||||
|
color = theme.color;
|
||||||
|
};
|
||||||
|
})
|
||||||
|
];
|
||||||
|
};
|
||||||
|
environment.systemPackages = [
|
||||||
|
(pkgs.writeShellScriptBin "theme" ''
|
||||||
|
sudo "/nix/var/nix/profiles/system/specialisation/$1-theme/bin/switch-to-configuration" test
|
||||||
|
'')
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
@ -6,32 +6,28 @@
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
programs.steam.enable = true;
|
programs.steam.enable = true;
|
||||||
programs.steam.extraPackages =
|
programs.steam.package = pkgs.steam.override {
|
||||||
config.fonts.packages
|
extraLibraries =
|
||||||
++ (with pkgs; [
|
pkgs:
|
||||||
|
with config.hardware.opengl;
|
||||||
|
if pkgs.hostPlatform.is64bit then
|
||||||
|
[ package ] ++ extraPackages
|
||||||
|
else
|
||||||
|
[ package32 ] ++ extraPackages32;
|
||||||
|
|
||||||
|
extraPkgs =
|
||||||
|
pkgs: with pkgs; [
|
||||||
capitaine-cursors
|
capitaine-cursors
|
||||||
bibata-cursors
|
bibata-cursors
|
||||||
mangohud
|
mangohud
|
||||||
xdg-user-dirs
|
xdg-user-dirs
|
||||||
gamescope
|
];
|
||||||
|
};
|
||||||
# gamescope compatibility??
|
|
||||||
xorg.libXcursor
|
|
||||||
xorg.libXi
|
|
||||||
xorg.libXinerama
|
|
||||||
xorg.libXScrnSaver
|
|
||||||
libpng
|
|
||||||
libpulseaudio
|
|
||||||
libvorbis
|
|
||||||
stdenv.cc.cc.lib
|
|
||||||
libkrb5
|
|
||||||
keyutils
|
|
||||||
]);
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
protontricks
|
protontricks
|
||||||
bottles
|
bottles
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.dzgui.enable = true;
|
programs.dzgui.enable = true;
|
||||||
|
programs.dzgui.package = inputs.dzgui-nix.packages.${pkgs.system}.default;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,6 @@
|
||||||
"bluetooth"
|
"bluetooth"
|
||||||
"corectrl"
|
"corectrl"
|
||||||
"vboxusers"
|
"vboxusers"
|
||||||
"input"
|
|
||||||
];
|
];
|
||||||
shell = pkgs.fish;
|
shell = pkgs.fish;
|
||||||
openssh.authorizedKeys.keys = [
|
openssh.authorizedKeys.keys = [
|
||||||
|
|
|
||||||
|
|
@ -116,12 +116,6 @@ in
|
||||||
mode = "Vi|~Search";
|
mode = "Vi|~Search";
|
||||||
action = "SearchNext";
|
action = "SearchNext";
|
||||||
}
|
}
|
||||||
{
|
|
||||||
key = lib.toUpper key.next;
|
|
||||||
mods = "Shift";
|
|
||||||
mode = "Vi|~Search";
|
|
||||||
action = "SearchPrevious";
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
key = "Up";
|
key = "Up";
|
||||||
mods = "Control|Shift";
|
mods = "Control|Shift";
|
||||||
|
|
|
||||||
|
|
@ -9,14 +9,14 @@
|
||||||
wayland.windowManager.sway = {
|
wayland.windowManager.sway = {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
exec thunderbird
|
exec thunderbird
|
||||||
exec vesktop
|
exec webcord
|
||||||
exec telegram-desktop
|
exec telegram-desktop
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
tdesktop
|
tdesktop
|
||||||
vesktop
|
webcord
|
||||||
thunderbird
|
thunderbird
|
||||||
element-desktop-wayland
|
element-desktop-wayland
|
||||||
];
|
];
|
||||||
|
|
|
||||||
26
user/controller.nix
Normal file
26
user/controller.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
||||||
|
{ pkgs, lib, ... }:
|
||||||
|
{
|
||||||
|
systemd.user.services = {
|
||||||
|
autoconnect-gamepad = {
|
||||||
|
Unit = {
|
||||||
|
Description = "Attempt to connect to game controllers";
|
||||||
|
PartOf = [ "graphical-session.target" ];
|
||||||
|
After = [ "graphical-session.target" ];
|
||||||
|
};
|
||||||
|
Service = {
|
||||||
|
ExecStart = lib.getExe pkgs.auto_connect_gamepad;
|
||||||
|
};
|
||||||
|
Install = {
|
||||||
|
WantedBy = [ "sway-session.target" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
xdg.desktopEntries = {
|
||||||
|
disconnect-controller = {
|
||||||
|
name = "Disconnect Controller";
|
||||||
|
exec = "bluetoothctl disconnect 84:30:95:97:1A:79";
|
||||||
|
terminal = false;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -41,6 +41,24 @@
|
||||||
TryExec = "kak";
|
TryExec = "kak";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
neomutt = {
|
||||||
|
name = "Neomutt";
|
||||||
|
genericName = "Email Client";
|
||||||
|
comment = "View and Send Emails";
|
||||||
|
exec = "neomutt %U";
|
||||||
|
terminal = true;
|
||||||
|
type = "Application";
|
||||||
|
icon = "mutt";
|
||||||
|
categories = [
|
||||||
|
"Network"
|
||||||
|
"Email"
|
||||||
|
];
|
||||||
|
startupNotify = false;
|
||||||
|
mimeType = [ "x-scheme-handler/mailto" ];
|
||||||
|
settings = {
|
||||||
|
Keywords = "Mail;E-mail;";
|
||||||
|
};
|
||||||
|
};
|
||||||
down_meme = {
|
down_meme = {
|
||||||
name = "DownMeme";
|
name = "DownMeme";
|
||||||
genericName = "Download memes";
|
genericName = "Download memes";
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (config.my) desktop browser;
|
inherit (config.my) desktop browser;
|
||||||
bugfixedFirefox = pkgs.firefox-devedition-unwrapped // {
|
bugfixedFirefox = pkgs.firefox-esr-unwrapped // {
|
||||||
requireSigning = false;
|
requireSigning = false;
|
||||||
allowAddonSideload = true;
|
allowAddonSideload = true;
|
||||||
};
|
};
|
||||||
|
|
@ -35,15 +35,9 @@ in
|
||||||
})
|
})
|
||||||
(pkgs.fetchFirefoxAddon {
|
(pkgs.fetchFirefoxAddon {
|
||||||
name = "ublock-origin";
|
name = "ublock-origin";
|
||||||
url = "https://addons.mozilla.org/firefox/downloads/file/4290466/ublock_origin-1.58.0.xpi";
|
url = "https://addons.mozilla.org/firefox/downloads/file/4198829/ublock_origin-1.54.0.xpi";
|
||||||
hash = "sha256-RwxWmUpxdNshV4rc5ZixWKXcCXDIfFz+iJrGMr0wheo=";
|
hash = "sha256-l5cWCQgZFxD/CFhTa6bcKeytmSPDCyrW0+XjcddZ5E0=";
|
||||||
})
|
})
|
||||||
(pkgs.fetchFirefoxAddon {
|
|
||||||
name = "user_agent_string_switcher";
|
|
||||||
url = "https://addons.mozilla.org/firefox/downloads/file/4098688/user_agent_string_switcher-0.5.0.xpi";
|
|
||||||
hash = "sha256-ncjaPIxG1PBNEv14nGNQH6ai9QL4WbKGk5oJDbY+rjM=";
|
|
||||||
})
|
|
||||||
|
|
||||||
(pkgs.fetchFirefoxAddon {
|
(pkgs.fetchFirefoxAddon {
|
||||||
name = "i-still-dont-care-about-cookies";
|
name = "i-still-dont-care-about-cookies";
|
||||||
url = "https://github.com/OhMyGuus/I-Still-Dont-Care-About-Cookies/releases/download/v1.1.4/istilldontcareaboutcookies-1.1.4.xpi";
|
url = "https://github.com/OhMyGuus/I-Still-Dont-Care-About-Cookies/releases/download/v1.1.4/istilldontcareaboutcookies-1.1.4.xpi";
|
||||||
|
|
@ -56,11 +50,10 @@ in
|
||||||
hash = "sha256-lKLX6IWWtliRdH1Ig33rVEB4DVfbeuMw0dfUPV/mSSI=";
|
hash = "sha256-lKLX6IWWtliRdH1Ig33rVEB4DVfbeuMw0dfUPV/mSSI=";
|
||||||
})
|
})
|
||||||
(pkgs.fetchFirefoxAddon {
|
(pkgs.fetchFirefoxAddon {
|
||||||
name = "invidious_redirect";
|
name = "unhook";
|
||||||
url = "https://addons.mozilla.org/firefox/downloads/file/4292924/invidious_redirect_2-1.16.xpi";
|
url = "https://addons.mozilla.org/firefox/downloads/file/4050795/youtube_recommended_videos-1.6.2.xpi";
|
||||||
hash = "sha256-ApCc+MNmW9Wd/5seV6npePQVEaszT/rhD9EB7HGiUb8=";
|
hash = "sha256-xMuglNassZb9WqjfEGg6WeuhMACRuYqQor+iX1dEdsE=";
|
||||||
})
|
})
|
||||||
|
|
||||||
(pkgs.fetchFirefoxAddon {
|
(pkgs.fetchFirefoxAddon {
|
||||||
name = "mastodon_simplified_federation";
|
name = "mastodon_simplified_federation";
|
||||||
url = "https://addons.mozilla.org/firefox/downloads/file/4215691/mastodon_simplified_federation-2.2.xpi";
|
url = "https://addons.mozilla.org/firefox/downloads/file/4215691/mastodon_simplified_federation-2.2.xpi";
|
||||||
|
|
@ -86,7 +79,7 @@ in
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
profiles = {
|
profiles = {
|
||||||
dev-edition-default = {
|
main = {
|
||||||
isDefault = true;
|
isDefault = true;
|
||||||
search.force = true;
|
search.force = true;
|
||||||
search.default = "DuckDuckGo";
|
search.default = "DuckDuckGo";
|
||||||
|
|
@ -94,7 +87,6 @@ in
|
||||||
"devtools.theme" = "auto";
|
"devtools.theme" = "auto";
|
||||||
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
|
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
|
||||||
"browser.tabs.inTitlebar" = if desktop == "sway" then 0 else 1;
|
"browser.tabs.inTitlebar" = if desktop == "sway" then 0 else 1;
|
||||||
"sidebar.position_start" = false; # Move sidebar to the right
|
|
||||||
|
|
||||||
# enable media RDD to allow gpu acceleration
|
# enable media RDD to allow gpu acceleration
|
||||||
"media.rdd-ffmpeg.enabled" = true;
|
"media.rdd-ffmpeg.enabled" = true;
|
||||||
|
|
@ -107,7 +99,7 @@ in
|
||||||
"media.rdd-vpx.enabled" = true;
|
"media.rdd-vpx.enabled" = true;
|
||||||
"media.rdd-wav.enabled" = true;
|
"media.rdd-wav.enabled" = true;
|
||||||
|
|
||||||
"media.av1.enabled" = true;
|
"media.av1.enabled" = false;
|
||||||
"media.ffmpeg.vaapi-drm-display.enabled" = true;
|
"media.ffmpeg.vaapi-drm-display.enabled" = true;
|
||||||
"media.ffmpeg.vaapi.enabled" = true;
|
"media.ffmpeg.vaapi.enabled" = true;
|
||||||
"media.ffvpx.enabled" = true;
|
"media.ffvpx.enabled" = true;
|
||||||
|
|
@ -124,52 +116,9 @@ in
|
||||||
"devtools.chrome.enabled" = true;
|
"devtools.chrome.enabled" = true;
|
||||||
"devtools.debugger.remote-enabled" = true;
|
"devtools.debugger.remote-enabled" = true;
|
||||||
};
|
};
|
||||||
userChrome =
|
userChrome = lib.mkIf (desktop == "sway") ''
|
||||||
if desktop == "sway" then
|
|
||||||
''
|
|
||||||
#titlebar { display: none !important; }
|
#titlebar { display: none !important; }
|
||||||
#sidebar-header { display: none !important; }
|
#sidebar-header { display: none !important; }
|
||||||
''
|
|
||||||
else
|
|
||||||
''
|
|
||||||
/* Element | chrome://browser/content/browser.xhtml */
|
|
||||||
|
|
||||||
#navigator-toolbox {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: 1fr 50px;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Element | chrome://browser/content/browser.xhtml */
|
|
||||||
|
|
||||||
#nav-bar {
|
|
||||||
flex: 1;
|
|
||||||
width: 100%;
|
|
||||||
grid-column: 1 / 3;
|
|
||||||
grid-row: 1;
|
|
||||||
z-index: 0;
|
|
||||||
padding-right: 29px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Element | chrome://browser/content/browser.xhtml */
|
|
||||||
|
|
||||||
.toolbar-items {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Element | chrome://browser/content/browser.xhtml */
|
|
||||||
|
|
||||||
#TabsToolbar {
|
|
||||||
max-width: 50px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Element | chrome://browser/content/browser.xhtml */
|
|
||||||
|
|
||||||
#titlebar {
|
|
||||||
max-width: 50px;
|
|
||||||
grid-area: 1 / 2;
|
|
||||||
z-index: 10;
|
|
||||||
}
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
124
user/fish/completions/todo.fish
Normal file
124
user/fish/completions/todo.fish
Normal file
|
|
@ -0,0 +1,124 @@
|
||||||
|
set __fish_complete_todoman_subcomands cancel copy delete done edit flush list move new show
|
||||||
|
function __fish_complete_todoman_not_subcomand
|
||||||
|
not __fish_seen_subcommand_from $__fish_complete_todoman_subcomands
|
||||||
|
end
|
||||||
|
|
||||||
|
function __fish_complete_todoman_list_todos
|
||||||
|
todo list |
|
||||||
|
string replace -r '^\[.\] ' "" |
|
||||||
|
string replace -r ' ' '\t' |
|
||||||
|
string replace -r '\t!*' '\t' |
|
||||||
|
string replace -r '\(.*?\)' ""
|
||||||
|
end
|
||||||
|
|
||||||
|
function __fish_complete_todoman_config_path
|
||||||
|
set -q XDG_CONFIG_DIR
|
||||||
|
or set -l XDG_CONFIG_DIR "$HOME/.config"
|
||||||
|
|
||||||
|
set -l config_path "$XDG_CONFIG_DIR/todoman/config.py"
|
||||||
|
|
||||||
|
test -f "$config_path"
|
||||||
|
and echo "$config_path"
|
||||||
|
end
|
||||||
|
|
||||||
|
function __fish_complete_todoman_lists_dir
|
||||||
|
set -l config_path (__fish_complete_todoman_config_path)
|
||||||
|
or return
|
||||||
|
|
||||||
|
# looks something like "~/.local/share/calendars/*"
|
||||||
|
string replace -fr 'path\s*=\s*"(.*)"\s*$' '$1' < $config_path |
|
||||||
|
string replace -r '^~' "$HOME" |
|
||||||
|
string replace -r '\*$' ''
|
||||||
|
end
|
||||||
|
|
||||||
|
function __fish_complete_todoman_list_lists
|
||||||
|
set -l lists_path (__fish_complete_todoman_lists_dir)
|
||||||
|
string replace -r '.*/(.*?)$' '$1' $lists_path/*
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
#### Initial command definition ####
|
||||||
|
complete --erase todo
|
||||||
|
complete -c todo -f
|
||||||
|
|
||||||
|
#### Base command flags ####
|
||||||
|
complete -c todo -n __fish_complete_todoman_not_subcomand -s v -l verbosity -a "CRITICAL ERROR WARNING INFO DEBUG"
|
||||||
|
complete -c todo -n __fish_complete_todoman_not_subcomand -l colour -l color -a "always auto never"
|
||||||
|
complete -c todo -n __fish_complete_todoman_not_subcomand -l porcelain -a "Use a stable JSON format"
|
||||||
|
complete -c todo -n __fish_complete_todoman_not_subcomand -s h -l humanize -a "Format all dates and times in a human friendly way"
|
||||||
|
complete -c todo -n __fish_complete_todoman_not_subcomand -s c -l config -a "The config file to use."
|
||||||
|
complete -c todo -n __fish_complete_todoman_not_subcomand -l version -d "Show the version and exit."
|
||||||
|
complete -c todo -n __fish_complete_todoman_not_subcomand -l help -d "Show this message and exit."
|
||||||
|
|
||||||
|
#### Subcommands ####
|
||||||
|
complete -c todo -n __fish_complete_todoman_not_subcomand -a cancel -d 'Cancel one or more tasks'
|
||||||
|
complete -c todo -n __fish_complete_todoman_not_subcomand -a copy -d 'Copy tasks to another list'
|
||||||
|
complete -c todo -n __fish_complete_todoman_not_subcomand -a delete -d 'Delete tasks'
|
||||||
|
complete -c todo -n __fish_complete_todoman_not_subcomand -a done -d 'Mark one or more tasks as done'
|
||||||
|
complete -c todo -n __fish_complete_todoman_not_subcomand -a edit -d 'Edit the task with id ID'
|
||||||
|
complete -c todo -n __fish_complete_todoman_not_subcomand -a flush -d 'Delete done tasks'
|
||||||
|
complete -c todo -n __fish_complete_todoman_not_subcomand -a list -d 'List tasks'
|
||||||
|
complete -c todo -n __fish_complete_todoman_not_subcomand -a move -d 'Move tasks to another list'
|
||||||
|
complete -c todo -n __fish_complete_todoman_not_subcomand -a new -d 'Create a new task with SUMMARY'
|
||||||
|
complete -c todo -n __fish_complete_todoman_not_subcomand -a show -d 'Show details about a task'
|
||||||
|
|
||||||
|
#### Subcommand flags ####
|
||||||
|
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from cancel" -a "(__fish_complete_todoman_list_todos)" -d 'Cancel one or more tasks.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from cancel" -l help -d 'Show this message and exit.'
|
||||||
|
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from copy" -a "(__fish_complete_todoman_list_todos)" -d 'Cancel one or more tasks.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from copy" -s l -l list -d 'The list to copy the tasks to.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from copy" -l help -d 'Show this message and exit.'
|
||||||
|
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from delete" -a "(__fish_complete_todoman_list_todos)" -d 'Delete tasks.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from delete" -l yes -d 'Confirm the action without prompting.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from delete" -l help -d 'Show this message and exit.'
|
||||||
|
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from done" -a "(__fish_complete_todoman_list_todos)" -d 'Mark one or more tasks as done.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from done" -l help -d 'Show this message and exit.'
|
||||||
|
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from edit" -a "(__fish_complete_todoman_list_todos)" -d 'Edit the task with id ID.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from edit" -l raw -d 'Open the raw file for editing in $EDITOR. Only use this'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from edit" -s s -l start -r -d 'When the task starts.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from edit" -s d -l due -r -d 'Due date of the task, in the format specified in the configuration.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from edit" -l location -r -d 'The location where this todo takes place.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from edit" -l priority -r -d 'Priority for this task'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from edit" -s i -l interactive -r -d 'Go into interactive mode before saving the task.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from edit" -l help -d 'Show this message and exit.'
|
||||||
|
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from flush" -d 'Delete done tasks. This will also clear the cache to reset task IDs.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from flush" -l yes -d 'Confirm the action without prompting.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from flush" -l help -d 'Show this message and exit.'
|
||||||
|
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from flush" -d 'Delete done tasks. This will also clear the cache to reset task IDs.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from flush" -l yes -d 'Confirm the action without prompting.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from flush" -l help -d 'Show this message and exit.'
|
||||||
|
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from list" -a "(__fish_complete_todoman_list_lists)" -d 'List tasks by list name'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from list" -l location -r -d 'Only show tasks with location containg TEXT'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from list" -l category -d "Only show tasks with category containg"
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from list" -l grep -d "Only show tasks with message containg"
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from list" -l sort -d "Sort tasks by field" -a "description location status summary uid rrule percent_complete priority sequence categories completed_at created_at dtstamp start due last_modified"
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from list" -l reverse -l no-reverse -d 'Sort tasks in reverse order (see --sort)'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from list" -l due -d 'Only show tasks due in INTEGER hours'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from list" -l priority -r -d 'Only show tasks with priority at least as high as' -a "low medium high"
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from list" -l start -r -d "Only shows tasks before/after given DATE"
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from list" -l startable -d "Show only todos which should can be started today"
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from list" -s s -l status -r -d "Show only todos with the provided comma-separated" -a "NEEDS-ACTION CANCELLED COMPLETED IN-PROCESS ANY"
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from list" -l help -d "Show this message and exit."
|
||||||
|
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from move" -a "(__fish_complete_todoman_list_todos)" -d 'Move tasks to another list.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from move" -s l -l list -a "(__fish_complete_todoman_list_lists)" -d 'The list to move the tasks to.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from move" -l help -d 'Show this message and exit.'
|
||||||
|
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from new" -d 'Create a new task with SUMMARY.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from new" -s l -l list -a "(__fish_complete_todoman_list_lists)" -d 'List in which the task will be saved.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from new" -s r -l read-description -d 'Read task description from stdin.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from new" -s s -l start -d 'When the task starts.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from new" -s d -l due -d 'Due date of the task, in the format specified in the configuration.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from new" -l location -d 'The location where this todo takes place.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from new" -s i -l interactive -d 'Go into interactive mode before saving the task.'
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from new" -l help -d 'Show this message and exit.'
|
||||||
|
|
||||||
|
complete -c todo -n "__fish_seen_subcommand_from show" -a "(__fish_complete_todoman_list_todos)" -d 'Show details about a task.'
|
||||||
|
|
@ -32,6 +32,8 @@ in
|
||||||
set_color normal
|
set_color normal
|
||||||
|
|
||||||
bind \cy 'commandline | wl-copy -n'
|
bind \cy 'commandline | wl-copy -n'
|
||||||
|
|
||||||
|
${pkgs.todoman}/bin/todo list
|
||||||
'';
|
'';
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
rm = "trash";
|
rm = "trash";
|
||||||
|
|
@ -50,7 +52,7 @@ in
|
||||||
c = "cargo";
|
c = "cargo";
|
||||||
# system
|
# system
|
||||||
sv = "sudo systemct";
|
sv = "sudo systemct";
|
||||||
suv = "systemct --user";
|
suv = "sudo systemct --user";
|
||||||
# docker abbrs
|
# docker abbrs
|
||||||
d = "docker";
|
d = "docker";
|
||||||
dc = "docker-compose";
|
dc = "docker-compose";
|
||||||
|
|
@ -83,6 +85,10 @@ in
|
||||||
};
|
};
|
||||||
xdg.configFile = {
|
xdg.configFile = {
|
||||||
"fish/conf.d/prompt.fish".source = ./fish_prompt.fish;
|
"fish/conf.d/prompt.fish".source = ./fish_prompt.fish;
|
||||||
|
"fish/completions/" = {
|
||||||
|
recursive = true;
|
||||||
|
source = ./completions;
|
||||||
|
};
|
||||||
"fish/conf.d/" = {
|
"fish/conf.d/" = {
|
||||||
recursive = true;
|
recursive = true;
|
||||||
source = ./conf.d;
|
source = ./conf.d;
|
||||||
|
|
|
||||||
|
|
@ -103,8 +103,9 @@ function fish_git_prompt
|
||||||
_fish_prompt_warn "init"
|
_fish_prompt_warn "init"
|
||||||
end
|
end
|
||||||
|
|
||||||
# if we have at least one commit
|
git rev-parse HEAD -- &>/dev/null
|
||||||
if git rev-parse HEAD -- &>/dev/null
|
or return
|
||||||
|
|
||||||
# print a "↑" if ahead of origin
|
# print a "↑" if ahead of origin
|
||||||
test 0 -ne (git log --oneline "$git_remote_branch"..HEAD -- | wc -l)
|
test 0 -ne (git log --oneline "$git_remote_branch"..HEAD -- | wc -l)
|
||||||
and set -f _git_sync_ahead '↑'
|
and set -f _git_sync_ahead '↑'
|
||||||
|
|
@ -126,7 +127,6 @@ function fish_git_prompt
|
||||||
_fish_prompt_normal '↻'
|
_fish_prompt_normal '↻'
|
||||||
_fish_prompt_warn $git_log_unpushed[1]
|
_fish_prompt_warn $git_log_unpushed[1]
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
############################################################
|
############################################################
|
||||||
# Right side represents WorkTree/Staged
|
# Right side represents WorkTree/Staged
|
||||||
|
|
|
||||||
|
|
@ -28,13 +28,16 @@ lib.mkIf (config.my.desktop == "gnome") {
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
|
inputs.nixos-conf-editor.packages.${pkgs.system}.nixos-conf-editor
|
||||||
|
inputs.nix-software-center.packages.${pkgs.system}.nix-software-center
|
||||||
|
|
||||||
adw-gtk3
|
adw-gtk3
|
||||||
|
|
||||||
newsflash
|
newsflash
|
||||||
foliate
|
foliate
|
||||||
amberol
|
amberol
|
||||||
pitivi
|
pitivi
|
||||||
keepassxc
|
gnome-passwordsafe
|
||||||
|
|
||||||
libsForQt5.qt5ct
|
libsForQt5.qt5ct
|
||||||
libsForQt5.qtstyleplugin-kvantum
|
libsForQt5.qtstyleplugin-kvantum
|
||||||
|
|
@ -42,7 +45,9 @@ lib.mkIf (config.my.desktop == "gnome") {
|
||||||
qt6Packages.qtstyleplugin-kvantum
|
qt6Packages.qtstyleplugin-kvantum
|
||||||
];
|
];
|
||||||
|
|
||||||
services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
|
home.sessionVariables = {
|
||||||
|
QT_QPA_PLATFORMTHEME = "qt5ct";
|
||||||
|
};
|
||||||
|
|
||||||
xdg.defaultApplications = {
|
xdg.defaultApplications = {
|
||||||
enable = lib.mkForce false;
|
enable = lib.mkForce false;
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultCacheTtl = 604800;
|
defaultCacheTtl = 604800;
|
||||||
maxCacheTtl = 604800;
|
maxCacheTtl = 604800;
|
||||||
|
pinentryPackage = pkgs.pinentry-curses;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
allow-preset-passphrase
|
allow-preset-passphrase
|
||||||
'';
|
'';
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,14 @@
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
./controller.nix
|
||||||
./waybar
|
./waybar
|
||||||
./helix.nix
|
./helix.nix
|
||||||
./kakoune
|
./kakoune
|
||||||
./vscode
|
./vscode
|
||||||
./fish
|
./fish
|
||||||
./firefox.nix
|
./firefox.nix
|
||||||
|
./hyprland.nix
|
||||||
./alacritty.nix
|
./alacritty.nix
|
||||||
./git.nix
|
./git.nix
|
||||||
./ssh.nix
|
./ssh.nix
|
||||||
|
|
@ -26,6 +28,7 @@
|
||||||
./desktop-entries.nix
|
./desktop-entries.nix
|
||||||
./chat.nix
|
./chat.nix
|
||||||
./syncthing.nix
|
./syncthing.nix
|
||||||
|
./vdir.nix
|
||||||
./bmenu.nix
|
./bmenu.nix
|
||||||
./fzf.nix
|
./fzf.nix
|
||||||
./ranger
|
./ranger
|
||||||
|
|
@ -39,9 +42,9 @@
|
||||||
./gnome.nix
|
./gnome.nix
|
||||||
./thunar.nix
|
./thunar.nix
|
||||||
./xdg-dirs.nix
|
./xdg-dirs.nix
|
||||||
|
inputs.hyprland.homeManagerModules.default
|
||||||
inputs.nix-index-database.hmModules.nix-index
|
inputs.nix-index-database.hmModules.nix-index
|
||||||
../settings
|
../settings
|
||||||
./powerplay-led-idle.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
my = import ./variables.nix;
|
my = import ./variables.nix;
|
||||||
|
|
@ -52,9 +55,11 @@
|
||||||
home.homeDirectory = "/home/lelgenio";
|
home.homeDirectory = "/home/lelgenio";
|
||||||
|
|
||||||
# Let Home Manager install and manage itself.
|
# Let Home Manager install and manage itself.
|
||||||
programs.home-manager.enable = true;
|
# programs.home-manager.enable = true;
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
terminal
|
# home-manager
|
||||||
|
|
||||||
|
terminal # see flake.nix
|
||||||
|
|
||||||
pulse_sink
|
pulse_sink
|
||||||
pulseaudio
|
pulseaudio
|
||||||
|
|
@ -79,6 +84,7 @@
|
||||||
amdgpu_top
|
amdgpu_top
|
||||||
inxi
|
inxi
|
||||||
dmidecode
|
dmidecode
|
||||||
|
ncdu
|
||||||
|
|
||||||
## text manipulation
|
## text manipulation
|
||||||
sd
|
sd
|
||||||
|
|
@ -107,6 +113,7 @@
|
||||||
## Network
|
## Network
|
||||||
speedtest-cli
|
speedtest-cli
|
||||||
nmap
|
nmap
|
||||||
|
httpie
|
||||||
miniupnpc
|
miniupnpc
|
||||||
deluge
|
deluge
|
||||||
nicotine-plus
|
nicotine-plus
|
||||||
|
|
@ -118,6 +125,7 @@
|
||||||
# rustup
|
# rustup
|
||||||
|
|
||||||
docker-compose
|
docker-compose
|
||||||
|
gnumake
|
||||||
mariadb
|
mariadb
|
||||||
|
|
||||||
nodePackages.intelephense
|
nodePackages.intelephense
|
||||||
|
|
@ -127,7 +135,7 @@
|
||||||
clang-tools # c/c++ lsp server
|
clang-tools # c/c++ lsp server
|
||||||
rust-analyzer # rust analyzer
|
rust-analyzer # rust analyzer
|
||||||
|
|
||||||
unstable.blade-formatter
|
blade-formatter
|
||||||
nixfmt-rfc-style
|
nixfmt-rfc-style
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
136
user/hyprland.nix
Normal file
136
user/hyprland.nix
Normal file
|
|
@ -0,0 +1,136 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
config = lib.mkIf (config.my.desktop == "hyprland") {
|
||||||
|
wayland.windowManager.hyprland = {
|
||||||
|
enable = false;
|
||||||
|
extraConfig = ''
|
||||||
|
monitor=,preferred,auto,1
|
||||||
|
|
||||||
|
input {
|
||||||
|
kb_file=
|
||||||
|
kb_layout=us(colemak)
|
||||||
|
kb_variant=
|
||||||
|
kb_model=
|
||||||
|
kb_options=
|
||||||
|
kb_rules=
|
||||||
|
|
||||||
|
follow_mouse=1
|
||||||
|
|
||||||
|
touchpad {
|
||||||
|
natural_scroll=no
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
general {
|
||||||
|
sensitivity=1.0 # for mouse cursor
|
||||||
|
main_mod=SUPER
|
||||||
|
|
||||||
|
gaps_in=5
|
||||||
|
gaps_out=10
|
||||||
|
border_size=2
|
||||||
|
col.active_border=0xffF44336
|
||||||
|
col.inactive_border=0x66333333
|
||||||
|
|
||||||
|
apply_sens_to_raw=0 # whether to apply the sensitivity to raw input (e.g. used by games where you aim using your mouse)
|
||||||
|
|
||||||
|
damage_tracking=full # leave it on full unless you hate your GPU and want to make it suffer
|
||||||
|
}
|
||||||
|
|
||||||
|
decoration {
|
||||||
|
rounding=5
|
||||||
|
blur=1
|
||||||
|
blur_size=3 # minimum 1
|
||||||
|
blur_passes=1 # minimum 1, more passes = more resource intensive.
|
||||||
|
# Your blur "amount" is blur_size * blur_passes, but high blur_size (over around 5-ish) will produce artifacts.
|
||||||
|
# if you want heavy blur, you need to up the blur_passes.
|
||||||
|
# the more passes, the more you can up the blur_size without noticing artifacts.
|
||||||
|
}
|
||||||
|
|
||||||
|
animations {
|
||||||
|
enabled=1
|
||||||
|
animation=windows,1,7,default
|
||||||
|
animation=border,1,10,default
|
||||||
|
animation=fade,1,10,default
|
||||||
|
animation=workspaces,1,6,default
|
||||||
|
}
|
||||||
|
|
||||||
|
dwindle {
|
||||||
|
pseudotile=0 # enable pseudotiling on dwindle
|
||||||
|
}
|
||||||
|
|
||||||
|
gestures {
|
||||||
|
workspace_swipe=no
|
||||||
|
}
|
||||||
|
|
||||||
|
# example window rules
|
||||||
|
# for windows named/classed as abc and xyz
|
||||||
|
#windowrule=move 69 420,abc
|
||||||
|
#windowrule=size 420 69,abc
|
||||||
|
#windowrule=tile,xyz
|
||||||
|
#windowrule=float,abc
|
||||||
|
#windowrule=pseudo,abc
|
||||||
|
#windowrule=monitor 0,xyz
|
||||||
|
|
||||||
|
# example binds
|
||||||
|
bind=SUPER,Q,exec,kitty
|
||||||
|
bind=SUPER,RETURN,exec,alacritty
|
||||||
|
bind=SUPER,x,killactive,
|
||||||
|
bind=SUPER,M,exit,
|
||||||
|
# bind=SUPER,E,exec,dolphin
|
||||||
|
bind=SUPER,V,togglefloating,
|
||||||
|
bind=SUPER,s,exec,wlauncher
|
||||||
|
bind=SUPER,P,pseudo,
|
||||||
|
|
||||||
|
bind=SUPER,f,fullscreen
|
||||||
|
|
||||||
|
bind=SUPER,n,movefocus,l
|
||||||
|
bind=SUPER,o,movefocus,r
|
||||||
|
bind=SUPER,i,movefocus,u
|
||||||
|
bind=SUPER,e,movefocus,d
|
||||||
|
|
||||||
|
bind=SUPER,left,movefocus,l
|
||||||
|
bind=SUPER,right,movefocus,r
|
||||||
|
bind=SUPER,up,movefocus,u
|
||||||
|
bind=SUPER,down,movefocus,d
|
||||||
|
|
||||||
|
bind=SUPER,1,workspace,1
|
||||||
|
bind=SUPER,2,workspace,2
|
||||||
|
bind=SUPER,3,workspace,3
|
||||||
|
bind=SUPER,4,workspace,4
|
||||||
|
bind=SUPER,5,workspace,5
|
||||||
|
bind=SUPER,6,workspace,6
|
||||||
|
bind=SUPER,7,workspace,7
|
||||||
|
bind=SUPER,8,workspace,8
|
||||||
|
bind=SUPER,9,workspace,9
|
||||||
|
bind=SUPER,0,workspace,10
|
||||||
|
|
||||||
|
bind=ALT,1,movetoworkspace,1
|
||||||
|
bind=ALT,2,movetoworkspace,2
|
||||||
|
bind=ALT,3,movetoworkspace,3
|
||||||
|
bind=ALT,4,movetoworkspace,4
|
||||||
|
bind=ALT,5,movetoworkspace,5
|
||||||
|
bind=ALT,6,movetoworkspace,6
|
||||||
|
bind=ALT,7,movetoworkspace,7
|
||||||
|
bind=ALT,8,movetoworkspace,8
|
||||||
|
bind=ALT,9,movetoworkspace,9
|
||||||
|
bind=ALT,0,movetoworkspace,10
|
||||||
|
|
||||||
|
bind=SUPER,u,workspace,e-1
|
||||||
|
bind=SUPER,y,workspace,e+1
|
||||||
|
|
||||||
|
bind=SUPER,mouse_down,workspace,e-1
|
||||||
|
bind=SUPER,mouse_up,workspace,e+1
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
home.file.".config/eww".source = ./eww;
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
eww-wayland
|
||||||
|
jq
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -114,112 +114,3 @@ with colors;
|
||||||
Hint = "blue";
|
Hint = "blue";
|
||||||
}
|
}
|
||||||
))
|
))
|
||||||
+ ''
|
|
||||||
# Color palette
|
|
||||||
declare-option str red "red"
|
|
||||||
declare-option str mauve "magenta"
|
|
||||||
declare-option str maroon "rgb:ee99a0"
|
|
||||||
declare-option str pink "rgb:f5bde6"
|
|
||||||
declare-option str cyan "cyan"
|
|
||||||
declare-option str yellow "yellow"
|
|
||||||
declare-option str green "green"
|
|
||||||
declare-option str white "white"
|
|
||||||
declare-option str blue "blue"
|
|
||||||
declare-option str sky "rgb:91d7e3"
|
|
||||||
declare-option str lavender "rgb:b7bdf8"
|
|
||||||
declare-option str black1 "rgb:202020"
|
|
||||||
declare-option str black2 "rgb:272727"
|
|
||||||
declare-option str black3 "rgb:3a3a3a"
|
|
||||||
declare-option str orange ${orange}
|
|
||||||
declare-option str teal "rgb:8bd5ca"
|
|
||||||
declare-option str flamingo "rgb:f0c6c6"
|
|
||||||
declare-option str gray0 "rgb:606060"
|
|
||||||
declare-option str gray1 "rgb:737373"
|
|
||||||
declare-option str bright_red "%opt{red}+b"
|
|
||||||
declare-option str bright_green "%opt{green}+b"
|
|
||||||
declare-option str bright_yellow "%opt{yellow}+b"
|
|
||||||
declare-option str bright_blue "%opt{blue}+b"
|
|
||||||
declare-option str bright_cyan "%opt{cyan}+b"
|
|
||||||
declare-option str foreground %opt{white}
|
|
||||||
declare-option str background %opt{black2}
|
|
||||||
declare-option str overlay0 "rgb:878787"
|
|
||||||
declare-option str overlay1 "rgb:9a9a9a"
|
|
||||||
|
|
||||||
# Tree-sitter (<https://git.sr.ht/~hadronized/kak-tree-sitter>)
|
|
||||||
set-face global ts_attribute "%opt{cyan}"
|
|
||||||
set-face global ts_comment "%opt{overlay0}+i"
|
|
||||||
set-face global ts_conceal "%opt{mauve}+i"
|
|
||||||
set-face global ts_constant "%opt{orange}"
|
|
||||||
set-face global ts_constant_builtin_boolean "%opt{sky}"
|
|
||||||
set-face global ts_constant_character "%opt{yellow}"
|
|
||||||
set-face global ts_constant_macro "%opt{mauve}"
|
|
||||||
set-face global ts_constructor "%opt{cyan}"
|
|
||||||
set-face global ts_diff_plus "%opt{green}"
|
|
||||||
set-face global ts_diff_minus "%opt{red}"
|
|
||||||
set-face global ts_diff_delta "%opt{blue}"
|
|
||||||
set-face global ts_diff_delta_moved "%opt{mauve}"
|
|
||||||
set-face global ts_error "%opt{red}+b"
|
|
||||||
set-face global ts_function "%opt{blue}"
|
|
||||||
set-face global ts_function_builtin "%opt{blue}+i"
|
|
||||||
set-face global ts_function_macro "%opt{mauve}"
|
|
||||||
set-face global ts_hint "%opt{blue}+b"
|
|
||||||
set-face global ts_info "%opt{green}+b"
|
|
||||||
set-face global ts_keyword "%opt{mauve}"
|
|
||||||
set-face global ts_keyword_conditional "%opt{mauve}+i"
|
|
||||||
set-face global ts_keyword_control_conditional "%opt{mauve}+i"
|
|
||||||
set-face global ts_keyword_control_directive "%opt{mauve}+i"
|
|
||||||
set-face global ts_keyword_control_import "%opt{mauve}+i"
|
|
||||||
set-face global ts_keyword_directive "%opt{mauve}+i"
|
|
||||||
set-face global ts_keyword_storage "%opt{mauve}"
|
|
||||||
set-face global ts_keyword_storage_modifier "%opt{mauve}"
|
|
||||||
set-face global ts_keyword_storage_modifier_mut "%opt{mauve}"
|
|
||||||
set-face global ts_keyword_storage_modifier_ref "%opt{teal}"
|
|
||||||
set-face global ts_label "%opt{cyan}+i"
|
|
||||||
set-face global ts_markup_bold "%opt{orange}+b"
|
|
||||||
set-face global ts_markup_heading "%opt{red}"
|
|
||||||
set-face global ts_markup_heading_1 "%opt{red}"
|
|
||||||
set-face global ts_markup_heading_2 "%opt{mauve}"
|
|
||||||
set-face global ts_markup_heading_3 "%opt{green}"
|
|
||||||
set-face global ts_markup_heading_4 "%opt{yellow}"
|
|
||||||
set-face global ts_markup_heading_5 "%opt{pink}"
|
|
||||||
set-face global ts_markup_heading_6 "%opt{teal}"
|
|
||||||
set-face global ts_markup_heading_marker "%opt{orange}+b"
|
|
||||||
set-face global ts_markup_italic "%opt{pink}+i"
|
|
||||||
set-face global ts_markup_list_checked "%opt{green}"
|
|
||||||
set-face global ts_markup_list_numbered "%opt{blue}+i"
|
|
||||||
set-face global ts_markup_list_unchecked "%opt{teal}"
|
|
||||||
set-face global ts_markup_list_unnumbered "%opt{mauve}"
|
|
||||||
set-face global ts_markup_link_label "%opt{blue}"
|
|
||||||
set-face global ts_markup_link_url "%opt{teal}+u"
|
|
||||||
set-face global ts_markup_link_uri "%opt{teal}+u"
|
|
||||||
set-face global ts_markup_link_text "%opt{blue}"
|
|
||||||
set-face global ts_markup_quote "%opt{gray1}"
|
|
||||||
set-face global ts_markup_raw "%opt{green}"
|
|
||||||
set-face global ts_markup_strikethrough "%opt{gray1}+s"
|
|
||||||
set-face global ts_namespace "%opt{blue}+i"
|
|
||||||
set-face global ts_operator "%opt{sky}"
|
|
||||||
set-face global ts_property "%opt{sky}"
|
|
||||||
set-face global ts_punctuation "%opt{overlay1}"
|
|
||||||
set-face global ts_punctuation_special "%opt{sky}"
|
|
||||||
set-face global ts_special "%opt{blue}"
|
|
||||||
set-face global ts_spell "%opt{mauve}"
|
|
||||||
set-face global ts_string "%opt{green}"
|
|
||||||
set-face global ts_string_regex "%opt{orange}"
|
|
||||||
set-face global ts_string_regexp "%opt{orange}"
|
|
||||||
set-face global ts_string_escape "%opt{mauve}"
|
|
||||||
set-face global ts_string_special "%opt{blue}"
|
|
||||||
set-face global ts_string_special_path "%opt{orange}"
|
|
||||||
set-face global ts_string_special_symbol "%opt{mauve}"
|
|
||||||
set-face global ts_string_symbol "%opt{red}"
|
|
||||||
set-face global ts_tag "%opt{mauve}"
|
|
||||||
set-face global ts_tag_error "%opt{red}"
|
|
||||||
set-face global ts_text "%opt{white}"
|
|
||||||
set-face global ts_text_title "%opt{mauve}"
|
|
||||||
set-face global ts_type "%opt{yellow}"
|
|
||||||
set-face global ts_type_enum_variant "%opt{flamingo}"
|
|
||||||
set-face global ts_variable "%opt{blue}"
|
|
||||||
set-face global ts_variable_builtin "%opt{red}"
|
|
||||||
set-face global ts_variable_other_member "%opt{teal}"
|
|
||||||
set-face global ts_variable_parameter "%opt{maroon}+i"
|
|
||||||
set-face global ts_warning "%opt{orange}+b"
|
|
||||||
''
|
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (config.my)
|
inherit (config.my)
|
||||||
|
key
|
||||||
dmenu
|
dmenu
|
||||||
editor
|
editor
|
||||||
theme
|
theme
|
||||||
|
|
@ -16,7 +17,6 @@ let
|
||||||
inherit (pkgs.kakouneUtils) buildKakounePlugin;
|
inherit (pkgs.kakouneUtils) buildKakounePlugin;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [ ./kak-tree-sitter.nix ];
|
|
||||||
config = {
|
config = {
|
||||||
programs.kakoune = {
|
programs.kakoune = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -100,9 +100,6 @@ in
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
+ ''
|
+ ''
|
||||||
try %{
|
|
||||||
eval %sh{ kak-tree-sitter -vvvv -dks --init $kak_session }
|
|
||||||
}
|
|
||||||
|
|
||||||
set global scrolloff 10,20
|
set global scrolloff 10,20
|
||||||
set global autoreload yes
|
set global autoreload yes
|
||||||
|
|
@ -121,19 +118,16 @@ in
|
||||||
home.file = {
|
home.file = {
|
||||||
".config/kak-lsp/kak-lsp.toml".source = ./kak-lsp.toml;
|
".config/kak-lsp/kak-lsp.toml".source = ./kak-lsp.toml;
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
terminal
|
terminal
|
||||||
ranger
|
ranger
|
||||||
bmenu
|
bmenu
|
||||||
kak-lsp
|
kak-lsp
|
||||||
unstable.kak-tree-sitter
|
|
||||||
kak-pager
|
kak-pager
|
||||||
kak-man-pager
|
kak-man-pager
|
||||||
|
|
||||||
emmet-cli
|
emmet-cli
|
||||||
nodePackages.prettier
|
nodePackages.prettier
|
||||||
pint-fmt
|
|
||||||
|
|
||||||
aspell
|
aspell
|
||||||
aspellDicts.en
|
aspellDicts.en
|
||||||
|
|
|
||||||
|
|
@ -30,18 +30,10 @@ hook global WinSetOption filetype=angular %[
|
||||||
add-highlighter buffer/angular ref html
|
add-highlighter buffer/angular ref html
|
||||||
]
|
]
|
||||||
|
|
||||||
hook global BufCreate .*\.php %{
|
|
||||||
set buffer formatcmd 'pint-fmt'
|
|
||||||
}
|
|
||||||
|
|
||||||
hook global BufCreate .*\.js %{
|
hook global BufCreate .*\.js %{
|
||||||
set buffer formatcmd 'prettier --parser babel'
|
set buffer formatcmd 'prettier --parser babel'
|
||||||
}
|
}
|
||||||
|
|
||||||
hook global BufCreate .*\.scss %{
|
|
||||||
set buffer formatcmd 'prettier --parser scss'
|
|
||||||
}
|
|
||||||
|
|
||||||
hook global BufCreate .*\.vue %{
|
hook global BufCreate .*\.vue %{
|
||||||
set buffer formatcmd 'prettier --parser vue'
|
set buffer formatcmd 'prettier --parser vue'
|
||||||
hook buffer InsertCompletionHide {
|
hook buffer InsertCompletionHide {
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,6 @@ map global git 'N' ': git-next-merge-conflict <ret>' -docstring 'next git me
|
||||||
map global git 'P' ': git-prev-merge-conflict <ret>' -docstring 'previous git merge conflict'
|
map global git 'P' ': git-prev-merge-conflict <ret>' -docstring 'previous git merge conflict'
|
||||||
map global git 'm' ': git-merge-head <ret>' -docstring 'merge using head'
|
map global git 'm' ': git-merge-head <ret>' -docstring 'merge using head'
|
||||||
map global git 'M' ': git-merge-new <ret>' -docstring 'merge using new'
|
map global git 'M' ': git-merge-new <ret>' -docstring 'merge using new'
|
||||||
map global git '<c-m>' ': git-merge-head-and-new <ret>' -docstring 'merge using both head and new'
|
|
||||||
map global git '<a-m>' ': git-merge-original <ret>' -docstring 'merge using original'
|
map global git '<a-m>' ': git-merge-original <ret>' -docstring 'merge using original'
|
||||||
|
|
||||||
define-command -override git-next-merge-conflict %{
|
define-command -override git-next-merge-conflict %{
|
||||||
|
|
@ -93,19 +92,6 @@ define-command -override git-merge-new %{
|
||||||
}
|
}
|
||||||
} -docstring "merge using new"
|
} -docstring "merge using new"
|
||||||
|
|
||||||
define-command -override git-merge-head-and-new %{
|
|
||||||
evaluate-commands -draft %{
|
|
||||||
# delete head marker
|
|
||||||
execute-keys <a-/>^<lt>{4,}<ret>xd
|
|
||||||
# select middle of conflict
|
|
||||||
execute-keys /^[|]{4,}<ret>x
|
|
||||||
# extendo to theirs marker
|
|
||||||
execute-keys ?^={4,}<ret>xd
|
|
||||||
# delete end marker
|
|
||||||
execute-keys /^<gt>{4,}<ret>xd
|
|
||||||
}
|
|
||||||
} -docstring "merge using head and new"
|
|
||||||
|
|
||||||
define-command -override git-graph %{
|
define-command -override git-graph %{
|
||||||
try %{ delete-buffer '*git-graph*' }
|
try %{ delete-buffer '*git-graph*' }
|
||||||
edit -scratch '*git-graph*'
|
edit -scratch '*git-graph*'
|
||||||
|
|
|
||||||
|
|
@ -1,64 +0,0 @@
|
||||||
{ pkgs, lib, ... }:
|
|
||||||
let
|
|
||||||
hx-src = pkgs.helix.src;
|
|
||||||
kts-src = pkgs.unstable.kak-tree-sitter-unwrapped.src;
|
|
||||||
inherit (pkgs) fetchFromGitHub;
|
|
||||||
in
|
|
||||||
with pkgs.tree-sitter-grammars;
|
|
||||||
{
|
|
||||||
xdg.configFile."kak-tree-sitter/config.toml".text =
|
|
||||||
lib.foldlAttrs
|
|
||||||
(
|
|
||||||
acc: name: vals:
|
|
||||||
acc
|
|
||||||
+ ''
|
|
||||||
[language.${name}.grammar.source.local]
|
|
||||||
path = "${vals.parser}"
|
|
||||||
[language.${name}.grammar]
|
|
||||||
compile = "cc"
|
|
||||||
compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."]
|
|
||||||
compile_flags = ["-O3"]
|
|
||||||
link = "cc"
|
|
||||||
link_args = ["-shared", "-fpic", "scanner.o", "parser.o", "-o", "typescript.so"]
|
|
||||||
link_flags = ["-O3"]
|
|
||||||
[language.${name}.queries.source.local]
|
|
||||||
path = "${vals.queries}"
|
|
||||||
[language.${name}.queries]
|
|
||||||
path = "${vals.queries}"
|
|
||||||
''
|
|
||||||
)
|
|
||||||
""
|
|
||||||
{
|
|
||||||
nix = {
|
|
||||||
parser = tree-sitter-nix + "/parser";
|
|
||||||
queries = tree-sitter-nix + "/queries";
|
|
||||||
};
|
|
||||||
|
|
||||||
scss = {
|
|
||||||
parser = tree-sitter-scss + "/parser";
|
|
||||||
queries = tree-sitter-scss + "/queries";
|
|
||||||
};
|
|
||||||
css = {
|
|
||||||
parser = tree-sitter-css + "/parser";
|
|
||||||
queries = tree-sitter-css + "/queries";
|
|
||||||
};
|
|
||||||
|
|
||||||
javascript = {
|
|
||||||
parser = tree-sitter-javascript + "/parser";
|
|
||||||
queries = tree-sitter-javascript + "/queries";
|
|
||||||
};
|
|
||||||
typescript = {
|
|
||||||
parser =
|
|
||||||
tree-sitter-typescript.overrideAttrs (old: {
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "tree-sitter";
|
|
||||||
repo = "tree-sitter-typescript";
|
|
||||||
rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf";
|
|
||||||
hash = "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ=";
|
|
||||||
};
|
|
||||||
})
|
|
||||||
+ "/parser";
|
|
||||||
queries = kts-src + "/runtime/queries/typescript";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -492,7 +492,6 @@ in
|
||||||
{
|
{
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultApplications = mimes;
|
defaultApplications = mimes;
|
||||||
associations.added = mimes;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,12 +9,7 @@
|
||||||
config = {
|
config = {
|
||||||
programs.password-store = {
|
programs.password-store = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.pass.withExtensions (
|
package = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]);
|
||||||
ex: with ex; [
|
|
||||||
pass-otp
|
|
||||||
pass-import
|
|
||||||
]
|
|
||||||
);
|
|
||||||
};
|
};
|
||||||
services = {
|
services = {
|
||||||
pass-secret-service.enable = true;
|
pass-secret-service.enable = true;
|
||||||
|
|
@ -31,7 +26,6 @@
|
||||||
_gpg-unlock
|
_gpg-unlock
|
||||||
qtpass
|
qtpass
|
||||||
readQrCode
|
readQrCode
|
||||||
pass-export
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
{ pkgs, lib, ... }:
|
|
||||||
{
|
|
||||||
systemd.user.services.powerplay-led-idle = {
|
|
||||||
Unit = {
|
|
||||||
Description = "Autosuspend Powerplay mousepad led";
|
|
||||||
PartOf = [ "graphical-session.target" ];
|
|
||||||
After = [ "graphical-session.target" ];
|
|
||||||
};
|
|
||||||
Service = {
|
|
||||||
ExecStart = lib.getExe pkgs.powerplay-led-idle;
|
|
||||||
Restart = "on-failure";
|
|
||||||
};
|
|
||||||
Install = {
|
|
||||||
WantedBy = [ "graphical-session.target" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -32,6 +32,7 @@ let
|
||||||
);
|
);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
# My bemenu wrapper
|
||||||
xdg.configFile = {
|
xdg.configFile = {
|
||||||
"pqivrc".text = ''
|
"pqivrc".text = ''
|
||||||
[options]
|
[options]
|
||||||
|
|
|
||||||
16
user/ssh.nix
16
user/ssh.nix
|
|
@ -1,8 +1,16 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
inherit (config.my) username mail;
|
||||||
|
in
|
||||||
{
|
{
|
||||||
config = {
|
config = {
|
||||||
programs.ssh = {
|
programs.ssh.enable = true;
|
||||||
enable = true;
|
programs.ssh.matchBlocks = {
|
||||||
matchBlocks = {
|
|
||||||
monolith = {
|
monolith = {
|
||||||
user = "lelgenio";
|
user = "lelgenio";
|
||||||
hostname = "monolith.lelgenio.com";
|
hostname = "monolith.lelgenio.com";
|
||||||
|
|
@ -14,7 +22,5 @@
|
||||||
port = 9022;
|
port = 9022;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
includes = [ "~/Wopus/.ssh.config" ];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -80,12 +80,6 @@ in
|
||||||
};
|
};
|
||||||
# Ignore PS4 controller touchpad events
|
# Ignore PS4 controller touchpad events
|
||||||
input."1356:2508:Wireless_Controller_Touchpad".events = "disabled";
|
input."1356:2508:Wireless_Controller_Touchpad".events = "disabled";
|
||||||
|
|
||||||
input."type:pointer" = {
|
|
||||||
accel_profile = "flat";
|
|
||||||
pointer_accel = "0";
|
|
||||||
};
|
|
||||||
|
|
||||||
input."type:touchpad" = {
|
input."type:touchpad" = {
|
||||||
# Disable While Typing
|
# Disable While Typing
|
||||||
dwt = "enabled";
|
dwt = "enabled";
|
||||||
|
|
@ -107,9 +101,9 @@ in
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
for_window [title=.*] inhibit_idle fullscreen
|
for_window [title=.*] inhibit_idle fullscreen
|
||||||
|
exec ${pkgs.dbus-sway-environment}/bin/dbus-sway-environment
|
||||||
exec swaymsg workspace 2
|
exec swaymsg workspace 2
|
||||||
exec_always systemctl --user restart waybar.service
|
exec_always systemctl --user restart waybar.service
|
||||||
exec corectrl --minimize-systray
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
services.gammastep = {
|
services.gammastep = {
|
||||||
|
|
@ -137,8 +131,6 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
services.gpg-agent.pinentryPackage = pkgs.pinentry-all;
|
|
||||||
|
|
||||||
xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json;
|
xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json;
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
|
|
@ -154,7 +146,6 @@ in
|
||||||
wdmenu
|
wdmenu
|
||||||
wlauncher
|
wlauncher
|
||||||
volumesh
|
volumesh
|
||||||
brightnessctl
|
|
||||||
showkeys
|
showkeys
|
||||||
pamixer
|
pamixer
|
||||||
libnotify
|
libnotify
|
||||||
|
|
@ -167,8 +158,7 @@ in
|
||||||
wl-crosshair
|
wl-crosshair
|
||||||
|
|
||||||
grim
|
grim
|
||||||
satty
|
swappy
|
||||||
xdg-user-dirs
|
|
||||||
(tesseract5.override {
|
(tesseract5.override {
|
||||||
enableLanguages = [
|
enableLanguages = [
|
||||||
"eng"
|
"eng"
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue