home/i3status-rust.nix

@@ -18,15 +18,7 @@
         }
         {
           block = "disk_space";
-          path = "/nix";
+          path = "/";
-          info_type = "available";
-          interval = 20;
-          warning = 20.0;
-          alert = 10.0;
-        }
-        {
-          block = "disk_space";
-          path = "/home";
           info_type = "available";
           interval = 20;
           warning = 20.0;

magpie/configuration.nix

@@ -272,12 +272,6 @@
     startAt = "daily";
   };
 
-  services.seafile = {
-    enable = true;
-    initialAdminPassword = "admin";
-    adminEmail = "asmir.abdulahovic" + "@" + "gmail.com";
-  };
-
   /*
   needed for sendmail mail functionality
   */

nixy/configuration.nix

@@ -80,7 +80,7 @@
       memtest86.enable = true;
     };
     readOnlyNixStore = true;
-    supportedFilesystems = ["f2fs" "xfs"];
+    supportedFilesystems = ["btrfs"];
     tmp.useTmpfs = true;
   };
 
@@ -105,7 +105,7 @@
   networking = {
     firewall = {
       enable = true;
-      allowedTCPPorts = [80 443 51820 8020];
+      allowedTCPPorts = [80 443 51820];
     };
 
     hostName = "nixy";
@@ -215,9 +215,7 @@
         description = "wg network interface";
         bindsTo = ["netns@wg.service"];
         requires = ["network-online.target"];
-        wants = ["dnscrypt-proxy2_proton.service"];
         after = ["netns@wg.service"];
-        before = ["dnscrypt-proxy2_proton.service"];
         serviceConfig = {
           Type = "oneshot";
           RemainAfterExit = true;
@@ -251,9 +249,11 @@
           "network-online.target"
           "nss-lookup.target"
         ];
-        before = ["nss-lookup.target"];
+        before = [
+          "nss-lookup.target"
+        ];
         after = ["wg_proton.service"];
-        partOf = ["wg_proton.service"];
+        bindsTo = ["netns@wg.service"];
         serviceConfig = {
           AmbientCapabilities = "CAP_NET_BIND_SERVICE";
           CacheDirectory = "dnscrypt-proxy";
@@ -305,7 +305,7 @@
 
   services = {
     acpid.enable = true;
-    btrfs.autoScrub.enable = false;
+    btrfs.autoScrub.enable = true;
     dbus.enable = true;
     fstrim.enable = true;
     fwupd.enable = true;
@@ -455,23 +455,6 @@
     logind.extraConfig = ''
       KillUserProcesses=yes
     '';
-
-    seafile = {
-      enable = false;
-      initialAdminPassword = "admin";
-      adminEmail = "asmir.abdulahovic@gmail.com";
-      ccnetSettings = {
-        General = {
-          SERVICE_URL = "http://127.0.0.1:8020";
-        };
-      };
-      seafileSettings = {
-        fileserver = {
-          host = "0.0.0.0";
-          port = 8082;
-        };
-      };
-    };
   };
 
   fonts = {
@@ -509,7 +492,7 @@
   virtualisation = {
     containers.storage.settings = {
       storage = {
-        #driver = lib.mkForce "btrfs";
+        driver = lib.mkForce "btrfs";
         graphroot = "/var/lib/containers/storage";
         runroot = "/run/containers/storage";
       };

nixy/hardware-configuration.nix

@@ -1,45 +1,77 @@
 # 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, ... }:
-
 {
-  imports =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  lib,
-    ];
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "uas" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.availableKernelModules = ["nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
+  boot.initrd.kernelModules = [];
-  boot.initrd.luks.devices."crypt_dev".device = "/dev/disk/by-uuid/e10821b9-5426-4f03-b716-1645a64fcd6a";
+  boot.kernelModules = ["kvm-amd" "amdgpu"];
-  boot.kernelModules = [ "kvm-amd" "amd-gpu" ];
+  boot.extraModulePackages = [];
-  boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/c461c971-54ca-4fb7-91e8-6ac70de53ef2";
+    device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
-      fsType = "xfs";
+    fsType = "btrfs";
-    };
+    options = ["subvol=root" "compress=lzo" "noatime"];
+  };
 
-  fileSystems."/nix" =
+  boot.initrd.luks.devices."sys_enc".device = "/dev/disk/by-uuid/682d030d-189e-4b47-a60a-62cf1f3729d3";
-    { device = "/dev/disk/by-uuid/6b8d9a11-3bc4-4c63-afd3-336975abe987";
-      fsType = "f2fs";
-      options = [ "atgc" "gc_merge" "lazytime" ];
-    };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "/dev/disk/by-uuid/aeaa71ca-a439-4ef3-9ab8-db7ae8f59376";
+    device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
-      fsType = "xfs";
+    fsType = "btrfs";
-    };
+    options = ["subvol=home" "compress=lzo" "noatime"];
+  };
 
-  fileSystems."/boot" =
+  fileSystems."/nix" = {
-    { device = "/dev/disk/by-uuid/828E-F3C3";
+    device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
-      fsType = "vfat";
+    fsType = "btrfs";
-      options = [ "fmask=0022" "dmask=0022" ];
+    options = ["subvol=nix" "compress=lzo" "noatime"];
-    };
+  };
 
-  swapDevices = [ ];
+  fileSystems."/persist" = {
+    device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
+    fsType = "btrfs";
+    options = ["subvol=persist" "compress=lzo" "noatime"];
+  };
 
+  fileSystems."/var/log" = {
+    device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
+    fsType = "btrfs";
+    options = ["subvol=log" "compress=lzo" "noatime"];
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/3F3E-9833";
+    fsType = "vfat";
+  };
+
+  fileSystems."/opt/xilinx" = {
+    device = "/dev/disk/by-uuid/f5c27ef2-8053-4d96-9f8f-c6a50d6193b9";
+    fsType = "erofs";
+  };
+
+  swapDevices = [
+    /*
+    {
+       device = "/dev/disk/by-uuid/ee1792c9-098b-40c1-b760-20def16ba67f";
+       encrypted = {
+         enable = true;
+         keyFile = "/mnt-root/swap.key";
+         label = "swap_encr";
+         blkDev = "/dev/disk/by-uuid/aee12e27-b45a-4291-be78-db0a903071b3";
+       };
+     }
+    */
+  ];
 
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
+  nix.settings.max-jobs = lib.mkDefault 8;
 }