formatting

modules/home/bundles/core.nix

@@ -6,7 +6,6 @@
   ...
 }: {
   imports = [
-    inputs.nixvim.homeManagerModules.nixvim
   ];
 
   nixpkgs.config = {
@@ -51,7 +50,6 @@
     EDITOR = "nvim";
   };
 
-  # programs.neovim.enable = true;
-  # programs.neovim.defaultEditor = true;
-  programs.nixvim.enable = true;
+  programs.neovim.enable = true;
+  programs.neovim.defaultEditor = true;
 }

modules/home/bundles/desktop.nix

@@ -14,7 +14,7 @@
   ];
 
   programs.firefox = {
-    enable = true; 
+    enable = true;
   };
 
   # TODO: fill this out (and move it in a service, probably)

modules/home/bundles/graphicDesign.nix

@@ -11,5 +11,7 @@
     inkscape-with-extensions
     gimp
     krita
+
+    xournalpp
   ];
 }

modules/home/default.nix

@@ -1,5 +1,5 @@
-{ 
-  pkgs, 
+{
+  pkgs,
   system,
   inputs,
   config,
@@ -31,13 +31,12 @@
       configExtension = config: (lib.mkIf cfg.bundles.${name}.enable config);
     })
     (helperLib.filesIn ./bundles);
