Jimbo/NixOS-Config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

The Blue Update #1

Merged
Jimbo merged 101 commits from Refactor into main 2024-10-25 21:26:22 -04:00
Conversation 0 Commits 101 Files changed 306 +577 -401
47 changed files with 577 additions and 401 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f3d9e8a188 - Show all commits

91
flake.lock
View file

@ -1,5 +1,30 @@
{ {
"nodes": { "nodes": {
"agenix": {
"inputs": {
"darwin": "darwin",
"home-manager": [
"home-manager"
],
"nixpkgs": [
"nixpkgs"
],
"systems": "systems"
},
"locked": {
"lastModified": 1723293904,
"narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
"owner": "ryantm",
"repo": "agenix",
"rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
"type": "github"
},
"original": {
"owner": "ryantm",
"repo": "agenix",
"type": "github"
}
},
"blender-bin": { "blender-bin": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
@ -14,7 +39,7 @@
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://flakehub.com/f/edolstra/blender-bin/1.0.8.tar.gz" "url": "https://flakehub.com/f/edolstra/blender-bin/1.0.9.tar.gz"
} }
}, },
"blobs": { "blobs": {
@ -54,6 +79,28 @@
"type": "github" "type": "github"
} }
}, },
"darwin": {
"inputs": {
"nixpkgs": [
"agenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1700795494,
"narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
"type": "github"
},
"original": {
"owner": "lnl7",
"ref": "master",
"repo": "nix-darwin",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -125,7 +172,7 @@
}, },
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -143,7 +190,7 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1681202837,
@ -366,18 +413,17 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1727540905, "lastModified": 1728740863,
"narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fbca5e745367ae7632731639de5c21f29c8744ed", "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "id": "nixpkgs",
"ref": "nixos-24.05", "ref": "nixos-24.05",
"repo": "nixpkgs", "type": "indirect"
"type": "github"
} }
}, },
"nur": { "nur": {
@ -424,6 +470,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix",
"blender-bin": "blender-bin", "blender-bin": "blender-bin",
"hardware": "hardware", "hardware": "hardware",
"home-manager": "home-manager", "home-manager": "home-manager",
@ -505,25 +552,39 @@
"type": "github" "type": "github"
} }
}, },
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1728492678, "lastModified": 1728492678,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "id": "nixpkgs",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "type": "indirect"
"type": "github"
} }
}, },
"utils": { "utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1709126324, "lastModified": 1709126324,

100
flake.nix
View file

@ -1,93 +1,57 @@
{ {
description = "Jimbo's systems as a flake";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs.url = "nixpkgs/nixos-24.05";
unstable.url = "github:nixos/nixpkgs/nixos-unstable"; unstable.url = "nixpkgs/nixos-unstable";
nur.url = "github:nix-community/NUR";
mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
blender-bin.url = "https://flakehub.com/f/edolstra/blender-bin/1.0.9.tar.gz";
minecraft.url = "github:Infinidoge/nix-minecraft";
hardware.url = "github:nixos/nixos-hardware/master";
# Secure boot
lanzaboote = {
url = "github:nix-community/lanzaboote/v0.4.1";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nur.url = "github:nix-community/NUR";
blender-bin.url = "https://flakehub.com/f/edolstra/blender-bin/1.0.9.tar.gz";
hardware.url = "github:nixos/nixos-hardware/master";
lanzaboote = {
url = "github:nix-community/lanzaboote/v0.4.1";
inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = { agenix = {
self, url = "github:ryantm/agenix";
nixpkgs, inputs.nixpkgs.follows = "nixpkgs";
unstable, inputs.home-manager.follows = "home-manager";
nur, };
mailserver,
blender-bin, mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
hardware, minecraft.url = "github:Infinidoge/nix-minecraft";
lanzaboote, };
home-manager,
... outputs = { self, nixpkgs, unstable, home-manager, nur, blender-bin, hardware, lanzaboote, agenix, mailserver, minecraft, ... }:
}@inputs:
let let
mkNixos = modules: nixpkgs.lib.nixosSystem { mkNixos = modules: nixpkgs.lib.nixosSystem {
inherit modules; inherit modules;
specialArgs = { inherit (self) inputs outputs; }; specialArgs = { inherit nixpkgs unstable hardware lanzaboote mailserver minecraft; };
}; };
mkHome = modules: pkgs: home-manager.lib.homeManagerConfiguration { mkHome = modules: pkgs: home-manager.lib.homeManagerConfiguration {
inherit modules pkgs; inherit modules pkgs;
extraSpecialArgs = { inherit (self) inputs outputs; }; extraSpecialArgs = { inherit unstable nur blender-bin; };
}; };
in { in {
# Variables defined so they can be accessed globally # nixos-rebuild switch --flake .#hostname
secrets = import ./variables/secrets;
displays = import ./variables/displays;
ips = import ./variables/ips;
look = import ./variables/look;
ws = import ./variables/workspaces;
# NixOS config entrypoint, use 'nixos-rebuild --flake .#your-hostname'
nixosConfigurations = { nixosConfigurations = {
firefly = mkNixos [ firefly = mkNixos [ ./hosts/firefly/system ];
./hosts/firefly/system cyberspark = mkNixos [ ./hosts/cyberspark/system ];
lanzaboote.nixosModules.lanzaboote shuttleworth = mkNixos [ ./hosts/shuttleworth/system ];
];
cyberspark = mkNixos [
./hosts/cyberspark/system
mailserver.nixosModule
];
shuttleworth = mkNixos [
./hosts/shuttleworth/system
hardware.nixosModules.pine64-pinebook-pro
];
}; };
# Home-manager configuration, use 'home-manager --flake .#your-username@your-hostname' # home-manager switch --flake .#username@hostname
homeConfigurations = { homeConfigurations = {
"jimbo@firefly" = mkHome [ "jimbo@firefly" = mkHome [ ./hosts/firefly/home ] nixpkgs.legacyPackages.x86_64-linux;
./hosts/firefly/home "jimbo@cyberspark" = mkHome [ ./hosts/cyberspark/home ] nixpkgs.legacyPackages.x86_64-linux;
nur.nixosModules.nur "jimbo@shuttleworth" = mkHome [ ./hosts/shuttleworth/home ] nixpkgs.legacyPackages.aarch64-linux;
] nixpkgs.legacyPackages.x86_64-linux; "jimbo@guest" = mkHome [ ./hosts/guest/home ] nixpkgs.legacyPackages.x86_64-linux;
"jimbo@cyberspark" = mkHome [
./hosts/cyberspark/home
] nixpkgs.legacyPackages.x86_64-linux;
"jimbo@shuttleworth" = mkHome [
./hosts/shuttleworth/home
nur.nixosModules.nur
] nixpkgs.legacyPackages.aarch64-linux;
# Profile for ssh envrionments on different non-root systems
"jimbo@terminal" = mkHome [
./hosts/terminal/home
] nixpkgs.legacyPackages.x86_64-linux;
}; };
}; };
} }

4
hosts/cyberspark/system/default.nix
View file

@ -1,7 +1,9 @@
{ ... }: { mailserver, ... }:
{ {
imports = [ imports = [
./hardware ./hardware
mailserver.nixosModule
../../../modules/system ../../../modules/system
../../../modules/system/accounts ../../../modules/system/accounts
../../../modules/system/devices/filesystems ../../../modules/system/devices/filesystems

9
hosts/firefly/home/default.nix
View file

@ -1,7 +1,7 @@
{ ... }: { nur, ... }:
{ {
imports = [ imports = [
../../../overlays # Apps and programs
../../../modules/home ../../../modules/home
../../../modules/home/users ../../../modules/home/users
../../../modules/home/files ../../../modules/home/files
@ -9,5 +9,10 @@
../../../modules/home/programs ../../../modules/home/programs
../../../modules/home/sway ../../../modules/home/sway
../../../modules/home/utils ../../../modules/home/utils
# Misc
nur.nixosModules.nur
../../../overlays
../../../variables
]; ];
} }

11
hosts/firefly/system/default.nix
View file

@ -1,20 +1,23 @@
{ ... }: { lanzaboote, ... }:
{ {
imports = [ imports = [
./hardware
# Apps and programs # Apps and programs
../../../overlays
../../../modules/system ../../../modules/system
../../../modules/system/accounts ../../../modules/system/accounts
../../../modules/system/desktop ../../../modules/system/desktop
../../../modules/system/programs ../../../modules/system/programs
../../../modules/system/services ../../../modules/system/services
../../../overlays
../../../variables
# Devices and hardware # Devices and hardware
./hardware lanzaboote.nixosModules.lanzaboote
../../../modules/system/devices ../../../modules/system/devices
../../../modules/system/devices/boot/lanzaboote ../../../modules/system/devices/boot/lanzaboote
../../../modules/system/devices/video/nvidia ../../../modules/system/devices/video/nvidia
../../../modules/system/devices/networking/firewall/server ../../../modules/system/devices/networking/firewall/pc
]; ];
networking.hostName = "firefly"; networking.hostName = "firefly";

88
hosts/firefly/system/hardware/default.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, outputs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
let let
# Set common boot paramaters # Set common boot paramaters
commonKernelParams = [ commonKernelParams = [
@ -23,9 +23,8 @@ in {
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
# Set all boot options
boot = { boot = {
kernelPackages = pkgs.unstable.linuxPackages_zen; kernelPackages = pkgs.unstable.linuxPackages_latest;
blacklistedKernelModules = [ blacklistedKernelModules = [
"pcspkr" "pcspkr"
]; ];
@ -48,6 +47,16 @@ in {
"vfio_iommu_type1" "vfio_iommu_type1"
"kvm-amd" "kvm-amd"
]; ];
# Encryption and TPM
systemd.enable = true;
luks.devices = {
"crypt-ssd" = {
device = "/dev/disk/by-uuid/52110c74-19b6-40ef-9710-e6c9b157005f";
preLVM = true;
allowDiscards = true;
};
};
}; };
}; };
@ -61,15 +70,57 @@ in {
# Mount everything as necessary # Mount everything as necessary
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "/dev/disk/by-uuid/f0786b07-8303-416f-87ff-276bfd696387"; device = "/dev/disk/by-uuid/bbfed7d1-62f2-4d8e-b63f-7f6ec932105b";
fsType = "bcachefs"; fsType = "btrfs";
options = [ "subvol=@" "noatime" "nodiratime" "discard" ];
};
"/home" = {
device = "/dev/disk/by-uuid/bbfed7d1-62f2-4d8e-b63f-7f6ec932105b";
fsType = "btrfs";
options = [ "subvol=@home" "noatime" "nodiratime" "discard" ];
};
"/nix" = {
device = "/dev/disk/by-uuid/bbfed7d1-62f2-4d8e-b63f-7f6ec932105b";
fsType = "btrfs";
options = [ "subvol=@nix" "noatime" "nodiratime" "discard" ];
};
"/var" = {
device = "/dev/disk/by-uuid/bbfed7d1-62f2-4d8e-b63f-7f6ec932105b";
fsType = "btrfs";
options = [ "subvol=@var" "noatime" "nodiratime" "discard" ];
}; };
"/boot" = { "/boot" = {
device = "/dev/disk/by-uuid/EF6D-9009"; device = "/dev/disk/by-uuid/3B4A-76C9";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
}; };
# Games and such
"/mnt/Linux1" = {
device = "/dev/disk/by-uuid/b2901f8c-ffda-4b88-bb63-a9ea0c96ccb4";
options = [ "nosuid" "nodev" "nofail" "x-gvfs-show" ];
};
"/mnt/Linux2" = {
device = "/dev/disk/by-uuid/f08e4f38-162c-402f-ba2a-5925151b78bf";
options = [ "nosuid" "nodev" "nofail" "x-gvfs-show" ];
};
"/mnt/Windows1" = {
device = "/dev/disk/by-uuid/10BC97B2BC979138";
options = [ "nosuid" "nodev" "noauto" ];
};
"/mnt/Windows2" = {
device = "/dev/disk/by-uuid/0A5A3420237C863A";
options = [ "nosuid" "nodev" "noauto" ];
};
# Miscellaneous mounts
"/etc/libvirt" = { "/etc/libvirt" = {
device = "/dev/disk/by-label/Qemu"; device = "/dev/disk/by-uuid/f18a0302-9914-471d-828c-85ab1a67a8be";
options = [ "nosuid" "nodev" "nofail" ];
};
"/etc/libvirt/VMs/Bulk" = {
depends = [ "/etc/libvirt" ];
device = "/dev/disk/by-uuid/3eb36c3e-81ac-4281-89f0-c89242d88dd6";
options = [ "nosuid" "nodev" "nofail" ]; options = [ "nosuid" "nodev" "nofail" ];
}; };
"/var/lib/libvirt" = { "/var/lib/libvirt" = {
@ -77,24 +128,10 @@ in {
device = "/etc/libvirt/varlibvirt"; device = "/etc/libvirt/varlibvirt";
options = [ "bind" "rw" ]; options = [ "bind" "rw" ];
}; };
"/mnt/Linux1" = {
device = "/dev/disk/by-label/Linux1"; # Network mounts
options = ["nosuid" "nodev" "nofail" "x-gvfs-show"];
};
"/mnt/Linux2" = {
device = "/dev/disk/by-label/Linux2";
options = ["nosuid" "nodev" "nofail" "x-gvfs-show"];
};
"/mnt/Windows1" = {
device = "/dev/disk/by-label/Windows1";
options = ["nosuid" "nodev" "noauto"];
};
"/mnt/Windows2" = {
device = "/dev/disk/by-label/Windows2";
options = ["nosuid" "nodev" "noauto"];
};
"/home/jimbo/JimboNFS" = { "/home/jimbo/JimboNFS" = {
device = "${outputs.ips.server}:/export/JimboNFS"; device = "${config.ips.server}:/export/JimboNFS";
fsType = "nfs4"; fsType = "nfs4";
options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ]; options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
}; };
@ -102,12 +139,11 @@ in {
# Set the swap partition # Set the swap partition
swapDevices = [ swapDevices = [
{device = "/dev/disk/by-uuid/2e4c5120-716d-4cdc-84a0-c9e6391760db";} { device = "/dev/disk/by-uuid/1a6a68d0-8ae7-4836-a585-b708597937a1"; }
]; ];
# Enables DHCP on each ethernet and wireless interface. # Enables DHCP on each ethernet and wireless interface.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

13
hosts/shuttleworth/home/default.nix Normal file
View file

@ -0,0 +1,13 @@
{ nur, ... }:
{
imports = [
nur.nixosModules.nur
../../../modules/home
../../../modules/home/users
../../../modules/home/files
../../../modules/home/settings
../../../modules/home/programs
../../../modules/home/sway
../../../modules/home/utils
];
}

25
hosts/shuttleworth/system/default.nix Normal file
View file

@ -0,0 +1,25 @@
{ hardware, ... }:
{
imports = [
./hardware
# Apps and programs
../../../modules/system
../../../modules/system/accounts
../../../modules/system/desktop
../../../modules/system/programs
../../../modules/system/services
# Devices and hardware
hardware.nixosModules.pine64-pinebook-pro
../../../modules/system/devices
../../../modules/system/devices/boot/extlinux
../../../modules/system/devices/networking/firewall/pc
../../../modules/system/devices/networking/wireguard/pc
];
networking.hostName = "shuttleworth";
# Force Electron to use Wayland
environment.sessionVariables.NIXOS_OZONE_WL = "1";
}

6
modules/home/programs/gui/foot/default.nix
View file

@ -1,4 +1,4 @@
{ outputs, ... }: { config, ... }:
{ {
programs.foot = { programs.foot = {
enable = true; enable = true;
@ -6,14 +6,14 @@
settings = { settings = {
main = { main = {
term = "xterm-256color"; term = "xterm-256color";
font = "${outputs.look.fonts.nerd}:size=14.7"; font = "${config.look.fonts.nerd}:size=14.7";
}; };
cursor = { cursor = {
style = "beam"; style = "beam";
}; };
colors = { colors = {
alpha = "0.65"; alpha = "0.65";
background = "${outputs.look.colors.dark}"; background = "${config.look.colors.dark}";
regular0 = "3f3f3f"; regular0 = "3f3f3f";
regular1 = "cc0000"; regular1 = "cc0000";
regular2 = "4e9a06"; regular2 = "4e9a06";

40
modules/home/programs/gui/librewolf/default.nix
View file

@ -1,31 +1,31 @@
{ pkgs, config, outputs, ... }: { pkgs, config, ... }:
let let
# FireFox colors # FireFox colors
themeJim = '' themeJim = ''
:root { :root {
--tab-active-bg-color: #${outputs.look.colors.prime}; --tab-active-bg-color: #${config.look.colors.prime};
--tab-hover-bg-color: #${outputs.look.colors.accent}; --tab-hover-bg-color: #${config.look.colors.accent};
--tab-inactive-bg-color: #${outputs.look.colors.dark}; --tab-inactive-bg-color: #${config.look.colors.dark};
--tab-active-fg-fallback-color: #FFFFFF; --tab-active-fg-fallback-color: #FFFFFF;
--tab-inactive-fg-fallback-color: #${outputs.look.colors.text}; --tab-inactive-fg-fallback-color: #${config.look.colors.text};
--urlbar-focused-bg-color: #${outputs.look.colors.dark}; --urlbar-focused-bg-color: #${config.look.colors.dark};
--urlbar-not-focused-bg-color: #${outputs.look.colors.dark}; --urlbar-not-focused-bg-color: #${config.look.colors.dark};
--toolbar-bgcolor: #${outputs.look.colors.dark} !important; --toolbar-bgcolor: #${config.look.colors.dark} !important;
''; '';
themeAlt = '' themeAlt = ''
:root { :root {
--tab-active-bg-color: #${outputs.look.colors.dark}; --tab-active-bg-color: #${config.look.colors.dark};
--tab-hover-bg-color: #${outputs.look.colors.accent}; --tab-hover-bg-color: #${config.look.colors.accent};
--tab-inactive-bg-color: #${outputs.look.colors.prime}; --tab-inactive-bg-color: #${config.look.colors.prime};
--tab-active-fg-fallback-color: #${outputs.look.colors.text}; --tab-active-fg-fallback-color: #${config.look.colors.text};
--tab-inactive-fg-fallback-color: #FFFFFF; --tab-inactive-fg-fallback-color: #FFFFFF;
--urlbar-focused-bg-color: #${outputs.look.colors.prime}; --urlbar-focused-bg-color: #${config.look.colors.prime};
--urlbar-not-focused-bg-color: #${outputs.look.colors.prime}; --urlbar-not-focused-bg-color: #${config.look.colors.prime};
--toolbar-bgcolor: #${outputs.look.colors.prime} !important; --toolbar-bgcolor: #${config.look.colors.prime} !important;
''; '';
quteFoxCSS = '' quteFoxCSS = ''
--tab-font: '${outputs.look.fonts.main}'; --tab-font: '${config.look.fonts.main}';
--urlbar-font: '${outputs.look.fonts.main}'; --urlbar-font: '${config.look.fonts.main}';
/* try increasing if you encounter problems */ /* try increasing if you encounter problems */
--urlbar-height-setting: 24px; --urlbar-height-setting: 24px;
@ -336,9 +336,9 @@ in {
}; };
}; };
commonSettings = { commonSettings = {
"font.name.serif.x-western" = "${outputs.look.fonts.main}"; "font.name.serif.x-western" = "${config.look.fonts.main}";
"font.name.sans-serif.x-western" = "${outputs.look.fonts.main}"; "font.name.sans-serif.x-western" = "${config.look.fonts.main}";
"font.name.monospace.x-western" = "${outputs.look.fonts.nerd}"; "font.name.monospace.x-western" = "${config.look.fonts.nerd}";
"general.autoScroll" = true; "general.autoScroll" = true;
"browser.compactmode.show" = true; "browser.compactmode.show" = true;
"browser.uidensity" = 1; "browser.uidensity" = 1;

12
modules/home/programs/gui/mako/default.nix
View file

@ -1,18 +1,18 @@
{ pkgs, outputs, ... }: { pkgs, config, ... }:
{ {
services.mako = { services.mako = {
enable = true; enable = true;
borderColor = "#${outputs.look.colors.accent}"; borderColor = "#${config.look.colors.accent}";
backgroundColor = "#${outputs.look.colors.dark}CC"; backgroundColor = "#${config.look.colors.dark}CC";
output = "${outputs.displays.d1}"; output = "${config.displays.d1}";
sort = "+time"; sort = "+time";
layer = "overlay"; layer = "overlay";
padding = "8"; padding = "8";
margin = "0"; margin = "0";
borderSize = outputs.look.border.int; borderSize = config.look.border.int;
maxIconSize = 40; maxIconSize = 40;
defaultTimeout = 6000; defaultTimeout = 6000;
font = "${outputs.look.fonts.main} 12"; font = "${config.look.fonts.main} 12";
anchor = "bottom-right"; anchor = "bottom-right";
extraConfig = "on-button-right=dismiss-all\nouter-margin=10\n[mode=do-not-disturb]\ninvisible=1"; extraConfig = "on-button-right=dismiss-all\nouter-margin=10\n[mode=do-not-disturb]\ninvisible=1";
}; };

40
modules/home/programs/gui/rofi/default.nix
View file

@ -1,10 +1,10 @@
{ pkgs, config, outputs, ... }: { pkgs, config, ... }:
{ {
programs.rofi = { programs.rofi = {
enable = true; enable = true;
package = pkgs.rofi-wayland; package = pkgs.rofi-wayland;
terminal = "foot"; terminal = "foot";
font = "${outputs.look.fonts.main} 14"; font = "${config.look.fonts.main} 14";
theme = let theme = let
inherit (config.lib.formats.rasi) mkLiteral; inherit (config.lib.formats.rasi) mkLiteral;
in { in {
@ -15,24 +15,24 @@
red = mkLiteral "#DC322F"; red = mkLiteral "#DC322F";
background-color = mkLiteral "#00000000"; background-color = mkLiteral "#00000000";
separatorcolor = mkLiteral "#00000000"; separatorcolor = mkLiteral "#00000000";
normal-foreground = mkLiteral "#${outputs.look.colors.text}"; normal-foreground = mkLiteral "#${config.look.colors.text}";
normal-background = mkLiteral "#${outputs.look.colors.dark}1A"; normal-background = mkLiteral "#${config.look.colors.dark}1A";
urgent-foreground = mkLiteral "#${outputs.look.colors.urgent}"; urgent-foreground = mkLiteral "#${config.look.colors.urgent}";
active-foreground = mkLiteral "#${outputs.look.colors.split}"; active-foreground = mkLiteral "#${config.look.colors.split}";
selected-active-foreground = mkLiteral "#${outputs.look.colors.prime}"; selected-active-foreground = mkLiteral "#${config.look.colors.prime}";
background = mkLiteral "#${outputs.look.colors.dark}B3"; background = mkLiteral "#${config.look.colors.dark}B3";
bordercolor = mkLiteral "#${outputs.look.colors.prime}"; bordercolor = mkLiteral "#${config.look.colors.prime}";
selected-normal-foreground = mkLiteral "#FFFFFF"; selected-normal-foreground = mkLiteral "#FFFFFF";
selected-normal-background = mkLiteral "#${outputs.look.colors.prime}80"; selected-normal-background = mkLiteral "#${config.look.colors.prime}80";
border-color = mkLiteral "#${outputs.look.colors.prime}"; border-color = mkLiteral "#${config.look.colors.prime}";
urgent-background = mkLiteral "#${outputs.look.colors.accent}26"; urgent-background = mkLiteral "#${config.look.colors.accent}26";
active-background = mkLiteral "#${outputs.look.colors.accent}26"; active-background = mkLiteral "#${config.look.colors.accent}26";
selected-active-background = mkLiteral "#${outputs.look.colors.split}54"; selected-active-background = mkLiteral "#${config.look.colors.split}54";
}; };
"#window" = { "#window" = {
background-color = mkLiteral "@background"; background-color = mkLiteral "@background";
width = 500; width = 500;
border = mkLiteral "${outputs.look.border.string}"; border = mkLiteral "${config.look.border.string}";
padding = 5; padding = 5;
}; };
"#message" = { "#message" = {
@ -155,13 +155,13 @@
case $RET in case $RET in
Default) swaymsg reload ;; Default) swaymsg reload ;;
Wide) swaymsg " Wide) swaymsg "
output ${outputs.displays.d1} enable pos 1680 0 mode 1680x1050@59.954Hz output ${config.displays.d1} enable pos 1680 0 mode 1680x1050@59.954Hz
output ${outputs.displays.d2} enable pos 0 0 mode 1680x1050@59.954Hz output ${config.displays.d2} enable pos 0 0 mode 1680x1050@59.954Hz
output ${outputs.displays.d3} enable pos 3360 0 transform 0 output ${config.displays.d3} enable pos 3360 0 transform 0
";; ";;
GPU2) swaymsg " GPU2) swaymsg "
output ${outputs.displays.d2} enable pos 1680 0 mode 1920x1080@60Hz output ${config.displays.d2} enable pos 1680 0 mode 1920x1080@60Hz
output ${outputs.displays.d3} enable pos 0 0 transform 0 output ${config.displays.d3} enable pos 0 0 transform 0
";; ";;
esac esac
} }

1
modules/home/programs/misc/default.nix
View file

@ -7,6 +7,5 @@
./general ./general
./headless ./headless
./production ./production
./remote-desktop
]; ];
} }

2
modules/home/programs/misc/gaming/emulators/default.nix
View file

@ -6,6 +6,6 @@
ryujinx ryujinx
duckstation duckstation
pcsx2 pcsx2
unstable.lime3ds #lime3ds
]; ];
} }

4
modules/home/programs/misc/production/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, config, ... }: { pkgs, blender-bin, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
krita krita
@ -7,4 +7,6 @@
blender_4_2 blender_4_2
sunvox sunvox
]; ];
nixpkgs.overlays = [ blender-bin.overlays.default ];
} }

7
modules/home/programs/terminal/git/default.nix
View file

@ -1,9 +1,8 @@
{ pkgs, outputs, ... }: { pkgs, ... }:
{ {
programs.git = { programs.git = {
enable = true; enable = true;
lfs.enable = true; userName = "Jimbo";
userName = outputs.secrets.jimUsername; userEmail = "jimbo@jimbosfiles.com";
userEmail = outputs.secrets.jimEmail;
}; };
} }

6
modules/home/programs/terminal/neovim/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, outputs, ... }: { config, pkgs, ... }:
{ {
programs.neovim = { programs.neovim = {
enable = true; enable = true;
@ -85,8 +85,8 @@
let g:airline_theme='onedark' let g:airline_theme='onedark'
let g:airline#extensions#tabline#enabled = 1 let g:airline#extensions#tabline#enabled = 1
hi Normal guibg=none ctermbg=235 hi Normal guibg=none ctermbg=235
hi Visual guibg=#${outputs.look.colors.mid} ctermbg=238 hi Visual guibg=#${config.look.colors.mid} ctermbg=238
hi Pmenu guibg=#${outputs.look.colors.mid} ctermbg=238 hi Pmenu guibg=#${config.look.colors.mid} ctermbg=238
hi EndOfBuffer guibg=none ctermbg=235 hi EndOfBuffer guibg=none ctermbg=235
hi LineNr guibg=none ctermbg=none hi LineNr guibg=none ctermbg=none
lua require'colorizer'.setup() lua require'colorizer'.setup()

4
modules/home/settings/gtk/default.nix
View file

@ -1,9 +1,9 @@
{ pkgs, outputs, ... }: { pkgs, config, ... }:
{ {
gtk = { gtk = {
enable = true; enable = true;
font = { font = {
name = "${outputs.look.fonts.main}"; name = "${config.look.fonts.main}";
size = 11; size = 11;
}; };
theme = { theme = {

11
modules/home/sway/default.nix
View file

@ -1,15 +1,16 @@
{ config, pkgs, outputs, ... }: { config, pkgs, ... }:
{ {
imports = [ imports = [
./hardware ./hardware
./theme ./theme
./hotkeys ./hotkeys
./programs
./rules ./rules
./autostart ./autostart
./waybar ./waybar
./swayshot ./swayshot
./swaylock ./swaylock
./swayfx #./swayfx
]; ];
# Enable Sway and write some scripts # Enable Sway and write some scripts
@ -20,7 +21,7 @@
checkConfig = false; checkConfig = false;
extraConfig = '' extraConfig = ''
# Options I can't find in Nix yet # Options I can't find in Nix yet
default_floating_border pixel ${outputs.look.border.string} default_floating_border pixel ${config.look.border.string}
hide_edge_borders --i3 smart hide_edge_borders --i3 smart
titlebar_padding 10 1 titlebar_padding 10 1
primary_selection disabled primary_selection disabled
@ -32,8 +33,8 @@
}} }}
# Switch to workspace 1 # Switch to workspace 1
workspace ${outputs.ws.w7} workspace ${config.ws.w7}
workspace ${outputs.ws.w1} workspace ${config.ws.w1}
''; '';
}; };
} }

8
modules/home/sway/hardware/default.nix
View file

@ -1,10 +1,10 @@
{ pkgs, outputs, ... }: { pkgs, config, ... }:
{ {
wayland.windowManager.sway = { wayland.windowManager.sway = {
config = { config = {
# Define monitors # Define monitors
output = { output = {
${outputs.displays.d1} = { ${config.displays.d1} = {
pos = "1920 405"; pos = "1920 405";
mode = "1920x1080@143.980Hz"; mode = "1920x1080@143.980Hz";
max_render_time = "3"; max_render_time = "3";
@ -12,13 +12,13 @@
adaptive_sync = "on"; adaptive_sync = "on";
#tearing_allowed = "1"; #tearing_allowed = "1";
}; };
${outputs.displays.d2} = { ${config.displays.d2} = {
pos = "0 405"; pos = "0 405";
mode = "1920x1080@60Hz"; mode = "1920x1080@60Hz";
max_render_time = "3"; max_render_time = "3";
bg = "~/.wallpapers/2.png fill"; bg = "~/.wallpapers/2.png fill";
}; };
${outputs.displays.d3} = { ${config.displays.d3} = {
pos = "3840 0"; pos = "3840 0";
mode = "1680x1050@59.883Hz"; mode = "1680x1050@59.883Hz";
transform = "270"; transform = "270";

104
modules/home/sway/hotkeys/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, outputs, ... }: { pkgs, config, ... }:
{ {
wayland.windowManager.sway = { wayland.windowManager.sway = {
config = let config = let
@ -16,9 +16,9 @@
# Get the current border style of the focused window # Get the current border style of the focused window
current_style=$(swaymsg -t get_tree | jq -r '.. | select(.focused?).border') current_style=$(swaymsg -t get_tree | jq -r '.. | select(.focused?).border')
# Toggle between "normal" (default) and "pixel ${outputs.look.border.string}" border styles # Toggle between "normal" (default) and "pixel ${config.look.border.string}" border styles
if [ "$current_style" == "none" ]; then if [ "$current_style" == "none" ]; then
swaymsg "sticky disable, border pixel ${outputs.look.border.string}" swaymsg "sticky disable, border pixel ${config.look.border.string}"
else else
swaymsg "sticky enable, border none" swaymsg "sticky enable, border none"
fi fi
@ -28,7 +28,7 @@
swayTools = pkgs.writeScript "swaytools" '' swayTools = pkgs.writeScript "swaytools" ''
# List the app name and whether or not it uses wayland # List the app name and whether or not it uses wayland
swayprop() { swayprop() {
selected_window=$(swaymsg -t get_tree | jq -r '.. | select(.pid? and .visible?) | "\(.rect.x),\(.rect.y) \(.rect.width)x\(.rect.height)"' | slurp -r -c ${outputs.look.colors.prime} -B 00000066 -b 00000000) selected_window=$(swaymsg -t get_tree | jq -r '.. | select(.pid? and .visible?) | "\(.rect.x),\(.rect.y) \(.rect.width)x\(.rect.height)"' | slurp -r -c ${config.look.colors.prime} -B 00000066 -b 00000000)
if [ -n "$selected_window" ]; then if [ -n "$selected_window" ]; then
app_id=$(swaymsg -t get_tree | jq -r '.. | select(.pid? and .visible?) | select("\(.rect.x),\(.rect.y) \(.rect.width)x\(.rect.height)" == "'"$selected_window"'") | .app_id') app_id=$(swaymsg -t get_tree | jq -r '.. | select(.pid? and .visible?) | select("\(.rect.x),\(.rect.y) \(.rect.width)x\(.rect.height)" == "'"$selected_window"'") | .app_id')
system=$(sed 's/xdg_shell/Wayland/g; s/xwayland/Xorg/g' < <(swaymsg -t get_tree | jq -r '.. | select(.pid? and .visible?) | select("\(.rect.x),\(.rect.y) \(.rect.width)x\(.rect.height)" == "'"$selected_window"'") | .shell')) system=$(sed 's/xdg_shell/Wayland/g; s/xwayland/Xorg/g' < <(swaymsg -t get_tree | jq -r '.. | select(.pid? and .visible?) | select("\(.rect.x),\(.rect.y) \(.rect.width)x\(.rect.height)" == "'"$selected_window"'") | .shell'))
@ -38,7 +38,7 @@
# Kill a selected window # Kill a selected window
swaykill() { swaykill() {
selected_window=$(swaymsg -t get_tree | jq -r '.. | select(.pid? and .visible?) | "\(.rect.x),\(.rect.y) \(.rect.width)x\(.rect.height)"' | slurp -r -c ${outputs.look.colors.prime} -B 00000066 -b 00000000) selected_window=$(swaymsg -t get_tree | jq -r '.. | select(.pid? and .visible?) | "\(.rect.x),\(.rect.y) \(.rect.width)x\(.rect.height)"' | slurp -r -c ${config.look.colors.prime} -B 00000066 -b 00000000)
if [ -n "$selected_window" ]; then if [ -n "$selected_window" ]; then
pid=$(swaymsg -t get_tree | jq -r '.. | select(.pid? and .visible?) | select("\(.rect.x),\(.rect.y) \(.rect.width)x\(.rect.height)" == "'"$selected_window"'") | .pid') pid=$(swaymsg -t get_tree | jq -r '.. | select(.pid? and .visible?) | select("\(.rect.x),\(.rect.y) \(.rect.width)x\(.rect.height)" == "'"$selected_window"'") | .pid')
kill -9 "$pid" kill -9 "$pid"
@ -143,7 +143,7 @@
"Shift+Print" = ''exec swayshot --screen''; "Shift+Print" = ''exec swayshot --screen'';
# Server SSH # Server SSH
"${primeMod}+Ctrl+Return" = ''exec foot ssh ${outputs.ips.server} -p 2222''; "${primeMod}+Ctrl+Return" = ''exec foot ssh ${config.ips.server} -p 2222'';
# Display Brightness and Keyboard Brightness # Display Brightness and Keyboard Brightness
"XF86MonBrightnessUp" = ''exec light -A 5''; "XF86MonBrightnessUp" = ''exec light -A 5'';
@ -158,50 +158,50 @@
"${primeMod}+Shift+r" = ''reload''; "${primeMod}+Shift+r" = ''reload'';
# Switch to workspaces # Switch to workspaces
"${primeMod}+grave" = ''workspace ${outputs.ws.w0}''; "${primeMod}+grave" = ''workspace ${config.ws.w0}'';
"${primeMod}+1" = ''workspace ${outputs.ws.w1}''; "${primeMod}+1" = ''workspace ${config.ws.w1}'';
"${primeMod}+2" = ''workspace ${outputs.ws.w2}''; "${primeMod}+2" = ''workspace ${config.ws.w2}'';
"${primeMod}+3" = ''workspace ${outputs.ws.w3}''; "${primeMod}+3" = ''workspace ${config.ws.w3}'';
"${primeMod}+4" = ''workspace ${outputs.ws.w4}''; "${primeMod}+4" = ''workspace ${config.ws.w4}'';
"${primeMod}+5" = ''workspace ${outputs.ws.w5}''; "${primeMod}+5" = ''workspace ${config.ws.w5}'';
"${primeMod}+6" = ''workspace ${outputs.ws.w6}''; "${primeMod}+6" = ''workspace ${config.ws.w6}'';
"${primeMod}+7" = ''workspace ${outputs.ws.w7}''; "${primeMod}+7" = ''workspace ${config.ws.w7}'';
"${primeMod}+8" = ''workspace ${outputs.ws.w8}''; "${primeMod}+8" = ''workspace ${config.ws.w8}'';
"${primeMod}+9" = ''workspace ${outputs.ws.w9}''; "${primeMod}+9" = ''workspace ${config.ws.w9}'';
# Switch to alternate workspaces # Switch to alternate workspaces
"${secMod}+F1" = ''workspace ${outputs.ws.w1a}''; "${secMod}+F1" = ''workspace ${config.ws.w1a}'';
"${secMod}+F2" = ''workspace ${outputs.ws.w2a}''; "${secMod}+F2" = ''workspace ${config.ws.w2a}'';
"${secMod}+F3" = ''workspace ${outputs.ws.w3a}''; "${secMod}+F3" = ''workspace ${config.ws.w3a}'';
"${secMod}+F4" = ''workspace ${outputs.ws.w4a}''; "${secMod}+F4" = ''workspace ${config.ws.w4a}'';
"${secMod}+F5" = ''workspace ${outputs.ws.w5a}''; "${secMod}+F5" = ''workspace ${config.ws.w5a}'';
"${secMod}+F6" = ''workspace ${outputs.ws.w6a}''; "${secMod}+F6" = ''workspace ${config.ws.w6a}'';
"${secMod}+F7" = ''workspace ${outputs.ws.w7a}''; "${secMod}+F7" = ''workspace ${config.ws.w7a}'';
"${secMod}+F8" = ''workspace ${outputs.ws.w8a}''; "${secMod}+F8" = ''workspace ${config.ws.w8a}'';
"${secMod}+F9" = ''workspace ${outputs.ws.w9a}''; "${secMod}+F9" = ''workspace ${config.ws.w9a}'';
# Move window to and focus new workspace # Move window to and focus new workspace
"${primeMod}+Shift+grave" = ''move container to workspace ${outputs.ws.w0}; workspace ${outputs.ws.w0}''; "${primeMod}+Shift+grave" = ''move container to workspace ${config.ws.w0}; workspace ${config.ws.w0}'';
"${primeMod}+Shift+1" = ''move container to workspace ${outputs.ws.w1}; workspace ${outputs.ws.w1}''; "${primeMod}+Shift+1" = ''move container to workspace ${config.ws.w1}; workspace ${config.ws.w1}'';
"${primeMod}+Shift+2" = ''move container to workspace ${outputs.ws.w2}; workspace ${outputs.ws.w2}''; "${primeMod}+Shift+2" = ''move container to workspace ${config.ws.w2}; workspace ${config.ws.w2}'';
"${primeMod}+Shift+3" = ''move container to workspace ${outputs.ws.w3}; workspace ${outputs.ws.w3}''; "${primeMod}+Shift+3" = ''move container to workspace ${config.ws.w3}; workspace ${config.ws.w3}'';
"${primeMod}+Shift+4" = ''move container to workspace ${outputs.ws.w4}; workspace ${outputs.ws.w4}''; "${primeMod}+Shift+4" = ''move container to workspace ${config.ws.w4}; workspace ${config.ws.w4}'';
"${primeMod}+Shift+5" = ''move container to workspace ${outputs.ws.w5}; workspace ${outputs.ws.w5}''; "${primeMod}+Shift+5" = ''move container to workspace ${config.ws.w5}; workspace ${config.ws.w5}'';
"${primeMod}+Shift+6" = ''move container to workspace ${outputs.ws.w6}; workspace ${outputs.ws.w6}''; "${primeMod}+Shift+6" = ''move container to workspace ${config.ws.w6}; workspace ${config.ws.w6}'';
"${primeMod}+Shift+7" = ''move container to workspace ${outputs.ws.w7}; workspace ${outputs.ws.w7}''; "${primeMod}+Shift+7" = ''move container to workspace ${config.ws.w7}; workspace ${config.ws.w7}'';
"${primeMod}+Shift+8" = ''move container to workspace ${outputs.ws.w8}; workspace ${outputs.ws.w8}''; "${primeMod}+Shift+8" = ''move container to workspace ${config.ws.w8}; workspace ${config.ws.w8}'';
"${primeMod}+Shift+9" = ''move container to workspace ${outputs.ws.w9}; workspace ${outputs.ws.w9}''; "${primeMod}+Shift+9" = ''move container to workspace ${config.ws.w9}; workspace ${config.ws.w9}'';
# Move window to and focus new alternate workspace # Move window to and focus new alternate workspace
"${secMod}+Shift+F1" = ''move container to workspace ${outputs.ws.w1a}; workspace ${outputs.ws.w1a}''; "${secMod}+Shift+F1" = ''move container to workspace ${config.ws.w1a}; workspace ${config.ws.w1a}'';
"${secMod}+Shift+F2" = ''move container to workspace ${outputs.ws.w2a}; workspace ${outputs.ws.w2a}''; "${secMod}+Shift+F2" = ''move container to workspace ${config.ws.w2a}; workspace ${config.ws.w2a}'';
"${secMod}+Shift+F3" = ''move container to workspace ${outputs.ws.w3a}; workspace ${outputs.ws.w3a}''; "${secMod}+Shift+F3" = ''move container to workspace ${config.ws.w3a}; workspace ${config.ws.w3a}'';
"${secMod}+Shift+F4" = ''move container to workspace ${outputs.ws.w4a}; workspace ${outputs.ws.w4a}''; "${secMod}+Shift+F4" = ''move container to workspace ${config.ws.w4a}; workspace ${config.ws.w4a}'';
"${secMod}+Shift+F5" = ''move container to workspace ${outputs.ws.w5a}; workspace ${outputs.ws.w5a}''; "${secMod}+Shift+F5" = ''move container to workspace ${config.ws.w5a}; workspace ${config.ws.w5a}'';
"${secMod}+Shift+F6" = ''move container to workspace ${outputs.ws.w6a}; workspace ${outputs.ws.w6a}''; "${secMod}+Shift+F6" = ''move container to workspace ${config.ws.w6a}; workspace ${config.ws.w6a}'';
"${secMod}+Shift+F7" = ''move container to workspace ${outputs.ws.w7a}; workspace ${outputs.ws.w7a}''; "${secMod}+Shift+F7" = ''move container to workspace ${config.ws.w7a}; workspace ${config.ws.w7a}'';
"${secMod}+Shift+F8" = ''move container to workspace ${outputs.ws.w8a}; workspace ${outputs.ws.w8a}''; "${secMod}+Shift+F8" = ''move container to workspace ${config.ws.w8a}; workspace ${config.ws.w8a}'';
"${secMod}+Shift+F9" = ''move container to workspace ${outputs.ws.w9a}; workspace ${outputs.ws.w9a}''; "${secMod}+Shift+F9" = ''move container to workspace ${config.ws.w9a}; workspace ${config.ws.w9a}'';
# Change focus across windows # Change focus across windows
"${primeMod}+Up" = ''focus up''; "${primeMod}+Up" = ''focus up'';
@ -209,10 +209,10 @@
"${primeMod}+Left" = ''focus left''; "${primeMod}+Left" = ''focus left'';
"${primeMod}+Right" = ''focus right''; "${primeMod}+Right" = ''focus right'';
# Switch focus across outputs # Switch focus across config
"${primeMod}+j" = ''focus output ${outputs.displays.d2}''; "${primeMod}+j" = ''focus output ${config.displays.d2}'';
"${primeMod}+k" = ''focus output ${outputs.displays.d1}''; "${primeMod}+k" = ''focus output ${config.displays.d1}'';
"${primeMod}+l" = ''focus output ${outputs.displays.d3}''; "${primeMod}+l" = ''focus output ${config.displays.d3}'';
# Move focused window # Move focused window
"${primeMod}+Shift+Up" = ''move up ${resizeAmount} px''; "${primeMod}+Shift+Up" = ''move up ${resizeAmount} px'';
@ -220,10 +220,10 @@
"${primeMod}+Shift+Left" = ''move left ${resizeAmount} px''; "${primeMod}+Shift+Left" = ''move left ${resizeAmount} px'';
"${primeMod}+Shift+Right" = ''move right ${resizeAmount} px''; "${primeMod}+Shift+Right" = ''move right ${resizeAmount} px'';
# Move window across outputs # Move window across config
"${primeMod}+Shift+j" = ''move output ${outputs.displays.d2}; focus output ${outputs.displays.d2}''; "${primeMod}+Shift+j" = ''move output ${config.displays.d2}; focus output ${config.displays.d2}'';
"${primeMod}+Shift+k" = ''move output ${outputs.displays.d1}; focus output ${outputs.displays.d1}''; "${primeMod}+Shift+k" = ''move output ${config.displays.d1}; focus output ${config.displays.d1}'';
"${primeMod}+Shift+l" = ''move output ${outputs.displays.d3}; focus output ${outputs.displays.d3}''; "${primeMod}+Shift+l" = ''move output ${config.displays.d3}; focus output ${config.displays.d3}'';
# Change focus between floating/tiled, toggle floating # Change focus between floating/tiled, toggle floating
"${primeMod}+space" = ''focus mode_toggle''; "${primeMod}+space" = ''focus mode_toggle'';

72
modules/home/sway/rules/default.nix
View file

@ -1,33 +1,33 @@
{ pkgs, outputs, ... }: { pkgs, config, ... }:
{ {
wayland.windowManager.sway = { wayland.windowManager.sway = {
config = { config = {
# Assign workspaces to outputs # Assign workspaces to config
workspaceOutputAssign = let workspaceOutputAssign = let
workspaces1 = [ workspaces1 = [
"${outputs.ws.w0}" "${config.ws.w0}"
"${outputs.ws.w1}" "${config.ws.w1}"
"${outputs.ws.w2}" "${config.ws.w2}"
"${outputs.ws.w3}" "${config.ws.w3}"
"${outputs.ws.w1a}" "${config.ws.w1a}"
"${outputs.ws.w2a}" "${config.ws.w2a}"
"${outputs.ws.w3a}" "${config.ws.w3a}"
]; ];
workspaces2 = [ workspaces2 = [
"${outputs.ws.w4}" "${config.ws.w4}"
"${outputs.ws.w5}" "${config.ws.w5}"
"${outputs.ws.w6}" "${config.ws.w6}"
"${outputs.ws.w4a}" "${config.ws.w4a}"
"${outputs.ws.w5a}" "${config.ws.w5a}"
"${outputs.ws.w6a}" "${config.ws.w6a}"
]; ];
workspaces3 = [ workspaces3 = [
"${outputs.ws.w7}" "${config.ws.w7}"
"${outputs.ws.w8}" "${config.ws.w8}"
"${outputs.ws.w9}" "${config.ws.w9}"
"${outputs.ws.w7a}" "${config.ws.w7a}"
"${outputs.ws.w8a}" "${config.ws.w8a}"
"${outputs.ws.w9a}" "${config.ws.w9a}"
]; ];
assign = output: workspaces: assign = output: workspaces:
map (workspace: { map (workspace: {
@ -36,13 +36,13 @@
}) })
workspaces; workspaces;
in in
(assign "${outputs.displays.d1}" workspaces1) ++ (assign "${config.displays.d1}" workspaces1) ++
(assign "${outputs.displays.d2}" workspaces2) ++ (assign "${config.displays.d2}" workspaces2) ++
(assign "${outputs.displays.d3}" workspaces3); (assign "${config.displays.d3}" workspaces3);
# Rules # Rules
window = { window = {
border = outputs.look.border.int; border = config.look.border.int;
titlebar = false; titlebar = false;
commands = [ commands = [
# Scratchpads # Scratchpads
@ -76,7 +76,7 @@
# Give apps that don't have them borders # Give apps that don't have them borders
{ {
criteria = {con_mark = "borderless";}; criteria = {con_mark = "borderless";};
command = ''border pixel ${outputs.look.border.string}''; command = ''border pixel ${config.look.border.string}'';
} }
{ {
criteria = {app_id = "com.github.wwmm.easyeffects";}; criteria = {app_id = "com.github.wwmm.easyeffects";};
@ -111,20 +111,20 @@
]; ];
}; };
assigns = { assigns = {
# Brooutputs.wsers # Broconfig.wsers
"${outputs.ws.w1}" = [{app_id = "JimBrowser";}]; "${config.ws.w1}" = [{app_id = "JimBrowser";}];
"${outputs.ws.w1a}" = [{app_id = "AltBrowser";}]; "${config.ws.w1a}" = [{app_id = "AltBrowser";}];
# Communication # Communication
"${outputs.ws.w3a}" = [{class = "zoom";}]; "${config.ws.w3a}" = [{class = "zoom";}];
"${outputs.ws.w7}" = [{app_id = "MiscBrowser";} {app_id = "vesktop";} {class = "vesktop";}]; "${config.ws.w7}" = [{app_id = "MiscBrowser";} {app_id = "vesktop";} {class = "vesktop";}];
"${outputs.ws.w8}" = [{app_id = "org.gnome.Fractal";}]; "${config.ws.w8}" = [{app_id = "org.gnome.Fractal";}];
"${outputs.ws.w9}" = [{app_id = "thunderbird";}]; "${config.ws.w9}" = [{app_id = "thunderbird";}];
# Else # Else
"${outputs.ws.w2}" = [{class = "steam";} {app_id = "heroic";}]; "${config.ws.w2}" = [{class = "steam";} {app_id = "heroic";}];
"${outputs.ws.w2a}" = [{app_id = "looking-glass-client";}]; "${config.ws.w2a}" = [{app_id = "looking-glass-client";}];
"${outputs.ws.w4a}" = [{app_id = "com.obsproject.Studio";}]; "${config.ws.w4a}" = [{app_id = "com.obsproject.Studio";}];
}; };
focus.newWindow = "focus"; focus.newWindow = "focus";
}; };

2
modules/home/sway/swayfx/default.nix
View file

@ -1,7 +1,7 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
wayland.windowManager.sway = { wayland.windowManager.sway = {
package = pkgs.unstable.sway; package = pkgs.swayfx;
extraConfig = '' extraConfig = ''
blur enable blur enable
blur_passes 3 blur_passes 3

10
modules/home/sway/swaylock/default.nix
View file

@ -1,14 +1,14 @@
{ pkgs, outputs, ... }: { pkgs, config, ... }:
let let
swayLock = pkgs.writeScriptBin "swaylock" '' swayLock = pkgs.writeScriptBin "swaylock" ''
# Set the lock script # Set the lock script
lockscript() { lockscript() {
BLANK='#00000000' BLANK='#00000000'
CLEAR='#FFFFFF22' CLEAR='#FFFFFF22'
DEFAULT='#${outputs.look.colors.prime}FF' DEFAULT='#${config.look.colors.prime}FF'
TEXT='#FFFFFFFF' TEXT='#FFFFFFFF'
WRONG='#${outputs.look.colors.split}FF' WRONG='#${config.look.colors.split}FF'
VERIFYING='#${outputs.look.colors.accent}FF' VERIFYING='#${config.look.colors.accent}FF'
${pkgs.swaylock-effects}/bin/swaylock -f -e \ ${pkgs.swaylock-effects}/bin/swaylock -f -e \
--key-hl-color=$VERIFYING \ --key-hl-color=$VERIFYING \
@ -35,7 +35,7 @@ let
--indicator-radius=80 \ --indicator-radius=80 \
--image=~/.wallpapers/lock.png \ --image=~/.wallpapers/lock.png \
--clock \ --clock \
--font=${outputs.look.fonts.main} \ --font=${config.look.fonts.main} \
--font-size=30 \ --font-size=30 \
--timestr="%I:%M%p" \ --timestr="%I:%M%p" \
--datestr="%a %b %d %Y" --datestr="%a %b %d %Y"

6
modules/home/sway/swayshot/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, outputs, ... }: { pkgs, config, ... }:
{ {
imports = [ imports = [
./swappy ./swappy
@ -13,7 +13,7 @@
# Capture the screenshot of the selected area and save to a temporary file # Capture the screenshot of the selected area and save to a temporary file
selected_area=$(swaymsg -t get_tree | jq -r '.. | select(.pid? and .visible?) | .rect | "\(.x),\(.y) \(.width)x\(.height)"'\ selected_area=$(swaymsg -t get_tree | jq -r '.. | select(.pid? and .visible?) | .rect | "\(.x),\(.y) \(.width)x\(.height)"'\
| XCURSOR_SIZE=40 slurp -w ${outputs.look.border.string} -c ${outputs.look.colors.prime} -B 00000066 -b 00000099) | XCURSOR_SIZE=40 slurp -w ${config.look.border.string} -c ${config.look.colors.prime} -B 00000066 -b 00000099)
temp_file=$(mktemp -u).png temp_file=$(mktemp -u).png
grim -g "$selected_area" "$temp_file" grim -g "$selected_area" "$temp_file"
@ -31,7 +31,7 @@
handle_screen() { handle_screen() {
# Take a screenshot and save it to the temporary file # Take a screenshot and save it to the temporary file
temp_file=$(mktemp -u).png temp_file=$(mktemp -u).png
grim -o $(swaymsg -t get_outputs | jq -r '.[] | select(.focused) | .name') "$temp_file" grim -o $(swaymsg -t get_config | jq -r '.[] | select(.focused) | .name') "$temp_file"
# Check if the screenshot was successfully taken # Check if the screenshot was successfully taken
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then

42
modules/home/sway/theme/default.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, outputs, ... }: { config, pkgs, ... }:
{ {
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
@ -7,36 +7,36 @@
config = { config = {
colors = { colors = {
focused = { focused = {
border = "#${outputs.look.colors.prime}"; border = "#${config.look.colors.prime}";
background = "#${outputs.look.colors.prime}"; background = "#${config.look.colors.prime}";
text = "#FFFFFF"; text = "#FFFFFF";
indicator = "#${outputs.look.colors.actSplit}"; indicator = "#${config.look.colors.actSplit}";
childBorder = "#${outputs.look.colors.prime}"; childBorder = "#${config.look.colors.prime}";
}; };
focusedInactive = { focusedInactive = {
border = "#${outputs.look.colors.accent}"; border = "#${config.look.colors.accent}";
background = "#${outputs.look.colors.accent}"; background = "#${config.look.colors.accent}";
text = "#${outputs.look.colors.text}"; text = "#${config.look.colors.text}";
indicator = "#${outputs.look.colors.split}"; indicator = "#${config.look.colors.split}";
childBorder = "#${outputs.look.colors.accent}"; childBorder = "#${config.look.colors.accent}";
}; };
unfocused = { unfocused = {
border = "#${outputs.look.colors.dark}"; border = "#${config.look.colors.dark}";
background = "#${outputs.look.colors.dark}"; background = "#${config.look.colors.dark}";
text = "#${outputs.look.colors.text}"; text = "#${config.look.colors.text}";
indicator = "#${outputs.look.colors.split}"; indicator = "#${config.look.colors.split}";
childBorder = "#${outputs.look.colors.split}"; childBorder = "#${config.look.colors.split}";
}; };
urgent = { urgent = {
border = "#${outputs.look.colors.urgent}"; border = "#${config.look.colors.urgent}";
background = "#${outputs.look.colors.urgent}"; background = "#${config.look.colors.urgent}";
text = "#${outputs.look.colors.text}"; text = "#${config.look.colors.text}";
indicator = "#${outputs.look.colors.urgent}"; indicator = "#${config.look.colors.urgent}";
childBorder = "#${outputs.look.colors.urgent}"; childBorder = "#${config.look.colors.urgent}";
}; };
}; };
fonts = { fonts = {
names = ["${outputs.look.fonts.main}"]; names = ["${config.look.fonts.main}"];
size = 10.5; size = 10.5;
}; };
gaps = { gaps = {

28
modules/home/sway/waybar/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, outputs, ... }: { pkgs, config, ... }:
{ {
programs.waybar = let programs.waybar = let
swayWorkspacesModule = { swayWorkspacesModule = {
@ -11,7 +11,7 @@
swayWindowsModule = { swayWindowsModule = {
icon = true; icon = true;
icon-size = 15; icon-size = 15;
all-outputs = true; all-config = true;
tooltip = false; tooltip = false;
rewrite = { rewrite = {
"(.*) — LibreWolf" = " $1"; "(.*) — LibreWolf" = " $1";
@ -262,7 +262,7 @@
name = "bar1"; name = "bar1";
position = "top"; position = "top";
layer = "bottom"; layer = "bottom";
output = [outputs.displays.d1 "VGA-1"]; output = [config.displays.d1 "VGA-1"];
modules-left = ["sway/workspaces" "sway/window"]; modules-left = ["sway/workspaces" "sway/window"];
modules-right = [ modules-right = [
"pulseaudio" "pulseaudio"
@ -293,7 +293,7 @@
name = "bar2"; name = "bar2";
position = "top"; position = "top";
layer = "bottom"; layer = "bottom";
output = [outputs.displays.d2]; output = [config.displays.d2];
modules-left = ["sway/workspaces" "sway/window"]; modules-left = ["sway/workspaces" "sway/window"];
modules-right = [ modules-right = [
"pulseaudio" "pulseaudio"
@ -318,7 +318,7 @@
name = "bar3"; name = "bar3";
position = "top"; position = "top";
layer = "bottom"; layer = "bottom";
output = [outputs.displays.d3]; output = [config.displays.d3];
modules-left = ["sway/workspaces" "sway/window"]; modules-left = ["sway/workspaces" "sway/window"];
modules-right = [ modules-right = [
"pulseaudio" "pulseaudio"
@ -383,12 +383,12 @@
border: 0; border: 0;
border-radius: 0; border-radius: 0;
min-height: 0; min-height: 0;
font-family: ${outputs.look.fonts.main}, ${outputs.look.fonts.nerd}; font-family: ${config.look.fonts.main}, ${config.look.fonts.nerd};
font-size: 15.5px; font-size: 15.5px;
color: #${outputs.look.colors.text}; color: #${config.look.colors.text};
} }
#waybar { #waybar {
background: #${outputs.look.colors.dark}; background: #${config.look.colors.dark};
} }
#workspaces { #workspaces {
padding: 0 6px 0 0; padding: 0 6px 0 0;
@ -413,15 +413,15 @@
min-width: 20px; min-width: 20px;
} }
#workspaces button.visible { #workspaces button.visible {
border-bottom: 3px solid #${outputs.look.colors.prime}; border-bottom: 3px solid #${config.look.colors.prime};
background: #${outputs.look.colors.mid}; background: #${config.look.colors.mid};
} }
#workspaces button.urgent { #workspaces button.urgent {
border-bottom: 3px solid #${outputs.look.colors.urgent}; border-bottom: 3px solid #${config.look.colors.urgent};
} }
#workspaces button:hover { #workspaces button:hover {
box-shadow: none; box-shadow: none;
background: #${outputs.look.colors.light}; background: #${config.look.colors.light};
} }
#scratchpad { #scratchpad {
margin-left: 2px; margin-left: 2px;
@ -457,13 +457,13 @@
color: #888; color: #888;
} }
#custom-weather { #custom-weather {
border-bottom: 3px solid #${outputs.look.colors.prime}; border-bottom: 3px solid #${config.look.colors.prime};
} }
#custom-weather2 { #custom-weather2 {
border-bottom: 3px solid #c75bd3; border-bottom: 3px solid #c75bd3;
} }
#custom-notifs { #custom-notifs {
border-bottom: 3px solid #${outputs.look.colors.prime}; border-bottom: 3px solid #${config.look.colors.prime};
} }
#custom-notifs.disabled { #custom-notifs.disabled {
color: #888; color: #888;

6
modules/system/accounts/users/jimbo/default.nix
View file

@ -1,11 +1,11 @@
{ pkgs, outputs, ... }: { pkgs, config, ... }:
{ {
users.users = { users.users = {
jimbo = { jimbo = {
description = "Jimbo"; description = "Jimbo";
hashedPassword = outputs.secrets.jimboAccPass; hashedPassword = config.secrets.jimboAccPass;
isNormalUser = true; isNormalUser = true;
openssh.authorizedKeys.keys = outputs.secrets.jimKeys; openssh.authorizedKeys.keys = config.secrets.jimKeys;
extraGroups = [ extraGroups = [
"wheel" "wheel"
"audio" "audio"

6
modules/system/accounts/users/liquidsoap/default.nix
View file

@ -1,10 +1,12 @@
{ ... }: { ... }:
{ {
users.users = { users = {
nextcloud = { users.liquidsoap = {
group = "liquidsoap";
extraGroups = [ "nginx" ]; extraGroups = [ "nginx" ];
isSystemUser = true; isSystemUser = true;
uid = 155; uid = 155;
}; };
groups.liquidsoap = {};
}; };
} }

9
modules/system/accounts/users/nextcloud/default.nix
View file

@ -1,9 +1,12 @@
{ ... }: { { ... }:
users.users = { {
nextcloud = { users = {
users.nextcloud = {
group = "nextcloud";
extraGroups = [ "nfsShare" ]; extraGroups = [ "nfsShare" ];
isSystemUser = true; isSystemUser = true;
uid = 995; uid = 995;
}; };
groups.nextcloud = {};
}; };
} }

6
modules/system/accounts/users/nginx/default.nix
View file

@ -1,10 +1,12 @@
{ ... }: { ... }:
{ {
users.users = { users = {
nginx = { users.nginx = {
group = "nginx";
extraGroups = [ "turnserver" "virtualMail" ]; extraGroups = [ "turnserver" "virtualMail" ];
isSystemUser = true; isSystemUser = true;
uid = 60; uid = 60;
}; };
groups.nginx = {};
}; };
} }

7
modules/system/default.nix
View file

@ -1,4 +1,4 @@
{ outputs, config, pkgs, ... }: { config, pkgs, ... }:
{ {
nix = { nix = {
settings = { settings = {
@ -12,7 +12,9 @@
}; };
}; };
time.timeZone = outputs.secrets.timeZone; nixpkgs.config.allowUnfree = true;
time.timeZone = "America/Toronto";
programs = { programs = {
zsh.enable = true; zsh.enable = true;
@ -29,7 +31,6 @@
packages = with pkgs; [ terminus_font ]; packages = with pkgs; [ terminus_font ];
}; };
nixpkgs.config.allowUnfree = true;
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion

1
modules/system/devices/boot/systemd/default.nix
View file

@ -2,6 +2,7 @@
{ {
boot.loader.systemd-boot = { boot.loader.systemd-boot = {
enable = true; enable = true;
editor = false;
netbootxyz.enable = true; netbootxyz.enable = true;
}; };
} }

4
modules/system/devices/networking/firewall/pc/default.nix
View file

@ -1,9 +1,9 @@
{ outputs, ... }: { config, ... }:
{ {
networking.firewall = { networking.firewall = {
allowPing = false; allowPing = false;
extraInputRules = '' extraInputRules = ''
ip saddr { ${outputs.ips.server}, ${outputs.ips.wgSpan}.1 } accept comment "Accept Server" ip saddr { ${config.ips.server}, ${config.ips.wgSpan}.1 } accept comment "Accept Server"
''; '';
}; };
} }

3
modules/system/services/common/ssh/fail2ban/default.nix
View file

@ -1,9 +1,8 @@
{ outputs, ... }: { ... }:
{ {
services.fail2ban = { services.fail2ban = {
enable = true; enable = true;
maxretry = 5; maxretry = 5;
bantime = "5m"; bantime = "5m";
ignoreIP = [ "${outputs.ips.localSpan}.0/24" ];
}; };
} }

5
overlays/default.nix
View file

@ -1,9 +1,8 @@
{ inputs, ... }: { unstable, ... }:
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
inputs.blender-bin.overlays.default (import ./unstable { inherit unstable; })
(final: _prev: import ./packages { pkgs = final; }) (final: _prev: import ./packages { pkgs = final; })
(import ./mpv) (import ./mpv)
(import ./unstable { inherit inputs; })
]; ];
} }

5
overlays/mpv/default.nix
View file

@ -1,5 +1,4 @@
{ ... }: (self: super: {
self: super: {
mpv = super.mpv.override { mpv = super.mpv.override {
scripts = with self.mpvScripts; [ scripts = with self.mpvScripts; [
mpris mpris
@ -7,4 +6,4 @@ self: super: {
thumbnail thumbnail
]; ];
}; };
} })

8
overlays/unstable/default.nix
View file

@ -1,7 +1,7 @@
{ inputs, ... }: { unstable, ... }:
final: prev: { (final: prev: {
unstable = import inputs.unstable { unstable = import unstable {
system = final.system; system = final.system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
} })

10
variables/default.nix Normal file
View file

@ -0,0 +1,10 @@
{ ... }:
{
imports = [
./displays
./ips
./look
./secrets
./workspaces
];
}

9
variables/displays/default.nix
View file

@ -1,7 +1,14 @@
{ ... }: { lib, config, ... }:
{ {
options.displays = lib.mkOption {
type = lib.types.attrs;
default = {};
};
config.displays = {
d1 = "DP-3"; d1 = "DP-3";
d2 = "DP-1"; d2 = "DP-1";
d3 = "DP-2"; d3 = "DP-2";
dI = "eDP-1"; dI = "eDP-1";
};
} }

11
variables/ips/default.nix
View file

@ -1,5 +1,11 @@
{ ... }: { lib, config, ... }:
rec { {
options.ips = lib.mkOption {
type = lib.types.attrs;
default = {};
};
config.ips = rec {
netInt = "eno1"; netInt = "eno1";
localSpan = "10.0.0"; localSpan = "10.0.0";
server = "${localSpan}.2"; server = "${localSpan}.2";
@ -9,4 +15,5 @@ rec {
wgInt = "wg0"; wgInt = "wg0";
wgSpan = "10.100.0"; wgSpan = "10.100.0";
};
} }

12
variables/look/border/default.nix Normal file
View file

@ -0,0 +1,12 @@
{ lib, config, ... }:
{
options.look.border = lib.mkOption {
type = lib.types.attrs;
default = {};
};
config.look.border = rec {
int = 3;
string = toString int;
};
}

19
variables/look/colors/default.nix Normal file
View file

@ -0,0 +1,19 @@
{ lib, config, ... }:
{
options.look.colors = lib.mkOption {
type = lib.types.attrs;
default = {};
};
config.look.colors = {
prime = ''3823C4''; #3823C4
accent = ''1B1F59''; #1B1F59
split = ''555B9E''; #555B9E
actSplit = ''5980B7''; #5980B7
dark = ''101419''; #101419
mid = ''171C23''; #171C23
light = ''272b33''; #272B33
urgent = ''C43823''; #C43823
text = ''C7D3E3''; #C7D3E3
};
}

24
variables/look/default.nix
View file

@ -1,22 +1,8 @@
{ ... }: { ... }:
{ {
colors = { imports = [
prime = ''3823C4''; #3823C4 ./border
accent = ''1B1F59''; #1B1F59 ./colors
split = ''555B9E''; #555B9E ./fonts
actSplit = ''5980B7''; #5980B7 ];
dark = ''101419''; #101419
mid = ''171C23''; #171C23
light = ''272b33''; #272B33
urgent = ''C43823''; #C43823
text = ''C7D3E3''; #C7D3E3
};
fonts = {
main = ''Ubuntu'';
nerd = ''UbuntuMono Nerd Font'';
};
border = rec {
int = 3;
string = toString int;
};
} }

12
variables/look/fonts/default.nix Normal file
View file

@ -0,0 +1,12 @@
{ lib, config, ... }:
{
options.look.fonts = lib.mkOption {
type = lib.types.attrs;
default = {};
};
config.look.fonts = {
main = ''Ubuntu'';
nerd = ''UbuntuMono Nerd Font'';
};
}

BIN
variables/secrets/default.nix
View file

Binary file not shown.

9
variables/workspaces/default.nix
View file

@ -1,5 +1,11 @@
{ ... }: { lib, config, ... }:
{ {
options.ws = lib.mkOption {
type = lib.types.attrs;
default = {};
};
config.ws = {
w0 = ''0:0''; w0 = ''0:0'';
w1 = ''1:1''; w1 = ''1:1'';
w2 = ''2:2''; w2 = ''2:2'';
@ -19,4 +25,5 @@
w7a = ''77:VII''; w7a = ''77:VII'';
w8a = ''88:VIII''; w8a = ''88:VIII'';
w9a = ''99:IX''; w9a = ''99:IX'';
};
} }