Merge branch 'master' of ssh://bosco:/srv/git/.flake

5 files changed, 43 insertions, 44 deletions

diff --git a/flake.lock b/flake.lock
index bd5a636..bbd33a2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -242,11 +242,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772985280,
-        "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=",
+        "lastModified": 1773264488,
+        "narHash": "sha256-rK0507bDuWBrZo+0zts9bCs/+RRUEHuvFE5DHWPxX/Q=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8f736f007139d7f70752657dff6a401a585d6cbc",
+        "rev": "5c0f63f8d55040a7eed69df7e3fcdd15dfb5a04c",
         "type": "github"
       },
       "original": {
@@ -259,7 +259,7 @@
     "hugo-congo": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-9nARwUmQZgMFrGsT4n28fJh/iG/oG93+HMObX5BOWdI=",
+        "narHash": "sha256-UqSzN9kzXKYhUOLjZg9e8Qxs6BGUaT/7MUcjboEujPU=",
         "type": "file",
         "url": "https://github.com/jpanther/congo"
       },
@@ -345,11 +345,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1773082851,
-        "narHash": "sha256-xeeeJ1gt4SoskgHW67PVX5p7cDlZFSyX5n4eUSPjxT8=",
+        "lastModified": 1773439168,
+        "narHash": "sha256-BP8JCxijLBf5Qk83lEN/9qAOeDuAnftfmr92KQM1QOI=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "e32eeb1d454b029a24ca71f410896bf52839085d",
+        "rev": "9bf8fe7a5278b5f366384d73d87844a165c16b7a",
         "type": "github"
       },
       "original": {
@@ -787,11 +787,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1772963539,
-        "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
+        "lastModified": 1773282481,
+        "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
+        "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
         "type": "github"
       },
       "original": {
@@ -819,11 +819,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1772822230,
-        "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=",
+        "lastModified": 1773375660,
+        "narHash": "sha256-SEzUWw2Rf5Ki3bcM26nSKgbeoqi2uYy8IHVBqOKjX3w=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96",
+        "rev": "3e20095fe3c6cbb1ddcef89b26969a69a1570776",
         "type": "github"
       },
       "original": {
@@ -836,11 +836,11 @@
     "nushell-scripts": {
       "flake": false,
       "locked": {
-        "lastModified": 1773054709,
-        "narHash": "sha256-JDepNHHj0aKnLPBDuLNjvNLKsTcp84WeYqoASTl1Gvs=",
+        "lastModified": 1773315180,
+        "narHash": "sha256-5FKqphXxVSgqGXbqOL3aiZEGFSr5SMjMVIWzB0dA/+I=",
         "owner": "nushell",
         "repo": "nu_scripts",
-        "rev": "33ea2a5271a3b9d5f2722ebeebc26e4159068a76",
+        "rev": "196d94338d382561e7bacb29948ffcfa5ff1b2a1",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/default.nix b/home-manager/default.nix
index bba5525..b814c27 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -43,16 +43,20 @@
         broot # tree view files
         procs # process view
         gnupg
+
         #helix plugins
         # vadimcn.vscode-lldb
-        # yaml-language-server
+        yaml-language-server #Language Server for YAML Files
         # typescript-language-server
-        # rust-analyzer
-        # solargraph
+        # rust-analyzer #A modular compiler frontend for the Rust language
+        # solargraph #A ruby language server
         # clangd
         # vscode-json-language-server
-        # lua-language-server
-        # marksman
+        taplo #A TOML toolkit written in Rust
+        # lua-language-server #A language server that offers Lua language support
+        marksman #Language Server for Markdown
+        texlab #An implementation of the Language Server Protocol for LaTeX
+        nil #Yet another language server for Nix
       ];
 
       # Home Manager is pretty good at managing dotfiles. The primary way to manage
diff --git a/home-manager/home.nix b/home-manager/home.nix
index aa3ba62..a13e62c 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -71,7 +71,7 @@
         wineWowPackages.waylandFull
         # unstable.yt-dlp
         yt-dlp
-        telegram-desktop
+        # telegram-desktop
         obsidian
         zettlr
         element-desktop
@@ -100,19 +100,6 @@
         openjdk
         adoptopenjdk-icedtea-web
 
-        #helix plugins
-        # vadimcn.vscode-lldb
-        yaml-language-server #Language Server for YAML Files
-        # typescript-language-server
-        rust-analyzer #A modular compiler frontend for the Rust language
-        solargraph #A ruby language server
-        # clangd
-        # vscode-json-language-server
-        taplo #A TOML toolkit written in Rust
-        lua-language-server #A language server that offers Lua language support
-        marksman #Language Server for Markdown
-        texlab #An implementation of the Language Server Protocol for LaTeX
-        nil #Yet another language server for Nix
       ];
 
       # Home Manager is pretty good at managing dotfiles. The primary way to manage
diff --git a/modules/nixos/nix-common.nix b/modules/nixos/nix-common.nix
index c7b6fe5..80556a6 100644
--- a/modules/nixos/nix-common.nix
+++ b/modules/nixos/nix-common.nix
@@ -1,6 +1,14 @@
 { config, pkgs, ... }: {
   imports = [./lix.nix];
-  
+
+  # Manage nix installation with helper script
+  programs.nh = {
+    enable = true;
+    clean.enable = true;
+    clean.extraArgs = "--keep-since 30d --keep 3";
+    flake = "/home/defin/.flake"; 
+  };
+
   nix = {
     settings = {
       # Users allowed to run nix
@@ -11,10 +19,10 @@
     };
 
     # Clean up old generations after 30 days
-    gc = {
-      automatic = true;
-      dates = "weekly";
-      options = "--delete-older-than 30d";
-    };
+    # gc = {
+    #   automatic = true;
+    #   dates = "weekly";
+    #   options = "--delete-older-than 30d";
+    # };
   };
 }
diff --git a/modules/nixos/system-packages.nix b/modules/nixos/system-packages.nix
index a38646b..07696ae 100644
--- a/modules/nixos/system-packages.nix
+++ b/modules/nixos/system-packages.nix
@@ -22,7 +22,7 @@
   fonts.packages = with pkgs; [
     hack-font
   ];
-  nixpkgs.config.permittedInsecurePackages = [
-    # "electron-33.4.11"
-  ];
+  # nixpkgs.config.permittedInsecurePackages = [
+  #   # "electron-33.4.11"
+  # ];
 }