feat: jenkins + darwin (and linting)

flake.lock

@@ -534,6 +534,26 @@
         "type": "github"
       }
     },
+    "nix-darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729579044,
+        "narHash": "sha256-0kEUVl5s8LHbK4/xEePflsdYVwG+RRFSIofSvITYmIU=",
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "rev": "64d9d1ae25215c274c37e3e4016977a6779cf0d3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
     "nix-filter": {
       "locked": {
         "lastModified": 1710156097,
@@ -1069,6 +1089,7 @@
         "impermanence": "impermanence",
         "lanzaboote": "lanzaboote",
         "nix-alien": "nix-alien",
+        "nix-darwin": "nix-darwin",
         "nix-index-database": "nix-index-database_2",
         "nix-on-droid": "nix-on-droid",
         "nixgl": "nixgl",

flake.nix

@@ -84,8 +84,8 @@
     };
     
     disko = {
-      url = "github:nix-community/disko";
-      inputs.nixpkgs.follows = "nixpkgs";
+       url =  "github:nix-community/disko";
+       inputs.nixpkgs.follows = "nixpkgs";
     };
     
     impermanence.url = "github:nix-community/impermanence";
@@ -98,6 +98,12 @@
       url = "github:TamtamHero/fw-fanctrl/packaging/nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    
+    nix-darwin = {
+      url = "github:lnl7/nix-darwin";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    
   };
 
   outputs =
@@ -105,6 +111,7 @@
     , nixpkgs
     , nixpkgs-stable
     , home-manager
+    , nix-darwin
     , systems
     , ...
     }:
