summary refs log tree commit diff stats
path: root/hm
diff options
context:
space:
mode:
Diffstat (limited to 'hm')
-rw-r--r--hm/gpg/default.nix16
-rw-r--r--hm/hyfetch/default.nix19
-rw-r--r--hm/mako/default.nix30
-rw-r--r--hm/nixvim/config.nix4
-rw-r--r--hm/packages/default.nix9
-rw-r--r--hm/silas/default.nix8
-rw-r--r--hm/sils/default.nix8
-rw-r--r--hm/zsh/default.nix13
8 files changed, 54 insertions, 53 deletions
diff --git a/hm/gpg/default.nix b/hm/gpg/default.nix
index 2632874..8bbfb22 100644
--- a/hm/gpg/default.nix
+++ b/hm/gpg/default.nix
@@ -7,21 +7,21 @@
     enable = true;
   };
   services.gpg-agent = {
-    enable = true;
+    enable = false;
     defaultCacheTtl = 60 * 50;
     defaultCacheTtlSsh = 60 * 50;
     maxCacheTtl = 60 * 50;
     maxCacheTtlSsh = 60 * 50;
-    pinentryPackage = pkgs.pinentry-curses;
+    pinentry.package = pkgs.pinentry-curses;
     enableSshSupport = true;
     sshKeys = ["4077454831C98FE4BE4A9C167186C5A63615B790"];
   };
-  programs.zsh.initExtraFirst = lib.mkBefore ''
-    current_tty="$(tty)"
-    tty() { echo "$current_tty"; }
-    SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
-    gpg-connect-agent /bye
-  '';
+  #programs.zsh.initContent = lib.mkBefore ''
+  #  current_tty="$(tty)"
+  #  tty() { echo "$current_tty"; }
+  #  SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+  #  gpg-connect-agent /bye
+  #'';
   #home.sessionVariables = {
   #  GNUPGHOME = lib.mkForce "";
   #};
