mail: perform migration

system: remove deleted flag
karabiner: don't prevent me from typing ~ or ¨
2025-07-30 03:27:45 +00:00 · 2025-06-23 01:46:16 +03:00 · 2025-06-23 01:37:25 +03:00 · 2025-06-23 01:13:39 +03:00 · 2025-06-23 01:08:17 +03:00 · 2025-06-23 00:36:50 +03:00
8 changed files with 108 additions and 156 deletions
--- a/flake.lock
+++ b/flake.lock
@ -14,10 +14,10 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1747575206,
+        "lastModified": 1750173260,
        "owner": "ryantm",
        "repo": "agenix",
-        "rev": "4835b1dc898959d8547a871ef484930675cb47f1",
+        "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf",
        "type": "github"
      },
      "original": {
@ -50,10 +50,10 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1749186560,
+        "lastModified": 1749314438,
        "owner": "RGBCube",
        "repo": "crash",
-        "rev": "fd77a5a50c9c49a9b18302ae305c274f04373174",
+        "rev": "db0cf4a08907a97095849143e8b659f777838b1b",
        "type": "github"
      },
      "original": {
@ -68,10 +68,10 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1749278330,
+        "lastModified": 1750574187,
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "68e191fa1f76ab42d3eb7195844eab261e412e2e",
+        "rev": "263d9d394e9b9606a82c73941c4145052007799a",
        "type": "github"
      },
      "original": {
@ -83,11 +83,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
        "type": "github"
      },
      "original": {
@ -120,35 +120,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
-        "type": "github"
+        "lastModified": 1748821116,
+        "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=",
+        "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1",
+        "revCount": 377,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.377%2Brev-49f0870db23e8c1ca0b5259734a02cd9e1e371a1/01972f28-554a-73f8-91f4-d488cc502f08/source.tar.gz"
      },
      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems_4"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://flakehub.com/f/hercules-ci/flake-parts/0.1"
      }
    },
    "git-hooks": {
@ -164,11 +145,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742649964,
-        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
+        "lastModified": 1749636823,
+        "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
+        "rev": "623c56286de5a3193aa38891a6991b28f9bab056",
        "type": "github"
      },
      "original": {
@ -186,24 +167,19 @@
        "nixpkgs": [
          "nix",
          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nix",
-          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1734279981,
-        "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785",
-        "type": "github"
+        "lastModified": 1747372754,
+        "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
+        "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
+        "revCount": 1026,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/cachix/git-hooks.nix/0.1.1026%2Brev-80479b6ec16fefd9c1db3ea13aeb038c60530f46/0196d79a-1b35-7b8e-a021-c894fb62163d/source.tar.gz"
      },
      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941"
      }
    },
    "github2forgejo": {
@ -255,10 +231,10 @@
        ]
      },
      "locked": {
-        "lastModified": 1749243446,
+        "lastModified": 1750614446,
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "2d7d65f65b61fdfce23278e59ca266ddd0ef0a36",
+        "rev": "7c35504839f915abec86a96435b881ead7eb6a2b",
        "type": "github"
      },
      "original": {
@ -269,15 +245,13 @@
    },
    "nil": {
      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2",
-        "rust-overlay": "rust-overlay"
+        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1741118843,
+        "lastModified": 1750558251,
        "owner": "oxalica",
        "repo": "nil",
-        "rev": "577d160da311cc7f5042038456a0713e9863d09e",
+        "rev": "4e5ac6ec65c775fbc6adba1c6022b29c7eccde0f",
        "type": "github"
      },
      "original": {
@ -295,10 +269,10 @@
        "nixpkgs-regression": "nixpkgs-regression"
      },
      "locked": {
-        "lastModified": 1749233614,
+        "lastModified": 1750352474,
        "owner": "DeterminateSystems",
        "repo": "nix-src",
-        "rev": "0e1df1c0f14198b12640f032156eb3e7531a4f3a",
+        "rev": "1d5e161755dc269e30190f7a607b907b07ea2f63",
        "type": "github"
      },
      "original": {
@ -314,10 +288,10 @@
        ]
      },
      "locked": {
-        "lastModified": 1749194393,
+        "lastModified": 1750618568,
        "owner": "LnL7",
        "repo": "nix-darwin",
-        "rev": "19346808c445f23b08652971be198b9df6c33edc",
+        "rev": "1dd19f19e4b53a1fd2e8e738a08dd5fe635ec7e5",
        "type": "github"
      },
      "original": {
@ -337,10 +311,10 @@
        "nixpkgs-25_05": "nixpkgs-25_05"
      },
      "locked": {
-        "lastModified": 1749244584,
+        "lastModified": 1750598722,
        "owner": "simple-nixos-mailserver",
        "repo": "nixos-mailserver",
-        "rev": "8b27add0883067e990bff4f847b6f7b6f53324b9",
+        "rev": "cfb3136cf01a3e571b5340c7529b5b4722a08c52",
        "type": "gitlab"
      },
      "original": {
@ -352,11 +326,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1749143949,
-        "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
+        "lastModified": 1750365781,
+        "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
+        "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54",
        "type": "github"
      },
      "original": {
@ -384,11 +358,11 @@
    },
    "nixpkgs-25_05": {
      "locked": {
-        "lastModified": 1747610100,
-        "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
+        "lastModified": 1749727998,
+        "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
+        "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd",
        "type": "github"
      },
      "original": {
@ -416,15 +390,15 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1741037377,
-        "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=",
-        "owner": "nixos",
+        "lastModified": 1749619289,
+        "narHash": "sha256-qX6gXVjaCXXbcn6A9eSLUf8Fm07MgPGe5ir3++y2O1Q=",
+        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "02032da4af073d0f6110540c8677f16d4be0117f",
+        "rev": "f72be405a10668b8b00937b452f2145244103ebc",
        "type": "github"
      },
      "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
        "ref": "nixpkgs-unstable",
        "repo": "nixpkgs",
        "type": "github"
@ -434,24 +408,22 @@
      "locked": {
        "lastModified": 1747179050,
        "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
        "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
-        "type": "github"
+        "revCount": 799423,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.799423%2Brev-adaa24fbf46737f3f1b5497bf64bae750f82942e/0196d1c3-1974-7bf1-bcf6-06620ac40c8c/source.tar.gz"
      },
      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://flakehub.com/f/NixOS/nixpkgs/%3D0.1.799423"
      }
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1749143949,
+        "lastModified": 1750365781,
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
+        "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54",
        "type": "github"
      },
      "original": {
@ -479,11 +451,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1749194353,
-        "narHash": "sha256-i6nNh8It11J9afo8QAR1Vwk4qKz/byIc5yq0rU3SW7M=",
+        "lastModified": 1750538096,
+        "narHash": "sha256-8/KtURbFw0cd15WcqKJOMeF3JoxBbmjk2AWJ8Ud80WY=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "6acff6c1f8306a0a1d29be8fd1ffa63cff1ad598",
+        "rev": "0ddaf2cd7b5c020addb5c35b09dc5ef409701522",
        "type": "github"
      },
      "original": {
@ -493,27 +465,6 @@
        "type": "github"
      }
    },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "nil",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1741055476,
