yazi

install yazi plugins

builds/printer.nix

@@ -1,19 +1,32 @@
 { pkgs, ... }:
 
 {
-  services.printing.drivers = [ pkgs.epson-escpr ];
+  environment.systemPackages = with pkgs; [
+    gutenprint
+  ];
+
+  services.printing = {
+    enable = true;
+    listenAddresses = [ "*:631" ];
+    allowFrom = [ "all" ];
+    browsing = true;
+    defaultShared = true;
+    openFirewall = true;
+    drivers = [ pkgs.epson-escpr ];
+  };
   hardware.printers = {
-    ensurePrinters = [{
+    ensurePrinters = [
+      {
         name = "Epson-XP-520";
         location = "Home";
-      deviceUri = "http://192.168.178.34:631/ipp/print";
+        deviceUri = "usb://EPSON/XP-520%20Series?serial=554656593133323698&interface=1";
-      model =
+        model = "epson-inkjet-printer-escpr/Epson-XP-520_Series-epson-escpr-en.ppd";
-        "epson-inkjet-printer-escpr/Epson-XP-520_Series-epson-escpr-en.ppd";
         ppdOptions = {
           PageSize = "A4";
           Ink = "Color";
         };
-    }];
+      }
+    ];
     ensureDefaultPrinter = "Epson-XP-520";
   };
 }

configuration.nix

@@ -71,7 +71,6 @@ in
       defaultSession = "river";
     };
     libinput.enable = true; # Enable touchpad.
-    printing.enable = true;
   };
 
   programs = {
@@ -184,5 +183,5 @@ in
     allowUnfree = true;
     permittedInsecurePackages = [ "electron-32.3.3" ];
   };
-  system.stateVersion = "23.11";
+  system.stateVersion = "26.05";
 }

flake.lock

@@ -81,6 +81,24 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -221,6 +239,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1772419343,
+        "narHash": "sha256-QU3Cd5DJH7dHyMnGEFfPcZDaCAsJQ6tUD+JuUsYqnKU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "93178f6a00c22fcdee1c6f5f9ab92f2072072ea9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts_2",
@@ -271,7 +305,29 @@
         "nixpkgs": "nixpkgs_3",
         "nixvim": "nixvim",
         "nur": "nur",
-        "sops-nix": "sops-nix"
+        "sops-nix": "sops-nix",
+        "yazi": "yazi"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "yazi",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772420823,
+        "narHash": "sha256-q3oVwz1Rx41D1D+F6vg41kpOkk3Zi3KwnkHEZp7DCGs=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "458eea8d905c609e9d889423e6b8a1c7bc2f792c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
       }
     },
     "sops-nix": {
@@ -308,6 +364,41 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "yazi": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_5",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1774567340,
+        "narHash": "sha256-skKD1hvAvilKkK406RgNl6X/YJgkSsoZmtHmdfeoyWI=",
+        "owner": "sxyazi",
+        "repo": "yazi",
+        "rev": "935eb6b2989f8a7ce219a2a71a539365c8dccfbb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sxyazi",
+        "repo": "yazi",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -33,6 +33,8 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    yazi.url = "github:sxyazi/yazi";
   };
 
   outputs =
@@ -45,6 +47,7 @@
       nixvim,
       nur,
       sops-nix,
+      yazi,
       ...
     }@inputs:
     {

home/default.nix

@@ -52,7 +52,7 @@
       sops
     ];
 
-    stateVersion = "23.11";
+    stateVersion = "26.05";
   };
 
   programs.home-manager.enable = true;

home/programs/alacritty.nix

@@ -1,18 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    fira-code
-  ];
-
-  programs.alacritty = {
-    enable = true;
-
-    settings.font = {
-      size = 8;
-      normal.family = "Fira Code";
-      bold.family = "Fira Code";
-      italic.family = "Fira Code";
-    };
-  };
-}

home/programs/default.nix

@@ -1,16 +1,16 @@
 {
   imports = [
     ./3dprint.nix
-    ./alacritty.nix
     ./anki.nix
     ./calibre.nix
     ./digikam.nix
     ./eww
-    ./filebrowser.nix
+    ./filebrowser
     ./git.nix
     ./hyprlock.nix
     ./imv.nix
     ./inkscape.nix
+    ./kitty.nix
     ./libreoffice.nix
     ./messenger.nix
     ./nixvim

home/programs/filebrowser.nix

@@ -1,15 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    kdePackages.dolphin
-    kdePackages.dolphin-plugins
-    kdePackages.baloo-widgets
-    kdePackages.baloo
-    nautilus
-    udisks
-    yazi
-  ];
-  xdg.configFile."menus/applications.menu".source =
-    "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu";
-}

home/programs/filebrowser/default.nix

