5 changed files with 108 additions and 202 deletions
--- a/flake.lock
+++ b/flake.lock
@ -72,11 +72,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1713543876,
-        "narHash": "sha256-olEWxacm1xZhAtpq+ZkEyQgR4zgfE7ddpNtZNvubi3g=",
+        "lastModified": 1711763326,
+        "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "9e7c20ffd056e406ddd0276ee9d89f09c5e5f4ed",
+        "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083",
        "type": "github"
      },
      "original": {
@ -93,11 +93,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1713406758,
-        "narHash": "sha256-kwZvhmx+hSZvjzemKxsAqzEqWmXZS47VVwQhNrINORQ=",
+        "lastModified": 1712947906,
+        "narHash": "sha256-T0eT2lMbcK7RLelkx0qx4SiFpOS/0dt0aSfLB+WsGV8=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "1efd500e9805a9efbce401ed5999006d397b9f11",
+        "rev": "8d4ae698eaac8bd717e23507da2ca8b345bec4b5",
        "type": "github"
      },
      "original": {
@ -225,11 +225,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1713668430,
-        "narHash": "sha256-HnM70sE7OryisMQ8GYOovO/zRXTcFGIDg4BKrGiFtWk=",
+        "lastModified": 1713054897,
+        "narHash": "sha256-1RpjL4Erczw5Q1szSd543w+F1jsj5bXp2a74cpiyqIg=",
        "owner": "helix-editor",
        "repo": "helix",
-        "rev": "26d9610e78b287c2316577af91adfd920baa7fa6",
+        "rev": "9df1266376323b3dae07e48bd1e64463d3aec1dd",
        "type": "github"
      },
      "original": {
@ -246,11 +246,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1713707619,
-        "narHash": "sha256-g73hSx1osp8G7pbFQbiz7OCosAogf0WrLSOWyEF+F9M=",
+        "lastModified": 1713077896,
+        "narHash": "sha256-Noot8H0EZEAFRQWyGxh9ryvhK96xpIqKbh78X447JWs=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "ad83c154bdfedad9807e86dd0633729ea3b116c5",
+        "rev": "630a0992b3627c64e34f179fab68e3d48c6991c0",
        "type": "github"
      },
      "original": {
@ -308,11 +308,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1713521961,
-        "narHash": "sha256-EwR8wW9AqJhSIY+0oxWRybUZ32BVKuZ9bjlRh8SJvQ8=",
+        "lastModified": 1712909959,
+        "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "5d48925b815fd202781bfae8fb6f45c07112fdb2",
+        "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f",
        "type": "github"
      },
      "original": {
@ -324,11 +324,11 @@
    },
    "nixpkgs-master": {
      "locked": {
-        "lastModified": 1713709641,
-        "narHash": "sha256-Q4bPpC8UNjiR7Gg4GEeIi5XrG8yQai9cxOjkXlRQmVc=",
+        "lastModified": 1713084354,
+        "narHash": "sha256-QKtRsAcq/7CplQGXwTgJUgaI6E+E7fmZ7+r+n+E9p4E=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6e8bfab8324ef1aab71d47339ea5662e0249c4c0",
+        "rev": "32d9e07959a285ff73ffcd55a7be694649d585c0",
        "type": "github"
      },
      "original": {
@ -340,11 +340,11 @@
    },
    "nixpkgs-nixos-unstable": {
      "locked": {
-        "lastModified": 1713537308,
-        "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=",
+        "lastModified": 1712791164,
+        "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f",
+        "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
        "type": "github"
      },
      "original": {
@ -356,11 +356,11 @@
    },
    "nixpkgs-rust-analyzer": {
      "locked": {
-        "lastModified": 1713709641,
-        "narHash": "sha256-Q4bPpC8UNjiR7Gg4GEeIi5XrG8yQai9cxOjkXlRQmVc=",
+        "lastModified": 1713084354,
+        "narHash": "sha256-QKtRsAcq/7CplQGXwTgJUgaI6E+E7fmZ7+r+n+E9p4E=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6e8bfab8324ef1aab71d47339ea5662e0249c4c0",
+        "rev": "32d9e07959a285ff73ffcd55a7be694649d585c0",
        "type": "github"
      },
      "original": {
@ -372,11 +372,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1713564160,
-        "narHash": "sha256-YguPZpiejgzLEcO36/SZULjJQ55iWcjAmf3lYiyV1Fo=",
+        "lastModified": 1712867921,
+        "narHash": "sha256-edTFV4KldkCMdViC/rmpJa7oLIU8SE/S35lh/ukC7bg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "bc194f70731cc5d2b046a6c1b3b15f170f05999c",
+        "rev": "51651a540816273b67bc4dedea2d37d116c5f7fe",
        "type": "github"
      },
      "original": {
@ -388,11 +388,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1713707886,
-        "narHash": "sha256-eixmKYCzDqq0II8yOiuoQNmTE/lNCiIt71lh7V4PSvk=",
+        "lastModified": 1713081784,
+        "narHash": "sha256-t0RoW0DTQQ8MaQ6DXbkOZtPapv9rNZa5UYwOan5Th/k=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "e558232e47b407866c8e2974739fac7ccc17e452",
+        "rev": "34dd0b90d8075657d7816e31f3955fcc958e22f7",
        "type": "github"
      },
      "original": {
@ -501,11 +501,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1713668495,
-        "narHash": "sha256-4BvlfPfyUmB1U0r/oOF6jGEW/pG59c5yv6PJwgucTNM=",
+        "lastModified": 1713066950,
+        "narHash": "sha256-ZaefFyvt5369XdjzSw43NhfbPM9MN5b9YXhzx4lFIRc=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "09f1bc8ba3277c0f052f7887ec92721501541938",
+        "rev": "226062b47fe0e2130ba3ee9f4f1c880dc815cf87",
        "type": "github"
      },
      "original": {
--- a/nixos/boxes/foryog/default.nix
+++ b/nixos/boxes/foryog/default.nix
@ -1,11 +1,4 @@
-{
-  config,
-  pkgs,
-  inputs,
-  lib,
-  system,
-  ...
-}: {
+{ config, pkgs, inputs, lib, system, ... }: {
  networking.hostName = "foryog";

  imports = [
@ -15,20 +8,20 @@
    ../../git
    ../../gnome
    ../../gui
-    ../../helix
    ../../mercurial
    ../../vim
    ../../zsh
  ];

-  fileSystems."/" = {options = ["compress=zstd"];};
+  fileSystems."/" = { options = [ "compress=zstd" ]; };

  services.restic.backups.home-to-b2 = {
    repository = lib.mkForce "b2:cyplo-restic-foureighty:/";
  };
-  boot.kernelParams = ["initcall_debug" ''dyndbg="file suspend.c +p"'' "no_console_suspend"];
+  boot.kernelParams =
+    [ "initcall_debug" ''dyndbg="file suspend.c +p"'' "no_console_suspend" ];
  boot.tmp.cleanOnBoot = true;
-  boot.binfmt.emulatedSystems = ["aarch64-linux"];
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
  boot.plymouth = {
    enable = true;
    logo = ./boot.png;
@ -44,19 +37,17 @@

  hardware.trackpoint.enable = true;
  hardware.keyboard.qmk.enable = true;
-  services.udev.packages = [pkgs.qmk-udev-rules];
+  services.udev.packages = [ pkgs.qmk-udev-rules ];
  programs.ccache.enable = true;
-  hardware.opengl.extraPackages = with pkgs; [libva];
+  hardware.opengl.extraPackages = with pkgs; [ libva ];
  programs.steam.enable = true;
  nixpkgs.config.allowUnfree = true;

-  home-manager.users.cyryl = {...}: {
-    imports = [
-      ../../home-manager/programs/kitty.nix
-    ];
+  home-manager.users.cyryl = { ... }: {
+    imports = [ ../../home-manager/programs/kitty.nix ];
    home.packages =
-      (with inputs.nixpkgs-master.legacyPackages."${system}"; [bisq-desktop])
-      ++ (with pkgs; [lutris])
-      ++ (with inputs.endless-sky.legacyPackages."${system}"; [endless-sky]);
+      (with inputs.nixpkgs-master.legacyPackages."${system}"; [ bisq-desktop ])
+      ++ (with pkgs; [ lutris ])
+      ++ (with inputs.endless-sky.legacyPackages."${system}"; [ endless-sky ]);
  };
 }
--- a/nixos/gui/default.nix
+++ b/nixos/gui/default.nix
@ -1,16 +1,8 @@
-{
-  config,
-  pkgs,
-  discord,
-  inputs,
-  nixpkgs-nixos-unstable,
-  nixpkgs-nixos-stable-and-unfree,
-  nixpkgs-nixos-unstable-and-unfree,
-  ...
-}: {
+{ config, pkgs, discord, inputs, nixpkgs-nixos-unstable
+, nixpkgs-nixos-stable-and-unfree, nixpkgs-nixos-unstable-and-unfree, ... }: {
  security.chromiumSuidSandbox.enable = true;

-  home-manager.users.cyryl = {...}: {
+  home-manager.users.cyryl = { ... }: {
    gtk = {
      enable = true;
      iconTheme = {
@ -18,72 +10,71 @@
        package = pkgs.gnome3.adwaita-icon-theme;
      };
    };
-    qt = {enable = true;};
+    qt = { enable = true; };

-    imports = [];
+    imports = [ ];

    programs.chromium.enable = true;
    programs.firefox.enable = true;
    programs.sioyek.enable = true;
-    home.packages =
-      (with pkgs;
-        with pkgs.gnome3;
-        with pkgs.python39Packages; [
-          anarchism
-          cheese
-          digikam
-          electrum
-          element-desktop
-          eog
-          evince
-          fontconfig
-          ghidra-bin
-          gimp
-          glxinfo
-          gnome-screenshot
-          gparted
-          inkscape
-          kdenlive
-          koreader
-          krusader
-          libreoffice
-          logseq
-          mediainfo
-          mindforger
-          modem-manager-gui
-          nautilus
-          nyxt
-          obs-studio
-          openscad
-          organicmaps
-          passff-host
-          pdfarranger
-          pkgs.gsettings-desktop-schemas
-          pkgs.shotwell
-          qcad
-          qemu
-          remmina
-          signal-desktop
-          simple-scan
-          spotify
-          ssb-patchwork
-          tigervnc
-          tlaplusToolbox
-          tlaps
-          uefitool
-          vlc
-          winePackages.full
-          wireshark
-          wsjtx
-          xclip
-          xidlehook
-          yubico-piv-tool
-          yubikey-manager-qt
-          yubikey-personalization
-          yubikey-personalization-gui
-        ])
-      ++ (with nixpkgs-nixos-unstable; [thunderbird])
-      ++ [nixpkgs-nixos-stable-and-unfree.discord]
+    home.packages = (with pkgs;
+      with pkgs.gnome3;
+      with pkgs.python39Packages; [
+        anarchism
+        calibre
+        cheese
+        digikam
+        electrum
+        element-desktop
+        eog
+        evince
+        fontconfig
+        ghidra-bin
+        gimp
+        glxinfo
+        gnome-screenshot
+        gparted
+        inkscape
+        kdenlive
+        koreader
+        krusader
+        libreoffice
+        logseq
+        mediainfo
+        mindforger
+        modem-manager-gui
+        nautilus
+        nyxt
+        obs-studio
+        openscad
+        organicmaps
+        passff-host
+        pdfarranger
+        pkgs.gsettings-desktop-schemas
+        pkgs.shotwell
+        qcad
+        qemu
+        remmina
+        signal-desktop
+        simple-scan
+        spotify
+        ssb-patchwork
+        tigervnc
+        tlaplusToolbox
+        tlaps
+        uefitool
+        vlc
+        winePackages.full
+        wireshark
+        wsjtx
+        xclip
+        xidlehook
+        yubico-piv-tool
+        yubikey-manager-qt
+        yubikey-personalization
+        yubikey-personalization-gui
+      ]) ++ (with nixpkgs-nixos-unstable; [ thunderbird ])
+      ++ [ nixpkgs-nixos-stable-and-unfree.discord ]
      ++ (with nixpkgs-nixos-unstable-and-unfree; [
        hopper
        jetbrains.rust-rover
--- a/nixos/helix/default.nix
+++ b/nixos/helix/default.nix
@ -1,16 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
-  nix.settings = {
-    trusted-substituters = [
-      "https://helix.cachix.org"
-    ];
-    trusted-public-keys = [
-      "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
-    ];
-  };
-  home-manager.users.cyryl = {...}: {imports = [./home.nix];};
-}
--- a/nixos/helix/home.nix
+++ b/nixos/helix/home.nix
@ -1,60 +0,0 @@
-{
-  lib,
-  inputs,
-  system,
-  ...
-}: let
-  alejandra = lib.getExe inputs.alejandra.packages.${system}.default;
-  nil = lib.getExe inputs.nil.packages.${system}.default;
-  helixPackage = inputs.helix.packages.${system}.default;
-  helix = lib.getExe helixPackage;
-in {
-  home.sessionVariables = {
-    EDITOR = lib.mkForce helix;
-    VISUAL = lib.mkForce helix;
-  };
-  programs.zsh.sessionVariables = {
-    EDITOR = lib.mkForce helix;
-    VISUAL = lib.mkForce helix;
-  };
-  systemd.user.sessionVariables = {
-    EDITOR = lib.mkForce helix;
-    VISUAL = lib.mkForce helix;
-  };
-
-  programs.helix = {
-    enable = true;
-    package = helixPackage;
-    languages = {
-      language = [
-        {
-          name = "nix";
-          auto-format = true;
-          language-servers = ["nil"];
-          formatter = {
-            command = alejandra;
-            args = ["-q"];
-          };
-        }
-      ];
-      language-server.nil = {
-        command = nil;
-        config.nil.nix = {
-          maxMemoryMB = 8192;
-          flake.autoEvalInputs = true;
-        };
-      };
-    };
-    settings = {
-      theme = "solarized_dark";
-      editor = {
-        auto-save = true;
-        auto-pairs = false;
-        file-picker.hidden = false;
-        lsp.display-messages = true;
-        line-number = "relative";
-        soft-wrap.enable = true;
-      };
-    };
-  };
-}