From 7855c4b894a740cca97173d99df1255c4763aa26 Mon Sep 17 00:00:00 2001
From: Aleksandr Lebedev <alex.lebedev2003@icloud.com>
Date: Sun, 2 Feb 2025 20:54:00 +0100
Subject: [PATCH] Fixes + updated emacs

---
 flake.lock                                | 30 +++++++++++------------
 nixos/configuration.nix                   |  5 ++--
 nixos/modules/hyprland/battery-status.nix |  4 +--
 nixos/modules/hyprland/hyprland.nix       |  2 +-
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index e042b99..16a8af9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -147,11 +147,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1738362093,
-        "narHash": "sha256-qZ+RAqLmF/yoHtR7kvBlkkTATIPKfZwhJa5SrEibGlQ=",
+        "lastModified": 1738525678,
+        "narHash": "sha256-6r/7mLwI7vDkzqIjgjSGAnozZvsN+DZqiVHCEB0yz5I=",
         "owner": "kylekrein",
         "repo": "emacs-config",
-        "rev": "1edb1a0e4e1e4d59a5f2550a8aab7880c0519814",
+        "rev": "198d057f2626dad2cc539d7cbc32502c9944f3b9",
         "type": "github"
       },
       "original": {
@@ -166,11 +166,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1737998189,
-        "narHash": "sha256-Np3e0z3S9nSbnbqaj+i0KyCR5S+KS+bdqHyser+KJuU=",
+        "lastModified": 1738487447,
+        "narHash": "sha256-ijAfzHCr489cenoBBcmBn3huyeoitLx1f/9t2LaOwmE=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "2251b6ce66de3f27aaf26779f2dc8c7b99402014",
+        "rev": "a7f332f6e0813c9d0f53fe6539be1e7a65fff2e4",
         "type": "github"
       },
       "original": {
@@ -1012,11 +1012,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1737885640,
-        "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=",
+        "lastModified": 1738277201,
+        "narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7",
+        "rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554",
         "type": "github"
       },
       "original": {
@@ -1028,11 +1028,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1737885589,
-        "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
+        "lastModified": 1738410390,
+        "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
+        "rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
         "type": "github"
       },
       "original": {
@@ -1044,11 +1044,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1737885589,
-        "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
+        "lastModified": 1738410390,
+        "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
+        "rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
         "type": "github"
       },
       "original": {
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 7a63b92..6695505 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -72,10 +72,9 @@
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
   #flatpak
-  kk.services.flatpak.enable = hwconfig.system != "aarch64-linux";
+  #kk.services.flatpak.enable = hwconfig.system != "aarch64-linux";
   services.flatpak.packages = [
-    "com.super_productivity.SuperProductivity" # only x86_64-linux
-    "net.cozic.joplin_desktop"
+    
   ];
 
   # Enable networking
diff --git a/nixos/modules/hyprland/battery-status.nix b/nixos/modules/hyprland/battery-status.nix
index cf4a0f4..f363627 100644
--- a/nixos/modules/hyprland/battery-status.nix
+++ b/nixos/modules/hyprland/battery-status.nix
@@ -32,7 +32,7 @@ elif [[ "$STATUS" == "Charging" ]]; then
     elif [[ $BATTERY_LEVEL -ge 10 ]]; then
         ICON="󰢜 "
     else
-        ICON="󱊦 "
+        ICON="󰢜 "
     fi
 else
     if [[ $BATTERY_LEVEL -ge 90 ]]; then
@@ -46,7 +46,7 @@ else
     elif [[ $BATTERY_LEVEL -ge 10 ]]; then
         ICON="󰁺 "
     else
-        ICON="󱊣 "
+        ICON="󰁺 "
     fi
 fi
 
diff --git a/nixos/modules/hyprland/hyprland.nix b/nixos/modules/hyprland/hyprland.nix
index 2877676..44c2f93 100644
--- a/nixos/modules/hyprland/hyprland.nix
+++ b/nixos/modules/hyprland/hyprland.nix
@@ -134,7 +134,7 @@ in {
       ];
       input = {
         kb_layout = "us, ru";
-        kb_options = "grp:caps_toggle";
+        kb_options = "grp:lctrl_toggle, ctrl:nocaps" + (if hwconfig.hostname == "kylekrein-mac" then ", altwin:swap_alt_win" else ""); # "ctrl:nocaps, grp:toggle"
 
         touchpad = {
           natural_scroll = true;