@@ -0,0 +1,252 @@
+{ inputs, pkgs, ... }:
+
+let
+  exifaudio = pkgs.fetchFromGitHub {
+    owner = "Sonico98";
+    repo = "exifaudio.yazi";
+    rev = "4506f9d";
+    sha256 = "sha256-RWCqWBpbmU3sh/A+LBJPXL/AY292blKb/zZXGvIA5/o=";
+  };
+  bunny = pkgs.fetchFromGitHub {
+    owner = "stelcodes";
+    repo = "bunny.yazi";
+    rev = "71b14a3";
+    sha256 = "sha256-uQO0C00yOFPWq8KEO/kEZM6tFZRc9SiXfgN7kzlwDeA=";
+  };
+in
+{
+  home.packages = with pkgs; [
+    # kdePackages.dolphin
+    # kdePackages.dolphin-plugins
+    # kdePackages.baloo-widgets
+    # kdePackages.baloo
+    exiftool
+    nautilus
+    ouch
+    udisks
+  ];
+  xdg.configFile."menus/applications.menu".source =
+    "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu";
+
+  # ── Yazi ──────────────────────────────────────────────────────────────
+  programs.yazi = {
+    enable = true;
+    package = inputs.yazi.packages.${pkgs.stdenv.hostPlatform.system}.default;
+    enableZshIntegration = true;
+    initLua = ./init.lua;
+
+    settings = {
+      yazi = {
+        ratio = [
+          1
+          4
+          3
+        ];
+        sort_by = "natural";
+        sort_sensitive = true;
+        sort_reverse = false;
+        sort_dir_first = true;
+        linemode = "none";
+        show_hidden = true;
+        show_symlink = true;
+      };
+
+      preview = {
+        image_filter = "lanczos3";
+        image_quality = 90;
+        tab_size = 1;
+        max_width = 600;
+        max_height = 900;
+        cache_dir = "";
+        ueberzug_scale = 1;
+        ueberzug_offset = [
+          0
+          0
+          0
+          0
+        ];
+      };
+
+      tasks = {
+        micro_workers = 5;
+        macro_workers = 10;
+        bizarre_retry = 5;
+      };
+
+      plugin = {
+        prepend_previewers = [
+          {
+            run = "exifaudio";
+            mime = "audio/*";
+          }
+        ];
+        prepend_fetchers = [
+          {
+            id = "git";
+            url = "*";
+            run = "git";
+          }
+          {
+            id = "git";
+            url = "*/";
+            run = "git";
+          }
+        ];
+      };
+
+      opener = {
+        extract = [
+          {
+            run = "ouch d -y %*";
+            desc = "Extract here with ouch";
+            for = "windows";
+          }
+          {
+            run = "ouch d -y $@";
+            desc = "Extract here with ouch";
+            for = "unix";
+          }
+        ];
+      };
+    };
+
+    keymap = {
+      mgr.prepend_keymap = [
+        {
+          run = "plugin mount";
+          on = [ "M" ];
+        }
+        {
+          run = "plugin ouch";
+          on = [ "C" ];
+        }
+        {
+          run = "plugin bunny";
+          on = [
+            ";"
+          ];
+          desc = "Start bunny";
+        }
+        {
+          run = "plugin bunny fuzzy";
+          on = [
+            "'"
+          ];
+          desc = "Start bunny fuzzy search";
+        }
+        {
+          run = "plugin chmod";
+          on = [
+            "c"
+            "m"
+          ];
+          desc = "Chmod on selected files";
+        }
+        {
+          run = "plugin sudo -- paste";
+          on = [
+            "R"
+            "p"
+            "p"
+          ];
+          desc = "sudo paste";
+        }
+        {
+          run = "plugin sudo -- paste --force";
+          on = [
+            "R"
+            "P"
+          ];
+          desc = "sudo paste";
+        }
+        {
+          run = "plugin sudo -- rename";
+          on = [
+            "R"
+            "r"
+          ];
+          desc = "sudo rename";
+        }
+        {
+          run = "plugin sudo -- link";
+          on = [
+            "R"
+            "p"
+            "l"
+          ];
+          desc = "sudo link";
+        }
+        {
+          run = "plugin sudo -- link --relative";
+          on = [
+            "R"
+            "p"
+            "r"
+          ];
+          desc = "sudo link relative path";
+        }
+        {
+          run = "plugin sudo -- hardlink";
+          on = [
+            "R"
+            "p"
+            "L"
+          ];
+          desc = "sudo hardlink";
+        }
+        {
+          run = "plugin sudo -- create";
+          on = [
+            "R"
+            "a"
+          ];
+          desc = "sudo create";
+        }
+        {
+          run = "plugin sudo -- remove";
+          on = [
+            "R"
+            "d"
+          ];
+          desc = "sudo trash";
+        }
+        {
+          run = "plugin sudo -- remove --permanently";
+          on = [
+            "R"
+            "D"
+          ];
+          desc = "sudo delete";
+        }
+        {
+          run = "plugin sudo -- chmod";
+          on = [
+            "R"
+            "m"
+          ];
+          desc = "sudo chmod";
+        }
+        {
+          run = [ "plugin wl-clipboard" ];
+          on = [ "<C-y" ];
+        }
+      ];
+    };
+
+    plugins = {
+      bunny = bunny;
+      chmod = pkgs.yaziPlugins.chmod;
+      exifaudio = exifaudio;
+      git = pkgs.yaziPlugins.git;
+      mount = pkgs.yaziPlugins.mount;
+      ouch = pkgs.yaziPlugins.ouch;
+      sudo = pkgs.yaziPlugins.sudo;
+      wl-clipboard = pkgs.yaziPlugins.wl-clipboard;
+    };
+  };
+
+  programs.zoxide = {
+    enable = true;
+    enableZshIntegration = true;
+  };
+}