diff --git a/hm/hyfetch/default.nix b/hm/hyfetch/default.nix
deleted file mode 100644
index 596b26d..0000000
--- a/hm/hyfetch/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{...}: {
-  programs.hyfetch = {
-    enable = true;
-    settings = {
-      preset = "rainbow";
-      mode = "rgb";
-      light_dark = "dark";
-      lightness = 0.5;
-      color_align = {
-        mode = "horizontal";
-        custom_colors = [];
-        fore_back = null;
-      };
-      backend = "neofetch";
-      distro = null;
-      pride_month_shown = [];
-    };
-  };
-}
diff --git a/hm/mako/default.nix b/hm/mako/default.nix
index 503ca1b..92e1b16 100644
--- a/hm/mako/default.nix
+++ b/hm/mako/default.nix
@@ -1,20 +1,22 @@
 {...}: {
   services.mako = {
     enable = true;
-    #backgroundColor = "#2e3440";
-    #borderColor = "#88c0d0";
-    borderRadius = 25;
-    borderSize = 2;
-    defaultTimeout = 5000;
-    #font = "Source Code Pro 10";
-    width = 500;
-    height = 500;
-    icons = true;
-    ignoreTimeout = true;
-    layer = "overlay";
-    markup = true; # TODO
-    maxIconSize = 64;
-    sort = "-time";
+    settings = {
+      #backgroundColor = "#2e3440";
+      #borderColor = "#88c0d0";
+      borderRadius = 25;
+      borderSize = 2;
+      defaultTimeout = 5000;
+      #font = "Source Code Pro 10";
+      width = 500;
+      height = 500;
+      icons = true;
+      ignoreTimeout = true;
+      layer = "overlay";
+      markup = true; # TODO
+      maxIconSize = 64;
+      sort = "-time";
+    };
     #extraConfig = ''
     #  [urgency=low]
     #  border-color=#cccccc
diff --git a/hm/nixvim/config.nix b/hm/nixvim/config.nix
index 58753b0..e333324 100644
--- a/hm/nixvim/config.nix
+++ b/hm/nixvim/config.nix
@@ -78,6 +78,7 @@ pkgs: {
       enable = true;
       settings = {
         powerline_fonts = 1;
+        theme = "base16_black_metal"; #"base16_gruvbox_dark_pale";
       };
     };
     cmp = {
@@ -191,6 +192,9 @@ pkgs: {
     };
     vimtex = {
       enable = true;
+      settings = {
+        view_method = "zathura";
+      };
     };
     web-devicons = {
       enable = true;
diff --git a/hm/packages/default.nix b/hm/packages/default.nix
index d37ff18..c3ec778 100644
--- a/hm/packages/default.nix
+++ b/hm/packages/default.nix
@@ -12,8 +12,6 @@ in {
     godot_4 # gameengine
     # core tools
     neofetch # a must-have
-    hyfetch # permanent suggestions have their moments
-    fd # fast find
     lsd # ls in good
     ripgrep # amazing grep
     lf # file manager
@@ -31,12 +29,16 @@ in {
     htop # resource usage
     exiftool # edit (photo) metadata
 
+    gimp # image manipulation
+
     playerctl # for music control in eww
 
     # notification daemon
     mako
     libnotify
 
+    logseq # structured notes
+
     gnome-boxes # virtualisation
 
     hugo # ssg
@@ -109,7 +111,7 @@ in {
 
     # Programming Languages
     jdk # java
-    python39 # python
+    python3 # python
 
     # Rust
     cargo # rust package manager
@@ -140,6 +142,7 @@ in {
     swaylock
     swaybg # wallpaper
     prismlauncher.packages.${pkgs.system}.prismlauncher # minecraft-launcher
+    luanti # gameengine
 
     wl-togglescreens.packages.${pkgs.system}.wl-togglescreens # toggle screens
     wlr-randr # xrand for wayland, needed by wl-togglescreens
diff --git a/hm/silas/default.nix b/hm/silas/default.nix
index e108aa4..d83289a 100644
--- a/hm/silas/default.nix
+++ b/hm/silas/default.nix
@@ -3,7 +3,6 @@
     ../../modules/hm
     ../gpg
     ../gtk
-    ../hyfetch
     ../mako
     ../nixvim
     ../packages
@@ -29,17 +28,24 @@
     bat.enable = true;
     direnv.enable = true;
     etesync-dav.enable = true;
+    fd.enable = true;
+    fastfetch.enable = true;
     firefox.enable = true;
     foot.enable = true;
+    ghostty.enable = true;
     git.enable = true;
+    hyfetch.enable = true;
     hyprland.enable = true;
+    iamb.enable = true;
     jameica.enable = true;
     kdeconnect.enable = true;
     mail.enable = true;
     nextcloud.enable = true;
     sway.enable = true;
+    theming.enable = true;
     yt-dlp.enable = true;
     zathura.enable = true;
+    zellij.enable = true;
   };
   programs.home-manager.enable = true;
 }
diff --git a/hm/sils/default.nix b/hm/sils/default.nix
index a078a7b..fcd29fb 100644
--- a/hm/sils/default.nix
+++ b/hm/sils/default.nix
@@ -3,7 +3,6 @@
     ../../modules/hm
     ../gpg
     ../gtk
-    ../hyfetch
     ../mako
     ../nixvim
     ../packages
@@ -29,17 +28,24 @@
     bat.enable = true;
     direnv.enable = true;
     etesync-dav.enable = true;
+    fd.enable = true;
+    fastfetch.enable = true;
     firefox.enable = true;
     foot.enable = true;
+    ghostty.enable = true;
     git.enable = true;
+    hyfetch.enable = true;
     hyprland.enable = true;
+    iamb.enable = true;
     jameica.enable = true;
     kdeconnect.enable = true;
     mail.enable = true;
     nextcloud.enable = true;
     sway.enable = true;
+    theming.enable = true;
     yt-dlp.enable = true;
     zathura.enable = true;
+    zellij.enable = true;
   };
   programs.home-manager.enable = true;
 }
diff --git a/hm/zsh/default.nix b/hm/zsh/default.nix
index 684493f..88a429d 100644
--- a/hm/zsh/default.nix
+++ b/hm/zsh/default.nix
@@ -2,6 +2,7 @@
   config,
   pkgs,
   self,
+  lib,
   ...
 }: {
   programs.zsh = {
@@ -61,12 +62,10 @@
       addapache = "curl https://www.apache.org/licenses/LICENSE-2.0.txt > LICENSE";
     };
 
-    initExtraFirst =
-      builtins.readFile ./config/instant-prompt.zsh
-      + "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
-    # +
-    initExtra =
-      ''
+    initContent = lib.mkBefore (builtins.readFile ./config/instant-prompt.zsh
+      + "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme"
+      + ''
+
         rm -rf ~/.mozilla/firefox/default/containers.json.backup
 
         export ZSH=${pkgs.oh-my-zsh}/share/oh-my-zsh/
@@ -80,6 +79,6 @@
           source $ZSH/oh-my-zsh.sh
       ''
       + builtins.readFile ./config/p10k.zsh
-      + builtins.readFile ./config/functions.zsh;
+      + builtins.readFile ./config/functions.zsh);
   };
 }
generated by cgit-pink 1.4.1 (git 2.36.1) at 2025-07-07 18:46:49 +0000