diff --git a/flake.lock b/flake.lock index f9dc770..9cef65d 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1754222849, - "narHash": "sha256-NpdYp66lyapJZvKKV/613PFdxSM6jqIuZYEIUBhBSHI=", + "lastModified": 1758301928, + "narHash": "sha256-zwXD5QYjSTH9a1EWMOMJvV0nB06QZ4C+IBqyGnSWMbE=", "owner": "ethui", "repo": "ethui", - "rev": "03cdf7d2e2c2fd513faa6dd85d4253c511c87ba4", + "rev": "726410e5b92fe5406e98ccca2a96b608b682570c", "type": "github" }, "original": { @@ -593,11 +593,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1752633862, - "narHash": "sha256-Bj7ozT1+5P7NmvDcuAXJvj56txcXuAhk3Vd9FdWFQzk=", + "lastModified": 1754575663, + "narHash": "sha256-afOx8AG0KYtw7mlt6s6ahBBy7eEHZwws3iCRoiuRQS4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8668ca94858206ac3db0860a9dec471de0d995f8", + "rev": "6db0fb0e9cec2e9729dc52bf4898e6c135bb8a0f", "type": "github" }, "original": { diff --git a/home/arrakis/default.nix b/home/arrakis/default.nix index f5b5923..7883902 100644 --- a/home/arrakis/default.nix +++ b/home/arrakis/default.nix @@ -15,7 +15,6 @@ ../common/programs/zen-browser.nix ../common/programs/hyprland ../common/programs/i3.nix - ../common/programs/ghostty.nix ../common/programs/kitty.nix ../common/programs/syncthing.nix ../common/programs/unity.nix diff --git a/home/common/programs/desktop/default.nix b/home/common/programs/desktop/default.nix index 8e43925..84a200e 100644 --- a/home/common/programs/desktop/default.nix +++ b/home/common/programs/desktop/default.nix @@ -1,7 +1,6 @@ { pkgs, ... }: { imports = [ - ./firefox.nix ./darkman.nix ]; diff --git a/home/common/programs/desktop/firefox.nix b/home/common/programs/desktop/firefox.nix deleted file mode 100644 index 028dca7..0000000 --- a/home/common/programs/desktop/firefox.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ pkgs, ... }: -{ - - home.sessionVariables = { - BROWSER = "zen-twilight"; - }; - - programs.firefox = { - enable = true; - package = pkgs.firefox-devedition; - policies = { - DefaultDownloadDirectory = "$HOME/downloads"; - DontCheckDefaultBrowser = true; - DisableTelemetry = true; - DisablePocket = true; - DisableFirefoxStudies = true; - - DisplayBookmarksToolbar = "never"; - DisplayMenuBar = "never"; - - OverrideFirstRunPage = ""; - PromptForDownloadLocation = false; - - HardwareAcceleration = true; - TranslateEnabled = true; - - Homepage.StartPage = "previous-session"; - - UserMessaging = { - SkipOnboarding = true; - }; - - FirefoxSuggest = { - WebSuggestions = false; - SponsoredSuggestions = false; - ImproveSuggest = false; - }; - - EnableTrackingProtection = { - Value = true; - Cryptomining = true; - Fingerprinting = true; - }; - - FirefoxHome = { - Search = true; - TopSites = true; - SponsoredTopSites = true; - Highlights = true; - Pocket = false; - SponsoredPocket = false; - Snippets = false; - }; - }; - }; -} diff --git a/home/common/programs/ghostty.nix b/home/common/programs/ghostty.nix deleted file mode 100644 index 3e22f2a..0000000 --- a/home/common/programs/ghostty.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ config, pkgs, ... }: -{ - programs.ghostty = { - enable = true; - }; - - xdg.configFile."ghostty/config".source = ./ghostty/config; -} diff --git a/home/common/programs/kitty.nix b/home/common/programs/kitty.nix index 104f491..57cf487 100644 --- a/home/common/programs/kitty.nix +++ b/home/common/programs/kitty.nix @@ -54,8 +54,6 @@ }; extraConfig = '' - font_size 12.0 - background #1c1c1c foreground #ddeedd cursor #e2bbef diff --git a/home/desktop/default.nix b/home/desktop/default.nix index ef7fce7..c7e15b6 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -15,7 +15,6 @@ ../common/programs/zen-browser.nix ../common/programs/hyprland ../common/programs/i3.nix - ../common/programs/ghostty.nix ../common/programs/kitty.nix ../common/programs/syncthing.nix ../common/programs/unity.nix diff --git a/home/desktop/monitors.nix b/home/desktop/monitors.nix index f5c181d..2d03f87 100644 --- a/home/desktop/monitors.nix +++ b/home/desktop/monitors.nix @@ -23,11 +23,11 @@ in wayland.windowManager.hyprland.settings = { monitor = [ # monitor, res, position, scale, transform, rotation - "HDMI-A-1, 3840x2160, 0x1620, 1.333333" - "DP-1, 3840x2160, 0x0, 1.333333" + "HDMI-A-1, 3840x2160, 0x2160, 1" + "DP-1, 3840x2160, 0x0, 1" # 300 instead of 0 is so that 'move left' actually focuses the bottom one instead of the top one # for some reason, that's the minimum value for which this works - "DP-2, 3840x2160, 2880x180, 1.333333, transform, 1" + "DP-2, 3840x2160, 3840x180, 1, transform, 1" ]; workspace = [ "1, monitor=DP-2"