Remove go-pkg template (#80)

* feat: remove go-pkg template that is now deprecated * chore: remove go-pkg template from flake-language.yml and update README - Removed the `go-pkg` template from the `.github/workflows/flake-language.yml` file. - Updated the README to remove the reference to `go-pkg` for building legacy Go apps. * chore: remove go-pkg from flake-language.yml configuration * chore: update home-manager and nixpkgs to release-24.11 Updated the URLs for home-manager and nixpkgs in the flake.nix files for darwin, nixos-desktop, and nixos-minimal templates to point to the release-24.11 versions. This ensures the templates use the latest versions of these dependencies. * chore(configuration): remove redundant sound.enable setting The sound.enable setting has been removed as it is redundant with the current configuration. Pulseaudio is disabled and Pipewire is being used for sound management. * chore: update home-manager and nixpkgs to release-25.05 Updated the home-manager and nixpkgs URLs in the flake.nix file to point to the release-25.05 versions. This ensures compatibility with the latest features and improvements in the new release. * chore: update flake.nix to use latest home-manager and nixpkgs Updated the home-manager URL to point to the latest version instead of a specific release. Changed the nixpkgs URL to use the nixos-unstable branch for more up-to-date packages. * chore: update stateVersion to 24.11 - Updated `system.stateVersion` and `home.stateVersion` across various modules to "24.11". - Ensures consistency in versioning for system and home-manager configurations. - Affects darwin, nixos-desktop, and nixos-minimal templates. * feat(nix): enable automatic optimization - Added `optimise.automatic = true;` to the Nix configuration in darwin, nixos-desktop, and nixos-minimal templates. - Removed `auto-optimise-store = true;` from the Nix settings as it is now replaced by the new automatic optimization setting. * refactor(darwin): remove nix-daemon service enablement The nix-daemon service enablement has been removed from the darwin.nix configuration. This change simplifies the module configuration by eliminating the explicit setting of services.nix-daemon.enable to true.
ALT-F4-LLC · Feb 12, 2025 · 6b348b2 · 6b348b2
1 parent 7c3de1e
commit 6b348b2
Show file tree

Hide file tree

Showing 21 changed files with 51 additions and 128 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -1,16 +1,19 @@
 {
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base",
-    ":semanticCommitTypeAll(chore)"
-  ],
-  "lockFileMaintenance": {
-    "enabled": true,
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
     "extends": [
-      "schedule:weekly"
-    ]
-  },
-  "nix": {
-    "enabled": true
-  }
+        "config:base",
+        ":semanticCommitTypeAll(chore)"
+    ],
+    "lockFileMaintenance": {
+        "enabled": true,
+        "extends": [
+            "schedule:weekly"
+        ]
+    },
+    "nix": {
+        "enabled": true
+    },
+    "node": {
+        "enabled": false
+    }
 }
diff --git a/.github/workflows/flake-language.yml b/.github/workflows/flake-language.yml
@@ -19,7 +19,6 @@ jobs:
           - cpp-cmake
           - dart
           - go-mod
-          - go-pkg
           - haskell
           - lua-app
           - nodejs-backend
@@ -54,7 +53,6 @@ jobs:
           - cpp-cmake
           - dart
           - go-mod
-          - go-pkg
           - haskell
           - nodejs-backend
           - nestjs

