reorg

hosts/algiz/default.nix

@@ -8,8 +8,8 @@
   ];
 
   languages = {
-    nim.enable = true;
+    nim= true;
-    python.enable = true;
+    python= true;
   };
   cli.enable = true;
 

hosts/mannaz/default.nix

@@ -11,14 +11,6 @@
 
     gui
     nix-ld
-    virtualization
-  ];
-
-  environment.systemPackages = with pkgs; [
-    (vivaldi.override {
-      proprietaryCodecs = true;
-      # enableWidevine = true;
-    })
   ];
 
   users = {

hosts/othalan/default.nix

@@ -9,8 +9,7 @@
     #  hyprland
 
     nix-ld
-    virtualization
+    virtualbox
-
     restic
   ];
   programs.hyprland.enable = true;
@@ -18,11 +17,11 @@
   services.vpn.enable = true;
 
   languages = {
-    misc.enable = true;
+    misc = true;
-    python.enable = true;
+    python = true;
-    nim.enable = true;
+    nim = true;
-    tex.enable = true;
+    tex = true;
-    node.enable = true;
+    node = true;
   };
   cli.enable = true;
 

modules/langs/misc.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.languages.misc;
+  cfg = config.languages;
 in {
-  options.languages.misc.enable = mkEnableOption "go + rustup";
+  options.languages.misc = mkEnableOption "go + rustup";
-  config = mkIf cfg.enable {
+  config = mkIf cfg.misc {
     environment.systemPackages = with pkgs; [
       go
       rustup

modules/langs/nim.nix

@@ -6,10 +6,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.languages.nim;
+  cfg = config.languages;
 in {
-  options.languages.nim.enable = mkEnableOption "nim";
+  options.languages.nim = mkEnableOption "nim";
-  config = mkIf cfg.enable {
+  config = mkIf cfg.nim {
     nixpkgs.overlays = [
       (import ../../overlays/nim {})
       (import ../../overlays/nimlsp {})

modules/langs/node.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.languages.node;
+  cfg = config.languages;
 in {
-  options.languages.node.enable = mkEnableOption "node";
+  options.languages.node = mkEnableOption "node";
-  config = mkIf cfg.enable {
+  config = mkIf cfg.node {
     environment.systemPackages = with pkgs; [
       nodejs
       nodePackages.pnpm

modules/langs/python.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.languages.python;
+  cfg = config.languages ;
 in {
-  options.languages.python.enable = mkEnableOption "python";
+  options.languages.python = mkEnableOption "python";
-  config = mkIf cfg.enable {
+  config = mkIf cfg.python {
     environment.systemPackages = with pkgs; [
       # https://github.com/Mic92/nix-ld?tab=readme-ov-file#my-pythonnodejsrubyinterpreter-libraries-do-not-find-the-libraries-configured-by-nix-ld
       (pkgs.writeShellScriptBin "python" ''

modules/langs/tex.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.languages.tex;
+  cfg = config.languages;
 in {
-  options.languages.tex.enable = mkEnableOption "tex";
+  options.languages.tex = mkEnableOption "tex";
-  config = mkIf cfg.enable {
+  config = mkIf cfg.tex {
     environment.systemPackages = with pkgs; [
       texlive.combined.scheme-full
     ];

modules/window-managers/qtile.nix

@@ -1,17 +1,16 @@
 {
-  input,
+  inputs,
   pkgs,
   ...
 }: {
-  imports = [
+  imports = with inputs.self.nixosModules; [
-    ./lock
+    lock
   ];
 
   # Enable the X11 windowing system.
   services.xserver = {
     enable = true;
     displayManager.startx.enable = true;
-    desktopManager.plasma5.enable = true;
     windowManager.qtile.enable = true;
   };