-
 in {
-  imports = [
-  ]
-  # ++ features
-  ++ bundles
-  ;
+  imports =
+    [
+    ]
+    # ++ features
+    ++ bundles;
 
   config = {
     myHomeManager = {

modules/nixOS/bundles/core/sops.nix

@@ -18,7 +18,7 @@ in {
 
     age = {
       # automatically import host SSH keys as age keys
-      sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
+      sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
       # this will use an age key that is expected to already be in the filesystem
       keyFile = "/var/lib/sops-nix/key.txt";
       # generate a new key if the key specified above does not exist
@@ -34,4 +34,3 @@ in {
     sops
   ];
 }
-

modules/nixOS/bundles/users.nix

@@ -1,7 +1,7 @@
 {
   lib,
   config,
-  inputs, 
+  inputs,
   outputs,
   helperLib,
   pkgs,
@@ -10,7 +10,7 @@
   cfg = config.myNixOS;
 in {
   options.myNixOS.home-users = lib.mkOption {
-    type = lib.types.attrsOf ( lib.types.submodule {
+    type = lib.types.attrsOf (lib.types.submodule {
       options = {
         userConfig = lib.mkOption {
           example = "home.nix";
@@ -37,13 +37,13 @@ in {
         outputs = inputs.self.outputs;
       };
 
-      users = 
+      users =
         builtins.mapAttrs (name: user: {...}: {
           imports = [
             (import user.userConfig)
             outputs.homeManagerModules.default
           ];
-        }) 
+        })
         (config.myNixOS.home-users);
     };
 

modules/nixOS/default.nix

@@ -1,19 +1,19 @@
-{ 
-  pkgs, 
+{
+  pkgs,
   config,
-  lib, 
-  inputs, 
-  outputs, 
+  lib,
+  inputs,
+  outputs,
   helperLib,
   ...
 }: let
   cfg = config.myNixOS;
 
   # Taking all modules in ./features and adding enables to them
-  features = 
+  features =
     helperLib.extendModules
-    (name: { 
-      extraOptions = { 
+    (name: {
+      extraOptions = {
         myNixOS.${name}.enable = lib.mkEnableOption "enable my ${name} configuration";
       };
 
@@ -22,7 +22,7 @@
     (helperLib.filesIn ./features);
 
   # taking all module bundles in ./bundles and adding bundle.enables to them
-  bundles = 
+  bundles =
     helperLib.extendModules
     (name: {
       extraOptions = {
@@ -34,7 +34,7 @@
     (helperLib.filesIn ./bundles);
 
   # taking all module services in ./services and adding service.enables to them
-  services = 
+  services =
     helperLib.extendModules
     (name: {
       extraOptions = {
@@ -45,14 +45,13 @@
     })
     (helperLib.filesIn ./services);
 in {
-  imports = 
-  [
-    inputs.home-manager.nixosModules.home-manager
-  ]
-  ++ features
-  ++ bundles
-  ++ services
-  ;
+  imports =
+    [
+      inputs.home-manager.nixosModules.home-manager
+    ]
+    ++ features
+    ++ bundles
+    ++ services;
 
   options.myNixOS = {
     sharedSettings = {
@@ -68,7 +67,6 @@ in {
     };
   };
 
-
   config = {
     nix.settings.experimental-features = ["nix-command" "flakes"];
     programs.nix-ld.enable = true;
@@ -81,7 +79,6 @@ in {
       defaultLocale.enable = lib.mkDefault true;
     };
   };
-
 }
 #   imports = [
 #     ./neo.nix
@@ -95,3 +92,4 @@ in {
 #   pipewire.enable = lib.mkDefault true;
 #   pipewire.useJack = lib.mkDefault false;
 # }
+

modules/nixOS/features/defaultLocale.nix

@@ -1,4 +1,9 @@
-{ pkgs, lib, config, ...}: {
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
   config = {
     time.timeZone = lib.mkDefault "Europe/Berlin";
 

modules/nixOS/services/syncthing/default.nix

@@ -4,13 +4,13 @@
   lib,
   inputs,
   ...
-  }: let
-    webGuiPort = [ 8384 ];
-    cfg = config;
-    secretsFile = "../../../secrets/secrets.json";
-    secretsSet = builtins.fromJSON (builtins.readFile ./${secretsFile});
-    devices = builtins.attrNames secretsSet.syncthing.devices;
-  in {
+}: let
+  webGuiPort = [8384];
+  cfg = config;
+  secretsFile = "../../../secrets/secrets.json";
+  secretsSet = builtins.fromJSON (builtins.readFile ./${secretsFile});
+  devices = builtins.attrNames secretsSet.syncthing.devices;
+in {
   options = {
     rootDir = lib.mkOption {
       type = lib.types.path;
@@ -29,11 +29,11 @@
     overrideFolders = true;
     settings = {
       devices = {
-			  "saintAlphonso"  = { id ="LHASNUO-CXALARH-XI3TU4U-OCULV72-HS3HQ35-P4FECIT-UZ5VMSZ-PMCEPQH"; };
-			  "littleUmbrella" = { id ="BH3OHYP-TGGOSZO-EM6MXRY-YHSBOUO-CQHE7DL-N2LOUFY-TF3LEJ7-FHTGTQI"; };
-			  "pixelRoot"      = { id ="PO7U5SE-DYKTOM2-TFDS3BM-A25VK7V-MQ3VPFM-EFX3J4D-B3UDCX4-3XQAIAC"; };
-			  "pixelDefault"   = { id ="HC3CKC7-OUZBLU3-JIKTRYG-DPJE6EC-7POCWNS-6VNOPDU-L7OWYWO-PL332AY"; };
-			  "pixelGooglor"   = { id ="OWDM4I2-O6STMIS-H3EXF65-FSM26K3-5FLQXRN-VOK7JGC-T6H76IR-QAVO3QK"; };
+        "saintAlphonso" = {id = "LHASNUO-CXALARH-XI3TU4U-OCULV72-HS3HQ35-P4FECIT-UZ5VMSZ-PMCEPQH";};
+        "littleUmbrella" = {id = "BH3OHYP-TGGOSZO-EM6MXRY-YHSBOUO-CQHE7DL-N2LOUFY-TF3LEJ7-FHTGTQI";};
+        "pixelRoot" = {id = "PO7U5SE-DYKTOM2-TFDS3BM-A25VK7V-MQ3VPFM-EFX3J4D-B3UDCX4-3XQAIAC";};
+        "pixelDefault" = {id = "HC3CKC7-OUZBLU3-JIKTRYG-DPJE6EC-7POCWNS-6VNOPDU-L7OWYWO-PL332AY";};
+        "pixelGooglor" = {id = "OWDM4I2-O6STMIS-H3EXF65-FSM26K3-5FLQXRN-VOK7JGC-T6H76IR-QAVO3QK";};
       };
 
       folders = {
@@ -41,7 +41,10 @@
           label = "KeepassXC";
           id = "xd4de-mjfcq";
           devices = ["littleUmbrella" "pixelRoot" "pixelDefault" "pixelGooglor" "saintAlphonso"];
-          versioning = { type = "simple"; params.keep = "5"; };
+          versioning = {
+            type = "simple";
+            params.keep = "5";
+          };
         };
       };
     };
@@ -51,6 +54,6 @@
   # 22000 TCP and/or UDP for sync traffic
   # 21027/UDP for discovery
   # source: https://docs.syncthing.net/users/firewall.html
-  networking.firewall.allowedTCPPorts = [ 8384 22000 ];
-  networking.firewall.allowedUDPPorts = [ 22000 21027 ];
+  networking.firewall.allowedTCPPorts = [8384 22000];
+  networking.firewall.allowedUDPPorts = [22000 21027];
 }