Merge branch 'master' of github.com:aciceri/nixfleet

flake.nix

@@ -168,7 +168,7 @@
               gui = [ sway xdg gtk foot bat ];
               browser = [ firefox chromium qutebrowser tor-browser ];
               multimedia = [ mpv zathura ];
-              dev = [ vim emacs vscode lorri direnv ];
+              dev = [ vim emacs vscode lorri direnv qmk ];
               modelling = [ blender cura ];
             };
           };

hosts/hs/configuration.nix

@@ -165,10 +165,27 @@
       guiAddress = "0.0.0.0:8384";
       dataDir = "/mnt/archivio/syncthing";
       user = "ccr";
+      folders = {
+        "/mnt/archivio/syncthing/camera" = {
+          id = "camera";
+        };
+        "/mnt/archivio/syncthing/orgzly" = {
+          id = "orgzly";
+        };
+        "/mnt/archivio/syncthing/roam" = {
+          id = "roam";
+        };
+        "/mnt/archivio/syncthing/whatsapp" = {
+          id = "whatsapp";
+        };
+        "/mnt/archivio/syncthing/calls" = {
+          id = "calls";
+        };
+      };
     };
 
     navidrome = {
-      enable = true;
+      enable = false;
       settings = {
         Address = "0.0.0.0";
         Port = 9093;
@@ -259,6 +276,14 @@
     email = "andrea.ciceri@autistici.org";
   };
 
+  nix = {
+    package = pkgs.nixUnstable;
+    gc = {
+      automatic = true;
+      options = "--delete-older-than 3d";
+    };
+  };
+
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }
 

hosts/mbp/configuration.nix

@@ -18,13 +18,8 @@
 
   nix = {
     package = pkgs.nixUnstable;
-    extraOptions = ''
-      experimental-features = nix-command flakes flakes ca-references
-      keep-derivations = true
-      keep-outputs = true
-    '';
     gc = {
-      automatic = false;
+      automatic = true;
       user = "andreaciceri";
       options = "--delete-older-than 3d";
     };

hosts/pbp/configuration.nix

@@ -1,12 +1,12 @@
 { config, lib, pkgs, profiles, pbpKernelLatest, ... }:
 
 {
-  imports = with profiles; [ mount-nas sshd dbus avahi printing xdg ];
+  imports = with profiles; [ mount-nas sshd dbus avahi printing xdg syncthing ];
 
   boot = {
     initrd.availableKernelModules = [ "usbhid" ];
     kernelPackages = pbpKernelLatest;
-    kernelModules = [];
+    kernelModules = [ ];
     extraModulePackages = with config.boot.kernelPackages; [
       v4l2loopback
     ];
@@ -45,7 +45,16 @@
   };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/e236d328-496e-4cf8-ba54-857789ca258f"; } ];
+    [{ device = "/dev/disk/by-uuid/e236d328-496e-4cf8-ba54-857789ca258f"; }];
+
+
+  nix = {
+    package = pkgs.nixUnstable;
+    gc = {
+      automatic = true;
+      options = "--delete-older-than 3d";
+    };
+  };
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
 }

hosts/pbp/default.nix

@@ -4,6 +4,6 @@
     ./configuration.nix
   ] ++ suites.base;
 
-  bud.enable = true;
+  bud.enable = false;
   bud.localFlakeClone = "/home/ccr/fleet";
 }

hosts/pc/configuration.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, profiles, ... }:
 
 {
-  imports = with profiles; [ mount-nas sshd dbus avahi printing xdg docker adb ];
+  imports = with profiles; [ mount-nas sshd dbus avahi printing xdg docker adb syncthing ];
 
   boot = {
     initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
@@ -43,5 +43,13 @@
   swapDevices =
     [{ device = "/dev/disk/by-label/swap"; }];
 
+  nix = {
+    package = pkgs.nixUnstable;
+    gc = {
+      automatic = true;
+      options = "--delete-older-than 3d";
+    };
+  };
+
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }

profiles/core/default.nix

@@ -26,7 +26,7 @@ in
       nix-index
       nmap
       ripgrep
-      skim
+      #skim
       tealdeer
       tmux
       usbutils

profiles/syncthing/default.nix

@@ -0,0 +1,8 @@
+{
+  services.syncthing = {
+    enable = true;
+    guiAddress = "127.0.0.1:8384";
+    dataDir = "/home/ccr/syncthing";
+    user = "ccr";
+  };
+}

users/ccr/default.nix

@@ -25,8 +25,6 @@
       gphoto2
       digikam
       rawtherapee
-      freecad
-      openscad
       deploy-rs.deploy-rs
     ] ++
     (if !stdenv.hostPlatform.isAarch64 then [ wineWowPackages.full ] else [ ])

users/profiles/blender/default.nix

@@ -1,8 +1,10 @@
 { pkgs, ... }:
 {
   home.packages = with pkgs; [
+    openscad
   ] ++ (if !stdenv.hostPlatform.isAarch64 then [
     blender
+    freecad
   ]
   else [ ]);
 }

users/profiles/emacs/default.nix

@@ -11,6 +11,10 @@
     package = pkgs.customEmacs;
   };
 
+  services.emacs = {
+    enable = true;
+  };
+
   # For some reason Hunspell dictionaries paths must be specified on Darwin
   home.sessionVariables =
     if pkgs.stdenv.hostPlatform.isDarwin then {
@@ -34,7 +38,6 @@
       ag
       fd
       graphviz-nox
-      haskell-language-server
       hunspell
       hunspellDicts.en_US
       hunspellDicts.it_IT
@@ -58,6 +61,7 @@
       )
     ] ++ (if pkgs.system == "x86_64-linux" then [
       python-language-server
+      haskell-language-server
     ] ++ (with easy-ps; [
       # spago2nix
       ffmpegthumbnailer

users/profiles/emacs/emacs.d/config/config-emacs.el

@@ -2,6 +2,7 @@
       backup-by-copying t
       delete-old-versions 6
       kept-old-versions 2
-      version-control t)
+      version-control t
+      create-lockfiles nil)
 
 (provide 'config-emacs)

users/profiles/qmk/default.nix

@@ -0,0 +1,5 @@
+{ pkgs, ... }: with pkgs; {
+
+  home.packages = [ qmk ];
+
+}

users/profiles/sway/default.nix

@@ -57,8 +57,8 @@
               '';
             in
             lib.mkOptionDefault {
-              "${modifier}+x" = "exec ${pkgs.customEmacs}/bin/emacs";
-              "${modifier}+b" = "exec ${pkgs.firefox}/bin/firefox";
+              "${modifier}+x" = "exec emacsclient -c";
+              "${modifier}+b" = "exec firefox";
               "${modifier}+s" = "exec ${screenshotScript}";
             };
         };

users/profiles/vscode/default.nix

@@ -29,8 +29,9 @@
   };
 
   home.packages = with pkgs; [
-    haskell-language-server
     stylish-haskell
     ghc
-  ];
+  ] ++ (if pkgs.system == "x86_64-linux" then [
+    haskell-language-server
+  ] else [ ]);
 }