firefox: remove buggy config

flake.lock

@@ -73,6 +73,22 @@
         "url": "https://git.lelgenio.com/lelgenio/catboy-spinner"
       }
     },
+    "contador-da-viagem": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1742610036,
+        "narHash": "sha256-sY1iheemazmIVJAnoFtut6cN7HX/C5OMDY54UrmCoqE=",
+        "ref": "refs/heads/main",
+        "rev": "efe5ac4a16de7f78824ac89dc987ef635afa5267",
+        "revCount": 4,
+        "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",
@@ -440,11 +456,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742234739,
-        "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=",
+        "lastModified": 1742655702,
+        "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59",
+        "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff",
         "type": "github"
       },
       "original": {
@@ -481,11 +497,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742174123,
-        "narHash": "sha256-pDNzMoR6m1ZSJToZQ6XDTLVSdzIzmFl1b8Pc3f7iV6Y=",
+        "lastModified": 1742701275,
+        "narHash": "sha256-AulwPVrS9859t+eJ61v24wH/nfBEIDSXYxlRo3fL/SA=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "2cfb4e1ca32f59dd2811d7a6dd5d4d1225f0955c",
+        "rev": "36dc43cb50d5d20f90a28d53abb33a32b0a2aae6",
         "type": "github"
       },
       "original": {
@@ -551,11 +567,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1742422364,
-        "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
+        "lastModified": 1743095683,
+        "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
+        "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
         "type": "github"
       },
       "original": {
@@ -612,11 +628,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1742388435,
-        "narHash": "sha256-GheQGRNYAhHsvPxWVOhAmg9lZKkis22UPbEHlmZMthg=",
+        "lastModified": 1742937945,
+        "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b75693fb46bfaf09e662d09ec076c5a162efa9f6",
+        "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7",
         "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": 1742406979,
-        "narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=",
+        "lastModified": 1742700801,
+        "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609",
+        "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852",
         "type": "github"
       },
       "original": {
@@ -943,11 +960,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1742370146,
-        "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=",
+        "lastModified": 1743081648,
+        "narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808",
+        "rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7",
         "type": "github"
       },
       "original": {
@@ -958,11 +975,11 @@
     },
     "vpsadminos": {
       "locked": {
-        "lastModified": 1742222981,
-        "narHash": "sha256-EDhfWimpzUnpH5h/FQ3oYw/Kaq4Cx1E5nRofDQyI3aE=",
+        "lastModified": 1743047409,
+        "narHash": "sha256-WTUW2GZqHknVwEbzF/TeX2eg52414gfl6hXloDDwEsQ=",
         "owner": "vpsfreecz",
         "repo": "vpsadminos",
-        "rev": "14da38b9a49bf156e06f20ed02533a0549e6d487",
+        "rev": "cf9324b9ff855172bd9de8aa3b8215071c4a0c6f",
         "type": "github"
       },
       "original": {

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;

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;
+  };
 }

user/cursor/cursor.desktop

@@ -1,15 +0,0 @@
-[Desktop Entry]
-Name=Cursor
-Exec=/home/lelgenio/.local/bin/cursor --enable-features=UseOzonePlatform --ozone-platform-hint=wayland %F
-Path=/home/lelgenio/.local/bin
-Icon=/home/lelgenio/.icons/cursor.png
-Type=Application
-Categories=Utility;Development;
-StartupWMClass=Cursor
-X-AppImage-Version=latest
-Comment=Cursor is an AI-first coding environment.
-MimeType=x-scheme-handler/cursor;
-
-
-[Desktop Action new-empty-window]
-Exec=/home/lelgenio/.local/bin/cursor --enable-features=UseOzonePlatformc --ozone-platform-hint --new-window %F

user/cursor/default.nix

@@ -1,20 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}:
-{
-  options.cursor = {
-    enable = lib.mkEnableOption { };
-  };
-
-  config = lib.mkIf config.cursor.enable {
-    home.file = {
-      "${config.home.homeDirectory}/.local/share/applications/cursor.desktop".source = ./cursor.desktop;
-      "${config.home.homeDirectory}/.config/Cusor/User/keybindings.json".source =
-        config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/cursor/keybindings.json";
-      "${config.home.homeDirectory}/.config/Cursor/User/settings.json".source =
-        config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/cursor/settings.json";
-    };
-  };
-}

user/cursor/keybindings.json

@@ -1 +0,0 @@
-[]

user/cursor/settings.json

