sops changes, and things I cannot remember

home/bin/hyprland/cnst/cfg/inputs.nix

@@ -51,7 +51,6 @@
     };
     misc = {
       vrr = 2;
-      no_direct_scanout = false;
       mouse_move_enables_dpms = 1;
       key_press_enables_dpms = 0;
       force_default_wallpaper = 0;

home/bin/neovim/plugins/chatgpt.nix

@@ -1,5 +1,8 @@
-{
+{config, ...}: {
   programs.nixvim.plugins.chatgpt = {
     enable = true;
+    settings = {
+      api_key_cmd = "cat ${config.sops.secrets.openai_api_key.path}";
+    };
   };
 }

home/bin/neovim/plugins/default.nix

@@ -13,7 +13,7 @@
     ./tagbar.nix
     ./telescope.nix
     ./treesitter.nix
-    # ./chatgpt.nix
+    ./chatgpt.nix
     # ./vimtex.nix
     ./nonels.nix
     ./conform.nix

home/bin/neovim/plugins/lsp.nix

@@ -54,6 +54,9 @@
           # C#
           csharp-ls.enable = true;
 
+          # Yaml
+          yamlls.enable = true;
+
           # Lua
           lua-ls = {
             enable = true;

home/default.nix

@@ -11,6 +11,8 @@
       ./usr/share/git/cnst
       ./usr/share/shell/cnst
       ./bin/hyprland/cnst
+      ./opt/browsers/firefox
+      ./opt/sops
       ./etc
       ./bin
       ./opt

home/opt/browsers/chromium/default.nix

@@ -0,0 +1,12 @@
+{pkgs, ...}: {
+  programs.chromium = {
+    enable = true;
+    package = pkgs.ungoogled-chromium;
+    extensions = [
+      "gebbhagfogifgggkldgodflihgfeippi" # return youtube dislike
+      "mnjggcdmjocbbbhaepdhchncahnbgone" # sponsorblock for youtube
+      "ponfpcnoihfmfllpaingbgckeeldkhle" # enhancer for youtube
+      "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
+    ];
+  };
+}

home/opt/browsers/default.nix

@@ -1,34 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  inputs,
-  ...
-}: let
-  firefoxFlake = inputs.firefox-nightly.packages.${pkgs.stdenv.hostPlatform.system};
-  _firefoxNightly = firefoxFlake.firefox-nightly-bin;
-
-  _chromium = pkgs.ungoogled-chromium;
-  # _mullvad = pkgs.mullvad-browser;
-in {
-  home.packages = lib.mkMerge [
-    (lib.mkIf (pkgs.hostPlatform.system == "x86_64-linux") (
-      with pkgs; [
-        # browsers
-        _firefoxNightly
-        pkgs.firefox-bin
-        # _chromium
-      ]
-    ))
-  ];
-  programs.chromium = {
-    enable = true;
-    package = pkgs.ungoogled-chromium;
-    extensions = [
-      "gebbhagfogifgggkldgodflihgfeippi" # return youtube dislike
-      "mnjggcdmjocbbbhaepdhchncahnbgone" # sponsorblock for youtube
-      "ponfpcnoihfmfllpaingbgckeeldkhle" # enhancer for youtube
-      "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
-    ];
-  };
-}

home/opt/browsers/firefox/default.nix

@@ -0,0 +1,32 @@
+{
+  inputs,
+  pkgs,
+  ...
+}: {
+  programs.firefox = {
+    enable = true;
+    package = inputs.firefox-nightly.packages.${pkgs.system}.firefox-nightly-bin;
+    profiles.cnst = {
+      search = {
+        force = true;
+        default = "DuckDuckGo";
+        privateDefault = "DuckDuckGo";
+        order = ["DuckDuckGo" "Google"];
+      };
+      bookmarks = {};
+      extensions = with inputs.firefox-addons.packages.${pkgs.system}; [
+        ublock-origin
+        sponsorblock
+        clearurls
+        return-youtube-dislikes
+        # enhancer-for-youtube # unfree
+      ];
+      settings = {
+        "apz.overscroll.enabled" = true;
+        "browser.aboutConfig.showWarning" = false;
+        "general.autoScroll" = true;
+        "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
+      };
+    };
+  };
+}

home/opt/default.nix

@@ -1,7 +1,6 @@
 {
   imports = [
     # shared apps
-    ./browsers
     ./discord
     ./utility
     ./alacritty

home/opt/sops/default.nix

@@ -0,0 +1,68 @@
+{
+  inputs,
+  self,
+  lib,
+  config,
+  ...
+}: let
+  defaultConfig = {
+    age = {sshKeyPaths = ["/home/cnst/.ssh/id_ed25519"];};
+    defaultSopsFile = "${self}/secrets/cnst-secrets.yaml";
+    secrets = {
+      openai_api_key = {
+        format = "yaml";
+        sopsFile = "${self}/secrets/cnst-secrets.yaml";
+      };
+      ssh_user = {
+        format = "yaml";
+        sopsFile = "${self}/secrets/cnst-secrets.yaml";
+      };
+    };
+  };
+
+  userSpecificConfig = lib.mkMerge [
+    (lib.mkIf (config.home.username == "toothpick") {
+      age = {sshKeyPaths = ["/home/toothpick/.ssh/id_ed25519"];};
+      defaultSopsFile = "${self}/secrets/toothpick-secrets.yaml";
+      secrets = {
+        openai_api_key = {
+          format = "yaml";
+          sopsFile = "${self}/secrets/toothpick-secrets.yaml";
+        };
+        ssh_user = {
+          format = "yaml";
+          sopsFile = "${self}/secrets/toothpick-secrets.yaml";
+        };
+      };
+    })
+    (lib.mkIf (config.home.username == "adam") {
+      age = {sshKeyPaths = ["/home/adam/.ssh/id_ed25519"];};
+      defaultSopsFile = "${self}/secrets/adam-secrets.yaml";
+      secrets = {
+        openai_api_key = {
+          format = "yaml";
+          sopsFile = "${self}/secrets/adam-secrets.yaml";
+        };
+        ssh_user = {
+          format = "yaml";
+          sopsFile = "${self}/secrets/adam-secrets.yaml";
+        };
+      };
+    })
+  ];
+in {
+  imports = [
+    inputs.sops-nix.homeManagerModules.sops
+  ];
+
+  sops = lib.mkMerge [
+    {
+      gnupg = {
+        home = "~/.gnupg";
+        sshKeyPaths = [];
+      };
+    }
+    defaultConfig
+    userSpecificConfig
+  ];
+}

home/opt/utility/default.nix

@@ -1,5 +1,8 @@
 {pkgs, ...}: {
   programs = {
+    ssh = {
+      enable = true;
+    };
     # image viewer
     feh = {
       enable = true;

home/profiles/cnst/default.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  self,
+  ...
+}: {
   home = {
     username = "cnst";
     homeDirectory = "/home/cnst";
@@ -43,6 +47,7 @@
     json.enable = false;
     manpages.enable = false;
   };
+  # age.secrets.secret1.file = "${self}/secrets/openai.age";
 
   # let HM manage itself when in standalone mode
   programs.home-manager.enable = true;

home/srv/hypr/lock/default.nix

@@ -1,67 +1,76 @@
 {
+  pkgs,
+  inputs,
+  ...
+}: {
   programs.hyprlock = {
     enable = true;
+    package = inputs.hyprlock.packages.${pkgs.system}.hyprlock;
     settings = {
       general = {
         disable_loading_bar = true;
-        hide_cursor = false;
-        no_fade_in = false;
+        hide_cursor = true;
+        no_fade_in = true;
+        no_fade_out = true;
+        ignore_empty_input = true;
+        immediate_render = true;
       };
       background = [
         {
-          color = "rgba(000000FF)";
           monitor = "";
-          path = "~/media/images/galaxy.png";
-          blur_size = 3;
-          blur_passes = 2;
+          path = "~/media/images/dunes.png";
         }
       ];
       input-field = [
         {
           monitor = "";
           size = "200, 50";
-          outline_thickness = 2;
-          dots_size = 0.33;
-          dots_spacing = 0.15;
+          outline_thickness = 0;
+          dots_size = 0.1;
+          dots_spacing = 0.3;
           dots_center = true;
           dots_rounding = -1;
-          outer_color = "rgba(3B3B3B55)";
-          inner_color = "rgba(33333311)";
+          outer_color = "rgba(0,0,0,0)";
+          inner_color = "rgba(0,0,0,0)";
           font_color = "rgba(FFFFFFFF)";
-          fade_on_empty = true;
-          fade_timeout = 5000;
+          fade_on_empty = false;
+          fade_timeout = 0;
+          fail_text = "";
+          fail_transition = 0;
           placeholder_text = "";
           hide_input = false;
-          rounding = -1;
-          check_color = "rgb(204, 136, 34)";
-          fail_color = "rgb(204, 34, 34)";
+          rounding = 0;
+          check_color = "rgba(0,0,0,0)";
+          fail_color = "rgba(0,0,0,0)";
+          position = "0, 20";
+          halign = "center";
+          valign = "center";
         }
       ];
       label = [
+        # date
+        {
+          monitor = "";
+          text = "cmd[update:3600000] date +'%A, %B %d'";
+          shadow_passes = 1;
+          shadow_boost = 0.5;
+          color = "rgba(FFFFFFFF)";
+          font_size = 25;
+          font_family = "Input Mono Compressed";
+          position = "0, 230";
+          halign = "center";
+          valign = "center";
+        }
+        # clock
         {
-          # Clock
           monitor = "";
           text = "cmd[update:1000] echo '$TIME'";
           shadow_passes = 1;
           shadow_boost = 0.5;
           color = "rgba(FFFFFFFF)";
           font_size = 85;
-          font_family = "Input Mono";
-          position = "0, 300";
-          halign = "center";
-          valign = "center";
-        }
-        {
-          # Date
-          monitor = "";
-          text = "cmd[update:3600000] date +'%a %b %d'";
-          shadow_passes = 1;
-          shadow_boost = 0.5;
-          color = "rgba(FFFFFFFF)";
-          font_size = 25;
           font_family = "Input Mono Compressed";
-
-          position = "0, 230";
+          position = "0, 300";
           halign = "center";
           valign = "center";
         }

home/usr/share/shell/cnst/default.nix

@@ -12,8 +12,8 @@
       ll = "ls -l";
       nixupdate = "nh os switch -v -H cnix";
       nixup = "nh os switch -H cnix";
-      flakeupdate = "nh os switch -u -v -H cnix";
-      flakeup = "nh os switch -u -H cnix";
+      flakeupdate = "nh os switch -u -v -H cnix && sudo nix run .#cleanup-boot";
+      flakeup = "nh os switch -u -H cnix && sudo nix run .#cleanup-boot";
     };
     history = {
       size = 1000;