README.md

@@ -5,12 +5,6 @@ My dotfiles - including my vim, terminal and font config.
 My current setup consists of multiple machines running NixOS.
 This is using flakes for reproducibility and home manager for setting up user-specific things.
 
-
-## generating ssh keys
-```
-ssh-keygen -t ed25519
-```
-
 Workstations are set up by running ` sudo nixos-rebuild switch --flake '.#'` and servers are by `nixos-rebuild switch --flake '.#servername' --target-host root@hostname`.
 I don't use home manager the program, everything is referenced from the top flake.
 

flake.nix

@@ -137,22 +137,17 @@
       "x86_64-linux".default = mkShell nixpkgs-stable "x86_64-linux";
       "aarch64-linux".default = mkShell nixpkgs-stable "aarch64-linux";
     };
-
-    # Expose the package set, including overlays, for convenience.
-    darwinPackages = self.darwinConfigurations."airy".pkgs;
     darwinConfigurations = {
-      "airy" = darwin.lib.darwinSystem rec {
+      "FORM3-CYRYLPLOTN" = darwin.lib.darwinSystem rec {
-        system = "aarch64-darwin";
+        system = "x86_64-darwin";
         modules = [
-          (./. + "/nixos/boxes/airy")
+          (./. + "/nixos/boxes/form3")
-          {users.users.cyryl.home = "/Users/cyryl";}
           home-manager.darwinModules.home-manager
           {
             home-manager = {
               useGlobalPkgs = true;
               useUserPackages = true;
               users.cyryl = {
-                home.homeDirectory = "/Users/cyryl";
                 imports = [./nixos/home-manager];
                 _module.args.inputs = inputs;
                 _module.args.system = system;

nixos/boxes/airy/default.nix

@@ -1,38 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  lib,
-  nixpkgs-nixos-unstable-and-unfree,
-  ...
-}: {
-  imports = [
-    ../../git
-
-    ../../helix
-    ../../mercurial
-    ../../vim
-    ../../zsh
-  ];
-  services.nix-daemon.enable = true;
-
-  nix.settings.experimental-features = "nix-command flakes";
-
-  programs.zsh.enable = true; # default shell on catalina
-
-  system.stateVersion = 4;
-
-  # The platform the configuration will be used on.
-  nixpkgs.hostPlatform = "aarch64-darwin";
-
-  homebrew.enable = true;
-  homebrew.casks = ["firefox"];
-  home-manager.users.cyryl = {...}: {
-    imports = [
-      ../../home-manager/programs/kitty.nix
-    ];
-    home.packages = with pkgs; [];
-    programs = {
-    };
-  };
-}

nixos/boxes/cupsnet/backups.nix

@@ -1,12 +1,9 @@
-{
+{ config, pkgs, ... }:
-  config,
+let
-  pkgs,
-  ...
-}: let
   genericBackupPath = "/var/lib/backups/";
   nixosContainersBackupPath = "/var/lib/nixos-containers/";
 in rec {
-  environment.systemPackages = with pkgs; [restic];
+  environment.systemPackages = with pkgs; [ restic ];
 
   sops.secrets."restic-backups-b2-repo-password" = {
     sopsFile = ./restic.sops.yaml;
@@ -32,7 +29,7 @@ in rec {
         systemctl stop container@foundryvtt.service
         systemctl stop cryptpad.service
         systemctl stop forgejo.service
-        systemctl stop mastodon*
+        systemctl stop mastodon* 
         systemctl stop postgresql.service
       '';
       backupCleanupCommand = ''
@@ -40,11 +37,12 @@ in rec {
         systemctl start forgejo.service
         systemctl start cryptpad.service
         systemctl start container@foundryvtt.service
-        systemctl start --all mastodon*
+        systemctl start --all mastodon* 
       '';
-      timerConfig = {OnCalendar = "daily";};
+      timerConfig = { OnCalendar = "daily"; };
-      environmentFile = "${config.sops.secrets.restic-backups-b2-environment.path}";
+      environmentFile =
-      exclude = ["cache"];
+        "${config.sops.secrets.restic-backups-b2-environment.path}";
+      exclude = [ "cache" ];
       pruneOpts = [
         "--keep-hourly 25"
         "--keep-daily 8"
@@ -52,7 +50,7 @@ in rec {
         "--keep-monthly 13"
         "--keep-yearly 2"
       ];
-      checkOpts = ["--with-cache"];
+      checkOpts = [ "--with-cache" ];
     };
   };
 

nixos/boxes/cupsnet/forgejo.nix

@@ -1,11 +1,5 @@
-{
+{ config, pkgs, inputs, lib, system, ... }:
-  config,
+let
-  pkgs,
-  inputs,
-  lib,
-  system,
-  ...
-}: let
   unstable = inputs.nixpkgs-nixos-unstable;
   package = unstable.legacyPackages."${system}".forgejo;
   httpPort = 8083;
@@ -28,19 +22,20 @@
     };
     groups."${systemGroupName}" = {
       inherit gid;
-      members = ["${systemUserName}" "nginx"];
+      members = [ "${systemUserName}" "nginx" ];
     };
   };
 in {
-  imports = [../nginx.nix "${unstable}/nixos/modules/services/misc/forgejo.nix"];
+  imports =
-  disabledModules = ["services/misc/forgejo.nix"];
+    [ ../nginx.nix "${unstable}/nixos/modules/services/misc/forgejo.nix" ];
+  disabledModules = [ "services/misc/forgejo.nix" ];
 
   inherit users;
 
-  boot.kernel.sysctl = {"net.ipv4.ip_unprivileged_port_start" = 0;};
+  boot.kernel.sysctl = { "net.ipv4.ip_unprivileged_port_start" = 0; };
   systemd.services.systemd-sysctl.enable = lib.mkForce true;
 
-  networking.firewall.allowedTCPPorts = [sshPort];
+  networking.firewall.allowedTCPPorts = [ sshPort ];
   services.nginx = {
     virtualHosts = {
       "${domain}" = {

nixos/common-services.nix

@@ -1,12 +1,8 @@
-{
+{ config, pkgs, ... }: {
-  config,
-  pkgs,
-  ...
-}: {
   console.keyMap = "pl2";
-  imports = [./tailscale];
+  imports = [ ./tailscale ];
   services = {
-    udev.packages = [pkgs.android-udev-rules];
+    udev.packages = [ pkgs.android-udev-rules ];
     ratbagd.enable = true;
 
     gvfs.enable = true;

nixos/gnome/home.nix

@@ -1,15 +1,10 @@
-{
+{ config, pkgs, ... }: {
-  config,
+  services = { };
-  pkgs,
-  ...
-}: {
-  services = {};
 
-  xsession = {enable = false;};
+  xsession = { enable = false; };
 
-  home.sessionVariables = {QT_QPA_PLATFORM = "wayland";};
+  home.sessionVariables = { QT_QPA_PLATFORM = "wayland"; };
-  home.packages =
+  home.packages = (with pkgs; [ gnome-usage gnome3.gnome-tweaks ])
-    (with pkgs; [gnome-usage gnome3.gnome-tweaks])
     ++ (with pkgs.gnomeExtensions; [
       caffeine
       clipboard-indicator
@@ -19,7 +14,7 @@
   dconf.settings = {
     "org/gnome/mutter" = {
       # https://github.com/NixOS/nixpkgs/issues/114514#issuecomment-1177709271
-      experimental-features = ["scale-monitor-framebuffer"];
+      experimental-features = [ "scale-monitor-framebuffer" ];
     };
     "org/gnome/shell" = {
       disable-user-extensions = false;

nixos/home-manager/cli.nix

@@ -1,10 +1,4 @@
-{
+{ config, pkgs, inputs, system, ... }: {
-  config,
-  pkgs,
-  inputs,
-  system,
-  ...
-}: {
   home.packages = with pkgs; [
     (pass.withExtensions (ext: [
       ext.pass-otp
@@ -22,6 +16,7 @@
     bottom
     curl
     dive
+    dmidecode
     dnsutils
     docker-compose
     du-dust
@@ -58,6 +53,7 @@
     unzip
     wget
     wl-clipboard
-    inputs.nixpkgs-nixos-unstable.legacyPackages."${system}".yt-dlp
+    xdotool
+    inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".yt-dlp
   ];
 }

nixos/home-manager/linux.nix

@@ -12,7 +12,6 @@
     atop
     btop
     btrfs-progs
-    dmidecode
     glibcLocales
     hsetroot
     lm_sensors
@@ -25,6 +24,5 @@
     topgrade
     wirelesstools
     woeusb
-    xdotool
   ];
 }

nixos/kde/home.nix

@@ -1,13 +1,11 @@
-{
+{ config, pkgs, ... }: {
-  config,
-  pkgs,
-  ...
-}: {
   services = {
+
     kdeconnect.enable = true;
     kdeconnect.indicator = true;
+
   };
 
-  home.packages = [];
+  home.packages = [ ];
-  dconf.settings = {};
+  dconf.settings = { };
 }