From a3cccd8751acfa0899a0f987d48539aecc0d80c9 Mon Sep 17 00:00:00 2001
From: Roman Lubij <roman.lubij@gmail.com>
Date: Fri, 27 Mar 2026 21:57:52 +0100
Subject: [PATCH] Add flake for newer clion

---
 common/flakes/clion-flake/flake.nix | 30 +++++++++++++++++++++++
 common/modules/packages.nix         |  5 +++-
 flake.lock                          | 37 ++++++++++++++++++++++++++---
 flake.nix                           |  3 ++-
 4 files changed, 70 insertions(+), 5 deletions(-)
 create mode 100644 common/flakes/clion-flake/flake.nix

diff --git a/common/flakes/clion-flake/flake.nix b/common/flakes/clion-flake/flake.nix
new file mode 100644
index 0000000..fc79e58
--- /dev/null
+++ b/common/flakes/clion-flake/flake.nix
@@ -0,0 +1,30 @@
+{
+  description = "Latest CLion from JetBrains";
+
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+
+  outputs = {
+    self,
+    nixpkgs,
+  }: let
+    system = "x86_64-linux";
+    pkgs = import nixpkgs {
+      inherit system;
+      config = {
+        allowUnfree = true;
+        permittedInsecurePackages = [
+          "openssl-1.1.1w"
+        ];
+      };
+    };
+  in {
+    packages.${system}.default = pkgs.jetbrains.clion.overrideAttrs (oldAttrs: rec {
+      version = "2026.1";
+      src = pkgs.fetchurl {
+        url = "https://download-cdn.jetbrains.com/cpp/CLion-${version}.tar.gz";
+        hash = "sha256-r5flY2u6aCkI8q7ZcGWYLLxxcWWp3gtTkdBdKoacIB0=";
+      };
+      buildInputs = oldAttrs.buildInputs ++ [pkgs.openssl_1_1];
+    });
+  };
+}
diff --git a/common/modules/packages.nix b/common/modules/packages.nix
index fda5719..891bf87 100644
--- a/common/modules/packages.nix
+++ b/common/modules/packages.nix
@@ -2,6 +2,7 @@
   config,
   pkgs,
   lib,
+  clion-flake,
   czkawka-master,
   solaar-master,
   fet,
@@ -15,6 +16,7 @@
         "cisco-packet-tracer_9"
       ];
     };
+
     overlays = [
       (final: prev: {
         nautilus = prev.nautilus.overrideAttrs (nprev: {
@@ -91,7 +93,8 @@
     iftop
     inkscape
     iotop
-    jetbrains.clion
+    #jetbrains.clion
+    clion-flake.packages.${pkgs.stdenv.hostPlatform.system}.default
     jq
     just
     killall
diff --git a/flake.lock b/flake.lock
index 147cce1..b5d6bba 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,10 +1,24 @@
 {
   "nodes": {
+    "clion-flake": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "path": "./common/flakes/clion-flake",
+        "type": "path"
+      },
+      "original": {
+        "path": "./common/flakes/clion-flake",
+        "type": "path"
+      },
+      "parent": []
+    },
     "czkawka-master": {
       "inputs": {
         "czkawka-src": "czkawka-src",
         "naersk": "naersk",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "path": "./common/flakes/czkawka-master",
@@ -58,7 +72,7 @@
     "fet": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "path": "./common/flakes/fet",
@@ -178,6 +192,22 @@
       }
     },
     "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1774386573,
+        "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1774612448,
         "narHash": "sha256-+uVDNwxihd82I6aZTgNvIXqFyLcfUBkg/Y0A8UBgycg=",
@@ -195,11 +225,12 @@
     },
     "root": {
       "inputs": {
+        "clion-flake": "clion-flake",
         "czkawka-master": "czkawka-master",
         "fet": "fet",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_4"
       }
     },
     "rust-analyzer-src": {
diff --git a/flake.nix b/flake.nix
index 8480569..f2a01e2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,6 +9,7 @@
 
     czkawka-master.url = "path:./common/flakes/czkawka-master";
     fet.url = "path:./common/flakes/fet";
+    clion-flake.url = "path:./common/flakes/clion-flake";
   };
 
   outputs = {
@@ -18,7 +19,7 @@
     home-manager,
     ...
   } @ inputs: let
-    specialArgs = {inherit (inputs) czkawka-master fet;};
+    specialArgs = {inherit (inputs) czkawka-master fet clion-flake;};
   in {
     nixosConfigurations = {
       epiquev2 = nixpkgs.lib.nixosSystem {