@@ -251,11 +258,22 @@
 
       homeConfigurations = {
          
-        "swarsel@home-manager" = inputs.home-manager.lib.homeManagerConfiguration {
+         "swarsel@home-manager" = inputs.home-manager.lib.homeManagerConfiguration {
           pkgs = pkgsFor.x86_64-linux;
           extraSpecialArgs = { inherit inputs outputs; };
-          modules = homeModules ++ mixedModules ++ [
-            ./profiles/home-manager
+           modules = homeModules ++ mixedModules ++ [
+             ./profiles/home-manager
+           ];
+         };
+         
+      };
+
+      darwinConfigurations = {
+        
+        "nbm-imba-166" = inputs.nix-darwin.lib.darwinSystem {
+         specialArgs = { inherit inputs outputs; };
+          modules = [
+            ./profiles/nbm-imba-166
           ];
         };
         
@@ -264,7 +282,7 @@
       nixOnDroidConfigurations = {
         
         mysticant = inputs.nix-on-droid.lib.nixOnDroidConfiguration {
-          pkgs = pkgsFor.aarch64-linux;
+         pkgs = pkgsFor.aarch64-linux;
           modules = [
             ./profiles/mysticant
           ];

modules/home/darwin.nix

@@ -0,0 +1,4 @@
+{ lib, config, ... }:
+{
+  options.swarselsystems.isDarwin = lib.mkEnableOption "darwin host";
+}

modules/home/default.nix

@@ -4,6 +4,7 @@
   monitors = import ./monitors.nix;
   input = import ./input.nix;
   nixos = import ./nixos.nix;
+  darwin = import ./darwin.nix;
   waybar = import ./waybar.nix;
   startup = import ./startup.nix;
   wallpaper = import ./wallpaper.nix;

modules/nixos/input.nix

@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ lib, ... }:
 let
   inherit (lib) mkOption types;
 in

modules/nixos/setup.nix

@@ -23,4 +23,5 @@ in
   options.swarselsystems.server.syncthing = lib.mkEnableOption "enable syncthing on server";
   options.swarselsystems.server.restic = lib.mkEnableOption "enable restic backups on server";
   options.swarselsystems.server.monitoring = lib.mkEnableOption "enable monitoring on server";
+  options.swarselsystems.server.jenkins = lib.mkEnableOption "enable jenkins on server";
 }

overlays/default.nix

@@ -1,6 +1,6 @@
 { inputs, ... }: {
   additions = final: _prev: import ../pkgs { pkgs = final; };
-  modifications = final: _prev: {
+  modifications = _: _prev: {
     vesktop = _prev.vesktop.override {
       withSystemVencord = true;
     };
@@ -41,7 +41,7 @@
     };
   };
 
-  zjstatus = final: _prev: {
+  zjstatus = _: _prev: {
     zjstatus = inputs.zjstatus.packages.${_prev.system}.default;
   };
 

pkgs/check/default.nix

@@ -1,7 +0,0 @@
-{ writeShellApplication, kitty, element-desktop-wayland, discord, spotify-player, sway, jq }:
-
-writeShellApplication {
-  name = "swarselcheck";
-  runtimeInputs = [ jq ];
-  text = builtins.readFile ../../scripts/check.sh;
-}

pkgs/fs-diff/default.nix

@@ -1,4 +1,4 @@
-{ writeShellApplication, sway }:
+{ writeShellApplication }:
 
 writeShellApplication {
   name = "fs-diff";

pkgs/pass-fuzzel-otp/default.nix

@@ -1,7 +0,0 @@
-{ writeShellApplication, libnotify, pass, fuzzel, wtype }:
-
-writeShellApplication {
-  name = "pass-fuzzel-otp";
-  runtimeInputs = [ fuzzel (pass.withExtensions (exts: [ exts.pass-otp ])) ];
-  text = builtins.readFile ../../scripts/pass-fuzzel-otp.sh;
-}

pkgs/swarselcheck/default.nix

@@ -1,4 +1,4 @@
-{ writeShellApplication, kitty, element-desktop-wayland, vesktop, spotify-player, sway, jq }:
+{ writeShellApplication, kitty, element-desktop-wayland, vesktop, spotify-player, jq }:
 
 writeShellApplication {
   name = "swarselcheck";

profiles/common/home/sway.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 let
   inherit (config.swarselsystems) monitors;
   eachMonitor = _name: monitor: {

profiles/common/home/symlink.nix

@@ -24,7 +24,7 @@ _:
     };
   };
 
-  xdg.configFile = {
+xdg.configFile = {
     "tridactyl/tridactylrc".source = ../../../programs/firefox/tridactyl/tridactylrc;
     "tridactyl/themes/base16-codeschool.css".source = ../../../programs/firefox/tridactyl/themes/base16-codeschool.css;
   };

profiles/common/home/waybar.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 {
   programs.waybar = {
 

profiles/common/home/zellij.nix

@@ -1,36 +1,37 @@
-{ pkgs, config, ... }:
-let
-  inherit (config.lib.stylix) colors;
-  sesh = pkgs.writeScriptBin "sesh" ''
-    #! /usr/bin/env sh
+_:
+# { pkgs, config, ... }:
+# let
+# inherit (config.lib.stylix) colors;
+#   sesh = pkgs.writeScriptBin "sesh" ''
+#     #! /usr/bin/env sh
 
-    # Taken from https://github.com/zellij-org/zellij/issues/884#issuecomment-1851136980
-    # select a directory using zoxide
-    ZOXIDE_RESULT=$(zoxide query --interactive)
-    # checks whether a directory has been selected
-    if [[ -z "$ZOXIDE_RESULT" ]]; then
-    	# if there was no directory, select returns without executing
-    	exit 0
-    fi
-    # extracts the directory name from the absolute path
-    SESSION_TITLE=$(echo "$ZOXIDE_RESULT" | sed 's#.*/##')
+#     # Taken from https://github.com/zellij-org/zellij/issues/884#issuecomment-1851136980
+#     # select a directory using zoxide
+#     ZOXIDE_RESULT=$(zoxide query --interactive)
+#     # checks whether a directory has been selected
+#     if [[ -z "$ZOXIDE_RESULT" ]]; then
+#     	# if there was no directory, select returns without executing
+#     	exit 0
+#     fi
+#     # extracts the directory name from the absolute path
+#     SESSION_TITLE=$(echo "$ZOXIDE_RESULT" | sed 's#.*/##')
 
-    # get the list of sessions
-    SESSION_LIST=$(zellij list-sessions -n | awk '{print $1}')
+#     # get the list of sessions
+#     SESSION_LIST=$(zellij list-sessions -n | awk '{print $1}')
 
-    # checks if SESSION_TITLE is in the session list
-    if echo "$SESSION_LIST" | grep -q "^$SESSION_TITLE$"; then
-    	# if so, attach to existing session
-    	zellij attach "$SESSION_TITLE"
-    else
-    	# if not, create a new session
-    	echo "Creating new session $SESSION_TITLE and CD $ZOXIDE_RESULT"
-    	cd $ZOXIDE_RESULT
-    	zellij attach -c "$SESSION_TITLE"
-    fi
-  '';
+#     # checks if SESSION_TITLE is in the session list
+#     if echo "$SESSION_LIST" | grep -q "^$SESSION_TITLE$"; then
+#     	# if so, attach to existing session
+#     	zellij attach "$SESSION_TITLE"
+#     else
+#     	# if not, create a new session
+#     	echo "Creating new session $SESSION_TITLE and CD $ZOXIDE_RESULT"
+#     	cd $ZOXIDE_RESULT
+#     	zellij attach -c "$SESSION_TITLE"
+#     fi
+#   '';
 
-in
+# in
 {
   programs.zellij = {
     enable = true;

profiles/common/nixos/lid.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+_:
 {
   services.logind = {
     lidSwitch = "suspend";

profiles/common/nixos/networkdevices.nix

@@ -6,25 +6,25 @@
     extraBackends = [ pkgs.sane-airscan ];
   };
 
-  # enable discovery and usage of network devices (esp. printers)
-  services.printing = {
-    enable = true;
-    drivers = [
-      pkgs.gutenprint
-      pkgs.gutenprintBin
-    ];
-    browsedConf = ''
-      BrowseDNSSDSubTypes _cups,_print
-      BrowseLocalProtocols all
-      BrowseRemoteProtocols all
-      CreateIPPPrinterQueues All
-      BrowseProtocols all
-    '';
-  };
+# enable discovery and usage of network devices (esp. printers)
+services.printing = {
+  enable = true;
+  drivers = [
+    pkgs.gutenprint
+    pkgs.gutenprintBin
+  ];
+  browsedConf = ''
+    BrowseDNSSDSubTypes _cups,_print
+    BrowseLocalProtocols all
+    BrowseRemoteProtocols all
+    CreateIPPPrinterQueues All
+    BrowseProtocols all
+  '';
+};
 
-  services.avahi = {
-    enable = true;
-    nssmdns4 = true;
-    openFirewall = true;
-  };
+services.avahi = {
+  enable = true;
+  nssmdns4 = true;
+  openFirewall = true;
+};
 }

profiles/common/nixos/zsh.nix

@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }:
+{ pkgs, ... }:
 {
   programs.zsh.enable = true;
   users.defaultUserShell = pkgs.zsh;

profiles/nbl-imba-2/hardware-configuration.nix

@@ -1,7 +1,7 @@
 # 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, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
   imports =

profiles/nbm-imba-166/default.nix

@@ -0,0 +1,37 @@
+{ inputs, outputs, config, pkgs, lib, ... }:
+{
+
+  imports = [
+    inputs.home-manager.darwinModules.home-manager
+    {
+      home-manager.useGlobalPkgs = true;
+      home-manager.useUserPackages = true;
+      home-manager.users."leon.schwarzaeugl".imports = [
+      ] ++ (builtins.attrValues outputs.homeManagerModules);
+    }
+  ] ++ (builtins.attrValues outputs.nixosModules);
+
+  nix.settings.experimental-features = "nix-command flakes";
+  nixpkgs = {
+    hostPlatform = "x86_64-darwin";
+    inherit (outputs) overlays;
+    config = {
+      allowUnfree = true;
+    };
+  };
+
+  # Auto upgrade nix package and the daemon service.
+  services.nix-daemon.enable = true;
+  services.karabiner-elements.enable = true;
+
+  home-manager.users."leon.schwarzaeugl".home.stateVersion = "23.05";
+  home-manager.users."leon.schwarzaeugl".swarselsystems = {
+    isDarwin = true;
+    isLaptop = true;
+    isNixos = false;
+    isBtrfs = false;
+  };
+
+  system.stateVersion = 4;
+
+}

profiles/optional/nixos/work.nix

@@ -26,10 +26,12 @@
     zsh.shellInit = ''
       export CLAD="$(cat ${config.sops.secrets.clad.path})"
       export DCAD="$(cat ${config.sops.secrets.dcad.path})"
+      export GOVC_PASSWORD="$(cat ${config.sops.secrets.dcad.path})"
       export WSAD="$(cat ${config.sops.secrets.wsad.path})"
       export IMBAD="$(cat ${config.sops.secrets.imbad.path})"
       export DCUSER="dc_adm_schwarzaeugl@IMP.UNIVIE.AC.AT"
-      export PACKER_SSH_EXTRA_ARGS='"--scp-extra-args"',"\"'-O'\""
+      export GOVC_USERNAME="dc_adm_schwarzaeugl@IMP.UNIVIE.AC.AT"
+      export PACKER_SSH_EXTRA_ARGS='"--scp-extra-args","'-O'"'
     '';
 
     browserpass.enable = true;
@@ -53,6 +55,7 @@
     gnumake
     libisoburn
     govc
+    terraform
   ];
 
 
@@ -60,7 +63,7 @@
     openssh = {
       enable = true;
       extraConfig = ''
-      '';
+        '';
     };
 
     syncthing = {

profiles/server/common/default.nix

@@ -26,6 +26,7 @@
     ./syncthing.nix
     ./restic.nix
     ./monitoring.nix
+    ./jenkins.nix
   ];
 
   nix =

profiles/server/common/immich.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ lib, config, ... }:
 {
   config = lib.mkIf config.swarselsystems.server.immich {
 

profiles/server/common/jenkins.nix

@@ -0,0 +1,35 @@
+{ pkgs, lib, config, ... }:
+{
+  config = lib.mkIf config.swarselsystems.server.jenkins {
+
+    services.jenkins = {
+      enable = true;
+      withCLI = true;
+      port = 8088;
+      packages = [ pkgs.stdenv pkgs.git pkgs.jdk17 config.programs.ssh.package pkgs.nix ];
+      listenAddress = "127.0.0.1";
+      home = "/Vault/apps/jenkins";
+    };
+
+
+
+    services.nginx = {
+      virtualHosts = {
+        "servant.swarsel.win" = {
+          enableACME = true;
+          forceSSL = true;
+          acmeRoot = null;
+          locations = {
+            "/" = {
+              proxyPass = "http://localhost:8088";
+              extraConfig = ''
+                client_max_body_size 0;
+              '';
+            };
+          };
+        };
+      };
+    };
+  };
+
+}

profiles/server/common/matrix.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, modulesPath, sops, ... }:
+{ config, lib, pkgs, sops, ... }:
 let
   matrixDomain = "swatrix.swarsel.win";
   baseUrl = "https://${matrixDomain}";

profiles/server/common/monitoring.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ lib, config, ... }:
 {
   config = lib.mkIf config.swarselsystems.server.monitoring {
 

profiles/server/common/nfs.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ pkgs, ... }:
 {
   services = {
     # add a user with sudo smbpasswd -a <user>

profiles/server/common/paperless.nix

@@ -1,6 +1,6 @@
-{ pkgs, lib, config, ... }:
+{ lib, config, ... }:
 {
-  config = lib.mkIf config.swarselsystems.server.immich {
+  config = lib.mkIf config.swarselsystems.server.paperless {
 
     users.users.paperless = {
       extraGroups = [ "users" ];

profiles/server/common/restic.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ lib, config, ... }:
 {
   config = lib.mkIf config.swarselsystems.server.restic {
 

profiles/server/common/sfs.nix

@@ -1,53 +0,0 @@
-{ pkgs, lib, config, ... }:
-{
-
-  # Network shares
-  # add a user with sudo smbpasswd -a <user>
-  samba = {
-    package = pkgs.samba4Full;
-    extraConfig = ''
-      workgroup = WORKGROUP
-      server role = standalone server
-      dns proxy = no
-
-      pam password change = yes
-      map to guest = bad user
-      create mask = 0664
-      force create mode = 0664
-      directory mask = 0775
-      force directory mode = 0775
-      follow symlinks = yes
-    '';
-
-    # ^^ `samba4Full` is compiled with avahi, ldap, AD etc support compared to the default package, `samba`
-    # Required for samba to register mDNS records for auto discovery
-    # See https://github.com/NixOS/nixpkgs/blob/592047fc9e4f7b74a4dc85d1b9f5243dfe4899e3/pkgs/top-level/all-packages.nix#L27268
-    enable = true;
-    # openFirewall = true;
-    shares.Eternor = {
-      browseable = "yes";
-      "read only" = "no";
-      "guest ok" = "no";
-      path = "/Vault/Eternor";
-      writable = "true";
-      comment = "Eternor";
-      "valid users" = "@Swarsel";
-    };
-  };
-
-
-  avahi = {
-    publish.enable = true;
-    publish.userServices = true;
-    # ^^ Needed to allow samba to automatically register mDNS records without the need for an `extraServiceFile`
-    nssmdns4 = true;
-    # ^^ Not one hundred percent sure if this is needed- if it aint broke, don't fix it
-    enable = true;
-  };
-
-  samba-wsdd = {
-    # This enables autodiscovery on windows since SMB1 (and thus netbios) support was discontinued
-    enable = true;
-  };
-};
-}

profiles/server/common/sops.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ config, ... }:
 {
   sops = {
     age.sshKeyPaths = [ "/etc/ssh/sops" ];

profiles/server/common/spotifyd.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ lib, config, ... }:
 {
   config = lib.mkIf config.swarselsystems.server.spotifyd {
     users.groups.spotifyd = {

profiles/server/common/syncthing.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ lib, config, ... }:
 {
   config = lib.mkIf config.swarselsystems.server.syncthing {
 

profiles/server/common/zfs.nix

@@ -1,2 +0,0 @@
-{ pkgs, lib, config, ... }:
-{ }

profiles/server/nbm-imba-166/default.nix

@@ -0,0 +1,36 @@
+{ inputs, outputs, config, pkgs, lib, ... }:
+{
+
+  imports = [
+    inputs.home-manager.darwinModules.home-manager
+    {
+      home-manager.useGlobalPkgs = true;
+      home-manager.useUserPackages = true;
+      home-manager.users."leon.schwarzaeugl".imports = [
+        ../../common/home/emacs.nix
+      ] ++ (builtins.attrValues outputs.homeManagerModules);
+    }
+  ] ++ (builtins.attrValues outputs.nixosModules);
+
+  nix.settings.experimental-features = "nix-command flakes";
+  nixpkgs = {
+    inherit (outputs) overlays;
+    config = {
+      allowUnfree = true;
+    };
+  };
+
+  # Auto upgrade nix package and the daemon service.
+  services.nix-daemon.enable = true;
+  services.karabiner-elements.enable = true;
+
+  home-manager.users."leon.schwarzaeugl".swarselsystems = {
+    isDarwin = true;
+    isLaptop = true;
+    isNixos = false;
+    isBtrfs = false;
+  };
+
+  system.stateVersion = 4;
+
+}

profiles/server/winters/default.nix

@@ -1,4 +1,4 @@
-{ inputs, outputs, config, pkgs, lib, ... }:
+{ inputs, outputs, config, ... }:
 {
 
   imports = [
@@ -54,6 +54,7 @@
       transmission = true;
       syncthing = true;
       monitoring = true;
+      jenkins = false;
     };
   };
 

profiles/server/winters/hardware-configuration.nix

@@ -1,7 +1,7 @@
 # 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, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
   imports =

programs/emacs/init.el

@@ -179,17 +179,19 @@ create a new one."
     (shell-command "nixpkgs-fmt . > /dev/null")))
 
   (defun swarsel/org-babel-tangle-config ()
+  (interactive)
     (when (string-equal (buffer-file-name)
                         swarsel-swarsel-org-filepath)
       ;; Dynamic scoping to the rescue
       (let ((org-confirm-babel-evaluate nil))
         ;; (org-html-export-to-html)
         (org-babel-tangle)
-        (swarsel/run-formatting))))
+        ;; (swarsel/run-formatting)
+        )))
 
   (setq org-html-htmlize-output-type nil)
 
-  (add-hook 'org-mode-hook (lambda () (add-hook 'after-save-hook #'swarsel/org-babel-tangle-config)))
+  ;; (add-hook 'org-mode-hook (lambda () (add-hook 'after-save-hook #'swarsel/org-babel-tangle-config)))
 
 (defun org-fold-outer ()
   (interactive)
@@ -976,17 +978,19 @@ create a new one."
 
 (setq org-fold-core-style 'overlays)
 
-(org-babel-do-load-languages
- 'org-babel-load-languages
- '((emacs-lisp . t)
-   (python . t)
-   (js . t)
-   (shell . t)
-   ))
+(setq org-src-preserve-indentation nil)
 
-(push '("conf-unix" . conf-unix) org-src-lang-modes)
+  (org-babel-do-load-languages
+   'org-babel-load-languages
+   '((emacs-lisp . t)
+     (python . t)
+     (js . t)
+     (shell . t)
+     ))
 
-(setq org-export-with-broken-links 'mark)
+  (push '("conf-unix" . conf-unix) org-src-lang-modes)
+
+  (setq org-export-with-broken-links 'mark)
 
 (require 'org-tempo)
 (add-to-list 'org-structure-template-alist '("sh" . "src shell"))
@@ -1526,6 +1530,13 @@ create a new one."
 
 (defalias 'start-lsp-server #'eglot)
 
+(use-package sideline-flymake
+  :hook (flymake-mode . sideline-mode)
+  :init
+  (setq sideline-flymake-display-mode 'point) ; 'point to show errors only on point
+                                              ; 'line to show errors on the current line
+  (setq sideline-backends-right '(sideline-flymake)))
+
 (use-package breadcrumb
   ;; :config (breadcrumb-mode)
   )