From 0066175c4ea76f7a20e687bb234de6851e4a57d0 Mon Sep 17 00:00:00 2001
From: Alex Stan <alex.stan.2010@proton.me>
Date: Mon, 16 Dec 2024 12:53:37 +0200
Subject: [PATCH] updated nixos

Signed-off-by: Alex Stan <alex.stan.2010@proton.me>
---
 hosts/hermes/configuration.nix    | 10 ++++--
 users/ultra/configs/emacs/init.el |  2 ++
 users/ultra/home.nix              | 53 ++++++++++++++++++++++++++++---
 3 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/hosts/hermes/configuration.nix b/hosts/hermes/configuration.nix
index 13844ee..ae8224b 100644
--- a/hosts/hermes/configuration.nix
+++ b/hosts/hermes/configuration.nix
@@ -172,18 +172,18 @@ in {
     gnomeExtensions.media-controls
     gnomeExtensions.solaar-extension
     gnomeExtensions.paperwm
-    nerdfonts
+    # nerdfonts
     everblush
     bibata-cursors
     adw-gtk3
     virt-manager
-    gnome.gnome-software
+    gnome-software
     evtest
     appimagekit
     solaar
     hplip
     cozette
-    gnome.gnome-remote-desktop
+    gnome-remote-desktop
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
@@ -288,4 +288,8 @@ in {
       
     };
   };
+
+  fonts = {
+    packages = [] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
+  };
 }
diff --git a/users/ultra/configs/emacs/init.el b/users/ultra/configs/emacs/init.el
index bafdc78..c10de35 100644
--- a/users/ultra/configs/emacs/init.el
+++ b/users/ultra/configs/emacs/init.el
@@ -173,11 +173,13 @@
      ("*" mc/mark-all-like-this)
      ("v" er/expand-region)
      ("/" phi-search)
+     ("=" indent-region)
      ("C-v" set-rectangular-region-anchor)
      ("M-s" mc/split-region)
      (";" (("q" delete-window)
            ("v" split-window-horizontally)
            ("s" split-window-vertically)))
+     ("SPC" (("r" eglot-rename)))
      ("C-h" windmove-left)
      ("C-j" windmove-down)
      ("C-k" windmove-up)
diff --git a/users/ultra/home.nix b/users/ultra/home.nix
index 1d2aada..3d3f47a 100644
--- a/users/ultra/home.nix
+++ b/users/ultra/home.nix
@@ -80,6 +80,7 @@ let
       phi-search
       undo-tree
       counsel
+      elcord
     ];
   });
   helix = inputs.helix.packages.${pkgs.system}.default;
@@ -278,8 +279,8 @@ in {
         dino
         # cinny-desktop
         (inputs.nix-inst.packages.${pkgs.system}.default)
-        dotnet-runtime_6
-        # dotnet-runtime_8
+        # dotnet-runtime_6
+        dotnet-runtime_8
         tea
         thefuck
         playerctl
@@ -289,6 +290,7 @@ in {
         cozette
         leiningen
         sublime-music
+        calibre
       ];
         file = {
             "emacs.d/everblush-theme.el".source = ./configs/emacs/everblush-theme.el;
@@ -331,7 +333,7 @@ in {
         };
         shellAliases = {
           cls = "clear";
-          # emcc = "emacsclient -c";
+          emcc = "emacsclient -c";
         };
         oh-my-zsh = {
           enable = true;
@@ -504,25 +506,66 @@ in {
         #enable = true;
         package = pkgs.niri-stable;
         settings = {
+          prefer-no-csd = true;
+          window-rules = [
+            {
+              geometry-corner-radius = {
+                bottom-left = 8.0;
+                top-left = 8.0;
+                top-right = 8.0;
+                bottom-right = 8.0;
+              };
+              clip-to-geometry = true;
+            }
+            {
+              matches = [{is-focused = false;}];
+              opacity = 0.85;
+            }
+          ];
+#          layout = {
+#            
+#          };
           outputs = {
             eDP-1 = {
-              enable = true;
+              enable = false;
               scale = 2.25;
               position = { x = 0; y = 0; };
             };
             DP-2 = {
-              enable = true;
+              enable = false;
               scale = 2.25;
               position = { x = 0; y = 960; };
             };
+            DP-1 = {
+              enable = true;
+            };
           };
           binds = with config.lib.niri.actions; {
+            "Mod+Q".action = close-window;
             "Mod+T".action.spawn = "alacritty";
+            "Ctrl+Alt+T".action.spawn = "alacritty";
             "Mod+D".action.spawn = "fuzzel";
             "Mod+Shift+E".action = quit;
             "Mod+Ctrl+shift+E".action = quit { skip-confirmation = true; };
             "Mod+Shift+Slash".action = show-hotkey-overlay;
             "Mod+F".action = fullscreen-window;
+            "Mod+J".action = focus-column-or-monitor-left;
+            "Mod+K".action = focus-window-down;
+            "Mod+L".action = focus-window-up;
+            "Mod+semicolon".action = focus-column-or-monitor-right;
+            "Mod+Left".action = focus-column-or-monitor-left;
+            "Mod+Down".action = focus-window-down;
+            "Mod+Up".action = focus-window-up;
+            "Mod+Right".action = focus-column-or-monitor-right;
+
+            "Mod+WheelScrollRight".action = focus-column-or-monitor-right;
+            "Mod+WheelScrollLeft".action = focus-column-or-monitor-left;
+            "Mod+WheelScrollDown".action = focus-workspace-down;
+            "Mod+WheelScrollUp".action = focus-workspace-up;
+            "Mod+Minus".action = set-column-width "-10%";
+            "Mod+Plus".action = set-column-width "+10%";
+            "Mod+Equal".action = set-column-width "+10%";
+
           };
         };
       };