Merge remote-tracking branch 'refs/remotes/origin/main'

flake.lock

@@ -63,24 +63,6 @@
       "inputs": {
         "systems": "systems_2"
       },
-      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_3"
-      },
       "locked": {
         "lastModified": 1731533236,
         "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
@@ -95,21 +77,6 @@
         "type": "github"
       }
     },
-    "flakey-profile": {
-      "locked": {
-        "lastModified": 1712898590,
-        "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
-        "owner": "lf-",
-        "repo": "flakey-profile",
-        "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lf-",
-        "repo": "flakey-profile",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -117,11 +84,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751824240,
+        "lastModified": 1758653055,
-        "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=",
+        "narHash": "sha256-v2Pue/Xa9cDbKcrsOmhD8fiYR4No65z+ReAUBBvvE7g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "fd9e55f5fac45a26f6169310afca64d56b681935",
+        "rev": "131f4e22c30c114378dcf6191cb75c97eba673d0",
         "type": "github"
       },
       "original": {
@@ -130,48 +97,13 @@
         "type": "github"
       }
     },
-    "lix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1729298361,
-        "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
-        "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
-      }
-    },
-    "lix-module": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "flakey-profile": "flakey-profile",
-        "lix": "lix",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1732605668,
-        "narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=",
-        "rev": "f19bd752910bbe3a861c9cad269bd078689d50fe",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/f19bd752910bbe3a861c9cad269bd078689d50fe.tar.gz?rev=f19bd752910bbe3a861c9cad269bd078689d50fe"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz"
-      }
-    },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1751432711,
+        "lastModified": 1757943327,
-        "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=",
+        "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f",
+        "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05",
         "type": "github"
       },
       "original": {
@@ -183,11 +115,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1751637120,
+        "lastModified": 1758427187,
-        "narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=",
+        "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3",
+        "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46",
         "type": "github"
       },
       "original": {
@@ -200,7 +132,6 @@
       "inputs": {
         "edit": "edit",
         "home-manager": "home-manager",
-        "lix-module": "lix-module",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "tepid-client-services": "tepid-client-services"
@@ -253,24 +184,9 @@
         "type": "github"
       }
     },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "tepid-client-services": {
       "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixpkgs"
         ]

flake.nix

@@ -3,10 +3,10 @@
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
 
-    lix-module = {
+    # lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz";
+    #   url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz";
-      inputs.nixpkgs.follows = "nixpkgs";
+    #   inputs.nixpkgs.follows = "nixpkgs";
-    };
+    # };
 
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -31,7 +31,7 @@
     {
       self,
       nixpkgs,
-      lix-module,
+      # lix-module,
       home-manager,
       nixos-hardware,
       edit,
@@ -48,7 +48,7 @@
             defaultModules = [
               ./hosts/${hostname}/configuration.nix
               home-manager.nixosModules.home-manager
-              lix-module.nixosModules.default
+              # lix-module.nixosModules.default
             ];
           in
           {

hosts/de-lacadie/configuration.nix

@@ -10,6 +10,7 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      ../../snippets/lix.nix
     ];
 
   nixpkgs.config.allowUnfree = true;

hosts/randolph/configuration.nix

@@ -8,6 +8,7 @@
   imports = [ # Include the results of the hardware scan.
     ./hardware-configuration.nix
     ../../snippets/samba.nix
+    ../../snippets/lix.nix
   ];
 
   ################################################
@@ -34,8 +35,9 @@
       # "amdgpu.dcdebugmask=0x10"
   ];
 
-  # Enable flakes.
+  nix = {
-  nix = { settings.experimental-features = [ "nix-command" "flakes" ]; };
+    settings.experimental-features = [ "nix-command" "flakes" ];
+  };
 
   # Enable unfree packages.
   nixpkgs.config.allowUnfree = true;
@@ -63,7 +65,7 @@
 
   services.resolved = {
     enable = true;
-    dnssec = "true";
+    # dnssec = "true";
     domains = [ "~." ];
     fallbackDns = [ "9.9.9.9" "149.112.112.112" ];
   };
@@ -178,9 +180,9 @@
   # Make sure suspend actually happens
   # what this does is set the time it waits before sleeping to 10 (default 30)
   # default is 30 for, say, if you plug in an external monitor after shutting the lid
-  services.logind.extraConfig = ''
+  services.logind.settings.Login = {
-    InhibitDelayMaxSec=10
+    InhibitDelayMaxSec = 10;
-  '';
+  };
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget

snippets/gammastep.nix

@@ -5,6 +5,16 @@ let
     latitude = 45.4987;
     longitude = -73.5703;
   };
+  nagpur = {
+    # zero mile
+    latitude = 21.147399;
+    longitude = 79.080857;
+  };
+  zurich = {
+    # random spot
+    latitude = 74.21433;
+    longitude = 8.32245;
+  };
 in
 {
   services.gammastep = {

snippets/lix.nix

@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+{
+  # Enable Lix and flakes.
+  nixpkgs.overlays = [ (final: prev: {
+    inherit (final.lixPackageSets.stable)
+      nixpkgs-review
+      nix-direnv
+      nix-eval-jobs
+      nix-fast-build
+      colmena;
+    })
+  ];
+
+  nix.package = pkgs.lixPackageSets.stable.lix;
+}

snippets/sway.nix

@@ -158,7 +158,7 @@ in {
   programs.rofi = {
     enable = true;
     font = "Rubik 12";
-    package = pkgs.rofi-wayland;
+    package = pkgs.rofi;
     theme = "android_notification";
   };