Merge branch 'devel' of vcs.elnafo.ru:L-Nafaryus/bonfire into devel

2025-03-24 17:07:16 +05:00 · 2025-03-24 17:07:16 +05:00 · 5242582e80
commit 5242582e80
parent b1a2efb2de 01a682d419
17 changed files with 369 additions and 171 deletions
--- a/flake.lock
+++ b/flake.lock
@ -24,11 +24,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1732307740,
-        "narHash": "sha256-ZDsYdZOtg5qkK/wfLLB83B3SI+fE32S+/6Ey0ggHODM=",
+        "lastModified": 1738087375,
+        "narHash": "sha256-GLyNtU9A2VN22jNRHZ2OXuFfTJLh8uEVVt+ftsKUX0c=",
        "owner": "Aylur",
        "repo": "ags",
-        "rev": "81159966eb8b39b66c3efc133982fd76920c9605",
+        "rev": "a6a7a0adb17740f4c34a59902701870d46fbb6a4",
        "type": "github"
      },
      "original": {
@ -45,11 +45,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1731952585,
-        "narHash": "sha256-Sh1E7sJd8JJM3PCU1ZOei/QWz97OLCENIi2rTRoaniw=",
+        "lastModified": 1737670815,
+        "narHash": "sha256-ZCxxshGN7XooabArcoGkYSNx5yVunqjKJi2aTv6cznI=",
        "owner": "aylur",
        "repo": "astal",
-        "rev": "664c7a4ddfcf48c6e8accd3c33bb94424b0e8609",
+        "rev": "127e9cdcbf173846a3c40ddc0abfbb038df48042",
        "type": "github"
      },
      "original": {
@ -75,12 +75,15 @@
      }
    },
    "catppuccin": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
      "locked": {
-        "lastModified": 1733001911,
-        "narHash": "sha256-uX/9m0TbdhEzuWA0muM5mI/AaWcLiDLjCCyu5Qr9MRk=",
+        "lastModified": 1739934729,
+        "narHash": "sha256-PcrLk10meIJICzUJqtCMOJxoITzbH52fZg2XAB7SSsM=",
        "owner": "catppuccin",
        "repo": "nix",
-        "rev": "a817009ebfd2cca7f70a77884e5098d0a8c83f8e",
+        "rev": "b1ff2a638afa827f1473498190a2c1cae1cf41cf",
        "type": "github"
      },
      "original": {
@ -91,11 +94,11 @@
    },
    "crane": {
      "locked": {
-        "lastModified": 1733286231,
-        "narHash": "sha256-mlIDSv1/jqWnH8JTiOV7GMUNPCXL25+6jmD+7hdxx5o=",
+        "lastModified": 1741148495,
+        "narHash": "sha256-EV8KUaIZ2/CdBXlutXrHoZYbWPeB65p5kKZk71gvDRI=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "af1556ecda8bcf305820f68ec2f9d77b41d9cc80",
+        "rev": "75390a36cd0c2cdd5f1aafd8a9f827d7107f2e53",
        "type": "github"
      },
      "original": {
@ -171,7 +174,7 @@
        "dream2nix": "dream2nix",
        "fenix": "fenix",
        "nix-std": "nix-std",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
        "lastModified": 1733067025,
@ -219,11 +222,11 @@
        "rust-analyzer-src": []
      },
      "locked": {
-        "lastModified": 1732689334,
-        "narHash": "sha256-yKI1KiZ0+bvDvfPTQ1ZT3oP/nIu3jPYm4dnbRd6hYg4=",
+        "lastModified": 1741243019,
+        "narHash": "sha256-lFSPV4W5/oqztMPLlabt3f4jQy12Kw/TSUbDQKY/+bw=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "a8a983027ca02b363dfc82fbe3f7d9548a8d3dce",
+        "rev": "576638b227e5f465993588309d5dce9f112a9c28",
        "type": "github"
      },
      "original": {
@ -288,11 +291,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730504689,
-        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+        "lastModified": 1738453229,
+        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
        "type": "github"
      },
      "original": {
@ -361,11 +364,11 @@
        "systems": "systems_3"
      },
      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
@ -377,33 +380,33 @@
    "freetype2": {
      "flake": false,
      "locked": {
-        "lastModified": 1687587065,
-        "narHash": "sha256-+Fh+/k+NWL5Ow9sDLtp8Cv/8rLNA1oByQQCIQS/bysY=",
-        "owner": "wez",
-        "repo": "freetype2",
-        "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d",
+        "lastModified": 1723459814,
+        "narHash": "sha256-4l90lDtpgm5xlh2m7ifrqNy373DTRTULRkAzicrM93c=",
+        "owner": "freetype",
+        "repo": "freetype",
+        "rev": "42608f77f20749dd6ddc9e0536788eaad70ea4b5",
        "type": "github"
      },
      "original": {
-        "owner": "wez",
-        "repo": "freetype2",
-        "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d",
+        "owner": "freetype",
+        "ref": "VER-2-13-3",
+        "repo": "freetype",
        "type": "github"
      }
    },
    "harfbuzz": {
      "flake": false,
      "locked": {
-        "lastModified": 1711722720,
-        "narHash": "sha256-GdxcAPx5QyniSHPAN1ih28AD9JLUPR0ItqW9JEsl3pU=",
+        "lastModified": 1719502711,
+        "narHash": "sha256-2ieCf3ftNk851FZBDPVl+7QHWBqD729KiUxUyxi26Yg=",
        "owner": "harfbuzz",
        "repo": "harfbuzz",
-        "rev": "63973005bc07aba599b47fdd4cf788647b601ccd",
+        "rev": "9c03576c49db6e7207d9bcdfe3abd170a809157f",
        "type": "github"
      },
      "original": {
        "owner": "harfbuzz",
-        "ref": "8.4.0",
+        "ref": "9.0.0",
        "repo": "harfbuzz",
        "type": "github"
      }
@ -415,11 +418,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1733317578,
-        "narHash": "sha256-anN/LcP5IuqEARvhPETg1vnbyG3IQ0wdvSAYEJfIQzA=",
+        "lastModified": 1741217763,
+        "narHash": "sha256-g/TrltIjFHIjtzKY5CJpoPANfHQWDD43G5U1a/v5oVg=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "ad48eb25cd0b00ce730da00fa1f8e6e6c27b397d",
+        "rev": "486b066025dccd8af7fbe5dd2cc79e46b88c80da",
        "type": "github"
      },
      "original": {
@ -459,17 +462,17 @@
    "libpng": {
      "flake": false,
      "locked": {
-        "lastModified": 1549245649,
-        "narHash": "sha256-1+cRp0Ungme/OGfc9kGJbklYIWAFxk8Il1M+NV4KSgw=",
-        "owner": "glennrp",
+        "lastModified": 1726173884,
+        "narHash": "sha256-gBfHgGaqVYdmhWXoNKZzPyGzyw2rr3zp+DjWmfC41jk=",
+        "owner": "pnggroup",
        "repo": "libpng",
-        "rev": "8439534daa1d3a5705ba92e653eda9251246dd61",
+        "rev": "f5e92d76973a7a53f517579bc95d61483bf108c0",
        "type": "github"
      },
      "original": {
-        "owner": "glennrp",
+        "owner": "pnggroup",
+        "ref": "v1.6.44",
        "repo": "libpng",
-        "rev": "8439534daa1d3a5705ba92e653eda9251246dd61",
        "type": "github"
      }
    },
@ -510,14 +513,14 @@
        "nixpkgs": [
          "nixpkgs"
        ],
-        "nixpkgs-24_05": "nixpkgs-24_05"
+        "nixpkgs-24_11": "nixpkgs-24_11"
      },
      "locked": {
-        "lastModified": 1722877200,
-        "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
+        "lastModified": 1740437053,
+        "narHash": "sha256-exPTta4qI1ka9sk+jPcLogGffJ1OVXnAsTRqpeAXeNw=",
        "owner": "simple-nixos-mailserver",
        "repo": "nixos-mailserver",
-        "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
+        "rev": "c8ec4d5e432f5df4838eacd39c11828d23ce66ec",
        "type": "gitlab"
      },
      "original": {
@ -527,6 +530,37 @@
      }
    },
    "nixpkgs": {
+      "locked": {
+        "lastModified": 1736012469,
+        "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-24_11": {
+      "locked": {
+        "lastModified": 1734083684,
+        "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-24.11",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_2": {
      "locked": {
        "lastModified": 1731604181,
        "narHash": "sha256-uVtsFX1KpvDiDe1adeUkTK2YesWw1exgQ0nDMTfmJi0=",
@ -542,28 +576,13 @@
        "type": "github"
      }
    },
-    "nixpkgs-24_05": {
+    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1717144377,
-        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-24.05",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1733212471,
-        "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
+        "lastModified": 1741173522,
+        "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
+        "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049",
        "type": "github"
      },
      "original": {
@ -573,7 +592,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
      "locked": {
        "lastModified": 1719223410,
        "narHash": "sha256-jtIo8xR0Zp4SalIwmD+OdCwHF4l7OU6PD63UUK4ckt4=",
@ -591,24 +610,18 @@
    },
    "nixvim": {
      "inputs": {
-        "devshell": [],
-        "flake-compat": [],
        "flake-parts": "flake-parts",
-        "git-hooks": [],
-        "home-manager": [],
-        "nix-darwin": [],
        "nixpkgs": [
          "nixpkgs"
        ],
-        "nuschtosSearch": "nuschtosSearch",
-        "treefmt-nix": []
+        "nuschtosSearch": "nuschtosSearch"
      },
      "locked": {
-        "lastModified": 1733220378,
-        "narHash": "sha256-tWCskBne7LigfeXRWnUFJKKTLOYmmdqiwdqom2Sml1s=",
+        "lastModified": 1741098523,
+        "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "78bfbf7b7eb7a1b6cf42e199547de55a55ba2cea",
+        "rev": "03065fd4708bfdf47dd541d655392a60daa25ded",
        "type": "github"
      },
      "original": {
@ -627,11 +640,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1733006402,
-        "narHash": "sha256-BC1CecAQISV5Q4LZK72Gx0+faemOwaChiD9rMVfDPoA=",
+        "lastModified": 1738508923,
+        "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
        "owner": "NuschtOS",
        "repo": "search",
-        "rev": "16307548b7a1247291c84ae6a12c0aacb07dfba2",
+        "rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
        "type": "github"
      },
      "original": {
@ -642,7 +655,7 @@
    },
    "obs-image-reaction": {
      "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
        "lastModified": 1719314544,
@ -733,7 +746,7 @@
        "home-manager": "home-manager",
        "nix-std": "nix-std_2",
        "nixos-mailserver": "nixos-mailserver",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
        "nixvim": "nixvim",
        "obs-image-reaction": "obs-image-reaction",
        "oscuro": "oscuro",
@ -749,11 +762,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729477859,
-        "narHash": "sha256-r0VyeJxy4O4CgTB/PNtfQft9fPfN1VuGvnZiCxDArvg=",
+        "lastModified": 1735871325,
+        "narHash": "sha256-6Ta5E4mhSfCP6LdkzkG2+BciLOCPeLKuYTJ6lOHW+mI=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "ada8266712449c4c0e6ee6fcbc442b3c217c79e1",
+        "rev": "a599f011db521766cbaf7c2f5874182485554f00",
        "type": "github"
      },
      "original": {
@ -816,11 +829,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1733128155,
-        "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=",
+        "lastModified": 1741043164,
+        "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856",
+        "rev": "3f2412536eeece783f0d0ad3861417f347219f4d",
        "type": "github"
      },
      "original": {
@ -904,11 +917,11 @@
      },
      "locked": {
        "dir": "nix",
-        "lastModified": 1732918908,
-        "narHash": "sha256-k43oaC+35/LGqJ+3MjIhn4Ko+ap3wTvHCJ4sj9W/o+k=",
+        "lastModified": 1740857660,
+        "narHash": "sha256-fm/EVyg2soItlrRHSLyYUilcT2kCWxuj8KP7pN6SGXA=",
        "owner": "wez",
        "repo": "wezterm",
-        "rev": "4906789a6d61da58f73b95f89b59c41af60e0f3b",
+        "rev": "7d0bff0698813c9feeba91a342cd6df94aa34630",
        "type": "github"
      },
      "original": {
@ -921,16 +934,16 @@
    "zlib": {
      "flake": false,
      "locked": {
-        "lastModified": 1484501380,
-        "narHash": "sha256-j5b6aki1ztrzfCqu8y729sPar8GpyQWIrajdzpJC+ww=",
+        "lastModified": 1705948357,
+        "narHash": "sha256-TkPLWSN5QcPlL9D0kc/yhH0/puE9bFND24aj5NVDKYs=",
        "owner": "madler",
        "repo": "zlib",
-        "rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f",
+        "rev": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf",
        "type": "github"
      },
      "original": {
        "owner": "madler",
-        "ref": "v1.2.11",
+        "ref": "v1.3.1",
        "repo": "zlib",
        "type": "github"
      }
--- a/flake.nix
+++ b/flake.nix
@ -48,13 +48,6 @@
      url = "github:nix-community/nixvim";
      inputs = {
        nixpkgs.follows = "nixpkgs";
-
-        devshell.follows = "";
-        flake-compat.follows = "";
-        git-hooks.follows = "";
-        home-manager.follows = "";
-        nix-darwin.follows = "";
-        treefmt-nix.follows = "";
      };
    };
    ags = {
--- a/nixosConfigurations/astora/hardware.nix
+++ b/nixosConfigurations/astora/hardware.nix
@ -41,10 +41,10 @@
    graphics.enable32Bit = true;

    bluetooth.enable = true;
-
-    pulseaudio.enable = false;
  };

+  services.pulseaudio.enable = false;
+
  networking = {
    networkmanager = {
      enable = true;
--- a/nixosConfigurations/astora/users.nix
+++ b/nixosConfigurations/astora/users.nix
@ -36,12 +36,16 @@ in {
    imports = [
      (bonLib.injectArgs {
        inherit hmConfig;
+        inherit inputs;
      })
      inputs.catppuccin.homeManagerModules.catppuccin
      inputs.ags.homeManagerModules.default
      #bonLib.preconfiguredModules.homeManager.hyprland
      ../common/hm/helix.nix
      ../common/hm/nushell.nix
+      ../common/hm/zellij.nix
+      ../common/hm/wezterm.nix
+      ../common/hm/yazi.nix
    ];

    home.packages = with pkgs; [
@ -119,6 +123,7 @@ in {
      kdePackages.kmail
      kdePackages.kmail-account-wizard
      kdePackages.krdc
+      kdePackages.ksshaskpass

      flacon
      picard
@ -128,10 +133,12 @@ in {
      dive
      lazydocker

-      ksshaskpass
-
      # virtiofsd
      wl-clipboard
+
+      ripgrep
+      repgrep
+      delta
    ];

    xdg.portal = {
@ -262,61 +269,6 @@ in {

      # Graphical

-      wezterm = {
-        enable = true;
-        package = inputs.wezterm.packages.x86_64-linux.default;
-        extraConfig = ''
-          return {
-              default_prog = { "nu" },
-              font_size = 10.0,
-              enable_tab_bar = true,
-              hide_tab_bar_if_only_one_tab = true,
-              term = "wezterm",
-              window_padding = {
-                  left = 0,
-                  right = 0,
-                  top = 0,
-                  bottom = 0
-              },
-              enable_wayland = true,
-              color_scheme = "gruvbox-dark",
-              color_schemes = {
-                ["gruvbox-dark"] = {
-                    foreground = "#D4BE98",
-                    background = "#282828",
-                    cursor_bg = "#D4BE98",
-                    cursor_border = "#D4BE98",
-                    cursor_fg = "#282828",
-                    selection_bg = "#D4BE98",
-                    selection_fg = "#45403d",
-
-                    ansi = { "#282828", "#ea6962", "#a9b665", "#d8a657", "#7daea3", "#d3869b", "#89b482", "#d4be98" },
-                    brights = { "#eddeb5", "#ea6962", "#a9b665", "#d8a657", "#7daea3", "#d3869b", "#89b482", "#d4be98" }
-                  }
-              },
-              keys = {
-                { key = 'F11', action = wezterm.action.ToggleFullScreen }
-              }
-          }
-        '';
-      };
-
-      zellij = {
-        enable = true;
-        settings = {
-          theme = "gruvbox-dark";
-          default_mode = "normal";
-          copy_command = "${lib.getExe' pkgs.wl-clipboard "wl-copy"}";
-          copy_clipboard = "primary";
-        };
-      };
-
-      yazi = {
-        enable = true;
-        enableNushellIntegration = true;
-        enableBashIntegration = true;
-      };
-
      rofi = {
        enable = false;
        package = pkgs.rofi-wayland;
@ -396,6 +348,7 @@ in {

    home.sessionVariables = {
      HYPRSHOT_DIR = "${hmConfig.xdg.userDirs.pictures}/screenshots";
+      GNUPGHOME = hmConfig.programs.gpg.homedir;
    };
  };

@ -490,7 +443,7 @@ in {

  programs.ssh = {
    enableAskPassword = true;
-    askPassword = "${lib.getExe' pkgs.ksshaskpass "ksshaskpass"}";
+    askPassword = "${lib.getExe' pkgs.kdePackages.ksshaskpass "ksshaskpass"}";
    hostKeyAlgorithms = ["ssh-ed25519" "ssh-rsa"];
    startAgent = true;
  };
--- a/nixosConfigurations/catarina/default.nix
+++ b/nixosConfigurations/catarina/default.nix
@ -129,6 +129,26 @@
        forceSSL = true;
        enableACME = true;
        root = "/var/www";
+
+        listen = [
+          {
+            port = 8448;
+            addr = "0.0.0.0";
+            ssl = true;
+          }
+          {
+            port = 443;
+            addr = "0.0.0.0";
+            ssl = true;
+          }
+        ];
+        locations."~ ^/(_matrix|.well_known)" = {
+          proxyPass = "http://127.0.0.1:6167";
+          extraConfig = ''
+            proxy_http_version 1.0;
+            client_max_body_size 50M;
+          '';
+        };
      };

      "*.elnafo.ru" = {
--- a/nixosConfigurations/catarina/hardware.nix
+++ b/nixosConfigurations/catarina/hardware.nix
@ -123,10 +123,10 @@
    cpu.intel.updateMicrocode = true;

    bluetooth.enable = true;
-
-    pulseaudio.enable = false;
  };

+  services.pulseaudio.enable = false;
+
  networking = {
    networkmanager.enable = true;
    useDHCP = false;
--- a/nixosConfigurations/catarina/services/matrix.nix
+++ b/nixosConfigurations/catarina/services/matrix.nix
@ -44,6 +44,7 @@
        };
      };
    };
+    # Federation tester: https://federationtester.matrix.org/#elnafo.ru
    virtualHosts."matrix-federation" = {
      serverName = "elnafo.ru";
      forceSSL = true;
--- a/nixosConfigurations/catarina/users.nix
+++ b/nixosConfigurations/catarina/users.nix
@ -1,8 +1,16 @@
 {
  config,
  pkgs,
+  lib,
+  bonPkgs,
+  bonLib,
+  inputs,
  ...
 }: {
+  home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
+  home-manager.backupFileExtension = "hmbackup";
+
  # Users
  users.users.root.hashedPasswordFile = config.sops.secrets."users/root".path;

@ -12,13 +20,36 @@
    description = "L-Nafaryus";
    extraGroups = ["networkmanager" "wheel"];
    group = "users";
-    shell = pkgs.fish;
+    shell = pkgs.nushell;
    hashedPasswordFile = config.sops.secrets."users/l-nafaryus".path;
    openssh.authorizedKeys.keys = [
      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG1YGp8AI48hJUSQBZpuKLpbj2+3Q09vq64NxFr0N1MS nafaryus"
    ];
  };

+  home-manager.users.l-nafaryus = {pkgs, ...}: let
+    hmConfig = config.home-manager.users.l-nafaryus;
+  in {
+    home.stateVersion = "23.11";
+    home.username = "l-nafaryus";
+    home.homeDirectory = "/home/l-nafaryus";
+    imports = [
+      (bonLib.injectArgs {
+        inherit hmConfig;
+        inherit inputs;
+      })
+      ../common/hm/helix.nix
+      ../common/hm/nushell.nix
+      ../common/hm/zellij.nix
+      ../common/hm/yazi.nix
+    ];
+
+    home.packages = with pkgs; [
+      ripgrep
+      repgrep
+    ];
+  };
+
  users.users.nginx.extraGroups = ["acme" "papermc"];

  users.users.kirill = {
--- a/nixosConfigurations/common/hm/nushell.nix
+++ b/nixosConfigurations/common/hm/nushell.nix
@ -33,7 +33,7 @@
    environmentVariables = {
      GNUPGHOME = hmConfig.programs.gpg.homedir;
      SSH_AUTH_SOCK = "/run/user/1000/ssh-agent";
-      EDITOR = "hx";
+      EDITOR = "${lib.getExe' hmConfig.programs.helix.package "hx"}";
    };
  };

--- a/nixosConfigurations/common/hm/wezterm.nix
+++ b/nixosConfigurations/common/hm/wezterm.nix
@ -0,0 +1,47 @@
+{
+  pkgs,
+  lib,
+  config,
+  hmConfig,
+  inputs,
+  ...
+}: {
+  programs.wezterm = {
+    enable = true;
+    package = inputs.wezterm.packages.x86_64-linux.default;
+    extraConfig = ''
+      return {
+          default_prog = { "nu" },
+          font_size = 10.0,
+          enable_tab_bar = true,
+          hide_tab_bar_if_only_one_tab = true,
+          term = "wezterm",
+          window_padding = {
+              left = 0,
+              right = 0,
+              top = 0,
+              bottom = 0
+          },
+          enable_wayland = false,
+          color_scheme = "gruvbox-dark",
+          color_schemes = {
+            ["gruvbox-dark"] = {
+                foreground = "#D4BE98",
+                background = "#282828",
+                cursor_bg = "#D4BE98",
+                cursor_border = "#D4BE98",
+                cursor_fg = "#282828",
+                selection_bg = "#D4BE98",
+                selection_fg = "#45403d",
+
+                ansi = { "#282828", "#ea6962", "#a9b665", "#d8a657", "#7daea3", "#d3869b", "#89b482", "#d4be98" },
+                brights = { "#eddeb5", "#ea6962", "#a9b665", "#d8a657", "#7daea3", "#d3869b", "#89b482", "#d4be98" }
+              }
+          },
+          keys = {
+            { key = 'F11', action = wezterm.action.ToggleFullScreen }
+          }
+      }
+    '';
+  };
+}
--- a/nixosConfigurations/common/hm/yazi.nix
+++ b/nixosConfigurations/common/hm/yazi.nix
@ -0,0 +1,13 @@
+{
+  pkgs,
+  lib,
+  config,
+  hmConfig,
+  ...
+}: {
+  programs.yazi = {
+    enable = true;
+    enableNushellIntegration = true;
+    enableBashIntegration = true;
+  };
+}
--- a/nixosConfigurations/common/hm/zellij.nix
+++ b/nixosConfigurations/common/hm/zellij.nix
@ -0,0 +1,17 @@
+{
+  pkgs,
+  lib,
+  config,
+  hmConfig,
+  ...
+}: {
+  programs.zellij = {
+    enable = true;
+    settings = {
+      theme = "gruvbox-dark";
+      default_mode = "normal";
+      copy_command = "${lib.getExe' pkgs.wl-clipboard "wl-copy"}";
+      copy_clipboard = "primary";
+    };
+  };
+}
--- a/nixosConfigurations/default.nix
+++ b/nixosConfigurations/default.nix
@ -22,6 +22,7 @@
  catarina = lib.nixosSystem {
    system = "x86_64-linux";
    modules = with inputs; [
+      home-manager.nixosModules.home-manager
      elnafo-radio.nixosModules.elnafo-radio
      nixos-mailserver.nixosModules.mailserver
      sops-nix.nixosModules.sops
@ -44,5 +45,10 @@
    };
  };

-
+  priscilla = lib.nixosSystem {
+    system = "x86_64-linux";
+    modules = [
+      ./priscilla
+    ];
+  };
 }
--- a/nixosConfigurations/priscilla/default.nix
+++ b/nixosConfigurations/priscilla/default.nix
@ -0,0 +1,103 @@
+{
+  modulesPath,
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
+
+  system.stateVersion = "25.05";
+
+  system.build.qcow2 = import "${modulesPath}/../lib/make-disk-image.nix" {
+    inherit lib config pkgs;
+    diskSize = 10240;
+    format = "qcow2";
+    partitionTableType = "hybrid";
+  };
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/nixos";
+    autoResize = true;
+    fsType = "ext4";
+  };
+
+  boot = {
+    loader.grub.enable = lib.mkForce true;
+    loader.grub.device = lib.mkDefault "/dev/vda";
+    loader.timeout = lib.mkForce 0;
+    kernelParams = ["console=tty1" "console=ttyS0,115200"];
+  };
+
+  networking = {
+    useDHCP = true;
+    firewall.enable = true;
+  };
+
+  services = {
+    qemuGuest = {
+      enable = true;
+    };
+
+    openssh = {
+      enable = true;
+      openFirewall = true;
+    };
+
+    journald.extraConfig = ''
+      SystemMaxUse=100M
+      MaxFileSec=7day
+    '';
+
+    resolved = {
+      enable = true;
+      dnssec = "false";
+    };
+  };
+
+  users.users.l-nafaryus = {
+    isNormalUser = true;
+    extraGroups = ["wheel"];
+    shell = pkgs.nushell;
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG1YGp8AI48hJUSQBZpuKLpbj2+3Q09vq64NxFr0N1MS"
+    ];
+    initialPassword = "nixos";
+  };
+
+  users.users.root.openssh.authorizedKeys.keys =
+    config.users.users.l-nafaryus.openssh.authorizedKeys.keys;
+
+  nix = {
+    settings = {
+      experimental-features = ["nix-command" "flakes"];
+      trusted-users = ["l-nafaryus"];
+      allowed-users = ["l-nafaryus"];
+      substituters = [
+        "https://cache.elnafo.ru"
+        "https://bonfire.cachix.org"
+        "https://nix-community.cachix.org"
+      ];
+      trusted-public-keys = [
+        "cache.elnafo.ru:j3VD+Hn+is2Qk3lPXDSdPwHJQSatizk7V82iJ2RP1yo="
+        "bonfire.cachix.org-1:mzAGBy/Crdf8NhKail5ciK7ZrGRbPJJobW6TwFb7WYM="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      ];
+      auto-optimise-store = true;
+      allowed-uris = [
+        "github:"
+        "git+https://github.com/"
+        "git+ssh://github.com/"
+        "git+https://vcs.elnafo.ru/"
+        "git+ssh://vcs.elnafo.ru/"
+      ];
+    };
+    gc = {
+      automatic = lib.mkDefault true;
+      dates = lib.mkDefault "weekly";
+      options = lib.mkDefault "--delete-older-than 7d";
+    };
+  };
+}
--- a/nixosConfigurations/vinheim/hardware.nix
+++ b/nixosConfigurations/vinheim/hardware.nix
@ -88,9 +88,10 @@
    bluetooth.enable = true;

    bluetooth.powerOnBoot = true;
-    pulseaudio.enable = false;
  };

+  services.pulseaudio.enable = false;
+
  networking = {
    networkmanager = {
      enable = true;
--- a/nixosConfigurations/vinheim/users.nix
+++ b/nixosConfigurations/vinheim/users.nix
@ -90,7 +90,7 @@ in {
      podman-compose
      dive

-      ksshaskpass
+      kdePackages.ksshaskpass

      dbeaver-bin

--- a/packages/lego/default.nix
+++ b/packages/lego/default.nix
@ -5,8 +5,8 @@
  buildGoModule,
  nixosTests,
  version ? "bfe36067932e4594d3baf01cb6545c43b8e1f79c",
-  hash ? "sha256-j6AlA9+whDxvpbZBCnJinKTb0+bJrSqnMgCqmWWfLig=",
-  vendorHash ? "sha256-r9R+d5H5RjwzksbAlcFPyRtCGXSH1JBVfNHr5QiHA7Y=",
+  hash ? "sha256-ye5O1HYjzpuF4k2G5KUKHNyi33fJV8K0uxyeIXieX9Q=",
+  vendorHash ? "sha256-aW5Olj9t19R6J9NvuXhSXvfxdpC1yDk5/cHxZMRVJpY=",
  ...
 }:
 buildGoModule rec {