Update (#134)

* Partial update. * Full update, but it breaks the build. * Update, also update nerd-fonts package. * Remove Lix from the repo.
attilaolah · Dec 2, 2024 · 98ecb87 · 98ecb87
1 parent 6211b30
commit 98ecb87
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 113 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -11,22 +11,13 @@
       url = "github:hyprwm/hyprlock";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    lix-module = {
-      # https://lix.systems
-      # Include the below commit directly until the next release.
-      # url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1.tar.gz";
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/81d9ff97c93289bb1592ae702d11173724a643fa.tar.gz";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs = {
     self,
     nixpkgs,
     home-manager,
     hyprlock,
-    lix-module,
     ...
   } @ inputs: let
     pkgs = import nixpkgs {inherit system;};
@@ -55,9 +46,6 @@
             users.${username} = import ./home-manager/home.nix;
           };
         }
-
-        # https://lix.systems
-        lix-module.nixosModules.default
       ];
       specialArgs = {inherit inputs username email;};
     };

diff --git a/hosts/home/configuration.nix b/hosts/home/configuration.nix
@@ -54,12 +54,10 @@
 
     trusted-users = [username];
     extra-substituters = [
-      "https://cache.lix.systems" # lix.systems
       "https://devenv.cachix.org" # devenv.sh
       "https://nixpkgs-python.cachix.org" # devenv.sh python
     ];
     trusted-public-keys = [
-      "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
       "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
       "nixpkgs-python.cachix.org-1:hxjI7pFxTyuTHn2NkvWCrAUcNZLNS3ZAvfYNuYifcEU="
     ];

diff --git a/hosts/home/fonts.nix b/hosts/home/fonts.nix
@@ -16,7 +16,7 @@
       corefonts
       hack-font
       inter
-      nerdfonts
+      nerd-fonts.jetbrains-mono
       noto-fonts
       noto-fonts-cjk-sans
       noto-fonts-color-emoji

diff --git a/renovate.json b/renovate.json
@@ -22,15 +22,6 @@
       "datasourceTemplate": "github-tags",
       "depNameTemplate": "python/cpython",
       "currentValueTemplate": "{{major}}.{{minor}}"
-    },
-    {
-      "customType": "regex",
-      "fileMatch": ["flake\\.nix$"],
-      "matchStrings": [
-        "(?<depName>https://git\\..*?)/archive/(?<currentValue>.*?)\\.tar\\.gz.*"
-      ],
-      "datasourceTemplate": "git-tags",
-      "versioningTemplate": "semver"
     }
   ],
   "packageRules": [