diff --git a/README.md b/README.md
@@ -19,7 +19,6 @@ Kickstart your Nix environments.
     - [C++ (cmake)](#cpp-cmake)
     - [Dart](#dart)
     - [Go (module)](#go-module)
-    - [Go (package)](#go-package)
     - [Haskell](#haskell)
     - [Lua (application)](#lua-application)
     - [NestJS](#nestjs)
@@ -312,7 +311,7 @@ nix flake init -t github:ALT-F4-LLC/kickstart.nix#dart
 
 #### Go (module)
 
-Used for modern Go apps setup with `go.mod` system. To build legacy Go apps, use `go-pkg` template.
+Used for modern Go apps setup with `go.mod` system.
 
 > [!IMPORTANT]
 > Be sure to update `go.mod` with proper repository after running `init` command.
@@ -321,17 +320,6 @@ Used for modern Go apps setup with `go.mod` system. To build legacy Go apps, use
 nix flake init -t github:ALT-F4-LLC/kickstart.nix#go-mod
 ```
 
-#### Go (package)
-
-Used for legacy Go apps **not** setup with `go.mod` system. To build modern Go apps, use `go-mod` template.
-
-> [!IMPORTANT]
-> Be sure to update `deps.nix` with vendor dependencies after running `init` command [(read more)](https://nixos.wiki/wiki/Go#buildGoPackage).
-
-```bash
-nix flake init -t github:ALT-F4-LLC/kickstart.nix#go-pkg
-```
-
 #### Haskell
 
 Used for Haskell applications.

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -38,11 +38,6 @@
             path = ./template/go-mod;
           };
 
-          go-pkg = {
-            description = "Kickstart Go language package flake.";
-            path = ./template/go-pkg;
-          };
-
           haskell = {
             description = "Kickstart Haskell package flake.";
             path = ./template/haskell;
@@ -157,7 +152,6 @@
           example-dart = mkLanguage {name = "dart";};
           example-darwin = mkDarwin {};
           example-go-mod = mkLanguage {name = "go-mod";};
-          example-go-pkg = mkLanguage {name = "go-pkg";};
           example-haskell = mkLanguage {name = "haskell";};
           example-home-manager = mkHomeManager {};
           example-lua-app = mkLanguage {name = "lua-app";};

diff --git a/template/darwin/flake.nix b/template/darwin/flake.nix
@@ -5,8 +5,8 @@
     darwin.inputs.nixpkgs.follows = "nixpkgs";
     darwin.url = "github:lnl7/nix-darwin";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    home-manager.url = "github:nix-community/home-manager/release-23.11";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    home-manager.url = "github:nix-community/home-manager";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
   };
 
   outputs = inputs @ {

diff --git a/template/darwin/module/configuration.nix b/template/darwin/module/configuration.nix
@@ -1,8 +1,9 @@
 {
   # add more system settings here
   nix = {
+    optimise.automatic = true;
+
     settings = {
-      auto-optimise-store = true;
       builders-use-substitutes = true;
       experimental-features = ["flakes" "nix-command"];
       substituters = ["https://nix-community.cachix.org"];
@@ -13,5 +14,7 @@
       warn-dirty = false;
     };
   };
+
   programs.zsh.enable = true;
+  system.stateVersion = 6;
 }
diff --git a/template/darwin/module/home-manager.nix b/template/darwin/module/home-manager.nix
@@ -1,5 +1,5 @@
 {pkgs, ...}: {
   # add home-manager user settings here
   home.packages = with pkgs; [git neovim];
-  home.stateVersion = "23.11";
+  home.stateVersion = "24.11";
 }
diff --git a/template/darwin/system/darwin.nix b/template/darwin/system/darwin.nix
@@ -9,10 +9,7 @@ in
     inherit system;
     # modules: allows for reusable code
     modules = [
-      {
-        services.nix-daemon.enable = true;
-        users.users.${username}.home = "/Users/${username}";
-      }
+      {users.users.${username}.home = "/Users/${username}";}
       system-config
 
       inputs.home-manager.darwinModules.home-manager

diff --git a/template/go-pkg/.envrc b/template/go-pkg/.envrc
diff --git a/template/go-pkg/cmd/example/main.go b/template/go-pkg/cmd/example/main.go
diff --git a/template/go-pkg/deps.nix b/template/go-pkg/deps.nix
diff --git a/template/go-pkg/flake.nix b/template/go-pkg/flake.nix
diff --git a/template/home-manager/module/home-manager.nix b/template/home-manager/module/home-manager.nix
@@ -6,5 +6,5 @@
   home.homeDirectory = homeDirectory;
   home.username = username;
   home.packages = with pkgs; [git neovim];
-  home.stateVersion = "23.11";
+  home.stateVersion = "24.11";
 }
diff --git a/template/nixos-desktop/flake.nix b/template/nixos-desktop/flake.nix
@@ -3,8 +3,8 @@
 
   inputs = {
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    home-manager.url = "github:nix-community/home-manager/release-23.11";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    home-manager.url = "github:nix-community/home-manager/release-24.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
   };
 
   outputs = inputs @ {

diff --git a/template/nixos-desktop/module/configuration.nix b/template/nixos-desktop/module/configuration.nix
@@ -17,8 +17,9 @@
   };
 
   nix = {
+    optimise.automatic = true;
+
     settings = {
-      auto-optimise-store = true;
       builders-use-substitutes = true;
       experimental-features = ["nix-command" "flakes"];
       substituters = [
@@ -65,7 +66,6 @@
   time.timeZone = "America/Los_Angeles";
 
   ## Sound settings ##
-  sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
@@ -90,5 +90,5 @@
 
   users.mutableUsers = false;
 
-  system.stateVersion = "23.11";
+  system.stateVersion = "24.11";
 }
diff --git a/template/nixos-desktop/module/home-manager.nix b/template/nixos-desktop/module/home-manager.nix
@@ -1,5 +1,5 @@
 {pkgs, ...}: {
   # add home-manager user settings here
   home.packages = with pkgs; [git neovim];
-  home.stateVersion = "23.11";
+  home.stateVersion = "24.11";
 }
diff --git a/template/nixos-minimal/flake.nix b/template/nixos-minimal/flake.nix
@@ -3,8 +3,8 @@
 
   inputs = {
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    home-manager.url = "github:nix-community/home-manager/release-23.11";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    home-manager.url = "github:nix-community/home-manager/release-24.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
   };
 
   outputs = inputs @ {

diff --git a/template/nixos-minimal/module/configuration.nix b/template/nixos-minimal/module/configuration.nix
@@ -1,8 +1,9 @@
 {
   # add more system settings here
   nix = {
+    optimise.automatic = true;
+
     settings = {
-      auto-optimise-store = true;
       builders-use-substitutes = true;
       experimental-features = ["nix-command" "flakes"];
       substituters = [
@@ -15,5 +16,6 @@
       warn-dirty = false;
     };
   };
+
   programs.zsh.enable = true;
 }
diff --git a/template/nixos-minimal/module/home-manager.nix b/template/nixos-minimal/module/home-manager.nix
@@ -1,5 +1,5 @@
 {pkgs, ...}: {
   # add home-manager user settings here
   home.packages = with pkgs; [git neovim];
-  home.stateVersion = "23.11";
+  home.stateVersion = "24.11";
 }
diff --git a/template/nixos-minimal/system/nixos.nix b/template/nixos-minimal/system/nixos.nix
@@ -27,7 +27,7 @@ in
           isNormalUser = true;
           password = password;
         };
-        system.stateVersion = "23.11";
+        system.stateVersion = "24.11";
       }
       hardware-configuration
       configuration
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,6 @@ jobs: @@
               - cpp-cmake
               - dart
               - go-mod
-              - go-pkg
               - haskell
               - lua-app
               - nodejs-backend
@@ Expand Down Expand Up / @@ -54,7 +53,6 @@ jobs: @@
               - cpp-cmake
               - dart
               - go-mod
-              - go-pkg
               - haskell
               - nodejs-backend
               - nestjs
@@ Expand Down @@