From b47ff20d8068672db5e8eb513f0f8c21a9167d3b Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Thu, 25 Jan 2024 12:23:32 -0600 Subject: [PATCH] reorg --- hosts/algiz/default.nix | 4 ++-- hosts/mannaz/default.nix | 8 -------- hosts/othalan/default.nix | 13 ++++++------- modules/langs/misc.nix | 6 +++--- modules/langs/nim.nix | 6 +++--- modules/langs/node.nix | 6 +++--- modules/langs/python.nix | 6 +++--- modules/langs/tex.nix | 6 +++--- modules/{ => networking}/vpn.nix | 0 modules/{ => virtualization}/docker.nix | 0 .../virtualbox.nix} | 0 modules/{ => window-managers}/hyprland.nix | 0 modules/{ => window-managers}/qtile.nix | 7 +++---- 13 files changed, 26 insertions(+), 36 deletions(-) rename modules/{ => networking}/vpn.nix (100%) rename modules/{ => virtualization}/docker.nix (100%) rename modules/{virtualization.nix => virtualization/virtualbox.nix} (100%) rename modules/{ => window-managers}/hyprland.nix (100%) rename modules/{ => window-managers}/qtile.nix (87%) diff --git a/hosts/algiz/default.nix b/hosts/algiz/default.nix index d822027..cc29b5b 100644 --- a/hosts/algiz/default.nix +++ b/hosts/algiz/default.nix @@ -8,8 +8,8 @@ ]; languages = { - nim.enable = true; - python.enable = true; + nim= true; + python= true; }; cli.enable = true; diff --git a/hosts/mannaz/default.nix b/hosts/mannaz/default.nix index fe2330f..e46654b 100644 --- a/hosts/mannaz/default.nix +++ b/hosts/mannaz/default.nix @@ -11,14 +11,6 @@ gui nix-ld - virtualization - ]; - - environment.systemPackages = with pkgs; [ - (vivaldi.override { - proprietaryCodecs = true; - # enableWidevine = true; - }) ]; users = { diff --git a/hosts/othalan/default.nix b/hosts/othalan/default.nix index 004b63c..ac4a810 100644 --- a/hosts/othalan/default.nix +++ b/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; - python.enable = true; - nim.enable = true; - tex.enable = true; - node.enable = true; + misc = true; + python = true; + nim = true; + tex = true; + node = true; }; cli.enable = true; diff --git a/modules/langs/misc.nix b/modules/langs/misc.nix index 81bbbaf..3326cbd 100644 --- a/modules/langs/misc.nix +++ b/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"; - config = mkIf cfg.enable { + options.languages.misc = mkEnableOption "go + rustup"; + config = mkIf cfg.misc { environment.systemPackages = with pkgs; [ go rustup diff --git a/modules/langs/nim.nix b/modules/langs/nim.nix index 0132f27..de7625d 100644 --- a/modules/langs/nim.nix +++ b/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"; - config = mkIf cfg.enable { + options.languages.nim = mkEnableOption "nim"; + config = mkIf cfg.nim { nixpkgs.overlays = [ (import ../../overlays/nim {}) (import ../../overlays/nimlsp {}) diff --git a/modules/langs/node.nix b/modules/langs/node.nix index f1a99e1..d11fac9 100644 --- a/modules/langs/node.nix +++ b/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"; - config = mkIf cfg.enable { + options.languages.node = mkEnableOption "node"; + config = mkIf cfg.node { environment.systemPackages = with pkgs; [ nodejs nodePackages.pnpm diff --git a/modules/langs/python.nix b/modules/langs/python.nix index f4d5c87..7da0c3e 100644 --- a/modules/langs/python.nix +++ b/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"; - config = mkIf cfg.enable { + options.languages.python = mkEnableOption "python"; + 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" '' diff --git a/modules/langs/tex.nix b/modules/langs/tex.nix index a464f8d..1127a32 100644 --- a/modules/langs/tex.nix +++ b/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"; - config = mkIf cfg.enable { + options.languages.tex = mkEnableOption "tex"; + config = mkIf cfg.tex { environment.systemPackages = with pkgs; [ texlive.combined.scheme-full ]; diff --git a/modules/vpn.nix b/modules/networking/vpn.nix similarity index 100% rename from modules/vpn.nix rename to modules/networking/vpn.nix diff --git a/modules/docker.nix b/modules/virtualization/docker.nix similarity index 100% rename from modules/docker.nix rename to modules/virtualization/docker.nix diff --git a/modules/virtualization.nix b/modules/virtualization/virtualbox.nix similarity index 100% rename from modules/virtualization.nix rename to modules/virtualization/virtualbox.nix diff --git a/modules/hyprland.nix b/modules/window-managers/hyprland.nix similarity index 100% rename from modules/hyprland.nix rename to modules/window-managers/hyprland.nix diff --git a/modules/qtile.nix b/modules/window-managers/qtile.nix similarity index 87% rename from modules/qtile.nix rename to modules/window-managers/qtile.nix index 94e1a46..49f3f2f 100644 --- a/modules/qtile.nix +++ b/modules/window-managers/qtile.nix @@ -1,17 +1,16 @@ { - input, + inputs, pkgs, ... }: { - imports = [ - ./lock + imports = with inputs.self.nixosModules; [ + lock ]; # Enable the X11 windowing system. services.xserver = { enable = true; displayManager.startx.enable = true; - desktopManager.plasma5.enable = true; windowManager.qtile.enable = true; };