git-crypt test

.git-crypt/.gitattributes

@@ -0,0 +1,4 @@
+# Do not edit this file.  To specify the files to encrypt, create your own
+# .gitattributes file in the directory where your files are.
+* !filter !diff
+*.gpg binary

.gitattributes

@@ -0,0 +1 @@
+secrets/** filter=git-crypt diff=git-crypt

README.md

@@ -1,2 +1,8 @@
-# Deprecated and merged into mlaga97-nix
+# Bootstrapping
-https://git.mlaga97.space/mlaga97/mlaga97-nix
+```
+nix-shell -p git -p home-manager
+cd .config
+# git clone ssh://git@git.mlaga97.space:2222/mlaga97/home-manager
+git clone https://git.mlaga97.space/mlaga97/home-manager
+home-manager switch
+```

apply.sh

@@ -1 +1 @@
-home-manager switch --flake .?submodules=1 -b backup
+home-manager switch --flake .?submodules=1

base.nix

@@ -1,6 +1,10 @@
-{ ... }: {
+{ pkgs, ... }: {
   home.stateVersion = "24.11";
 
+  home.packages = with pkgs; [
+    git-crypt
+  ];
+
   imports = [
     ./programs/vim.nix
     ./programs/gpg.nix

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744117652,
+        "lastModified": 1739757849,
-        "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=",
+        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f",
+        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1744440957,
+        "lastModified": 1741332913,
-        "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
+        "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
+        "rev": "20755fa05115c84be00b04690630cb38f0a203ad",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1744463964,
+        "lastModified": 1741379970,
-        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
+        "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
+        "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
         "type": "github"
       },
       "original": {

i3.nix

@@ -1,6 +1,5 @@
 { lib, pkgs, ... }: {
   imports = [
-    ./programs/kitty.nix
     ./programs/firefox.nix
     ./programs/polybar.nix
     ./programs/chromium.nix
@@ -179,7 +178,7 @@
       ################################################################################
       
       # Terminal
-      bindsym $mod+Return exec kitty
+      bindsym $mod+Return exec i3-sensible-terminal
       
       # Exit Current Window
       bindsym $mod+Shift+q kill

programs/firefox.nix

@@ -54,8 +54,6 @@
       # Allow declarative management of extensions
       # See: https://github.com/nix-community/home-manager/pull/6389
       "extensions.webextensions.ExtensionStorageIDB.enabled" = false;
-
-      "browser.tabs.groups.enabled" = true;
     };
   };
 }

programs/kitty.nix

@@ -1,36 +0,0 @@
-{ pkgs, home-manager, ... }: {
-  programs.kitty = {
-    enable = true;
-    settings = {
-      enable_audio_bell = false;
-
-      background = "#101010";
-      foreground = "#f2f2f2";
-
-      color0 = "#303030";
-      color1 = "#E1321A";
-      color2 = "#6AB017";
-      color3 = "#FFC005";
-      color4 = "#004F9E";
-      color5 = "#EC0048";
-      color6 = "#2AA7E7";
-      color7 = "#F2F2F2";
-      color8 = "#5D5D5D";
-      color9 = "#FF361E";
-      color10 = "#7BC91F";
-      color11 = "#FFD00A";
-      color12 = "#0071FF";
-      color13 = "#FF1D62";
-      color14 = "#4BB8FD";
-      color15 = "#A020F0";
-      #cursor #facb7f";
-      #selection_background #403729
-      #selection_foreground #21211c
-    };
-  };
-
-  programs.bash.bashrcExtra = ''
-    # Fix KiTTY SSH Misbehavior
-    [[ "$TERM" == "xterm-kitty" ]] && alias ssh="TERM=xterm-256color ssh"
-  '';
-}

systems/ll-latitude-e5591.nix

@@ -5,15 +5,6 @@
     ../programs/thunderbird.nix
   ];
 
-  home.file = {
-    ".local/share/OpenSCAD/libraries/BOSL2" = {
-      source = builtins.fetchGit {
-        url = "https://github.com/BelfrySCAD/BOSL2";
-        rev = "7821a5143c7ab488ff3ff73d0cd0c4b508fb5796";
-      };
-    };
-  };
-
   home.packages = with pkgs; [
     # TODO: Figure these ones out
     #dunst