home/programs/filebrowser/init.lua

@@ -0,0 +1,25 @@
+require("bunny"):setup({
+  hops = {
+    { key = "/", path = "/", desc = "Root" },
+    { key = "n", path = "/nix/store", desc = "Nix store" },
+    { key = "~", path = "~", desc = "Home" },
+    { key = "r", path = "~/Repos", desc = "Repos" },
+    { key = "d", path = "~/Downloads", desc = "Downloads" },
+    { key = "D", path = "~/Documents", desc = "Documents" },
+    { key = "c", path = "~/.config", desc = "Config files" },
+    { key = { "N", "h" }, path = "~/Nextcloud", desc = "Nexctloud root" },
+    { key = { "N", "d" }, path = "~/Nextcloud/Data/Documents", desc = "Nextcloud documents" },
+    { key = { "N", "u" }, path = "~/Nextcloud/Uni", desc = "Nextcloud uni" },
+    -- key and path attributes are required, desc is optional
+  },
+  desc_strategy = "path", -- If desc isn't present, use "path" or "filename", default is "path"
+  ephemeral = true, -- Enable ephemeral hops, default is true
+  tabs = true, -- Enable tab hops, default is true
+  notify = false, -- Notify after hopping, default is false
+  fuzzy_cmd = "fzf", -- Fuzzy searching command, default is "fzf"
+})
+
+require("git"):setup({
+  -- Order of status signs showing in the linemode
+  order = 1500,
+})

home/programs/kitty.nix

