pagedmov/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

formatted all files with nixfmt, added env variable to hold secrets

Browse Source
This commit is contained in:
pagedmov
2024-11-09 16:20:27 -05:00
parent d38da56ba2
commit 2a1ba18c09
93 changed files with 948 additions and 1254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -1,4 +1,3 @@
secrets.nix
env.nix
result
hardware.nix

18
flake.nix
View File

@@ -35,13 +35,14 @@
system = "x86_64-linux";
pkgs = import nixpkgs { inherit system; };
username = "pagedmov";
env = import ./env.nix;
in {
homeConfigurations = {
oganessonHome = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
extraSpecialArgs = {
host = "oganesson";
inherit self username inputs;
inherit self username env inputs;
};
modules = [
@@ -57,7 +58,7 @@
inherit pkgs;
extraSpecialArgs = {
host = "oganesson";
inherit self username inputs;
inherit self env username inputs;
};
modules = [
@@ -73,7 +74,7 @@
inherit pkgs;
extraSpecialArgs = {
host = "oganesson";
inherit self username inputs;
inherit self env username inputs;
};
modules = [
@@ -88,7 +89,7 @@
oganesson = nixpkgs.lib.nixosSystem {
specialArgs = {
host = "oganesson";
inherit self inputs username;
inherit self inputs env username;
};
inherit system;
modules = [
@@ -102,7 +103,7 @@
mercury = nixpkgs.lib.nixosSystem {
specialArgs = {
host = "mercury";
inherit self inputs username;
inherit self inputs env username;
};
inherit system;
modules = [
@@ -116,7 +117,7 @@
xenon = nixpkgs.lib.nixosSystem {
specialArgs = {
host = "xenon";
inherit self inputs username;
inherit self inputs env username;
};
inherit system;
modules = [
@@ -134,10 +135,7 @@
inherit self inputs;
};
inherit system;
modules = [
./hosts/installer
nixvim.nixosModules.nixvim
];
modules = [ ./hosts/installer nixvim.nixosModules.nixvim ];
};
};
};

13
hosts/desktop/config.nix
View File

@@ -1,7 +1,5 @@
{ pkgs, username, ... }: {
imports = [
./hardware.nix
];
imports = [ ./hardware.nix ];
# My module options
movOpts = {
@@ -39,13 +37,8 @@
};
environment = {
variables = {
PATH = "${pkgs.clang-tools}/bin:$PATH";
};
shells = with pkgs; [
zsh
bash
];
variables = { PATH = "${pkgs.clang-tools}/bin:$PATH"; };
shells = with pkgs; [ zsh bash ];
};
users = {

18
hosts/desktop/hardware.nix
View File

@@ -1,18 +1,11 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
{ config, lib, pkgs, modulesPath, ... }: {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
boot.initrd.availableKernelModules =
[ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
@@ -49,5 +42,6 @@
# networking.interfaces.wlp15s0.useDHCP = lib.mkDefault true;
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;
}

27
hosts/installer/default.nix
View File

@@ -1,10 +1,5 @@
{
lib,
pkgs,
modulesPath,
inputs,
...
}: let
{ lib, pkgs, modulesPath, inputs, ... }:
let
extraFigletFonts = pkgs.fetchFromGitHub {
owner = "xero";
repo = "figlet-fonts";
@@ -28,11 +23,7 @@ in {
];
nixpkgs.hostPlatform = "x86_64-linux";
system.stateVersion = "24.05";
nix = {
settings = {
experimental-features = ["nix-command" "flakes"];
};
};
nix = { settings = { experimental-features = [ "nix-command" "flakes" ]; }; };
networking = {
wireless.enable = false;
@@ -67,9 +58,7 @@ in {
programs.home-manager.enable = true;
home = {
stateVersion = "24.05";
file = {
"disko.nix".source = ./disko-ext4-singledisk.nix;
};
file = { "disko.nix".source = ./disko-ext4-singledisk.nix; };
};
};
};
@@ -201,7 +190,9 @@ in {
format = "[$user]($style)";
};
directory = {
format = "\n[$path](bold cyan)[/](bold green) ";
format = ''
[$path](bold cyan)[/](bold green) '';
style = "bold #b4befe";
};
@@ -220,7 +211,9 @@ in {
};
git_branch = {
format = "\non [$symbol$branch](bold purple)";
format = ''
on [$symbol$branch](bold purple)'';
symbol = " ";
truncation_length = 15;
style = "bold purple";

8
hosts/installer/disko-ext4-singledisk.nix
View File

@@ -1,11 +1,7 @@
# USAGE in your configuration.nix.
# Update devices to match your hardware.
{
device ? throw "Set this to your disk device, e.g. /dev/sda",
root_size,
nix_size,
...
}: {
{ device ? throw "Set this to your disk device, e.g. /dev/sda", root_size
, nix_size, ... }: {
disko.devices = {
disk = {
main = {

28
hosts/laptop/config.nix
View File

@@ -1,18 +1,11 @@
{ pkgs, config, ... }: {
imports = [
./hardware.nix
./home.nix
];
imports = [ ./hardware.nix ./home.nix ];
powerProfiles.enable = true;
boot = {
kernelModules = [ "acpi_call" ];
extraModulePackages = with config.boot.kernelPackages;
[
acpi_call
cpupower
]
++ [pkgs.cpupower-gui];
[ acpi_call cpupower ] ++ [ pkgs.cpupower-gui ];
};
networkModule.enable = true;
@@ -26,20 +19,9 @@
sysServices.enable = true;
environment = {
variables = {
PATH = "${pkgs.clang-tools}/bin:$PATH";
variables = { PATH = "${pkgs.clang-tools}/bin:$PATH"; };
shells = with pkgs; [ zsh bash ];
systemPackages = with pkgs; [ acpi brightnessctl cpupower-gui powertop ];
};
shells = with pkgs; [
zsh
bash
];
systemPackages = with pkgs; [
acpi
brightnessctl
cpupower-gui
powertop
];
};
}

18
hosts/laptop/hardware.nix
View File

@@ -1,18 +1,11 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
{ config, lib, pkgs, modulesPath, ... }: {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
boot.initrd.availableKernelModules =
[ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
@@ -49,5 +42,6 @@
# networking.interfaces.wlp15s0.useDHCP = lib.mkDefault true;
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;
}

20
hosts/server/config.nix
View File

@@ -1,12 +1,5 @@
{
pkgs,
username,
...
}: {
imports = [
./hardware.nix
./home.nix
];
{ pkgs, username, ... }: {
imports = [ ./hardware.nix ./home.nix ];
movOpts = {
nixSettings.enable = true;
networkModule.enable = true;
@@ -18,9 +11,7 @@
jellyfinConfig.enable = true;
caddyConfig.enable = true;
};
networking.firewall = {
allowedTCPPorts = [ 443 8920 ];
};
networking.firewall = { allowedTCPPorts = [ 443 8920 ]; };
environment = {
etc."tmpfiles.d/home-permissions.conf".text = ''
d /home/pagedmov 0750 pagedmov users -
@@ -29,9 +20,6 @@
PATH = "${pkgs.clang-tools}/bin:$PATH";
TERM = "kitty";
};
shells = with pkgs; [
zsh
bash
];
shells = with pkgs; [ zsh bash ];
};
}

26
hosts/server/hardware.nix
View File

@@ -4,33 +4,32 @@
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.availableKernelModules =
[ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/c40b3b09-688d-4fe3-96f9-8e3d75b0a7b7";
fileSystems."/" = {
device = "/dev/disk/by-uuid/c40b3b09-688d-4fe3-96f9-8e3d75b0a7b7";
fsType = "ext4";
};
fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/1048d206-0a27-4e4e-b9a4-4f068bab5439";
fileSystems."/nix" = {
device = "/dev/disk/by-uuid/1048d206-0a27-4e4e-b9a4-4f068bab5439";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/357E-BCCD";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/357E-BCCD";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/b53ab583-f32e-4144-a2ee-f341e54f8233";
fileSystems."/home" = {
device = "/dev/disk/by-uuid/b53ab583-f32e-4144-a2ee-f341e54f8233";
fsType = "ext4";
};
@@ -45,5 +44,6 @@
# networking.interfaces.wlp11s0.useDHCP = lib.mkDefault true;
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;
}

18
modules/home/default.nix
View File

@@ -1,17 +1,3 @@
{
inputs,
nixpkgs,
config,
self,
username,
host,
lib,
...
}: {
imports = [
./programs
./environment
./scripts
./files.nix
];
{ env, inputs, nixpkgs, config, self, username, host, lib, ... }: {
imports = [ ./programs ./environment ./scripts ./files.nix ];
}

12
modules/home/environment/default.nix
View File

@@ -1,14 +1,4 @@
{
host,
nur,
nixvim,
self,
inputs,
username,
config,
home-manager,
...
}: {
{ host, nur, nixvim, self, inputs, username, config, home-manager, ... }: {
imports = [
./gtk.nix
./spicetify.nix

16
modules/home/environment/gtk.nix
View File

@@ -1,16 +1,14 @@
{ lib, config, pkgs, ... }: {
options = {
movOpts.envConfig.gtkConfig.enable = lib.mkEnableOption "enable my gtk options";
movOpts.envConfig.gtkConfig.enable =
lib.mkEnableOption "enable my gtk options";
};
config = lib.mkIf config.movOpts.envConfig.gtkConfig.enable {
fonts.fontconfig.enable = true;
home.packages = with pkgs; [
home.packages = with pkgs;
[
(nerdfonts.override {
fonts = [
"JetBrainsMono"
"CascadiaCode"
"NerdFontsSymbolsOnly"
];
fonts = [ "JetBrainsMono" "CascadiaCode" "NerdFontsSymbolsOnly" ];
})
];
@@ -18,9 +16,7 @@
enable = true;
iconTheme = {
name = "Papirus-Dark";
package = pkgs.papirus-nord.override {
accent = "frostblue4";
};
package = pkgs.papirus-nord.override { accent = "frostblue4"; };
};
#cursorTheme = {
# name = "Bibata-Modern-Ice";

13
modules/home/environment/hyprland.nix
View File

@@ -68,27 +68,30 @@ in {
"aplay ${self}/assets/sound/login.wav &"
];
workspace =
if (config.movOpts.envConfig.hyprlandConfig.workspaceLayout == "dualmonitor") then [
workspace = if (config.movOpts.envConfig.hyprlandConfig.workspaceLayout
== "dualmonitor") then [
"1,persistent=true,monitor:${builtins.elemAt mons 0}"
"2,persistent=true,monitor:${builtins.elemAt mons 0}"
"3,persistent=true,monitor:${builtins.elemAt mons 0}"
"4,persistent=true,monitor:${builtins.elemAt mons 1}"
"5,persistent=true,monitor:${builtins.elemAt mons 1}"
"6,persistent=true,monitor:${builtins.elemAt mons 1}"
] else if (config.movOpts.envConfig.hyprlandConfig.workspaceLayout == "singlemonitor") then [
] else if (config.movOpts.envConfig.hyprlandConfig.workspaceLayout
== "singlemonitor") then [
"1,persistent=true,monitor:${builtins.elemAt mons 0} "
"2,persistent=true,monitor:${builtins.elemAt mons 0}"
"3,persistent=true,monitor:${builtins.elemAt mons 0}"
"4,persistent=true,monitor:${builtins.elemAt mons 0}"
] else if (config.movOpts.envConfig.hyprlandConfig.workspaceLayout == "trimonitor") then [
] else if (config.movOpts.envConfig.hyprlandConfig.workspaceLayout
== "trimonitor") then [
"1,persistent=true,monitor:${builtins.elemAt mons 2}"
"2,persistent=true,monitor:${builtins.elemAt mons 2}"
"3,persistent=true,monitor:${builtins.elemAt mons 1}"
"4,persistent=true,monitor:${builtins.elemAt mons 1}"
"5,persistent=true,monitor:${builtins.elemAt mons 0}"
"6,persistent=true,monitor:${builtins.elemAt mons 0}"
] else [];
] else
[ ];
env = [
"XDG_CONFIG_HOME,$HOME/.config"

10
modules/home/environment/spicetify.nix
View File

@@ -1,16 +1,16 @@
{lib, config, pkgs, inputs, ... }: let
{ lib, config, pkgs, inputs, ... }:
let
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
scheme = config.lib.stylix.colors;
in {
imports = [ inputs.spicetify-nix.homeManagerModules.default ];
options = {
movOpts.envConfig.spicetifyConfig.enable = lib.mkEnableOption "enable my spicetify options";
movOpts.envConfig.spicetifyConfig.enable =
lib.mkEnableOption "enable my spicetify options";
};
config = lib.mkIf config.movOpts.envConfig.spicetifyConfig.enable {
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
"spotify"
];
builtins.elem (lib.getName pkg) [ "spotify" ];
programs.spicetify = {
enable = true;

11
modules/home/environment/starship.nix
View File

@@ -1,6 +1,7 @@
{ config, lib, inputs, ... }: {
options = {
movOpts.envConfig.starshipConfig.enable = lib.mkEnableOption "enables my starship configuration";
movOpts.envConfig.starshipConfig.enable =
lib.mkEnableOption "enables my starship configuration";
};
config = lib.mkIf config.movOpts.envConfig.starshipConfig.enable {
programs.starship = {
@@ -23,7 +24,9 @@
format = "[$user]($style)";
};
directory = {
format = "\n[$path](bold cyan)[/](bold green) ";
format = ''
[$path](bold cyan)[/](bold green) '';
style = "bold #b4befe";
};
@@ -42,7 +45,9 @@
};
git_branch = {
format = "\non [$symbol$branch](bold purple)";
format = ''
on [$symbol$branch](bold purple)'';
symbol = " ";
truncation_length = 15;
style = "bold purple";

8
modules/home/environment/stylix.nix
View File

@@ -3,10 +3,10 @@
let
scheme = "tokyo-night-dark";
wallpaper = "${self}/assets/wallpapers/dark-waves.jpg";
in
{
in {
options = {
movOpts.envConfig.stylixHomeConfig.enable = lib.mkEnableOption "enables my stylix Home-Manager options";
movOpts.envConfig.stylixHomeConfig.enable =
lib.mkEnableOption "enables my stylix Home-Manager options";
};
config = lib.mkIf config.movOpts.envConfig.stylixHomeConfig.enable {
stylix = {
@@ -15,7 +15,7 @@ in
image = wallpaper;
polarity = "dark";
autoEnable = true;
opacity.terminal = 0.50;
opacity.terminal = 0.5;
targets = {
waybar.enable = false;
btop.enable = false;

3
modules/home/environment/swaync.nix
View File

@@ -1,6 +1,7 @@
{ lib, config, pkgs, ... }: {
options = {
movOpts.envConfig.swayncConfig.enable = lib.mkEnableOption "enables my swaync configuration";
movOpts.envConfig.swayncConfig.enable =
lib.mkEnableOption "enables my swaync configuration";
};
config = lib.mkIf config.movOpts.envConfig.swayncConfig.enable {
home.packages = with pkgs; [ swaynotificationcenter ];

9
modules/home/environment/userpkgs.nix
View File

@@ -16,14 +16,13 @@ let
cp -r ${extraFigletFonts}/* $out/share/figlet
'';
});
in
{
in {
options = {
movOpts.envConfig.userPkgs.enable = lib.mkEnableOption "enables my default user packages";
movOpts.envConfig.userPkgs.enable =
lib.mkEnableOption "enables my default user packages";
};
config = lib.mkIf config.movOpts.envConfig.userPkgs.enable {
home.packages = with pkgs;
[
home.packages = with pkgs; [
nemo
gtk3
sqlite

153
modules/home/environment/waybar.nix
View File

@@ -13,16 +13,20 @@ let
"6" = "六";
};
persistent-workspaces =
if (config.movOpts.envConfig.hyprlandConfig.workspaceLayout == "singlemonitor") then {
if (config.movOpts.envConfig.hyprlandConfig.workspaceLayout
== "singlemonitor") then {
"${builtins.elemAt monitors 0}" = [ 1 2 3 4 ];
} else if (config.movOpts.envConfig.hyprlandConfig.workspaceLayout == "dualmonitor") then {
} else if (config.movOpts.envConfig.hyprlandConfig.workspaceLayout
== "dualmonitor") then {
"${builtins.elemAt monitors 0}" = [ 1 2 3 ];
"${builtins.elemAt monitors 1}" = [ 4 5 6 ];
} else if (config.movOpts.envConfig.hyprlandConfig.workspaceLayout == "trimonitor") then {
} else if (config.movOpts.envConfig.hyprlandConfig.workspaceLayout
== "trimonitor") then {
"${builtins.elemAt monitors 2}" = [ 1 2 ];
"${builtins.elemAt monitors 1}" = [ 3 4 ];
"${builtins.elemAt monitors 0}" = [ 5 6 ];
} else {};
} else
{ };
};
@@ -52,7 +56,8 @@ let
monitors = config.movOpts.envConfig.hyprlandConfig.monitorNames;
in {
options = {
movOpts.envConfig.waybarConfig.enable = lib.mkEnableOption "enables my waybar configuration";
movOpts.envConfig.waybarConfig.enable =
lib.mkEnableOption "enables my waybar configuration";
};
config = {
programs.waybar = {
@@ -68,25 +73,13 @@ in {
name = "mainBar";
margin-left = 8;
margin-top = 5;
margin-right =
if desktop
then 8
else 5;
margin-right = if desktop then 8 else 5;
mode = "dock";
"gtk-layer-shell" = true;
modules-left = [
"hyprland/workspaces"
"cava"
];
modules-center = [
"hyprland/window"
];
modules-right = [
"group/hardware"
"clock"
"group/powerbtns"
];
modules-left = [ "hyprland/workspaces" "cava" ];
modules-center = [ "hyprland/window" ];
modules-right = [ "group/hardware" "clock" "group/powerbtns" ];
"hyprland/workspaces" = workspaces;
@@ -112,11 +105,7 @@ in {
"group/hardware" = {
orientation = "inherit";
modules = [
"custom/disk-icon"
"memory"
"cpu"
];
modules = [ "custom/disk-icon" "memory" "cpu" ];
};
"custom/disk-icon" = {
@@ -146,34 +135,14 @@ in {
return-type = "json";
rotate = 270;
format = "{icon}";
format-icons = [
"󰝦"
"󰪞"
"󰪟"
"󰪠"
"󰪡"
"󰪢"
"󰪣"
"󰪤"
"󰪥"
];
format-icons = [ "󰝦" "󰪞" "󰪟" "󰪠" "󰪡" "󰪢" "󰪣" "󰪤" "󰪥" ];
};
memory = {
interval = 1;
rotate = 270;
format = "{icon}";
format-icons = [
"󰝦"
"󰪞"
"󰪟"
"󰪠"
"󰪡"
"󰪢"
"󰪣"
"󰪤"
"󰪥"
];
format-icons = [ "󰝦" "󰪞" "󰪟" "󰪠" "󰪡" "󰪢" "󰪣" "󰪤" "󰪥" ];
max-length = 10;
tooltip-format = "RAM: {used:0.1f} GB / {total:0.1f} GB";
};
@@ -182,17 +151,7 @@ in {
interval = 1;
rotate = 270;
format = "{icon}";
format-icons = [
"󰝦"
"󰪞"
"󰪟"
"󰪠"
"󰪡"
"󰪢"
"󰪣"
"󰪤"
"󰪥"
];
format-icons = [ "󰝦" "󰪞" "󰪟" "󰪠" "󰪡" "󰪢" "󰪣" "󰪤" "󰪥" ];
tooltip-format = "CPU: {usage:0.1f}%";
};
@@ -221,11 +180,7 @@ in {
children-class = "power-drawer";
transition-left-to-right = false;
};
modules = [
"custom/power"
"custom/logout"
"custom/reboot"
];
modules = [ "custom/power" "custom/logout" "custom/reboot" ];
};
clock = {
@@ -235,10 +190,10 @@ in {
};
sideBar = {
layer = "bottom";
output =
if desktop
then builtins.elemAt monitors 0
else builtins.elemAt monitors 1;
output = if desktop then
builtins.elemAt monitors 0
else
builtins.elemAt monitors 1;
position = "right";
margin-top = 8;
margin-right = 5;
@@ -247,47 +202,31 @@ in {
mode = "dock";
"gtk-layer-shell" = true;
modules-left =
if desktop
then [
"hyprland/workspaces"
]
modules-left = if desktop then
[ "hyprland/workspaces" ]
else [
"group/brightness"
"battery"
];
modules-center = [
];
modules-right = [
"network"
"group/audio"
];
modules-center = [ ];
modules-right = [ "network" "group/audio" ];
"hyprland/workspaces" = workspaces;
"pulseaudio/slider" = {
orientation = "vertical";
};
"pulseaudio/slider" = { orientation = "vertical"; };
"group/audio" = {
orientation = "vertical";
modules = [
"pulseaudio/slider"
"pulseaudio"
];
modules = [ "pulseaudio/slider" "pulseaudio" ];
};
pulseaudio = {
format = "{icon}";
format-muted = " ";
format-icons = {
default = [
" "
" "
];
};
format-icons = { default = [ " " " " ]; };
on-click = "pactl set-sink-mute @DEFAULT_SINK@ toggle";
on-click-right = "hyprctl dispatch exec '[float;size 40% 55%] pavucontrol'";
on-click-right =
"hyprctl dispatch exec '[float;size 40% 55%] pavucontrol'";
};
network = {
@@ -298,35 +237,27 @@ in {
tooltip-format-ethernet = "{ifname}";
format-disconnected = "󰖪 ";
tooltip-format-disconnected = "Disconnected";
on-click = "hyprctl dispatch exec '[float;size 40% 55%] kitty nmtui'";
on-click =
"hyprctl dispatch exec '[float;size 40% 55%] kitty nmtui'";
};
battery = {
bat = "BAT1";
interval = 1;
tooltip-format = "{capacity}%\nTil empty: {time}";
tooltip-format-charging = "{capacity}%\nTil full: {time}";
tooltip-format = ''
{capacity}%
Til empty: {time}'';
tooltip-format-charging = ''
{capacity}%
Til full: {time}'';
format = "{icon}";
format-icons = [
"󰁺"
"󰁻"
"󰁽"
"󰁾"
"󰁿"
"󰂀"
"󰂁"
"󰂂"
"󰁹"
];
format-icons = [ "󰁺" "󰁻" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
format-charging = "󰂄";
};
"group/brightness" = {
orientation = "vertical";
modules = [
"backlight"
"backlight/slider"
];
modules = [ "backlight" "backlight/slider" ];
};
backlight = {
format = "󰃠";

6
modules/home/environment/zshell.nix
View File

@@ -1,6 +1,7 @@
{ lib, config, self, ... }: {
options = {
movOpts.envConfig.zshConfig.enable = lib.mkEnableOption "enables my zsh configuration";
movOpts.envConfig.zshConfig.enable =
lib.mkEnableOption "enables my zsh configuration";
};
config = lib.mkIf config.movOpts.envConfig.zshConfig.enable {
programs.zoxide = {
@@ -28,7 +29,8 @@
svc = "sudo systemctl";
viflake = "nvim flake.nix";
iv = "invoke";
cfgfilecount = "find $FLAKEPATH -name \"*.nix\" | wc -l | toilet -f 3d | lolcat";
cfgfilecount =
''find $FLAKEPATH -name "*.nix" | wc -l | toilet -f 3d | lolcat'';
#git
"ga" = "playshellsound ${self}/assets/sound/gitadd.wav; git add";

24
modules/home/files.nix
View File

@@ -10,25 +10,25 @@ let
scheme_path = "${pkgs.base16-schemes}/share/themes/${ssh_base16}.yaml";
scheme_string = builtins.readFile scheme_path;
scheme_list = lib.splitString "\n" "${scheme_string}";
colors = lib.filter (line: builtins.match "^ *base[0-9A-F]{2}: .*" line != null) scheme_list;
ssh_scheme =
lib.lists.foldl' (
acc: line: let
colors =
lib.filter (line: builtins.match "^ *base[0-9A-F]{2}: .*" line != null)
scheme_list;
ssh_scheme = lib.lists.foldl' (acc: line:
let
splitLine = lib.splitString ": " line;
key = builtins.elemAt splitLine 0;
value = builtins.elemAt splitLine 1;
trimmedKey = lib.trim key;
cleanValue_step1 = lib.splitString " " value;
cleanValue_step2 = builtins.elemAt cleanValue_step1 0;
cleanValue_final = builtins.substring 1 (builtins.stringLength cleanValue_step2 - 2) cleanValue_step2;
in
acc // {"${trimmedKey}" = cleanValue_final;}
) {}
colors;
in
{
cleanValue_final =
builtins.substring 1 (builtins.stringLength cleanValue_step2 - 2)
cleanValue_step2;
in acc // { "${trimmedKey}" = cleanValue_final; }) { } colors;
in {
options = {
movOpts.homeFiles.enable = lib.mkEnableOption "enables declared custom files";
movOpts.homeFiles.enable =
lib.mkEnableOption "enables declared custom files";
};
config = {
home.file = {

3
modules/home/programs/autojump.nix
View File

@@ -1,6 +1,7 @@
{ lib, config, ... }: {
options = {
movOpts.programConfigs.autojumpConfig.enable = lib.mkEnableOption "enables my autojump options";
movOpts.programConfigs.autojumpConfig.enable =
lib.mkEnableOption "enables my autojump options";
};
config = lib.mkIf config.movOpts.programConfigs.autojumpConfig.enable {
programs.autojump = {

7
modules/home/programs/bat.nix
View File

@@ -1,13 +1,12 @@
{ lib, config, inputs, ... }: {
options = {
movOpts.programConfigs.batConfig.enable = lib.mkEnableOption "enables my bat options";
movOpts.programConfigs.batConfig.enable =
lib.mkEnableOption "enables my bat options";
};
config = lib.mkIf config.movOpts.programConfigs.batConfig.enable {
programs.bat = {
enable = true;
config = {
pager = "less -FR";
};
config = { pager = "less -FR"; };
};
};
}

3
modules/home/programs/btop.nix
View File

@@ -1,6 +1,7 @@
{ lib, config, pkgs, ... }: {
options = {
movOpts.programConfigs.btopConfig.enable = lib.mkEnableOption "enables my btop config";
movOpts.programConfigs.btopConfig.enable =
lib.mkEnableOption "enables my btop config";
};
config = lib.mkIf config.movOpts.programConfigs.btopConfig.enable {
programs.btop = {

7
modules/home/programs/cava.nix
View File

@@ -1,10 +1,9 @@
{ lib, config, inputs, pkgs, ... }: {
options = {
movOpts.programConfigs.cavaConfig.enable = lib.mkEnableOption "enables my cava settings";
movOpts.programConfigs.cavaConfig.enable =
lib.mkEnableOption "enables my cava settings";
};
config = lib.mkIf config.movOpts.programConfigs.cavaConfig.enable {
programs.cava = {
enable = true;
};
programs.cava = { enable = true; };
};
}

32
modules/home/programs/default.nix
View File

@@ -1,27 +1,9 @@
{
host,
nur,
nixvim,
self,
inputs,
username,
config,
home-manager,
...
}:
{
imports =
[(import ./btop.nix)]
++ [(import ./yazi.nix)]
++ [(import ./kitty.nix)]
++ [(import ./fuzzel.nix)]
++ [(import ./eza.nix)]
++ [(import ./cava.nix)]
++ [(import ./bat.nix)]
++ [(import ./fzf.nix)]
++ [(import ./git.nix)]
++ [(import ./password-store.nix)]
++ [(import ./autojump.nix)]
++ [(import ./firefox.nix)]
{ env, host, nur, nixvim, self, inputs, username, config, home-manager, ... }: {
imports = [ (import ./btop.nix) ] ++ [ (import ./yazi.nix) ]
++ [ (import ./kitty.nix) ] ++ [ (import ./fuzzel.nix) ]
++ [ (import ./eza.nix) ] ++ [ (import ./cava.nix) ]
++ [ (import ./bat.nix) ] ++ [ (import ./fzf.nix) ]
++ [ (import ./git.nix) ] ++ [ (import ./password-store.nix) ]
++ [ (import ./autojump.nix) ] ++ [ (import ./firefox.nix) ]
++ [ (import ./nixvim) ];
}

3
modules/home/programs/eza.nix
View File

@@ -1,6 +1,7 @@
{ lib, config, ... }: {
options = {
movOpts.programConfigs.ezaConfig.enable = lib.mkEnableOption "enables my eza options";
movOpts.programConfigs.ezaConfig.enable =
lib.mkEnableOption "enables my eza options";
};
config = lib.mkIf config.movOpts.programConfigs.ezaConfig.enable {
programs.eza = {

6
modules/home/programs/firefox.nix
View File

@@ -1,6 +1,7 @@
{ lib, config, nur, username, self, pkgs, ... }: {
options = {
movOpts.programConfigs.firefoxConfig.enable = lib.mkEnableOption "enables my firefox configuration";
movOpts.programConfigs.firefoxConfig.enable =
lib.mkEnableOption "enables my firefox configuration";
};
config = lib.mkIf config.movOpts.programConfigs.firefoxConfig.enable {
programs.firefox = {
@@ -22,7 +23,8 @@
OverridePostUpdatePage = "";
DontCheckDefaultBrowser = true;
DisplayBookmarksToolbar = "always"; # alternatives: "always" or "newtab"
DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on"
DisplayMenuBar =
"default-off"; # alternatives: "always", "never" or "default-on"
SearchBar = "unified"; # alternative: "separate" isDefault = true;
};
profiles.${username} = {

3
modules/home/programs/fuzzel.nix
View File

@@ -1,6 +1,7 @@
{ config, lib, ... }: {
options = {
movOpts.programConfigs.fuzzelConfig.enable = lib.mkEnableOption "enables my fuzzel configuration";
movOpts.programConfigs.fuzzelConfig.enable =
lib.mkEnableOption "enables my fuzzel configuration";
};
config = lib.mkIf config.movOpts.programConfigs.fuzzelConfig.enable {
programs.fuzzel = {

3
modules/home/programs/fzf.nix
View File

@@ -1,6 +1,7 @@
{ lib, config, ... }: {
options = {
movOpts.programConfigs.fzfConfig.enable = lib.mkEnableOption "enables my fzf options";
movOpts.programConfigs.fzfConfig.enable =
lib.mkEnableOption "enables my fzf options";
};
config = lib.mkIf config.movOpts.programConfigs.fzfConfig.enable {
programs.fzf = {

3
modules/home/programs/git.nix
View File

@@ -1,6 +1,7 @@
{ lib, config, username, ... }: {
options = {
movOpts.programConfigs.gitConfig.enable = lib.mkEnableOption "enables my git configuration";
movOpts.programConfigs.gitConfig.enable =
lib.mkEnableOption "enables my git configuration";
};
config = lib.mkIf config.movOpts.programConfigs.gitConfig.enable {
programs.git = {

3
modules/home/programs/kitty.nix
View File

@@ -1,6 +1,7 @@
{ lib, config, pkgs, ... }: {
options = {
movOpts.programConfigs.kittyConfig.enable = lib.mkEnableOption "enables my kitty configuration";
movOpts.programConfigs.kittyConfig.enable =
lib.mkEnableOption "enables my kitty configuration";
};
config = lib.mkIf config.movOpts.programConfigs.kittyConfig.enable {
programs.kitty = {

9
modules/home/programs/nixvim/autocmd.nix
View File

@@ -2,7 +2,8 @@
programs.nixvim = {
autoCmd = [
{
command = "FloatermNew --wintype=float --name=shadeterm --position=topright --autoclose=0 --silent --cwd=<buffer> --titleposition=left zsh";
command =
"FloatermNew --wintype=float --name=shadeterm --position=topright --autoclose=0 --silent --cwd=<buffer> --titleposition=left zsh";
event = [ "VimEnter" ];
pattern = [ "*" ];
desc = "Create a floating terminal, placed in the top right";
@@ -11,7 +12,8 @@
command = "silent! mkview";
event = [ "BufWinLeave" ];
pattern = [ "*" ];
desc = "Save session window settings to be loaded next time the file is opened";
desc =
"Save session window settings to be loaded next time the file is opened";
}
{
command = "silent! !aplay ~/sound/sys/cd.wav > /dev/null 2>&1 &";
@@ -23,7 +25,8 @@
command = "silent! loadview";
event = [ "BufWinEnter" ];
pattern = [ "*" ];
desc = "Load previous session window settings for the opened file (folds, cursor pos, etc)";
desc =
"Load previous session window settings for the opened file (folds, cursor pos, etc)";
}
{
command = "setlocal textwidth=135";

15
modules/home/programs/nixvim/default.nix
View File

@@ -1,14 +1,3 @@
{
config,
pkgs,
host,
self,
...
}: {
imports = [
./plugins
./options.nix
./keymaps.nix
./autocmd.nix
];
{ env, config, pkgs, host, self, ... }: {
imports = [ ./plugins ./options.nix ./keymaps.nix ./autocmd.nix ];
}

11
modules/home/programs/nixvim/options.nix
View File

@@ -1,12 +1,7 @@
{
config,
...
}:
{ config, ... }:
let
scheme = config.lib.stylix.colors;
in
{
let scheme = config.lib.stylix.colors;
in {
programs.nixvim = {
colorschemes.base16 = {
enable = true;

4
modules/home/programs/nixvim/plugins/barbar.nix
View File

@@ -2,9 +2,7 @@
programs.nixvim = {
plugins.barbar = {
enable = false;
settings = {
auto_hide = 1;
};
settings = { auto_hide = 1; };
};
};
}

7
modules/home/programs/nixvim/plugins/cmp.nix
View File

@@ -2,11 +2,8 @@
programs.nixvim = {
plugins.cmp = {
autoEnableSources = true;
settings.sources = [
{name = "nvim_lsp";}
{name = "path";}
{name = "buffer";}
];
settings.sources =
[ { name = "nvim_lsp"; } { name = "path"; } { name = "buffer"; } ];
};
plugins.cmp-nvim-lsp.enable = true;
plugins.cmp-nvim-lsp-document-symbol.enable = true;

4
modules/home/programs/nixvim/plugins/coq.nix
View File

@@ -2,9 +2,7 @@
programs.nixvim = {
plugins.coq-nvim = {
enable = true;
settings = {
auto_start = false;
};
settings = { auto_start = false; };
};
};
}

2
modules/home/programs/nixvim/plugins/default.nix
View File

@@ -1,4 +1,4 @@
{ host, self, pkgs, ... }:
{ host, self, pkgs, env, ... }:
{
imports = [

4
modules/home/programs/nixvim/plugins/fidget.nix
View File

@@ -3,9 +3,7 @@
enable = true;
notification = {
overrideVimNotify = true;
window = {
border = "rounded";
};
window = { border = "rounded"; };
};
};
}

4
modules/home/programs/nixvim/plugins/haskell.nix
View File

@@ -11,8 +11,6 @@
};
})
];
plugins = {
haskell-scope-highlighting.enable = true;
};
plugins = { haskell-scope-highlighting.enable = true; };
};
}

10
modules/home/programs/nixvim/plugins/lsp.nix
View File

@@ -38,9 +38,7 @@
})
'';
};
window = {
completion.border = "rounded";
};
window = { completion.border = "rounded"; };
};
};
lsp = {
@@ -63,8 +61,10 @@
};
options = {
# uses Xenon config because it has every option exposed to it
nixos.expr = "(builtins.getFlake \"github:pagedMov/nixos-config\").nixosConfigurations.xenon.options";
home.expr = "(builtins.getFlake \"github:pagedMov/nixos-config\").homeConfigurations.xenonHome.options";
nixos.expr = ''
(builtins.getFlake "github:pagedMov/nixos-config").nixosConfigurations.xenon.options'';
home.expr = ''
(builtins.getFlake "github:pagedMov/nixos-config").homeConfigurations.xenonHome.options'';
};
};
};

3
modules/home/programs/nixvim/plugins/neocord.nix
View File

@@ -2,7 +2,8 @@
programs.nixvim.plugins.neocord = {
enable = true;
settings = {
logo = "https://styles.redditmedia.com/t5_30kix/styles/communityIcon_n2hvyn96zwk81.png";
logo =
"https://styles.redditmedia.com/t5_30kix/styles/communityIcon_n2hvyn96zwk81.png";
logo_tooltip = "Neovim";
buttons = [
{

4
modules/home/programs/nixvim/plugins/nvim-lightbulb.nix
View File

@@ -2,9 +2,7 @@
programs.nixvim.plugins.nvim-lightbulb = {
enable = true;
settings = {
virtual_text = {
enable = true;
};
virtual_text = { enable = true; };
autocmd.enabled = true;
};
};

1
modules/home/programs/nixvim/plugins/scratch.nix Normal file
View File

@@ -0,0 +1 @@
{ programs.nixvim.plugins.chatgpt = { enable = true; }; }

8
modules/home/programs/nixvim/plugins/telescope.nix
View File

@@ -2,13 +2,7 @@
programs.nixvim = {
plugins.telescope = {
enable = true;
settings = {
pickers = {
find_files = {
hidden = true;
};
};
};
settings = { pickers = { find_files = { hidden = true; }; }; };
};
};
}

4
modules/home/programs/nixvim/plugins/vim-matchup.nix
View File

@@ -10,9 +10,7 @@
};
matchParen = {
hiSurroundAlways = true;
offscreen = {
method = "popup";
};
offscreen = { method = "popup"; };
};
treesitterIntegration = {
enable = true;

11
modules/home/programs/password-store.nix
View File

@@ -1,15 +1,14 @@
{lib, config, username, ...}: let
home = "/home/${username}";
{ lib, config, username, ... }:
let home = "/home/${username}";
in {
options = {
movOpts.programConfigs.passConfig.enable = lib.mkEnableOption "enables my pass config";
movOpts.programConfigs.passConfig.enable =
lib.mkEnableOption "enables my pass config";
};
config = lib.mkIf config.movOpts.programConfigs.passConfig.enable {
programs.password-store = {
enable = true;
settings = {
PASSWORD_STORE_DIR = "${home}/.password-store";
};
settings = { PASSWORD_STORE_DIR = "${home}/.password-store"; };
};
};
}

3
modules/home/programs/yazi.nix
View File

@@ -1,6 +1,7 @@
{ lib, config, ... }: {
options = {
movOpts.programConfigs.yaziConfig.enable = lib.mkEnableOption "enables my yazi config";
movOpts.programConfigs.yaziConfig.enable =
lib.mkEnableOption "enables my yazi config";
};
config = lib.mkIf config.movOpts.programConfigs.yaziConfig.enable {
programs.yazi = {

7
modules/home/scripts/commands/icanhazip.nix
View File

@@ -2,12 +2,7 @@
pkgs.writeShellApplication {
name = "icanhazip";
runtimeInputs = with pkgs; [
iproute2
curl
gawk
coreutils
];
runtimeInputs = with pkgs; [ iproute2 curl gawk coreutils ];
text = ''
if [ $# -eq 0 ]; then
echo "Public IP: $(curl -s icanhazip.com -4)"

4
modules/home/scripts/commands/invoke.nix
View File

@@ -1,6 +1,4 @@
{
pkgs
}:
{ pkgs }:
pkgs.writeShellApplication {
name = "invoke";
text = ''

4
modules/home/scripts/commands/runbg.nix
View File

@@ -1,6 +1,4 @@
{
pkgs,
}:
{ pkgs, }:
pkgs.writeShellApplication {
name = "runbg";
runtimeInputs = with pkgs; [

10
modules/home/scripts/commands/splash.nix
View File

@@ -1,13 +1,7 @@
{
pkgs
}:
{ pkgs }:
pkgs.writeShellApplication {
name = "splash";
runtimeInputs = with pkgs; [
lolcat
toilet
coreutils
];
runtimeInputs = with pkgs; [ lolcat toilet coreutils ];
text = ''
echo "NixOS kernel ver. $(uname -a | awk '{print $3}') x86_64 GNU/Linux"
date +"%A %B %-d %Y"

7
modules/home/scripts/commands/viconf.nix
View File

@@ -1,12 +1,7 @@
{ pkgs }:
pkgs.writeShellApplication {
name = "viconf";
runtimeInputs = with pkgs; [
coreutils
fd
ripgrep
fzf
];
runtimeInputs = with pkgs; [ coreutils fd ripgrep fzf ];
text = ''
#!/usr/bin/env bash

10
modules/home/scripts/commands/vipkg.nix
View File

@@ -6,15 +6,9 @@ let
rev = "63dacb46bf939521bdc93981b4cbb7ecb58427a0";
hash = "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=";
};
in
pkgs.writeShellApplication {
in pkgs.writeShellApplication {
name = "vipkg";
runtimeInputs = with pkgs; [
coreutils
fd
ripgrep
fzf
];
runtimeInputs = with pkgs; [ coreutils fd ripgrep fzf ];
text = ''
[ ! $# -eq 1 ] && echo "Usage: vipkg <nixpkgs package name>" && exit 1

122
modules/home/scripts/default.nix
View File

@@ -1,11 +1,5 @@
{
host,
lib,
config,
self,
pkgs,
...
}: let
{ host, lib, config, self, pkgs, ... }:
let
fetchfromgh = import ./nix/fetchfromgh.nix { inherit pkgs; };
vipkg = import ./commands/vipkg.nix { inherit pkgs; };
keyring = import ./wm-controls/keyring.nix { inherit pkgs; };
@@ -24,17 +18,15 @@
chscheme = import ./wm-controls/chscheme.nix { inherit pkgs; };
chpaper = import ./wm-controls/chpaper.nix { inherit pkgs; };
mkscreenshots = import ./wm-controls/mkscreenshots.nix { inherit pkgs; };
scriptOverride =
doc:
group:
name:
lib.mkEnableOption
"${doc}" // {
default = config.movOpts.movScripts.enable && config.movOpts.movScripts.${group}.enable;
scriptOverride = doc: group: name:
lib.mkEnableOption "${doc}" // {
default = config.movOpts.movScripts.enable
&& config.movOpts.movScripts.${group}.enable;
};
in {
options = {
movOpts.movScripts.enable = lib.mkEnableOption "Enables all pagedmov's scripts";
movOpts.movScripts.enable =
lib.mkEnableOption "Enables all pagedmov's scripts";
# Enable or disable by group
movOpts.movScripts.commandScripts.enable =
@@ -45,16 +37,20 @@ in {
lib.mkEnableOption "Enables all Nix shortcut scripts";
# Command Scripts
movOpts.movScripts.commandScripts.vipkg.enable =
scriptOverride "Search through the nixpkgs/pkgs directory for a package derivation. Useful for overrides." "commandScripts" "vipkg";
movOpts.movScripts.commandScripts.vipkg.enable = scriptOverride
"Search through the nixpkgs/pkgs directory for a package derivation. Useful for overrides."
"commandScripts" "vipkg";
movOpts.movScripts.commandScripts.icanhazip.enable =
scriptOverride "Enables the icanhazip command" "commandScripts" "icanhazip";
scriptOverride "Enables the icanhazip command" "commandScripts"
"icanhazip";
movOpts.movScripts.commandScripts.invoke.enable =
scriptOverride "Enables the invoke command" "commandScripts" "invoke";
movOpts.movScripts.commandScripts.runbg.enable =
scriptOverride "Enables the runbg command - written by FrostPhoenix" "commandScripts" "runbg";
scriptOverride "Enables the runbg command - written by FrostPhoenix"
"commandScripts" "runbg";
movOpts.movScripts.commandScripts.splash.enable =
scriptOverride "Enables the splash screen when opening a terminal" "commandScripts" "splash";
scriptOverride "Enables the splash screen when opening a terminal"
"commandScripts" "splash";
movOpts.movScripts.commandScripts.toolbelt.enable =
scriptOverride "Enables the toolbelt command" "commandScripts" "toolbelt";
movOpts.movScripts.commandScripts.viconf.enable =
@@ -66,52 +62,78 @@ in {
movOpts.movScripts.hyprlandControls.scheck.enable =
scriptOverride "Enables the scheck command" "hyprlandControls" "scheck";
movOpts.movScripts.hyprlandControls.chscheme.enable =
scriptOverride "Enables the chscheme command" "hyprlandControls" "chscheme";
scriptOverride "Enables the chscheme command" "hyprlandControls"
"chscheme";
movOpts.movScripts.hyprlandControls.keyring.enable =
scriptOverride "Enables the keyring command" "hyprlandControls" "keyring";
movOpts.movScripts.hyprlandControls.moveonscreen.enable =
scriptOverride "Ensures floating windows remain on screen" "hyprlandControls" "moveonscreen";
scriptOverride "Ensures floating windows remain on screen"
"hyprlandControls" "moveonscreen";
movOpts.movScripts.hyprlandControls.switchmon.enable =
scriptOverride "Moves cursor to the center of the second monitor" "hyprlandControls" "switchmon";
movOpts.movScripts.hyprlandControls.mkscreenshots.enable =
scriptOverride "Generates screenshots, and updates the README.md with the current rev hash" "hyprlandControls" "switchmon";
scriptOverride "Moves cursor to the center of the second monitor"
"hyprlandControls" "switchmon";
movOpts.movScripts.hyprlandControls.mkscreenshots.enable = scriptOverride
"Generates screenshots, and updates the README.md with the current rev hash"
"hyprlandControls" "switchmon";
# Nix Shortcuts
movOpts.movScripts.nixShortcuts.fetchfromgh.enable =
scriptOverride "Provides a full pkgs.fetchFromGitHub call from a repository url" "nixShortcuts" "fetchfromgh";
movOpts.movScripts.nixShortcuts.fetchfromgh.enable = scriptOverride
"Provides a full pkgs.fetchFromGitHub call from a repository url"
"nixShortcuts" "fetchfromgh";
movOpts.movScripts.nixShortcuts.garbage-collect.enable =
scriptOverride "Enables the garbage-collect script" "nixShortcuts" "garbage-collect";
scriptOverride "Enables the garbage-collect script" "nixShortcuts"
"garbage-collect";
movOpts.movScripts.nixShortcuts.nsp.enable =
scriptOverride "Enables nsp as an alias for 'nix-shell -p'" "nixShortcuts" "nsp";
movOpts.movScripts.nixShortcuts.rebuild.enable =
scriptOverride "Enables rebuild as an alias for 'sudo nixos-rebuild switch'" "nixShortcuts" "rebuild";
scriptOverride "Enables nsp as an alias for 'nix-shell -p'" "nixShortcuts"
"nsp";
movOpts.movScripts.nixShortcuts.rebuild.enable = scriptOverride
"Enables rebuild as an alias for 'sudo nixos-rebuild switch'"
"nixShortcuts" "rebuild";
};
config = lib.mkIf config.movOpts.movScripts.enable {
home.packages =
lib.optionals config.movOpts.movScripts.commandScripts.invoke.enable [ invoke ]
lib.optionals config.movOpts.movScripts.commandScripts.invoke.enable [
invoke
]
# Command Scripts Overrides
++ lib.optionals config.movOpts.movScripts.commandScripts.vipkg.enable [ vipkg ]
++ lib.optionals config.movOpts.movScripts.commandScripts.runbg.enable [ runbg ]
++ lib.optionals config.movOpts.movScripts.commandScripts.icanhazip.enable [ icanhazip ]
++ lib.optionals config.movOpts.movScripts.commandScripts.splash.enable [ splash ]
++ lib.optionals config.movOpts.movScripts.commandScripts.toolbelt.enable [ toolbelt ]
++ lib.optionals config.movOpts.movScripts.commandScripts.viconf.enable [ viconf ]
++ lib.optionals config.movOpts.movScripts.commandScripts.vipkg.enable
[ vipkg ]
++ lib.optionals config.movOpts.movScripts.commandScripts.runbg.enable
[ runbg ]
++ lib.optionals config.movOpts.movScripts.commandScripts.icanhazip.enable
[ icanhazip ]
++ lib.optionals config.movOpts.movScripts.commandScripts.splash.enable
[ splash ]
++ lib.optionals config.movOpts.movScripts.commandScripts.toolbelt.enable
[ toolbelt ]
++ lib.optionals config.movOpts.movScripts.commandScripts.viconf.enable [
viconf
]
# Hyprland Controls Overrides
++ lib.optionals config.movOpts.movScripts.hyprlandControls.chpaper.enable [ chpaper ]
++ lib.optionals config.movOpts.movScripts.hyprlandControls.scheck.enable [ scheck ]
++ lib.optionals config.movOpts.movScripts.hyprlandControls.chscheme.enable [ chscheme ]
++ lib.optionals config.movOpts.movScripts.hyprlandControls.keyring.enable [ keyring ]
++ lib.optionals config.movOpts.movScripts.hyprlandControls.moveonscreen.enable [ moveonscreen ]
++ lib.optionals config.movOpts.movScripts.hyprlandControls.switchmon.enable [ switchmon ]
++ lib.optionals config.movOpts.movScripts.hyprlandControls.mkscreenshots.enable [ mkscreenshots ]
++ lib.optionals config.movOpts.movScripts.hyprlandControls.chpaper.enable
[ chpaper ]
++ lib.optionals config.movOpts.movScripts.hyprlandControls.scheck.enable
[ scheck ] ++ lib.optionals
config.movOpts.movScripts.hyprlandControls.chscheme.enable [ chscheme ]
++ lib.optionals config.movOpts.movScripts.hyprlandControls.keyring.enable
[ keyring ] ++ lib.optionals
config.movOpts.movScripts.hyprlandControls.moveonscreen.enable
[ moveonscreen ] ++ lib.optionals
config.movOpts.movScripts.hyprlandControls.switchmon.enable [ switchmon ]
++ lib.optionals
config.movOpts.movScripts.hyprlandControls.mkscreenshots.enable [
mkscreenshots
]
# Nix Shortcuts Overrides
++ lib.optionals config.movOpts.movScripts.nixShortcuts.fetchfromgh.enable [ fetchfromgh ]
++ lib.optionals config.movOpts.movScripts.nixShortcuts.garbage-collect.enable [ garbage-collect ]
++ lib.optionals config.movOpts.movScripts.nixShortcuts.fetchfromgh.enable
[ fetchfromgh ] ++ lib.optionals
config.movOpts.movScripts.nixShortcuts.garbage-collect.enable
[ garbage-collect ]
++ lib.optionals config.movOpts.movScripts.nixShortcuts.nsp.enable [ nsp ]
++ lib.optionals config.movOpts.movScripts.nixShortcuts.rebuild.enable [ rebuild ];
++ lib.optionals config.movOpts.movScripts.nixShortcuts.rebuild.enable
[ rebuild ];
};
}

4
modules/home/scripts/nix/fetchfromgh.nix
View File

@@ -2,9 +2,7 @@
pkgs.writeShellApplication {
name = "fetchfromgh";
runtimeInputs = [
pkgs.nix-prefetch-scripts
];
runtimeInputs = [ pkgs.nix-prefetch-scripts ];
text = ''
if [ $# -ne 1 ] || ! echo "$1" | grep -qE "[A-Za-z0-9_-]+/[A-Za-z0-9_-]+"; then
echo "Usage: fetchfromgh someuser/somerepo"

4
modules/home/scripts/nix/garbage-collect.nix
View File

@@ -1,6 +1,4 @@
{
pkgs
}:
{ pkgs }:
pkgs.writeShellApplication {
name = "garbage-collect";
runtimeInputs = with pkgs; [

4
modules/home/scripts/nix/nsp.nix
View File

@@ -1,6 +1,4 @@
{
pkgs
}:
{ pkgs }:
pkgs.writeShellApplication {
name = "nsp";
text = ''

6
modules/home/scripts/nix/rebuild.nix
View File

@@ -1,8 +1,4 @@
{
host,
self,
pkgs,
}:
{ host, self, pkgs, }:
pkgs.writeShellApplication {
name = "rebuild";
text = ''

8
modules/home/scripts/wm-controls/chpaper.nix
View File

@@ -1,13 +1,7 @@
{ pkgs }:
pkgs.writeShellApplication {
name = "chpaper";
runtimeInputs = with pkgs; [
chafa
fzf
ripgrep
findutils
coreutils
];
runtimeInputs = with pkgs; [ chafa fzf ripgrep findutils coreutils ];
text = ''
paper="$\{self}/assets/wallpapers/$(find "$FLAKEPATH"/assets/wallpapers -exec basename {} \; | rg "\.\w+$" | fzf --preview "chafa -s 30x40 $FLAKEPATH/assets/wallpapers/{}")"
[ "$paper" = "$\{self}/assets/wallpapers/" ] && echo "Cancelling wallpaper change" && exit 1

5
modules/home/scripts/wm-controls/chscheme.nix
View File

@@ -1,10 +1,7 @@
{ pkgs }:
pkgs.writeShellApplication {
name = "chscheme";
runtimeInputs = with pkgs; [
fzf
coreutils
];
runtimeInputs = with pkgs; [ fzf coreutils ];
text = ''
selected_scheme=$(/usr/bin/env ls "$(nix-build '<nixpkgs>' -A base16-schemes)"/share/themes | \
sed 's/\.yaml//g' | \

4
modules/home/scripts/wm-controls/keyring.nix
View File

@@ -1,6 +1,4 @@
{
pkgs
}:
{ pkgs }:
pkgs.writeShellApplication {
name = "keyring";
runtimeInputs = with pkgs; [

10
modules/home/scripts/wm-controls/mkscreenshots.nix
View File

@@ -2,15 +2,7 @@
pkgs.writeShellApplication {
name = "mkscreenshots";
runtimeInputs = with pkgs; [
jq
neofetch
kitty
coreutils
nemo
grimblast
git
];
runtimeInputs = with pkgs; [ jq neofetch kitty coreutils nemo grimblast git ];
text = ''
if [ -n "$(hyprctl clients -j | jq -r '.[] | select(.workspace.name == "4")')" ]; then
echo "There are windows in workspace 4. This script uses workspace 4, so move those windows and run it again."

7
modules/home/scripts/wm-controls/moveonscreen.nix
View File

@@ -1,12 +1,7 @@
{ pkgs }:
pkgs.writeShellApplication {
name = "moveonscreen";
runtimeInputs = with pkgs; [
hyprland
jq
coreutils
gawk
];
runtimeInputs = with pkgs; [ hyprland jq coreutils gawk ];
text = ''
center_window=false
if [[ ! $# -eq 0 ]] && [[ $1 == "--center" ]]; then

4
modules/home/scripts/wm-controls/s_check.nix
View File

@@ -1,6 +1,4 @@
{
pkgs,
}:
{ pkgs, }:
pkgs.writeShellApplication {
name = "scheck";
text = ''

4
modules/home/scripts/wm-controls/switchmon.nix
View File

@@ -1,6 +1,4 @@
{
pkgs,
}:
{ pkgs, }:
pkgs.writeShellApplication {
name = "switchmon";
text = ''

11
modules/home/servermodule.nix
View File

@@ -1,13 +1,4 @@
{
inputs,
nixpkgs,
config,
self,
username,
host,
lib,
...
}: {
{ inputs, nixpkgs, config, self, username, host, lib, ... }: {
imports = [
./environment/starship.nix
./environment/userpkgs.nix

3
modules/server/cdn/jellyfin.nix
View File

@@ -2,7 +2,8 @@
{
options = {
movOpts.jellyfinConfig.enable = lib.mkEnableOption "Enables the server's jellyfin config";
movOpts.jellyfinConfig.enable =
lib.mkEnableOption "Enables the server's jellyfin config";
};
config = lib.mkIf config.movOpts.jellyfinConfig.enable {
services.jellyfin = {

5
modules/server/default.nix
View File

@@ -1,10 +1,7 @@
{ pkgs, lib, ... }:
{
imports = [
./cdn
./glasshaus
];
imports = [ ./cdn ./glasshaus ];
movOpts = {
jellyfinConfig.enable = lib.mkDefault false;
caddyConfig.enable = lib.mkDefault false;

3
modules/server/glasshaus/caddy.nix
View File

@@ -2,7 +2,8 @@
{
options = {
movOpts.caddyConfig.enable = lib.mkEnableOption "Enable my caddy config for the glasshaus.info domain name";
movOpts.caddyConfig.enable = lib.mkEnableOption
"Enable my caddy config for the glasshaus.info domain name";
};
config = lib.mkIf config.movOpts.caddyConfig.enable {
services.caddy = {

17
modules/sys/default.nix
View File

@@ -1,16 +1,3 @@
{
inputs,
nixpkgs,
config,
self,
username,
host,
lib,
...
}: {
imports = [
./hardware
./software
./environment
];
{ inputs, nixpkgs, config, self, username, host, lib, ... }: {
imports = [ ./hardware ./software ./environment ];
}

18
modules/sys/environment/default.nix
View File

@@ -1,16 +1,4 @@
{
inputs,
nixpkgs,
nixvim,
config,
self,
username,
host,
...
}: {
imports =
[(import ./sddm.nix)]
++ [(import ./issue.nix)]
++ [(import ./nix.nix)]
++ [(import ./stylix.nix)];
{ inputs, nixpkgs, nixvim, config, self, username, host, ... }: {
imports = [ (import ./sddm.nix) ] ++ [ (import ./issue.nix) ]
++ [ (import ./nix.nix) ] ++ [ (import ./stylix.nix) ];
}

3
modules/sys/environment/issue.nix
View File

@@ -1,6 +1,7 @@
{ lib, config, ... }: {
options = {
movOpts.sysEnv.issue.enable = lib.mkEnableOption "enables custom /etc/issue splash screen for the tty";
movOpts.sysEnv.issue.enable =
lib.mkEnableOption "enables custom /etc/issue splash screen for the tty";
};
config = lib.mkIf config.movOpts.sysEnv.issue.enable {
environment.etc."issue".text = ''

3
modules/sys/environment/nix.nix
View File

@@ -1,6 +1,7 @@
{ lib, config, ... }: {
options = {
movOpts.sysEnv.nixSettings.enable = lib.mkEnableOption "enables my nixos settings";
movOpts.sysEnv.nixSettings.enable =
lib.mkEnableOption "enables my nixos settings";
};
config = lib.mkIf config.movOpts.sysEnv.nixSettings.enable {
system.stateVersion = "24.05";

17
modules/sys/environment/sddm.nix
View File

@@ -1,24 +1,17 @@
{
pkgs,
self,
lib,
config,
...
}: {
{ pkgs, self, lib, config, ... }: {
options = {
movOpts.sysEnv.sddmConfig.enable = lib.mkEnableOption "enables custom sddm configuration";
movOpts.sysEnv.sddmConfig.enable =
lib.mkEnableOption "enables custom sddm configuration";
};
config = lib.mkIf config.movOpts.sysEnv.sddmConfig.enable {
environment.systemPackages = [
(
pkgs.catppuccin-sddm.override {
(pkgs.catppuccin-sddm.override {
flavor = "mocha";
font = "JetBrains Mono Nerd Font";
fontSize = "14";
loginBackground = true;
background = "${self}/assets/wallpapers/dark-waves.jpg";
}
)
})
];
services.displayManager.sddm = {
enable = true;

16
modules/sys/environment/stylix.nix
View File

@@ -1,18 +1,12 @@
{
pkgs,
self,
lib,
config,
...
}:
{ pkgs, self, lib, config, ... }:
let
scheme = "tokyo-night-dark";
wallpaper = "${self}/assets/wallpapers/dark-waves.jpg";
in
{
in {
options = {
movOpts.sysEnv.stylixConfig.enable = lib.mkEnableOption "enables custom stylix options";
movOpts.sysEnv.stylixConfig.enable =
lib.mkEnableOption "enables custom stylix options";
};
config = lib.mkIf config.movOpts.sysEnv.stylixConfig.enable {
stylix = {
@@ -25,7 +19,7 @@ in
};
polarity = "dark";
autoEnable = true;
opacity.terminal = 0.50;
opacity.terminal = 0.5;
targets = {
console.enable = true;
feh.enable = true;

3
modules/sys/hardware/bootloader.nix
View File

@@ -1,6 +1,7 @@
{ pkgs, lib, config, ... }: {
options = {
movOpts.hardwareCfg.bootLoader.enable = lib.mkEnableOption "enables bootloader config";
movOpts.hardwareCfg.bootLoader.enable =
lib.mkEnableOption "enables bootloader config";
};
config = lib.mkIf config.movOpts.hardwareCfg.bootLoader.enable {
boot = {

15
modules/sys/hardware/default.nix
View File

@@ -1,15 +1,4 @@
{
inputs,
nixpkgs,
nixvim,
config,
self,
username,
host,
...
}: {
imports =
[(import ./bootloader.nix)]
++ [(import ./network.nix)]
{ inputs, nixpkgs, nixvim, config, self, username, host, ... }: {
imports = [ (import ./bootloader.nix) ] ++ [ (import ./network.nix) ]
++ [ (import ./powerprofiles.nix) ];
}

6
modules/sys/hardware/network.nix
View File

@@ -1,7 +1,7 @@
{host, lib, config, ...}:
{
{ host, lib, config, ... }: {
options = {
movOpts.hardwareCfg.networkModule.enable = lib.mkEnableOption "enables network configuration";
movOpts.hardwareCfg.networkModule.enable =
lib.mkEnableOption "enables network configuration";
};
config = lib.mkIf config.movOpts.hardwareCfg.networkModule.enable {
networking = {

3
modules/sys/hardware/powerprofiles.nix
View File

@@ -1,6 +1,7 @@
{ lib, config, ... }: {
options = {
movOpts.hardwareCfg.powerProfiles.enable = lib.mkEnableOption "enables power profiles";
movOpts.hardwareCfg.powerProfiles.enable =
lib.mkEnableOption "enables power profiles";
};
config = lib.mkIf config.movOpts.hardwareCfg.powerProfiles.enable {
services = {

17
modules/sys/software/default.nix
View File

@@ -1,16 +1,5 @@
{
inputs,
nixpkgs,
config,
self,
username,
host,
...
}: {
imports =
[(import ./packages.nix)]
++ [(import ./programs.nix)]
++ [(import ./services.nix)]
++ [(import ./virtualization.nix)]
{ inputs, nixpkgs, config, self, username, host, ... }: {
imports = [ (import ./packages.nix) ] ++ [ (import ./programs.nix) ]
++ [ (import ./services.nix) ] ++ [ (import ./virtualization.nix) ]
++ [ (import ./gaming) ];
}

4
modules/sys/software/gaming/default.nix
View File

@@ -1,5 +1,3 @@
{ ... }: {
imports =
[(import ./steam.nix)]
++ [(import ./gaming_pkgs.nix)];
imports = [ (import ./steam.nix) ] ++ [ (import ./gaming_pkgs.nix) ];
}

11
modules/sys/software/gaming/gaming_pkgs.nix
View File

@@ -9,15 +9,12 @@ let
"-DDOWNLOAD_TITLE_SEQUENCES=ON"
];
});
in
{
in {
options = {
movOpts.softwareCfg.gamingPkgs.enable = lib.mkEnableOption "enables gaming packages";
movOpts.softwareCfg.gamingPkgs.enable =
lib.mkEnableOption "enables gaming packages";
};
config = lib.mkIf config.movOpts.softwareCfg.gamingPkgs.enable {
environment.systemPackages = with pkgs; [
snes9x-gtk
cust-openrct2
];
environment.systemPackages = with pkgs; [ snes9x-gtk cust-openrct2 ];
};
}

3
modules/sys/software/gaming/steam.nix
View File

@@ -1,6 +1,7 @@
{ lib, config, ... }: {
options = {
movOpts.softwareCfg.steamConfig.enable = lib.mkEnableOption "enables steam configuration";
movOpts.softwareCfg.steamConfig.enable =
lib.mkEnableOption "enables steam configuration";
};
config = lib.mkIf config.movOpts.softwareCfg.steamConfig.enable {
programs.steam = {

3
modules/sys/software/packages.nix
View File

@@ -1,6 +1,7 @@
{ lib, config, pkgs, inputs, ... }: {
options = {
movOpts.softwareCfg.sysPkgs.enable = lib.mkEnableOption "enables default system packages";
movOpts.softwareCfg.sysPkgs.enable =
lib.mkEnableOption "enables default system packages";
};
config = lib.mkIf config.movOpts.softwareCfg.sysPkgs.enable {
environment.systemPackages = with pkgs; [

8
modules/sys/software/programs.nix
View File

@@ -1,6 +1,7 @@
{ lib, config, pkgs, ... }: {
options = {
movOpts.softwareCfg.sysProgs.enable = lib.mkEnableOption "enables default system programs";
movOpts.softwareCfg.sysProgs.enable =
lib.mkEnableOption "enables default system programs";
};
config = lib.mkIf config.movOpts.softwareCfg.sysProgs.enable {
programs = {
@@ -8,10 +9,7 @@
zsh.enable = lib.mkDefault true;
nix-ld = {
enable = lib.mkDefault true;
libraries = with pkgs; [
stdenv.cc.cc
ffmpeg-full
];
libraries = with pkgs; [ stdenv.cc.cc ffmpeg-full ];
};
gnupg.agent = {
enable = lib.mkDefault true;

7
modules/sys/software/services.nix
View File

@@ -1,6 +1,7 @@
{ lib, config, ... }: {
options = {
movOpts.softwareCfg.sysServices.enable = lib.mkEnableOption "enables default system services";
movOpts.softwareCfg.sysServices.enable =
lib.mkEnableOption "enables default system services";
};
config = lib.mkIf config.movOpts.softwareCfg.sysServices.enable {
services = {
@@ -8,9 +9,7 @@
enable = true;
keyboards.default = {
ids = [ "*" ];
settings.main = {
capslock = "esc";
};
settings.main = { capslock = "esc"; };
};
};
pipewire = {

3
modules/sys/software/virtualization.nix
View File

@@ -1,6 +1,7 @@
{ lib, config, username, ... }: {
options = {
movOpts.softwareCfg.virtConfig.enable = lib.mkEnableOption "enables virtualization";
movOpts.softwareCfg.virtConfig.enable =
lib.mkEnableOption "enables virtualization";
};
config = lib.mkIf config.movOpts.softwareCfg.virtConfig.enable {
virtualisation.libvirtd.enable = true;