-        "narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "aefb7017d710f150970299685e8d8b549d653649",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
    "systems": {
      "locked": {
        "lastModified": 1681028828,
@ -559,21 +510,6 @@
        "type": "github"
      }
    },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
    "themes": {
      "locked": {
        "lastModified": 1748114866,
--- a/hosts/best/nextcloud/default.nix
+++ b/hosts/best/nextcloud/default.nix
@ -104,7 +104,6 @@ in {
      inherit (packageNextcloud.packages.apps)
        bookmarks calendar contacts deck forms
        impersonate mail notes previewgenerator;
-        # TODO: maps
    };

    nginx.recommendedHttpHeaders = true;
--- a/hosts/disk/mail.nix
+++ b/hosts/disk/mail.nix
@ -7,5 +7,7 @@ in {

  mailserver = {
    inherit fqdn;
+
+    stateVersion = 3;
  };
 }
--- a/hosts/nine/mail.nix
+++ b/hosts/nine/mail.nix
@ -10,5 +10,7 @@ in {

    # Not [ domain ] because this is a backup mailserver. contact@mail2.rgbcu.be.
    domains = [ fqdn ];
+
+    stateVersion = 3;
  };
 }
--- a/modules/darwin/karabiner.nix
+++ b/modules/darwin/karabiner.nix
@ -24,15 +24,8 @@
      manipulators = allBasic [
        {
          from.key_code            = "spacebar";
-          from.modifiers.mandatory = [ "left_option" ];
-          from.modifiers.optional  = [ "left_shift" "right_shift" ];
-
-          to = [{ key_code = "spacebar"; }];
-        }
-        {
-          from.key_code            = "spacebar";
-          from.modifiers.mandatory = [ "right_option" ];
-          from.modifiers.optional  = [ "left_shift" "right_shift" ];
+          from.modifiers.mandatory = [ "option" ];
+          from.modifiers.optional  = [ "shift" "control" "command" "fn" ];

          to = [{ key_code = "spacebar"; }];
        }
@ -42,64 +35,72 @@
    {
      description  = "Swap ĞğüÜ and {[]}";
      manipulators = allBasic [
-        {
-          from.key_code = "open_bracket";
+        { # ğ -> [
+          from.key_code           = "open_bracket";
+          from.modifiers.optional = [ "control" "command" "fn" ];

          to = [{
            key_code  = "8";
            modifiers = [ "right_option" ];
          }];
        }
-        {
+        { # Ğ -> {
          from.key_code            = "open_bracket";
-          from.modifiers.mandatory = ["shift"];
+          from.modifiers.mandatory = [ "shift" ];
+          from.modifiers.optional  = [ "control" "option" "command" "fn" ];

          to = [{
            key_code  = "7";
            modifiers = [ "right_option" ];
          }];
        }
-        {
-          from.key_code = "close_bracket";
+        { # ü -> ]
+          from.key_code           = "close_bracket";
+          from.modifiers.optional = [ "control" "command" "fn" ];

          to = [{
            key_code  = "9";
            modifiers = [ "right_option" ];
          }];
        }
-        {
+        { # Ü -> }
          from.key_code            = "close_bracket";
          from.modifiers.mandatory = [ "shift" ];
+          from.modifiers.optional  = [ "control" "option" "command" "fn" ];

          to = [{
            key_code  = "0";
            modifiers = [ "right_option" ];
          }];
        }
-        {
+        { # [ -> ğ
          from.key_code            = "8";
          from.modifiers.mandatory = [ "option" ];
+          from.modifiers.optional  = [ "control" "command" "fn" ];

          to = [{ key_code = "open_bracket"; }];
        }
-        {
+        { # { -> Ğ
          from.key_code            = "7";
          from.modifiers.mandatory = [ "option" ];
+          from.modifiers.optional  = [ "control" "command" "fn" ];

          to = [{
            key_code  = "open_bracket";
            modifiers = [ "shift" ];
          }];
        }
-        {
+        { # ] -> ü
          from.key_code            = "9";
          from.modifiers.mandatory = [ "option" ];
+          from.modifiers.optional  = [ "control" "command" "fn" ];

          to = [{ key_code = "close_bracket"; }];
        }
-        {
+        { # } -> Ü
          from.key_code            = "0";
          from.modifiers.mandatory = [ "option" ];
+          from.modifiers.optional  = [ "control" "command" "fn" ];

          to = [{
            key_code  = "close_bracket";
@ -112,13 +113,15 @@
    {
      description = "Swap ı and i";
      manipulators = allBasic [
-        {
-          from.key_code = "quote";
+        { # ı -> i
+          from.key_code           = "quote";
+          from.modifiers.optional = [ "control" "option" "command" "fn" ];

          to = [{ key_code = "i"; }];
        }
-        {
-          from.key_code = "i";
+        { # i -> ı
+          from.key_code           = "i";
+          from.modifiers.optional = [ "control" "option" "command" "fn" ];

          to = [{ key_code = "quote"; }];
        }
--- a/modules/darwin/paperwm.nix
+++ b/modules/darwin/paperwm.nix
@ -135,6 +135,7 @@ in {
        local super_alt = { "cmd", "ctrl", "alt" }
        local super_shift = { "cmd", "ctrl", "shift" }

+        -- FOCUS -- SUPER + DIRECTION
        hs.hotkey.bind(super, "left", PaperWM.actions.focus_left)
        hs.hotkey.bind(super, "down", PaperWM.actions.focus_down)
        hs.hotkey.bind(super, "up", PaperWM.actions.focus_up)
@ -145,6 +146,7 @@ in {
        hs.hotkey.bind(super, "k", PaperWM.actions.focus_up)
        hs.hotkey.bind(super, "l", PaperWM.actions.focus_right)

+        -- RESIZE WINDOW -- SUPER + ALT + DIRECTION
        hs.hotkey.bind(super_alt, "left", function() windowResize(-100, 0) end)
        hs.hotkey.bind(super_alt, "down", function() windowResize(0, 100) end)
        hs.hotkey.bind(super_alt, "up", function() windowResize(0, -100) end)
@ -155,14 +157,22 @@ in {
        hs.hotkey.bind(super_alt, "k", function() windowResize(0, -100) end)
        hs.hotkey.bind(super_alt, "l", function() windowResize(100, 0) end)

+        -- RESIZE WINDOW TO FULL WIDTH -- SUPER + ALT + F
+        hs.hotkey.bind(super_alt, "f", PaperWM.actions.full_width)
+
+        -- CYCLE SPACES -- SUPER[ + SHIFT FOR REVERSE] + TAB
        hs.hotkey.bind(super, "tab", function() spaceChange(1) end)
        hs.hotkey.bind(super_shift, "tab", function() spaceChange(-1) end)

        for index = 1, 9 do
+          -- GO TO SPACE -- SUPER + NUMBER
          hs.hotkey.bind(super, tostring(index), PaperWM.actions["switch_space_" .. index])
+
+          -- MOVE WINDOW TO SPACE -- SUPER + SHIFT + NUMBER
          hs.hotkey.bind(super_shift, tostring(index), PaperWM.actions["move_window_" .. index])
        end

+        -- SWAP WINDOW -- SUPER + SHIFT + DIRECTION
        hs.hotkey.bind(super_shift, "left", PaperWM.actions.swap_left)
        hs.hotkey.bind(super_shift, "down", PaperWM.actions.swap_down)
        hs.hotkey.bind(super_shift, "up", PaperWM.actions.swap_up)
@ -173,11 +183,16 @@ in {
        hs.hotkey.bind(super_shift, "k", PaperWM.actions.swap_up)
        hs.hotkey.bind(super_shift, "l", PaperWM.actions.swap_right)

+        -- SLURP & BARF WINDOW -- SUPER + SHIFT + I/O
+        hs.hotkey.bind(super_shift, "i", PaperWM.actions.slurp_in)
+        hs.hotkey.bind(super_shift, "o", PaperWM.actions.barf_out)
+
+        -- MISC CONTROL
        hs.hotkey.bind(super, "q", windowClose)
        hs.hotkey.bind(super, "c", PaperWM.actions.center_window)
-        hs.hotkey.bind(super_alt, "f", PaperWM.actions.full_width)
        hs.hotkey.bind(super, "f", PaperWM.actions.toggle_floating)

+        -- APPLICATIONS
        hs.hotkey.bind(super, "w", function() hs.application.launchOrFocus("Zen") end)
        hs.hotkey.bind(super, "return", function() hs.application.launchOrFocus("Ghostty") end)
        hs.hotkey.bind(super, "t", function() hs.application.launchOrFocus("Finder") end)
--- a/modules/linux/rebuild.nix
+++ b/modules/linux/rebuild.nix
@ -1,6 +1,3 @@
 {
-  system = {
-    switch.enableNg  = true;
-    rebuild.enableNg = true;
-  };
+  system.rebuild.enableNg = true;
 }
--- a/modules/mail/default.nix
+++ b/modules/mail/default.nix
@ -47,7 +47,5 @@ in {

      hashedPasswordFile = config.secrets.mailPassword.path;
    };
-
-    stateVersion = 2;
  };
 }
Author	SHA1	Message	Date
RGBCube	f459d15e48	mail: perform migration	2025-06-23 01:46:16 +03:00
RGBCube	a7d8d21afa	system: remove deleted flag	2025-06-23 01:37:25 +03:00
RGBCube	be7c4f483a	karabiner: don't prevent me from typing ~ or ¨	2025-06-23 01:13:39 +03:00
RGBCube	f94b6ad5a1	karabiner: fix config for real	2025-06-23 01:08:17 +03:00
RGBCube	a0519db66d	flake: update	2025-06-23 00:36:50 +03:00
RGBCube	da8cd8b754	paperwm: add slup/barf config	2025-06-23 00:36:35 +03:00
RGBCube	ad54d6db35	karabiner: fix config	2025-06-23 00:36:21 +03:00
RGBCube	64baa25315	nextcloud: delete todo	2025-06-23 00:36:06 +03:00