added SOPS

.gitignore

@@ -0,0 +1 @@
+

config.nix

@@ -60,17 +60,17 @@
       gaming = true;
 
       vpn = {
-        Enable = true;
+        Enable = false;
         secretFile = builtins.toPath ./secrets/.vpn.yaml;
       };
 
       touchpadSupport = false;
-      logitech-hardware.enable = false;
+      logitech-hardware.enable = true;
 
       # Custom Applications
-      linux-apps = {
+      apps = {
         gaming = true;
-        my-apps = pkgs:
+        apps = pkgs:
           with pkgs; [
             jellyfin-media-player
           ];

flake.lock

@@ -892,6 +892,7 @@
         "nix-gaming": "nix-gaming",
         "nixovim": "nixovim",
         "nixpkgs": "nixpkgs_3",
+        "sops-nix": "sops-nix",
         "unlisted-fonts": "unlisted-fonts"
       }
     },
@@ -913,6 +914,26 @@
         "type": "github"
       }
     },
+    "sops-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1750119275,
+        "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=",
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1689347949,

flake.nix

@@ -25,6 +25,9 @@
 
     nix-gaming.url = "github:fufexan/nix-gaming";
     nix-gaming.inputs.nixpkgs.follows = "nixpkgs";
+
+    sops-nix.url = "github:Mic92/sops-nix";
+    sops-nix.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = {

home/desktop.nix

@@ -1,12 +1,12 @@
-{username, ...}: {
+{myConfig, ...}: {
   imports = [
   ];
 
   programs.home-manager.enable = true;
 
   home = {
-    username = "${username}";
+    username = "${myConfig.username}";
-    homeDirectory = "/home/${username}";
+    homeDirectory = "/home/${myConfig.username}";
     packages = [];
     sessionVariables = {};
   };

hosts/desktop/configuration.nix

@@ -2,9 +2,11 @@
   pkgs,
   general,
   builds,
+  inputs,
   ...
 }: {
   imports = [
+    inputs.sops-nix.nixosModules.sops
     # Include the results of the hardware scan.
   ];
 

hosts/macos/darwin.nix

@@ -1,10 +1,12 @@
 {
   pkgs,
   myConfig,
+  inputs,
   ...
 }: {
   imports = [
     ../../modules/dev.nix
+    inputs.sops-nix.darwinModules.sops
   ];
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget
@@ -34,7 +36,7 @@
   users.users.${myConfig.general.Username} = {
     name = "${myConfig.general.Username}";
     home = "/Users/${myConfig.general.Username}";
-    shell = pkgs.${myConfig.general.terminal.Shell};
+    # shell = pkgs.${myConfig.general.terminal.Shell}; # no support for nix-darwin, but can be changed via chsh.
   };
 
   home-manager.users.${myConfig.general.Username} = import ../../home/macos.nix;

modules/desktop.nix

@@ -1,6 +1,10 @@
-{lib, ...}: {
+{
+  lib,
+  myConfig,
+  ...
+}: {
   imports =
     [
     ]
-    ++ [lib.optionals (linux-apps.gamingDesktop == true)];
+    ++ [lib.optionals (myConfig.linux.apps.gaming == true)];
 }

secrets/secrets.yaml

@@ -0,0 +1 @@
+VPN_HAKASE_DEFAULT_PRIVATE_KEY: aa