Updates packages

had to comment out broken Lix version
Fixes Linux builder
2024-12-16 11:25:53 +05:30 · 2024-12-01 21:25:03 +05:30 · 2024-11-30 10:45:09 +05:30 · 2024-11-30 10:14:40 +05:30 · 2024-11-29 13:57:27 +05:30 · 2024-11-26 20:33:25 +05:30
6 changed files with 146 additions and 115 deletions
--- a/flake.lock
+++ b/flake.lock
@ -19,11 +19,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
        "type": "github"
      },
      "original": {
@ -83,18 +83,26 @@
        "type": "github"
      }
    },
-    "flakey-profile": {
+    "hell": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
      "locked": {
-        "lastModified": 1712898590,
-        "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
-        "owner": "lf-",
-        "repo": "flakey-profile",
-        "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
+        "lastModified": 1733432399,
+        "narHash": "sha256-ZzDbfvtbqrU2U4OpfUn2syS30mgMsgZUmHNUxq7qz/0=",
+        "owner": "chrisdone",
+        "repo": "hell",
+        "rev": "64079de376a14cc0ab258be42f3460fd051f272b",
        "type": "github"
      },
      "original": {
-        "owner": "lf-",
-        "repo": "flakey-profile",
+        "owner": "chrisdone",
+        "repo": "hell",
        "type": "github"
      }
    },
@ -105,11 +113,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1732025103,
-        "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=",
+        "lastModified": 1734093295,
+        "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "a46e702093a5c46e192243edbd977d5749e7f294",
+        "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8",
        "type": "github"
      },
      "original": {
@ -118,59 +126,6 @@
        "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"
-        ],
-        "flakey-profile": "flakey-profile",
-        "lix": "lix",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729302939,
-        "narHash": "sha256-slp0zWHKvbCzhiBwwe6VX6jODEY+PKhHyiAoHgM5Bdc=",
-        "rev": "6478f624b2a00367e0e3d750a2c7a9f3afb72712",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/6478f624b2a00367e0e3d750a2c7a9f3afb72712.tar.gz?rev=6478f624b2a00367e0e3d750a2c7a9f3afb72712"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1.tar.gz"
-      }
-    },
-    "monaspace-font": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1715284772,
-        "narHash": "sha256-wdGDv5IO6X4gB1maSdEzh92UXAb+BQauAqKWz+//dwE=",
-        "owner": "githubnext",
-        "repo": "monaspace",
-        "rev": "ac94165d2a6d5fb60f876c22989e986dcaaf8a87",
-        "type": "github"
-      },
-      "original": {
-        "owner": "githubnext",
-        "repo": "monaspace",
-        "type": "github"
-      }
-    },
    "nix-darwin": {
      "inputs": {
        "nixpkgs": [
@ -178,11 +133,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1732016537,
-        "narHash": "sha256-XwXUK+meYnlhdQz2TVE4Wv+tsx1CkdGbDPt1tRzCNH4=",
+        "lastModified": 1733570843,
+        "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
        "owner": "LnL7",
        "repo": "nix-darwin",
-        "rev": "61cee20168a3ebb71a9efd70a55adebaadfbe4d4",
+        "rev": "a35b08d09efda83625bef267eb24347b446c80b8",
        "type": "github"
      },
      "original": {
@ -204,11 +159,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1732067576,
-        "narHash": "sha256-rLOjv9vHfZe3ldHdr4zPfdj/oBbpjOSNq0rEMbbC0Zs=",
+        "lastModified": 1734314392,
+        "narHash": "sha256-EydUadS7omV3SO/4TLeMkLT2JUugvPEtvBoAF43ggWU=",
        "owner": "nix-community",
        "repo": "nix-vscode-extensions",
-        "rev": "d12edb63d2550782aff99cf6db8d36d8ffe67275",
+        "rev": "4ef033412f0732794077fcc25af4f79f097ad1e1",
        "type": "github"
      },
      "original": {
@ -243,11 +198,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1731890469,
-        "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=",
+        "lastModified": 1734126203,
+        "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "5083ec887760adfe12af64830a66807423a859a7",
+        "rev": "71a6392e367b08525ee710a93af2e80083b5b3e2",
        "type": "github"
      },
      "original": {
@ -277,11 +232,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1730891215,
-        "narHash": "sha256-i85DPrhDuvzgvIWCpJlbfM2UFtNYbapo20MtQXsvay4=",
+        "lastModified": 1734097745,
+        "narHash": "sha256-ZDN1ytl6Xur0EhJqUtqa0/j686Hy155p3IAW+8yeyS0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "c128e44a249d6180740d0a979b6480d5b795c013",
+        "rev": "e84c1eb11ad40943c40db09436195c48f0dcfb57",
        "type": "github"
      },
      "original": {
@ -296,9 +251,8 @@
        "dm-mono-font": "dm-mono-font",
        "flake-compat": "flake-compat",
        "flake-utils": "flake-utils",
+        "hell": "hell",
        "home-manager": "home-manager",
-        "lix-module": "lix-module",
-        "monaspace-font": "monaspace-font",
        "nix-darwin": "nix-darwin",
        "nix-vscode-extensions": "nix-vscode-extensions",
        "nixd": "nixd",
--- a/flake.nix
+++ b/flake.nix
@ -24,11 +24,16 @@
      url = "github:nix-community/nixd/2.5.1";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1.tar.gz";
+    hell = {
+      url = "github:chrisdone/hell";
      inputs.nixpkgs.follows = "nixpkgs";
      inputs.flake-utils.follows = "flake-utils";
    };
+    # lix-module = {
+    #   url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    #   inputs.flake-utils.follows = "flake-utils";
+    # };
    flake-utils.url = "github:numtide/flake-utils";
    flake-compat = {
      url = "github:edolstra/flake-compat";
@ -38,10 +43,6 @@
      url = "github:googlefonts/dm-mono";
      flake = false;
    };
-    monaspace-font = {
-      url = "github:githubnext/monaspace";
-      flake = false;
-    };
  };

  outputs =
@ -51,11 +52,11 @@
      nixpkgs-stable,
      nix-darwin,
      home-manager,
-      lix-module,
+      # lix-module,
      ...
    }:
    let
-      system = "x86_64-darwin";
+      system = "aarch64-darwin";
      pkgs = import nixpkgs {
        inherit system;
        config = {
@ -70,7 +71,7 @@
      };
    in
    {
-      darwinConfigurations."Abhinavs-MacBook-Pro" = nix-darwin.lib.darwinSystem {
+      darwinConfigurations."Abhinavs-M4-MacBook-Pro" = nix-darwin.lib.darwinSystem {
        inherit system;
        specialArgs = {
          inherit inputs pkgs-stable;
@ -78,7 +79,7 @@
        modules = [
          ./configuration.nix
          ./homebrew.nix
-          lix-module.nixosModules.default
+          # lix-module.nixosModules.default
          home-manager.darwinModules.home-manager
          {
            home-manager.useGlobalPkgs = true;
@ -88,6 +89,7 @@
            home-manager.extraSpecialArgs = {
              inherit inputs pkgs-stable;
              nixd = inputs.nixd.packages.${system}.nixd;
+              hell = inputs.hell.packages.${system}.default;
            };
          }
        ];
@ -96,6 +98,8 @@
        buildInputs = with pkgs; [
          (import home-manager { inherit pkgs; }).home-manager
          just
+          nix-output-monitor
+          nvd
        ];
        shellHook = ''
          export NIXPKGS_PATH=${pkgs.path};
--- a/homebrew.nix
+++ b/homebrew.nix
@ -25,21 +25,14 @@
      "appcleaner"
      "calibre"
      "dropbox"
-      "fanny"
      "firefox"
-      "garmin-express"
      "google-chrome"
-      "homebrew/cask/handbrake"
-      "lastfm"
      "monodraw"
-      "obsidian"
      "signal"
      "spotify"
-      "steam"
+#      "steam"
      "telegram"
-      "utm"
-      "vlc"
-      "zed"
+#      "vlc"
    ];
    masApps = {
      Amphetamine = 937984704;
@ -51,7 +44,6 @@
      NextDNS = 1464122853;
      Numbers = 409203825;
      Pages = 409201541;
-      Reeder = 1449412482;
      TestFlight = 899247664;
      Xcode = 497799835;
    };
--- a/nix.nix
+++ b/nix.nix
@ -17,7 +17,7 @@ let
    keep-outputs = true;
    keep-going = true;
    log-lines = 25;
-    max-jobs = 3;
+    max-jobs = 5;
  };
 in
 {
@ -49,7 +49,10 @@ in
    distributedBuilds = true;
    linux-builder = {
      enable = true;
-      maxJobs = 3;
+      package = pkgs.darwin.linux-builder-x86_64;
+      systems = [ "x86_64-linux" ];
+      ephemeral = true;
+      maxJobs = 5;
      config = (
        { pkgs, ... }:
        {
@ -64,17 +67,19 @@ in
            };
            cores = 8;
          };
-          nix.package = pkgs.lix;
+          #nix.package = pkgs.lix;
          nix.settings = nixSettings // {
            sandbox = false;
+            trusted-users = [ "builder" ];
          };
+          nixpkgs.config.allowUnfree = true;
          environment.systemPackages = [ pkgs.htop ];
        }
      );
    };
  };
  nixpkgs = {
-    hostPlatform = "x86_64-darwin";
+    hostPlatform = "aarch64-darwin";
    config.allowUnfree = true;
  };
 }
--- a/programs/default.nix
+++ b/programs/default.nix
@ -3,6 +3,7 @@
  config,
  pkgs,
  nixd,
+  hell,
  ...
 }:

@ -52,6 +53,7 @@ let
    brotli
    cabal2nix
    (opaComplete "cabal-plan" (leanHaskellBinary haskellPackages.cabal-plan))
+    (opaComplete "hell" (leanHaskellBinary hell))
    (leanHaskellBinary (
      import ../packages/pandoc-cli-3.5.nix {
        system = pkgs.system;
@ -84,16 +86,8 @@ let
    roboto-mono
    source-code-pro
    (pkgs.callPackage ../packages/dm-mono.nix { dm-mono-src = "${inputs.dm-mono-font}"; })
-    (pkgs.callPackage ../packages/monaspace.nix { monaspace-src = "${inputs.monaspace-font}"; })
-    (nerdfonts.override {
-      fonts = [
-        "Monoid"
-        "Agave"
-        "Iosevka"
-        "Lekton"
-        "VictorMono"
-      ];
-    })
+    monaspace
+    nerd-fonts.iosevka
  ];
 in
 {
@ -102,6 +96,7 @@ in
    ./git.nix
    ./starship.nix
    ./vscode.nix
+    ./zed.nix
  ];

  home.packages = nixPackages ++ networkingPackages ++ cmdLineUtilPackages ++ miscPackages ++ fonts;
--- a/programs/zed.nix
+++ b/programs/zed.nix
@ -0,0 +1,81 @@
+{
+  inputs,
+  config,
+  pkgs,
+  ...
+}:
+
+{
+  programs.zed-editor = {
+    enable = true;
+    extensions = [
+      "assembly"
+      "brainfuck"
+      "ini"
+      "just"
+      "nix"
+      "roc"
+      "haskell"
+      "toml"
+    ];
+    userSettings = {
+      theme = "Summercamp";
+      telemetry = {
+        diagnostic = false;
+        metrics = false;
+      };
+      buffer_font_family = "PragmataPro Mono Liga"; # "Zed Plex Mono";
+      ui_font_size = 16;
+      buffer_font_size = 13;
+      confirm_quit = true;
+      cursor_blink = false;
+      tab_size = 2;
+      terminal = {
+        font_family = "Zed Plex Mono";
+        shell = {
+          program = "/etc/profiles/per-user/abhinav/bin/fish";
+        };
+        copy_on_select = true;
+      };
+      indent_guides = {
+        enabled = true;
+        coloring = "indent_aware";
+      };
+      wrap_guides = [ 100 ];
+      assistant = {
+        default_model = {
+          provider = "ollama";
+          model = "qwen2.5-coder:latest";
+        };
+        version = "2";
+      };
+      languages = {
+        Haskell = {
+          tab_size = 2;
+          format_on_save = "on";
+          wrap_guides = [ 100 ];
+        };
+        Nix = {
+          tab_size = 2;
+        };
+      };
+      lsp = {
+        hls = {
+          initialization_options = {
+            sessionLoading = "multiComponent";
+          };
+        };
+        nixd = {
+          formatting = {
+            command = [
+              "nixfmt"
+              "-s"
+              "-w"
+              "100"
+            ];
+          };
+        };
+      };
+    };
+  };
+}
Author	SHA1	Message	Date
Abhinav Sarkar	bcf9b570bb	Updates packages had to comment out broken Lix version	2024-12-16 11:25:53 +05:30
Abhinav Sarkar	d2091e5fc3	Fixes Linux builder	2024-12-01 21:25:03 +05:30
Abhinav Sarkar	329b83367d	flake.lock: Update Flake lock file updates: • Updated input 'flake-compat': 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04) → 'github:edolstra/flake-compat/9ed2ac151eada2306ca8c418ebd97807bb08f6ac' (2024-11-27) • Updated input 'home-manager': 'github:nix-community/home-manager/a9953635d7f34e7358d5189751110f87e3ac17da' (2024-11-24) → 'github:nix-community/home-manager/819f682269f4e002884702b87e445c82840c68f2' (2024-11-29) • Removed input 'monaspace-font' • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/3c52583b99666a349a6219dc1f0dd07d75c82d6a' (2024-11-24) → 'github:LnL7/nix-darwin/6ab87b7c84d4ee873e937108c4ff80c015a40c7a' (2024-11-26) • Updated input 'nix-vscode-extensions': 'github:nix-community/nix-vscode-extensions/b376bfa567fd25f9f22b6f51ffaa4f84d0b7c72f' (2024-11-25) → 'github:nix-community/nix-vscode-extensions/ad53e4155149d1d69e45bc0ade1d9695d81a05b6' (2024-11-30) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/8edf06bea5bcbee082df1b7369ff973b91618b8d' (2024-11-22) → 'github:nixos/nixpkgs/226216574ada4c3ecefcbbec41f39ce4655f78ef' (2024-11-28)	2024-11-30 10:45:09 +05:30
Abhinav Sarkar	4cebc9d607	Updates Zed settings	2024-11-30 10:14:40 +05:30
Abhinav Sarkar	017414d382	flake.lock: Update Flake lock file updates: • Updated input 'hell': 'github:chrisdone/hell/c34b46d1988d4db3cd571bfc13007eb76d509c97' (2024-11-20) → 'github:chrisdone/hell/ec773da7d0b1f8f5330de5b12a761019b4e87e6d' (2024-11-26)	2024-11-29 13:57:27 +05:30
Abhinav Sarkar	2a28aecc7a	Adds Zed editor	2024-11-26 20:33:25 +05:30
Abhinav Sarkar	1221e6ece8	Increase Nix maxJobs	2024-11-25 18:25:40 +05:30
Abhinav Sarkar	8b8b605bbf	Adds hell	2024-11-25 15:56:47 +05:30
Abhinav Sarkar	80fc16e495	flake.lock: Update Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/a46e702093a5c46e192243edbd977d5749e7f294' (2024-11-19) → 'github:nix-community/home-manager/a9953635d7f34e7358d5189751110f87e3ac17da' (2024-11-24) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/61cee20168a3ebb71a9efd70a55adebaadfbe4d4' (2024-11-19) → 'github:LnL7/nix-darwin/3c52583b99666a349a6219dc1f0dd07d75c82d6a' (2024-11-24) • Updated input 'nix-vscode-extensions': 'github:nix-community/nix-vscode-extensions/d12edb63d2550782aff99cf6db8d36d8ffe67275' (2024-11-20) → 'github:nix-community/nix-vscode-extensions/b376bfa567fd25f9f22b6f51ffaa4f84d0b7c72f' (2024-11-25) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/5083ec887760adfe12af64830a66807423a859a7' (2024-11-18) → 'github:nixos/nixpkgs/8edf06bea5bcbee082df1b7369ff973b91618b8d' (2024-11-22)	2024-11-25 15:43:40 +05:30
Abhinav Sarkar	ead04d4bc0	Changes for m4	2024-11-25 15:43:40 +05:30