@@ -1,34 +0,0 @@
-{
-    "terminal.integrated.sendKeybindingsToShell": true,
-    "window.titleBarStyle": "custom",
-    "workbench.preferredDarkColorTheme": "GitHub Dark",
-    "workbench.preferredLightColorTheme": "GitHub Light",
-    "window.autoDetectColorScheme": true,
-    "workbench.colorTheme": "GitHub Dark",
-    "git.autofetch": true,
-    "git.confirmSync": false,
-    "editor.suggest.snippetsPreventQuickSuggestions": false,
-    "update.mode": "none",
-    "intelephense.files.exclude": [
-        "**/.git/**",
-        "**/.svn/**",
-        "**/.hg/**",
-        "**/CVS/**",
-        "**/.DS_Store/**",
-        "**/node_modules/**",
-        "**/bower_components/**",
-        "**/vendor/**/{Tests,tests}/**",
-        "**/.history/**",
-        "**/vendor/**/vendor/**",
-        "**/.direnv/**"
-    ],
-    "intelephense.format.braces": "k&r",
-    "window.commandCenter": 1,
-    "files.exclude": {
-        "**/.deps": true,
-        "**/.direnv": true
-    },
-    "diffEditor.renderSideBySide": false,
-    "laravel-pint.enable": true,
-    "editor.formatOnSave": true
-}

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 = {
@@ -107,8 +114,6 @@ in
             "media.ffmpeg.vaapi.enabled" = true;
             "media.ffvpx.enabled" = true;
 
-            "gfx.webrender.all" = true;
-
             # Enable installing non signed extensions
             "extensions.langpacks.signatures.required" = false;
             "xpinstall.signatures.required" = false;
@@ -119,15 +124,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
-              "";
+          userChrome = ''
+            ${lib.optionalString (desktop == "sway") swayCustomization}
+
+            #sidebar-main {
+              background-color: ${color.bg};
+            }
+
+            #tabbrowser-tabbox {
+              outline-width: 0 !important;
+            }
+          '';
         };
       };
     };
@@ -136,9 +143,5 @@ in
         exec firefox
       '';
     };
-    home.sessionVariables = {
-      MOZ_ENABLE_WAYLAND = "1";
-      MOZ_DISABLE_RDD_SANDBOX = "1";
-    };
   };
 }

user/gnome.nix

@@ -43,7 +43,7 @@ lib.mkIf (config.my.desktop == "gnome") {
     qt6Packages.qtstyleplugin-kvantum
   ];
 
-  services.gpg-agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3;
+  services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome;
 
   xdg.defaultApplications = {
     enable = lib.mkForce false;

user/kakoune/default.nix

@@ -82,6 +82,9 @@ in
             rev = "1cc6baeb14b773916eb9209469aa77b3cfa67a0a";
             sha256 = "sha256-3PLxG9UtT0MMSibvTviXQIgTH3rApZ3WSbNCEH3c7HE=";
           };
+          buildInputs = with pkgs; [
+            python3Minimal
+          ];
         })
       ];
       extraConfig =

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'
 }

user/ranger/rc.conf

@@ -27,10 +27,10 @@ set confirm_on_delete multiple
 # Use non-default path for file preview script?
 # ranger ships with scope.sh, a script that calls external programs (see
 # README.md for dependencies) to preview images, archives, etc.
-set preview_script ~/.config/ranger/scope.sh
+# set preview_script ~/.config/ranger/scope.sh
 
 # Use the external preview script or display simple plain text or image previews?
-set use_preview_script true
+# set use_preview_script true
 
 # Automatically count files in the directory, even before entering them?
 set automatically_count_files true
@@ -40,7 +40,7 @@ set automatically_count_files true
 set open_all_images true
 
 # Be aware of version control systems and display information.
-set vcs_aware true
+set vcs_aware false
 
 # State of the four backends git, hg, bzr, svn. The possible states are
 # disabled, local (only show local info), enabled (show local and remote

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;

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;
+      };
+    };
+  };
+}

user/sway/theme.nix

@@ -55,7 +55,7 @@ lib.mkIf (desktop == "sway") {
   qt = {
     enable = true;
     platformTheme.name = "gtk3";
-    style.name = "qt5ct";
+    style.name = "kvantum";
   };
 
   dconf.settings = {
@@ -70,28 +70,6 @@ lib.mkIf (desktop == "sway") {
     };
   };
 
-  # fonts.fontconfig.enable = true;
-  xdg.configFile = {
-    "qt5ct/qt5ct.conf".text = ''
-      [Appearance]
-      # color_scheme_path=/nix/store/f07mk0vrm47jxw3y5v99hxncy0w4vcyq-qt5ct-1.5/share/qt5ct/colors/darker.conf
-      custom_palette=false
-      icon_theme=${icon_theme}
-      standard_dialogs=default
-      style=kvantum-dark
-
-      # [Fonts]
-      # fixed=@Variant(\0\0\0@\0\0\0\x1c\0H\0\x61\0\x63\0k\0 \0N\0\x65\0r\0\x64\0 \0\x46\0o\0n\0t@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
-      # general=@Variant(\0\0\0@\0\0\0\x1e\0L\0i\0\x62\0\x65\0r\0\x61\0t\0i\0o\0n\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
-    '';
-    "kdedefaults/kdeglobals".text = ''
-      [General]
-      ColorScheme=BreezeDark
-
-      [Icons]
-      Theme=${icon_theme}
-    '';
-  };
   services.xsettingsd = {
     enable = true;
     settings = {
@@ -105,11 +83,6 @@ lib.mkIf (desktop == "sway") {
   };
 
   home.packages = with pkgs; [
-    libsForQt5.qt5ct
-    libsForQt5.qtstyleplugin-kvantum
-    qt6Packages.qt6ct
-    qt6Packages.qtstyleplugin-kvantum
-
     pkgs.bibata-cursors
     pkgs.orchis_theme_compact
     pkgs.papirus_red

user/variables.nix

@@ -115,7 +115,7 @@ rec {
   };
 
   dmenu = "bmenu";
-  desktop = "gnome";
+  desktop = "sway";
   browser = "firefox";
   editor = "kakoune";
 }