settings n stuff

henrikvtcodes · Jan 14, 2025 · d73d155 · d73d155
1 parent 1a2c0a4
commit d73d155
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 49 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,17 +1,17 @@
 {
   "nix.enableLanguageServer": true,
-  "nix.formatterPath": ["nix", "fmt", "--", "-"],
+  "nix.formatterPath": ["nix", "fmt", "--", "--"],
   "[nix]": {
     "editor.defaultFormatter": "jnoortheen.nix-ide",
-    "editor.formatOnSave": false,
+    "editor.formatOnSave": true,
     "editor.formatOnPaste": false
   },
   "nix.serverPath": "nixd",
   "nix.serverSettings": {
     "nixd": {
       "formatting": {
         // This is the default if ommited.
-        "command": ["nix", "fmt", "--", "-"]
+        "command": ["nix", "fmt", "--", "--"]
       },
       "options": {
         "nixos": {

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,12 +2,6 @@
   description = "nix configuration for my servers + other stuff";
 
   inputs = {
-    # Required for nix to recognize the git submodule as a valid nix module
-    # secrets = {
-    #   url = "path:secrets"; # the submodule is in the ./subproject dir
-    #   flake = false;
-    # };
-
     nixpkgs = {
       url = "github:nixos/nixpkgs/nixos-24.11";
     };
@@ -17,9 +11,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew";
-
-    # Core tools: home manager, secrets, disk partitioning, deployment
     home-manager = {
       url = "github:nix-community/home-manager/release-24.11";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -48,6 +39,8 @@
     alejandra = {
       url = "github:kamadorueda/alejandra/3.1.0";
     };
+
+    nix-homebrew.url = "github:zhaofengli/nix-homebrew";
   };
 
   outputs = {
@@ -59,7 +52,6 @@
     darwin,
     nil-lsp,
     home-manager,
-    alejandra,
     nix-homebrew,
     ...
   } @ inputs: let
@@ -77,9 +69,13 @@
         });
 
     deployPkgs = forEachSupportedSystem (
-      {pkgs, ...}:
+      {
+        pkgs,
+        system,
+        ...
+      }:
         import nixpkgs {
-          inherit (pkgs) system;
+          inherit system;
           overlays = [
             deploy-rs.overlay # or deploy-rs.overlays.default
             (self: super: {
@@ -105,12 +101,9 @@
     );
 
     # Standard formatter for this flake
-    formatter = forEachSupportedSystem ({
-      pkgs,
-      system,
-      ...
-    }:
-      pkgs.alejandra);
+    formatter =
+      forEachSupportedSystem ({pkgs, ...}:
+        pkgs.alejandra);
 
     # Config for my macbook (only used to set up my terminal)
     darwinConfigurations.pepacton = darwin.lib.darwinSystem rec {

diff --git a/home/henrikvt/home.nix b/home/henrikvt/home.nix
@@ -121,32 +121,6 @@
         s = "status -sb";
         l = "log --all --graph --decorate --oneline";
       };
-      # extraConfig = ''
-      #   [init]
-      #     defaultBranch = main
-
-      #   [color]
-      #     ui = auto
-
-      #   [color "diff"]
-      #     meta = white bold
-      #     frag = cyan bold
-      #     old = red bold
-      #     new = green bold
-
-      #   [core]
-      #     editor = vim
-      #     excludesfile = ~/.gitignore
-      #     attributesfile = ~/.gitattributes
-      #     ignorecase = false
-      #   	compression = 0
-
-      #   [pull]
-      #     rebase = false
-
-      #   [protocol "file"]
-      #    allow = always
-      # '';
       extraConfig = {
         init.defaultBranch = "main";
         color.ui = "auto";