@@ -11,6 +11,11 @@
 
   programs.kitty = {
     enable = true;
+    font = {
+      size = 8;
+      name = "Fira Code";
+      package = pkgs.fira-code;
+    };
     settings = {
       clear_all_shortcuts = true;
       enabled_layouts = "splits:slit_axis=horizontal,stack";

home/programs/nixvim/plugins/default.nix

@@ -25,6 +25,7 @@
     ./noice.nix
     ./notify.nix
     ./oil.nix
+    ./openscad.nix
     ./otter.nix
     ./papis.nix
     ./peek.nix

home/programs/nixvim/plugins/openscad.nix

@@ -0,0 +1,17 @@
+{ ... }:
+
+{
+  programs.nixvim.plugins.openscad = {
+    enable = true;
+    luaConfig.post = ''
+      vim.g.openscad_fuzzy_finder = 'skim'
+      -- when the pdf_command is run, the last argument will be the pdf filename
+      vim.g.openscad_pdf_command = 'zathura'
+      vim.g.openscad_cheatsheet_window_blend = 15 --%
+      vim.g.openscad_load_snippets = false
+      -- should the openscad project automatically be opened on startup
+      vim.g.openscad_auto_open = false
+      vim.g.openscad_default_mappings = true
+    '';
+  };
+}

home/programs/river/default.nix

@@ -66,9 +66,7 @@
         };
         map = {
           normal = {
-            "Super+Shift Return" = "spawn alacritty";
+            "Super+Shift Return" = "spawn kitty";
-            # Messages
-            "Control+Super W" = "spawn 'printf \"Hello from Wayland!\" | dunstify -'";
             # System
             "Super P" = "spawn 'rofi -show drun'";
             "Super+Shift C" = "close";

home/programs/thunderbird.nix

@@ -12,36 +12,12 @@
   };
   accounts.email = {
     accounts = {
-      kjr = {
-        address = "elias.schroeter@kjr-ebe.de";
-        imap = {
-          host = "outlook.office365.com";
-          port = 993;
-          tls.enable = true;
-        };
-        realName = "Elias Schröter";
-        signature = {
-          text = ''
-            Mit freundlichen Grüßen,
-            Elias Schröter.
-          '';
-          showSignature = "append";
-        };
-        passwordCommand = "OAuth2";
-        smtp = {
-          host = "smtp.office365.com";
-          port = 587;
-          tls = {
-            enable = true;
-            useStartTls = true;
-          };
-        };
-        userName = "elias.schroeter@kjr-ebe.de";
-        thunderbird = { enable = true; };
-      };
       privat = {
         address = "elias.schroeter@e.email";
-        aliases = [ "elias.schroeter@murena.io" "xacufe67.cadome83@murena.io" ];
+        aliases = [
+          "elias.schroeter@murena.io"
+          "xacufe67.cadome83@murena.io"
+        ];
         imap = {
           host = "mail.ecloud.global";
           port = 993;
@@ -66,7 +42,9 @@
         };
         userName = "elias.schroeter@e.email";
         primary = true;
-        thunderbird = { enable = true; };
+        thunderbird = {
+          enable = true;
+        };
       };
       uni = {
         address = "elias.schroeter@campus.lmu.de";
@@ -94,7 +72,9 @@
         };
         userName = "elias.schroeter@campus.lmu.de";
         primary = false;
-        thunderbird = { enable = true; };
+        thunderbird = {
+          enable = true;
+        };
       };
     };
   };

home/programs/zsh.nix

@@ -13,11 +13,7 @@
     enable = true;
     dotDir = "${config.xdg.configHome}/zsh";
     shellAliases = {
-      encryptSops = "sops --age age1ammls20r5t3dx4cvhpt8n5dejxcpdmpqt37sa9r9fuztd8c43g4sz889zd -e -i secrets/secrets.yaml";
       update = "sudo nixos-rebuild switch";
-      conWG = "ssh elias@logout.nonagon.dev -p 6969";
-      conWS = "ssh elias@192.168.31.200";
-      setupPC = "wlr-randr --output HDMI-A-2 --on --mode 1920x1080 --pos 0,0;wlr-randr --output DVI-D-1 --on --mode 1920x1080 --pos 1920,0;wlr-randr --output DP-2 --on --mode 1920x1080 --pos 3840,0 --primary";
     };
     autosuggestion.enable = true;
     localVariables = {

home/services/ssh-agent.nix

@@ -1,5 +1,5 @@
 { ... }:
 
 {
-  services.ssh-agent.enable = false;
+  services.ssh-agent.enable = true;
 }

home/themes/catppuccin/default.nix

@@ -14,7 +14,7 @@ in
     ./hyprlock.nix
     ./nvim.nix
     ./taskwarrior.nix
-    # ./qt.nix
+    ./qt.nix
   ];
 
   catppuccin = {
@@ -22,12 +22,12 @@ in
     flavor = "mocha";
     accent = "pink";
 
-    alacritty.enable = true;
     anki.enable = true;
     element-desktop.enable = true;
     firefox.enable = true;
     fzf.enable = true;
     imv.enable = true;
+    kitty.enable = true;
     lazygit.enable = true;
     rofi.enable = true;
     spotify-player.enable = true;

machines/hardware-configuration-desktop.nix

@@ -1,54 +1,71 @@
 # 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 =
+  imports = [
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "usb_storage"
+    "usbhid"
+    "sd_mod"
+    "sr_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f";
+    device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f";
     fsType = "btrfs";
     options = [ "subvol=root" ];
   };
 
-  fileSystems."/.swapvol" =
+  fileSystems."/.swapvol" = {
-    { device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f";
+    device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f";
     fsType = "btrfs";
     options = [ "subvol=swap" ];
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/A38E-500D";
+    device = "/dev/disk/by-uuid/A38E-500D";
     fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
   };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f";
+    device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f";
     fsType = "btrfs";
     options = [ "subvol=home" ];
   };
 
-  fileSystems."/nix" =
+  fileSystems."/nix" = {
-    { device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f";
+    device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f";
     fsType = "btrfs";
     options = [ "subvol=nix" ];
   };
 
-  fileSystems."/partition-root" =
+  fileSystems."/partition-root" = {
-    { device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f";
+    device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f";
     fsType = "btrfs";
   };
 
-  swapDevices = [ ];
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f"; }
+  ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

machines/hardware-configuration-laptop.nix

@@ -1,30 +1,42 @@
 # 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 =
+  imports = [
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "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 = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/10e64a0a-7ef7-492e-8f1e-5d3916405d82";
+    device = "/dev/disk/by-uuid/10e64a0a-7ef7-492e-8f1e-5d3916405d82";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/40CB-8C4C";
+    device = "/dev/disk/by-uuid/40CB-8C4C";
     fsType = "vfat";
   };
 
-  swapDevices =
+  swapDevices = [
-    [ { device = "/dev/disk/by-uuid/6a36bba4-5be8-4fd5-af21-05447bded927"; }
+    { device = "/dev/disk/by-uuid/6a36bba4-5be8-4fd5-af21-05447bded927"; }
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking