kakoune: add json and yaml formatter

firefox: update userchrome
gammastep: extract config
2025-04-02 17:11:01 -03:00 · 2025-03-28 20:22:34 -03:00 · 2025-03-27 21:09:14 -03:00 · 2025-03-27 19:34:08 -03:00 · 2025-03-27 19:34:07 -03:00 · 2025-03-27 19:34:07 -03:00
12 changed files with 162 additions and 109 deletions
--- a/flake.lock
+++ b/flake.lock
@ -73,6 +73,22 @@
        "url": "https://git.lelgenio.com/lelgenio/catboy-spinner"
      }
    },
+    "contador-da-viagem": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1742597480,
+        "narHash": "sha256-aN+Kioc4AWPMyJxfz/zFCo2YdP4YxcPqoUcp46z9KcA=",
+        "ref": "refs/heads/main",
+        "rev": "29dde9d1965b1f8c1b870185a95859c050ba847d",
+        "revCount": 3,
+        "type": "git",
+        "url": "https://git.lelgenio.com/lelgenio/contador-da-viagem"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.lelgenio.com/lelgenio/contador-da-viagem"
+      }
+    },
    "crane": {
      "inputs": {
        "flake-compat": "flake-compat",
@ -209,11 +225,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1740485968,
-        "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=",
+        "lastModified": 1741786315,
+        "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940",
+        "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de",
        "type": "github"
      },
      "original": {
@ -227,11 +243,11 @@
        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1739502527,
-        "narHash": "sha256-KMLNOCWmqdDeAZV5O1ccRmVqRutDcy4IONJin3lzd0Q=",
+        "lastModified": 1742179690,
+        "narHash": "sha256-s/q3OWRe5m7kwDcAs1BhJEj6aHc5bsBxRnLP7DM77xE=",
        "owner": "lelgenio",
        "repo": "dzgui-nix",
-        "rev": "06fcea9445b5a005b40469a69f57f2147398bc94",
+        "rev": "a6d68720c932ac26d549b24f17c776bd2aeb73b4",
        "type": "github"
      },
      "original": {
@ -440,11 +456,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1739757849,
-        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
+        "lastModified": 1742234739,
+        "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
+        "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59",
        "type": "github"
      },
      "original": {
@ -481,11 +497,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1740281615,
-        "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=",
+        "lastModified": 1742174123,
+        "narHash": "sha256-pDNzMoR6m1ZSJToZQ6XDTLVSdzIzmFl1b8Pc3f7iV6Y=",
        "owner": "Mic92",
        "repo": "nix-index-database",
-        "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023",
+        "rev": "2cfb4e1ca32f59dd2811d7a6dd5d4d1225f0955c",
        "type": "github"
      },
      "original": {
@ -504,11 +520,11 @@
        "nixpkgs-24_11": "nixpkgs-24_11"
      },
      "locked": {
-        "lastModified": 1740437053,
-        "narHash": "sha256-exPTta4qI1ka9sk+jPcLogGffJ1OVXnAsTRqpeAXeNw=",
+        "lastModified": 1742413977,
+        "narHash": "sha256-NkhM9GVu3HL+MiXtGD0TjuPCQ4GFVJPBZ8KyI2cFDGU=",
        "owner": "simple-nixos-mailserver",
        "repo": "nixos-mailserver",
-        "rev": "c8ec4d5e432f5df4838eacd39c11828d23ce66ec",
+        "rev": "b4fbffe79c00f19be94b86b4144ff67541613659",
        "type": "gitlab"
      },
      "original": {
@ -551,11 +567,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1740560979,
-        "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
+        "lastModified": 1742422364,
+        "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "5135c59491985879812717f4c9fea69604e7f26f",
+        "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
        "type": "github"
      },
      "original": {
@ -612,11 +628,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1740603184,
-        "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=",
+        "lastModified": 1742388435,
+        "narHash": "sha256-GheQGRNYAhHsvPxWVOhAmg9lZKkis22UPbEHlmZMthg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49",
+        "rev": "b75693fb46bfaf09e662d09ec076c5a162efa9f6",
        "type": "github"
      },
      "original": {
@ -709,6 +725,7 @@
      "inputs": {
        "agenix": "agenix",
        "catboy-spinner": "catboy-spinner",
+        "contador-da-viagem": "contador-da-viagem",
        "demoji": "demoji",
        "dhist": "dhist",
        "disko": "disko",
@ -783,11 +800,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741043164,
-        "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=",
+        "lastModified": 1742406979,
+        "narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "3f2412536eeece783f0d0ad3861417f347219f4d",
+        "rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609",
        "type": "github"
      },
      "original": {
@ -943,11 +960,11 @@
        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1739829690,
-        "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=",
+        "lastModified": 1742370146,
+        "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "3d0579f5cc93436052d94b73925b48973a104204",
+        "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808",
        "type": "github"
      },
      "original": {
@ -958,11 +975,11 @@
    },
    "vpsadminos": {
      "locked": {
-        "lastModified": 1740754923,
-        "narHash": "sha256-o7Qo5kkjVgBL9CVqNJKnkcDbRkpD0UAp82G/mJ086Xw=",
+        "lastModified": 1742222981,
+        "narHash": "sha256-EDhfWimpzUnpH5h/FQ3oYw/Kaq4Cx1E5nRofDQyI3aE=",
        "owner": "vpsfreecz",
        "repo": "vpsadminos",
-        "rev": "3a9df8fbe84b680ad0a38ec85e8e9c8a4f095ca3",
+        "rev": "14da38b9a49bf156e06f20ed02533a0549e6d487",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -56,6 +56,10 @@
    wl-crosshair.url = "github:lelgenio/wl-crosshair";
    warthunder-leak-counter.url = "git+https://git.lelgenio.com/lelgenio/warthunder-leak-counter";
    made-you-look.url = "git+https://git.lelgenio.com/lelgenio/made-you-look";
+    contador-da-viagem = {
+      url = "git+https://git.lelgenio.com/lelgenio/contador-da-viagem";
+      flake = false;
+    };
    catboy-spinner = {
      url = "git+https://git.lelgenio.com/lelgenio/catboy-spinner";
      flake = false;
--- a/hosts/monolith/factorio-server.nix
+++ b/hosts/monolith/factorio-server.nix
@ -23,11 +23,12 @@
  systemd.services.factorio-backup-save = {
    description = "Backup factorio saves";
    script = ''
+      FILENAME="space-age-$(date --iso=seconds | tr ':' '_').zip"
      ${lib.getExe pkgs.rsync} \
        -av  \
        --chown=lelgenio \
        /var/lib/factorio/saves/default.zip \
-        ~lelgenio/Documentos/GameSaves/factorio_saves/space-age-$(date --iso=seconds).zip
+        ~lelgenio/Documentos/GameSaves/factorio_saves/$FILENAME
    '';
    serviceConfig.Type = "oneshot";
    wantedBy = [ "multi-user.target" ];
--- a/hosts/phantom/goofs.nix
+++ b/hosts/phantom/goofs.nix
@ -43,4 +43,9 @@
    forceSSL = true;
    root = inputs.hello-fonts;
  };
+  services.nginx.virtualHosts."contador-da-viagem.lelgenio.com" = {
+    enableACME = true;
+    forceSSL = true;
+    root = inputs.contador-da-viagem;
+  };
 }
--- a/user/firefox.nix
+++ b/user/firefox.nix
@ -2,15 +2,22 @@
  config,
  pkgs,
  lib,
-  font,
  ...
 }:
 let
-  inherit (config.my) desktop browser;
+  inherit (config.my) desktop;
+  inherit (config.my.theme) color;
+
  bugfixedFirefox = pkgs.firefox-devedition-unwrapped // {
    requireSigning = false;
    allowAddonSideload = true;
  };
+
+  swayCustomization = ''
+    #titlebar { display: none !important; }
+    #TabsToolbar { display: none !important; }
+    #sidebar-header { display: none !important; }
+  '';
 in
 {
  config = {
@ -119,54 +126,17 @@ in
            "devtools.chrome.enabled" = true;
            "devtools.debugger.remote-enabled" = true;
          };
-          userChrome =
-            if desktop == "sway" then
-              ''
-                #titlebar { display: none !important; }
-                #TabsToolbar { display: none !important; }
-                #sidebar-header { display: none !important; }
-              ''
-            else
-              ''
-                /* Element | chrome://browser/content/browser.xhtml */
+          userChrome = ''
+            ${lib.optionalString (desktop == "sway") swayCustomization}

-                #navigator-toolbox {
-                  display: grid;
-                  grid-template-columns: 1fr 50px;
-                  overflow: hidden;
-                }
+            #sidebar-main {
+              background-color: ${color.bg};
+            }

-                /* Element | chrome://browser/content/browser.xhtml */
-
-                #nav-bar {
-                  flex: 1;
-                  width: 100%;
-                  grid-column: 1 / 3;
-                  grid-row: 1;
-                  z-index: 0;
-                  padding-right: 29px !important;
-                }
-
-                /* Element | chrome://browser/content/browser.xhtml */
-
-                .toolbar-items {
-                  display: none;
-                }
-
-                /* Element | chrome://browser/content/browser.xhtml */
-
-                #TabsToolbar {
-                  max-width: 50px;
-                }
-
-                /* Element | chrome://browser/content/browser.xhtml */
-
-                #titlebar {
-                  max-width: 50px;
-                  grid-area: 1 / 2;
-                  z-index: 10;
-                }
-              '';
+            #tabbrowser-tabbox {
+              outline-width: 0 !important;
+            }
+          '';
        };
      };
    };
--- a/user/gnome.nix
+++ b/user/gnome.nix
@ -35,6 +35,7 @@ lib.mkIf (config.my.desktop == "gnome") {
    amberol
    pitivi
    keepassxc
+    menulibre

    libsForQt5.qt5ct
    libsForQt5.qtstyleplugin-kvantum
--- a/user/home-manager.nix
+++ b/user/home-manager.nix
@ -0,0 +1,28 @@
+{ pkgs, lib, ... }:
+{
+  programs.home-manager.enable = true;
+
+  systemd.user.services.home-manager-expire = {
+    Unit = {
+      Description = "Remove old home-manager generations";
+    };
+    Service = {
+      Type = "oneshot";
+      ExecStart = pkgs.writeShellScript "home-manager-expire" ''
+        ${lib.getExe pkgs.home-manager} expire-generations 7d
+      '';
+    };
+  };
+  systemd.user.timers.home-manager-expire = {
+    Unit = {
+      Description = "Remove old home-manager generations";
+    };
+    Timer = {
+      OnCalendar = "daily";
+      Unit = "home-manager-expire.service";
+    };
+    Install = {
+      WantedBy = [ "timers.target" ];
+    };
+  };
+}
--- a/user/home.nix
+++ b/user/home.nix
@ -9,6 +9,7 @@
 {
  imports = [
    ./dummy.nix
+    ./home-manager.nix
    ./waybar
    ./helix.nix
    ./kakoune
@ -44,6 +45,7 @@
    inputs.nix-index-database.hmModules.nix-index
    ../settings
    ./powerplay-led-idle.nix
+    ./rm-target.nix
  ];

  my = import ./variables.nix // {
@ -57,8 +59,6 @@
  home.username = "lelgenio";
  home.homeDirectory = "/home/lelgenio";

-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
  home.packages = with pkgs; [
    terminal

@ -169,30 +169,6 @@
        exec nicotine
      '';

-  systemd.user.services.rm-target = {
-    Unit = {
-      Description = "Remove directories named 'target'";
-    };
-    Service = {
-      Type = "oneshot";
-      ExecStart = pkgs.writeShellScript "rm-target" ''
-        sudo ${pkgs.fd}/bin/fd -td -u '^\.?target$' "$HOME" -x rm -vrf --
-      '';
-    };
-  };
-  systemd.user.timers.rm-target = {
-    Unit = {
-      Description = "Remove directories named 'target'";
-    };
-    Timer = {
-      OnCalendar = "weekly";
-      Unit = "rm-target.service";
-    };
-    Install = {
-      WantedBy = [ "timers.target" ];
-    };
-  };
-
  # This value determines the Home Manager release that your
  # configuration is compatible with. This helps avoid breakage
  # when a new Home Manager release introduces backwards
--- a/user/kakoune/filetypes.kak
+++ b/user/kakoune/filetypes.kak
@ -15,6 +15,14 @@ hook global WinSetOption filetype=nix %{
    set buffer formatcmd 'nixfmt'
 }

+hook global BufCreate .*\.json %{
+    set buffer formatcmd 'prettier --parser json'
+}
+
+hook global BufCreate .*\.ya?ml %{
+    set buffer formatcmd 'prettier --parser yaml'
+}
+
 hook global BufCreate .*\.html %{
    set buffer formatcmd 'prettier --parser html'
 }
--- a/user/rm-target.nix
+++ b/user/rm-target.nix
@ -0,0 +1,26 @@
+{ pkgs, lib, ... }:
+{
+  systemd.user.services.rm-target = {
+    Unit = {
+      Description = "Remove directories named 'target'";
+    };
+    Service = {
+      Type = "oneshot";
+      ExecStart = pkgs.writeShellScript "rm-target" ''
+        sudo ${pkgs.fd}/bin/fd -td -u '^\.?target$' "$HOME" -x rm -vrf --
+      '';
+    };
+  };
+  systemd.user.timers.rm-target = {
+    Unit = {
+      Description = "Remove directories named 'target'";
+    };
+    Timer = {
+      OnCalendar = "weekly";
+      Unit = "rm-target.service";
+    };
+    Install = {
+      WantedBy = [ "timers.target" ];
+    };
+  };
+}
--- a/user/sway/default.nix
+++ b/user/sway/default.nix
@ -20,6 +20,7 @@ in
    ./swayidle.nix
    ./swaylock.nix
    ./theme.nix
+    ./gammastep.nix
  ];

  options.my.sway.enable = lib.mkEnableOption { };
@ -32,6 +33,7 @@ in
    my.mpd.enable = true;
    my.zathura.enable = true;
    my.waybar.enable = true;
+    my.gammastep.enable = true;

    wayland.windowManager.sway = {
      enable = true;
@ -115,10 +117,6 @@ in
        exec_always systemctl --user restart waybar.service
      '';
    };
-    services.gammastep = {
-      enable = true;
-      provider = "geoclue2";
-    };

    services.kdeconnect = {
      enable = true;
--- a/user/sway/gammastep.nix
+++ b/user/sway/gammastep.nix
@ -0,0 +1,19 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.gammastep;
+in
+{
+  options.my.gammastep.enable = lib.mkEnableOption { };
+
+  config = lib.mkIf cfg.enable {
+    services.gammastep = {
+      enable = true;
+      dawnTime = "6:00-7:45";
+      duskTime = "18:35-20:15";
+      temperature = {
+        day = 6500;
+        night = 4500;
+      };
+    };
+  };
+}
Author	SHA1	Message	Date
lelgenio	9239cbef77	kakoune: add json and yaml formatter	2025-04-02 17:11:01 -03:00
Leonardo Eugênio	921413f545	firefox: update userchrome	2025-03-28 20:22:34 -03:00
Leonardo Eugênio	0a0b8f9e61	gammastep: extract config	2025-03-27 21:09:14 -03:00
Leonardo Eugênio	8cae611cd5	home: add automatic home-manager cleanup service	2025-03-27 19:34:08 -03:00
Leonardo Eugênio	0f61393bf3	refactor: move rm-target service and timer to separate file	2025-03-27 19:34:07 -03:00
Leonardo Eugênio	4ebfaca007	factorio: update backup script filename to fix syncthing integration	2025-03-27 19:34:07 -03:00
Leonardo Eugênio	a432569595	update	2025-03-27 19:34:07 -03:00
Leonardo Eugênio	0f161863fc	firefox: remove header styling	2025-03-27 19:34:07 -03:00
Leonardo Eugênio	3c7da418df	gnome: install menulibre	2025-03-27 19:34:07 -03:00
Leonardo Eugênio	d2654ca5bc	phantom: add travel counter goof	2025-03-21 23:23:52 -03:00