diff --git a/nixos/base.nix b/nixos/base.nix index 2282b423..37075c21 100644 --- a/nixos/base.nix +++ b/nixos/base.nix @@ -1,5 +1,5 @@ { config, pkgs, forEachUser, makeEnable, realUsers, ... }: -makeEnable config "modules.base" true { +makeEnable config "myModules.base" true { nixpkgs.config.permittedInsecurePackages = [ "openssl-1.0.2u" "electron-12.2.3" diff --git a/nixos/ben.nix b/nixos/ben.nix index 9201566a..603dd66f 100644 --- a/nixos/ben.nix +++ b/nixos/ben.nix @@ -1,5 +1,5 @@ { pkgs, inputs, config, makeEnable, ... }: -makeEnable config "modules.ben" true { +makeEnable config "myModules.ben" true { home-manager.backupFileExtension = "backup"; # Add this line home-manager.users.ben = { programs.zsh = { diff --git a/nixos/cache-server.nix b/nixos/cache-server.nix index 91045301..e484cef6 100644 --- a/nixos/cache-server.nix +++ b/nixos/cache-server.nix @@ -1,10 +1,10 @@ { config, lib, ... }: with lib; -let cfg = config.modules.cache-server; +let cfg = config.myModules.cache-server; in { options = { - modules.cache-server = { + myModules.cache-server = { enable = mkEnableOption "nix cache server"; port = mkOption { type = types.int; diff --git a/nixos/code.nix b/nixos/code.nix index bc382e48..82c8bed2 100644 --- a/nixos/code.nix +++ b/nixos/code.nix @@ -1,5 +1,5 @@ { pkgs, config, makeEnable, ... }: -makeEnable config "modules.code" true { +makeEnable config "myModules.code" true { programs.direnv = { enable = true; nix-direnv.enable = true; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index f3768445..c2f81919 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -42,17 +42,17 @@ }; config = lib.mkIf config.features.full.enable { - modules.base.enable = true; - modules.desktop.enable = true; - modules.plasma.enable = true; - modules.gnome.enable = false; - modules.xmonad.enable = true; - modules.extra.enable = true; - modules.electron.enable = true; - modules.code.enable = true; - modules.games.enable = true; - modules.syncthing.enable = true; - modules.fonts.enable = true; - modules.nixified-ai.enable = false; + myModules.base.enable = true; + myModules.desktop.enable = true; + myModules.plasma.enable = true; + myModules.gnome.enable = false; + myModules.xmonad.enable = true; + myModules.extra.enable = true; + myModules.electron.enable = true; + myModules.code.enable = true; + myModules.games.enable = true; + myModules.syncthing.enable = true; + myModules.fonts.enable = true; + myModules.nixified-ai.enable = false; }; } diff --git a/nixos/desktop.nix b/nixos/desktop.nix index 88e9411f..d490d2b8 100644 --- a/nixos/desktop.nix +++ b/nixos/desktop.nix @@ -1,5 +1,5 @@ { config, pkgs, makeEnable, ... }: -makeEnable config "modules.desktop" true { +makeEnable config "myModules.desktop" true { imports = [ ./fonts.nix ]; diff --git a/nixos/electron.nix b/nixos/electron.nix index 21b7be02..6da21472 100644 --- a/nixos/electron.nix +++ b/nixos/electron.nix @@ -1,5 +1,5 @@ { pkgs, config, makeEnable, forEachUser, ... }: -makeEnable config "modules.electron" false { +makeEnable config "myModules.electron" false { environment.systemPackages = with pkgs; [ element-desktop # bitwarden diff --git a/nixos/extra.nix b/nixos/extra.nix index 2b794869..c4085a99 100644 --- a/nixos/extra.nix +++ b/nixos/extra.nix @@ -1,5 +1,5 @@ { config, pkgs, makeEnable, ... }: -makeEnable config "modules.extra" false { +makeEnable config "myModules.extra" false { services.expressvpn.enable = true; programs.hyprland.enable = true; diff --git a/nixos/fonts.nix b/nixos/fonts.nix index b6d38d80..dc13f4ed 100644 --- a/nixos/fonts.nix +++ b/nixos/fonts.nix @@ -1,5 +1,5 @@ { pkgs, makeEnable, config, ... }: -makeEnable config "modules.fonts" true { +makeEnable config "myModules.fonts" true { # Enable the gtk icon cache gtk.iconCache.enable = true; diff --git a/nixos/games.nix b/nixos/games.nix index f20b0d3a..15f93b90 100644 --- a/nixos/games.nix +++ b/nixos/games.nix @@ -1,5 +1,5 @@ { config, pkgs, makeEnable, ... }: -makeEnable config "modules.games" false { +makeEnable config "myModules.games" false { environment.systemPackages = with pkgs; [ steam # heroic diff --git a/nixos/gitea-runner.nix b/nixos/gitea-runner.nix index fa64494a..5f54e076 100644 --- a/nixos/gitea-runner.nix +++ b/nixos/gitea-runner.nix @@ -1,5 +1,5 @@ { pkgs, config, makeEnable, ... }: -makeEnable config "modules.gitea-runner" false { +makeEnable config "myModules.gitea-runner" false { age.secrets.gitea-runner-token = { file = ./secrets/gitea-runner-token.${config.networking.hostName}.age; group = "docker"; diff --git a/nixos/gitea.nix b/nixos/gitea.nix index 4d45af25..acd7abb6 100644 --- a/nixos/gitea.nix +++ b/nixos/gitea.nix @@ -1,5 +1,5 @@ { config, makeEnable, ... }: -makeEnable config "modules.gitea" false { +makeEnable config "myModules.gitea" false { services.gitea = { enable = true; diff --git a/nixos/gnome.nix b/nixos/gnome.nix index dfcde785..65b7e7ad 100644 --- a/nixos/gnome.nix +++ b/nixos/gnome.nix @@ -1,5 +1,5 @@ { config, makeEnable, ... }: -makeEnable config "modules.gnome" false { +makeEnable config "myModules.gnome" false { services.xserver = { desktopManager.gnome.enable = true; displayManager.gdm.enable = true; diff --git a/nixos/kat.nix b/nixos/kat.nix index cce380bb..c04b283b 100644 --- a/nixos/kat.nix +++ b/nixos/kat.nix @@ -1,5 +1,5 @@ { pkgs, inputs, config, makeEnable, ... }: -makeEnable config "modules.kat" false { +makeEnable config "myModules.kat" false { environment.systemPackages = with pkgs; [ bitwarden obsidian diff --git a/nixos/machines/adele.nix b/nixos/machines/adele.nix index 8e041116..5f274422 100644 --- a/nixos/machines/adele.nix +++ b/nixos/machines/adele.nix @@ -6,16 +6,16 @@ inputs.nixos-hardware.nixosModules.dell-xps-17-9700-nvidia ]; - modules.base.enable = true; - modules.desktop.enable = true; - modules.xmonad.enable = true; - modules.extra.enable = false; - modules.code.enable = true; - modules.games.enable = false; - modules.syncthing.enable = true; - modules.fonts.enable = true; - modules.nixified-ai.enable = false; - modules.gitea-runner.enable = false; + myModules.base.enable = true; + myModules.desktop.enable = true; + myModules.xmonad.enable = true; + myModules.extra.enable = false; + myModules.code.enable = true; + myModules.games.enable = false; + myModules.syncthing.enable = true; + myModules.fonts.enable = true; + myModules.nixified-ai.enable = false; + myModules.gitea-runner.enable = false; hardware.enableRedistributableFirmware = true; diff --git a/nixos/machines/bencbox.nix b/nixos/machines/bencbox.nix index 29034ba9..8aec1471 100644 --- a/nixos/machines/bencbox.nix +++ b/nixos/machines/bencbox.nix @@ -8,10 +8,10 @@ sublime vlc ]; - modules.desktop.enable = false; - modules.plasma.enable = false; + myModules.desktop.enable = false; + myModules.plasma.enable = false; imalison.nixOverlay.enable = false; - modules.wsl.enable = true; + myModules.wsl.enable = true; networking.hostName = "bencbox"; diff --git a/nixos/machines/biskcomp.nix b/nixos/machines/biskcomp.nix index 091a3643..f8e19162 100644 --- a/nixos/machines/biskcomp.nix +++ b/nixos/machines/biskcomp.nix @@ -13,25 +13,25 @@ in extraGroups = ["syncthing"]; }; - modules.raspberry-pi.enable = true; + myModules.raspberry-pi.enable = true; - modules.base.enable = true; - modules.desktop.enable = true; - modules.xmonad.enable = false; - modules.extra.enable = false; - modules.code.enable = true; - modules.games.enable = false; - modules.syncthing.enable = true; - modules.fonts.enable = true; - modules.nixified-ai.enable = false; - modules.cache-server = { + myModules.base.enable = true; + myModules.desktop.enable = true; + myModules.xmonad.enable = false; + myModules.extra.enable = false; + myModules.code.enable = true; + myModules.games.enable = false; + myModules.syncthing.enable = true; + myModules.fonts.enable = true; + myModules.nixified-ai.enable = false; + myModules.cache-server = { enable = false; host-string = biskcomp-nginx-hostnames; port = 80; path = "/nix-cache"; }; - modules.gitea.enable = true; - modules.gitea-runner.enable = false; + myModules.gitea.enable = true; + myModules.gitea-runner.enable = false; services.vaultwarden = { enable = true; diff --git a/nixos/machines/david-blade.nix b/nixos/machines/david-blade.nix index bd1de27e..6a1871f3 100644 --- a/nixos/machines/david-blade.nix +++ b/nixos/machines/david-blade.nix @@ -5,15 +5,15 @@ ../configuration.nix ]; - modules.base.enable = true; - modules.desktop.enable = true; - modules.xmonad.enable = false; - modules.extra.enable = false; - modules.code.enable = true; - modules.games.enable = false; - modules.syncthing.enable = true; - modules.fonts.enable = true; - modules.nixified-ai.enable = false; + myModules.base.enable = true; + myModules.desktop.enable = true; + myModules.xmonad.enable = false; + myModules.extra.enable = false; + myModules.code.enable = true; + myModules.games.enable = false; + myModules.syncthing.enable = true; + myModules.fonts.enable = true; + myModules.nixified-ai.enable = false; hardware.enableRedistributableFirmware = true; diff --git a/nixos/machines/dean-zephyrus.nix b/nixos/machines/dean-zephyrus.nix index b454f41a..fc417fe8 100644 --- a/nixos/machines/dean-zephyrus.nix +++ b/nixos/machines/dean-zephyrus.nix @@ -5,10 +5,10 @@ ]; services.xserver.enable = true; environment.systemPackages = with pkgs; [sublime]; - modules.desktop.enable = false; - modules.plasma.enable = false; + myModules.desktop.enable = false; + myModules.plasma.enable = false; imalison.nixOverlay.enable = false; - modules.wsl.enable = true; + myModules.wsl.enable = true; networking.hostName = "dean-zephyrus"; diff --git a/nixos/machines/jay-lenovo-wsl.nix b/nixos/machines/jay-lenovo-wsl.nix index 777c4ada..3b028a88 100644 --- a/nixos/machines/jay-lenovo-wsl.nix +++ b/nixos/machines/jay-lenovo-wsl.nix @@ -5,7 +5,7 @@ ]; imalison.nixOverlay.enable = false; - modules.wsl.enable = true; + myModules.wsl.enable = true; networking.hostName = "jay-lenovo-wsl"; diff --git a/nixos/machines/jay-lenovo.nix b/nixos/machines/jay-lenovo.nix index 47099484..be300230 100644 --- a/nixos/machines/jay-lenovo.nix +++ b/nixos/machines/jay-lenovo.nix @@ -27,7 +27,7 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - modules.postgres.enable = true; + myModules.postgres.enable = true; networking.networkmanager.enable = true; diff --git a/nixos/machines/jimi-hendnix.nix b/nixos/machines/jimi-hendnix.nix index 8b81c869..1becd7e0 100644 --- a/nixos/machines/jimi-hendnix.nix +++ b/nixos/machines/jimi-hendnix.nix @@ -5,17 +5,17 @@ ../configuration.nix ]; - modules.base.enable = true; - modules.desktop.enable = true; - modules.xmonad.enable = true; - modules.extra.enable = false; - modules.code.enable = true; - modules.games.enable = false; - modules.syncthing.enable = true; - modules.fonts.enable = true; - modules.nixified-ai.enable = false; - modules.gitea-runner.enable = true; - modules.postgres.enable = true; + myModules.base.enable = true; + myModules.desktop.enable = true; + myModules.xmonad.enable = true; + myModules.extra.enable = false; + myModules.code.enable = true; + myModules.games.enable = false; + myModules.syncthing.enable = true; + myModules.fonts.enable = true; + myModules.nixified-ai.enable = false; + myModules.gitea-runner.enable = true; + myModules.postgres.enable = true; hardware.enableRedistributableFirmware = true; diff --git a/nixos/machines/nixquick.nix b/nixos/machines/nixquick.nix index a5e1be14..8a712d79 100644 --- a/nixos/machines/nixquick.nix +++ b/nixos/machines/nixquick.nix @@ -5,13 +5,13 @@ ]; features.full.enable = true; - modules.cache-server = { + myModules.cache-server = { enable = true; port = 3090; }; - modules.gitea-runner.enable = true; - modules.vscode.enable = true; - modules.kat.enable = true; + myModules.gitea-runner.enable = true; + myModules.vscode.enable = true; + myModules.kat.enable = true; networking.hostName = "nixquick"; diff --git a/nixos/machines/railbird-sf.nix b/nixos/machines/railbird-sf.nix index 27db6445..7181f91e 100644 --- a/nixos/machines/railbird-sf.nix +++ b/nixos/machines/railbird-sf.nix @@ -55,15 +55,15 @@ }; features.full.enable = false; - modules.base.enable = true; - modules.desktop.enable = true; - modules.xmonad.enable = false; - modules.gnome.enable = true; - modules.code.enable = true; - modules.syncthing.enable = true; - modules.fonts.enable = true; - modules.plasma.enable = false; - modules.gitea-runner.enable = true; + myModules.base.enable = true; + myModules.desktop.enable = true; + myModules.xmonad.enable = false; + myModules.gnome.enable = true; + myModules.code.enable = true; + myModules.syncthing.enable = true; + myModules.fonts.enable = true; + myModules.plasma.enable = false; + myModules.gitea-runner.enable = true; fileSystems."/" = { device = "/dev/disk/by-uuid/a317d456-6f84-41ee-a149-8e466e414aae"; diff --git a/nixos/machines/ryzen-shine.nix b/nixos/machines/ryzen-shine.nix index 2df83ec3..7799fe99 100644 --- a/nixos/machines/ryzen-shine.nix +++ b/nixos/machines/ryzen-shine.nix @@ -7,13 +7,13 @@ features.full.enable = true; # Needed for now because monitors have different refresh rates - modules.xmonad.picom.vSync.enable = false; - modules.cache-server = { + myModules.xmonad.picom.vSync.enable = false; + myModules.cache-server = { enable = true; port = 3090; }; - modules.gitea-runner.enable = true; - modules.postgres.enable = true; + myModules.gitea-runner.enable = true; + myModules.postgres.enable = true; boot.loader.systemd-boot.configurationLimit = 5; diff --git a/nixos/machines/strixi-minaj-wsl.nix b/nixos/machines/strixi-minaj-wsl.nix index 3f89e025..d6913966 100644 --- a/nixos/machines/strixi-minaj-wsl.nix +++ b/nixos/machines/strixi-minaj-wsl.nix @@ -4,7 +4,7 @@ ../configuration.nix ]; - modules.wsl.enable = true; + myModules.wsl.enable = true; networking.hostName = "strixi-minaj-wsl"; diff --git a/nixos/machines/strixi-minaj.nix b/nixos/machines/strixi-minaj.nix index 93666ba5..8a89106d 100644 --- a/nixos/machines/strixi-minaj.nix +++ b/nixos/machines/strixi-minaj.nix @@ -6,16 +6,16 @@ inputs.nixos-hardware.nixosModules.asus-rog-strix-g834jzr ]; - modules.base.enable = true; - modules.desktop.enable = true; - modules.xmonad.enable = true; - modules.extra.enable = false; - modules.code.enable = true; - modules.games.enable = false; - modules.syncthing.enable = true; - modules.fonts.enable = true; - modules.nixified-ai.enable = false; - modules.gitea-runner.enable = false; + myModules.base.enable = true; + myModules.desktop.enable = true; + myModules.xmonad.enable = true; + myModules.extra.enable = false; + myModules.code.enable = true; + myModules.games.enable = false; + myModules.syncthing.enable = true; + myModules.fonts.enable = true; + myModules.nixified-ai.enable = false; + myModules.gitea-runner.enable = false; hardware.enableRedistributableFirmware = true; diff --git a/nixos/nixified.ai.nix b/nixos/nixified.ai.nix index 3db4d4b9..1513b54b 100644 --- a/nixos/nixified.ai.nix +++ b/nixos/nixified.ai.nix @@ -1,5 +1,5 @@ { inputs, config, specialArgs, ... }: -specialArgs.makeEnable config "modules.nixified-ai" false { +specialArgs.makeEnable config "myModules.nixified-ai" false { imports = [ inputs.nixified-ai.nixosModules.invokeai ]; diff --git a/nixos/options.nix b/nixos/options.nix index d0a009ae..5d3fc5bb 100644 --- a/nixos/options.nix +++ b/nixos/options.nix @@ -1,6 +1,6 @@ { lib, ... }: { options = { - modules.xmonad.picom.vSync.enable = lib.mkOption { + myModules.xmonad.picom.vSync.enable = lib.mkOption { default = true; type = lib.types.bool; }; diff --git a/nixos/plasma.nix b/nixos/plasma.nix index 8858d1c4..1ec32fd9 100644 --- a/nixos/plasma.nix +++ b/nixos/plasma.nix @@ -1,5 +1,5 @@ { config, makeEnable, ... }: -makeEnable config "modules.plasma" true { +makeEnable config "myModules.plasma" true { services.displayManager.sddm.enable = true; services.xserver = { desktopManager.plasma5.enable = true; diff --git a/nixos/postgres.nix b/nixos/postgres.nix index 0718a4f1..942efff7 100644 --- a/nixos/postgres.nix +++ b/nixos/postgres.nix @@ -1,5 +1,5 @@ { pkgs, config, makeEnable, realUsers, ... }: -makeEnable config "modules.postgres" true { +makeEnable config "myModules.postgres" true { services.postgresql = { enable = true; package = pkgs.postgresql_15; diff --git a/nixos/rabbitmq.nix b/nixos/rabbitmq.nix index ba7f8837..478f7c18 100644 --- a/nixos/rabbitmq.nix +++ b/nixos/rabbitmq.nix @@ -1,5 +1,5 @@ { pkgs, config, makeEnable, realUsers, ... }: -makeEnable config "modules.rabbitmq" true { +makeEnable config "myModules.rabbitmq" true { services.rabbitmq = { enable = true; }; diff --git a/nixos/raspberry-pi.nix b/nixos/raspberry-pi.nix index e059846b..099d4701 100644 --- a/nixos/raspberry-pi.nix +++ b/nixos/raspberry-pi.nix @@ -1,6 +1,6 @@ { config, pkgs, inputs, makeEnable, ... }: -makeEnable config "modules.raspberry-pi" false { +makeEnable config "myModules.raspberry-pi" false { imports = [ inputs.nixos-hardware.nixosModules.raspberry-pi-4 ]; diff --git a/nixos/syncthing.nix b/nixos/syncthing.nix index fb07141b..b40af95c 100644 --- a/nixos/syncthing.nix +++ b/nixos/syncthing.nix @@ -21,7 +21,7 @@ let }; allDevices = builtins.attrNames devices; in -makeEnable config "modules.syncthing" true { +makeEnable config "myModules.syncthing" true { system.activationScripts.syncthingPermissions = { text = '' chown -R syncthing:syncthing /var/lib/syncthing diff --git a/nixos/vscode.nix b/nixos/vscode.nix index 0bb0aa43..c32e17a0 100644 --- a/nixos/vscode.nix +++ b/nixos/vscode.nix @@ -1,5 +1,5 @@ { inputs, config, makeEnable, forEachUser, ... }: -makeEnable config "modules.vscode" true { +makeEnable config "myModules.vscode" true { home-manager.users = forEachUser { imports = [inputs.vscode-server.homeModules.default]; services.vscode-server.enable = true; diff --git a/nixos/wsl.nix b/nixos/wsl.nix index 2a3e0e21..05347720 100644 --- a/nixos/wsl.nix +++ b/nixos/wsl.nix @@ -1,13 +1,13 @@ { config, inputs, pkgs, makeEnable, ... }: -makeEnable config "modules.wsl" false { +makeEnable config "myModules.wsl" false { imports = [ inputs.nixos-wsl.nixosModules.wsl ]; - modules.base.enable = false; - modules.desktop.enable = false; - modules.xmonad.enable = false; - modules.plasma.enable = false; + myModules.base.enable = false; + myModules.desktop.enable = false; + myModules.xmonad.enable = false; + myModules.plasma.enable = false; # Update timezone automatically services.tzupdate.enable = true; diff --git a/nixos/xmonad.nix b/nixos/xmonad.nix index d8073f13..b1345444 100644 --- a/nixos/xmonad.nix +++ b/nixos/xmonad.nix @@ -1,5 +1,5 @@ { config, pkgs, inputs, forEachUser, makeEnable, ... }: -makeEnable config "modules.xmonad" true { +makeEnable config "myModules.xmonad" true { nixpkgs.overlays = with inputs; [ xmonad.overlay xmonad-contrib.overlay @@ -25,7 +25,7 @@ makeEnable config "modules.xmonad" true { # Haskell Desktop haskellPackages.xmonad haskellPackages.imalison-xmonad - haskellPackages.notifications-tray-icon + # haskellPackages.notifications-tray-icon haskellPackages.gtk-sni-tray haskellPackages.status-notifier-item haskellPackages.dbus-hslogger @@ -80,7 +80,7 @@ makeEnable config "modules.xmonad" true { services.picom = { enable = true; - vSync = config.modules.xmonad.picom.vSync.enable; + vSync = config.myModules.xmonad.picom.vSync.enable; backend = "glx"; extraArgs = ["--experimental-backends"]; @@ -137,21 +137,21 @@ makeEnable config "modules.xmonad" true { }; }; - systemd.user.services.notifications-tray-icon = { - Unit = { - Description = "Notifications tray icon"; - After = [ "graphical-session-pre.target" "tray.target" ]; - PartOf = [ "graphical-session.target" ]; - }; + # systemd.user.services.notifications-tray-icon = { + # Unit = { + # Description = "Notifications tray icon"; + # After = [ "graphical-session-pre.target" "tray.target" ]; + # PartOf = [ "graphical-session.target" ]; + # }; - Install = { WantedBy = [ "graphical-session.target" ]; }; + # Install = { WantedBy = [ "graphical-session.target" ]; }; - Service = { - ExecStart = "${pkgs.haskellPackages.notifications-tray-icon}/bin/notifications-tray-icon --github-token-pass dfinity-github-api-token"; - Restart = "always"; - RestartSec = 3; - }; - }; + # Service = { + # ExecStart = "${pkgs.haskellPackages.notifications-tray-icon}/bin/notifications-tray-icon --github-token-pass dfinity-github-api-token"; + # Restart = "always"; + # RestartSec = 3; + # }; + # }; systemd.user.services.shutter = { Unit = {