diff --git a/.config/qutebrowser/greasemonkey/redirect.js b/.config/qutebrowser/greasemonkey/redirect.js index 8f6c51d..84997a3 100644 --- a/.config/qutebrowser/greasemonkey/redirect.js +++ b/.config/qutebrowser/greasemonkey/redirect.js @@ -1146,7 +1146,7 @@ switch (urlHostname) { case "www.imdb.com": case "m.imdb.com": - redirectImdb(); + // redirectImdb(); break; case "www.quora.com": @@ -1166,7 +1166,7 @@ switch (urlHostname) { break; case "stackoverflow.com": - redirectStackoverflow(); + // redirectStackoverflow(); break; case "f4.bcbits.com": diff --git a/flake.lock b/flake.lock index 73a9bda..a37c088 100644 --- a/flake.lock +++ b/flake.lock @@ -13,11 +13,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1764195413, - "narHash": "sha256-YNehE1Vq7Gntrpl6FYwfHU+8U/5v5OaS/KtiB35AWfE=", + "lastModified": 1764799851, + "narHash": "sha256-GSwYx+yFEZWUtRrUUyQjikvAErXZM/yLWtJYOWYlfKA=", "owner": "mrshmllow", "repo": "affinity-nix", - "rev": "5312de0bb4808e256a346c58ab3607bd7ffc924b", + "rev": "8c939e11edda228a529ed78701c327df4d38a4c4", "type": "github" }, "original": { @@ -32,11 +32,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1760826146, - "narHash": "sha256-NZZYr7N/ReAotoh3NFrXTaHIIMWsA+DBdfJNZnMqW8g=", + "lastModified": 1765480787, + "narHash": "sha256-V5DTurvmO0tQZbcmejUDOErigARS3zzqUmLuzE1Hj28=", "owner": "sdaqo", "repo": "anipy-cli", - "rev": "c4fc79896ff00bd4521b2a066089ddfe97b7d7ce", + "rev": "7c0b8b4e7514b31df2e1fcc16df8c90b9740921e", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1752979451, - "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -138,11 +138,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1764596563, - "narHash": "sha256-tH3AGDWlAN3ImVuBBCLmqaqD0EbkISiPCHGeMcd430k=", + "lastModified": 1765204341, + "narHash": "sha256-7xd45skcuLCu2DHxVvU+W/z+7CUOjyv+QPtT4PLZaIU=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "0701ee838b0fb34a77b6dd4b35476b4bb09fbca9", + "rev": "aacb796ccd42be1555196c20013b9b674b71df75", "type": "github" }, "original": { @@ -157,11 +157,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1763015923, - "narHash": "sha256-IJGWKVxztJT/NsonaRjWm5OaW07Rg+kBr6NMhfQiJzM=", + "lastModified": 1765222869, + "narHash": "sha256-LUYJ9Qgp0nELw3V2NyfMgAZnE+rx8eHbHgBKCNt5NWY=", "owner": "Bali10050", "repo": "Darkly", - "rev": "5a323b775695f889b495d9f499eceb38ed538b42", + "rev": "f000d5a198d87ea2cb7fcb0a9906dcf0837dcdf8", "type": "github" }, "original": { @@ -197,17 +197,16 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1732326917, - "narHash": "sha256-FOHMWtR46AeDbRnOSD6wN3XWhIRvqYIyPDEczCbKMWY=", + "lastModified": 1765790297, + "narHash": "sha256-z7rsQrdC+6XAX/gwUbRkCNLpy6LNwfEQnunPE9oqmpc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "dd38645351b6f14cda47c81456131c86b11386db", + "rev": "2032215e38abcdf5a21bdc8c6a3565a0362063c8", "type": "github" }, "original": { "owner": "nix-community", "repo": "emacs-overlay", - "rev": "dd38645351b6f14cda47c81456131c86b11386db", "type": "github" } }, @@ -240,11 +239,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1758112371, - "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", + "lastModified": 1764724327, + "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", + "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", "type": "github" }, "original": { @@ -342,11 +341,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -481,11 +480,11 @@ "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1762869044, - "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=", + "lastModified": 1764524476, + "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad", + "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", "type": "gitlab" }, "original": { @@ -504,11 +503,11 @@ ] }, "locked": { - "lastModified": 1764194569, - "narHash": "sha256-iUM9ktarEzThkayyZrzQ7oycPshAY2XRQqVKz0xX/L0=", + "lastModified": 1764998300, + "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", "owner": "nix-community", "repo": "home-manager", - "rev": "9651819d75f6c7ffaf8a9227490ac704f29659f0", + "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", "type": "github" }, "original": { @@ -524,11 +523,11 @@ ] }, "locked": { - "lastModified": 1764636297, - "narHash": "sha256-S41K55kw+hWgDfgKmZ9/fMZ3F0BQDMvqFfE120fMHeE=", + "lastModified": 1765480374, + "narHash": "sha256-HlbvQAqLx7WqZFFQZ8nu5UUJAVlXiV/kqKbyueA8srw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ff067cfc619fdf6f82d50344e7d19ff2323f0827", + "rev": "39cb677ed9e908e90478aa9fe5f3383dfc1a63f3", "type": "github" }, "original": { @@ -547,11 +546,11 @@ ] }, "locked": { - "lastModified": 1764275117, - "narHash": "sha256-DRcv8Y0BnWm4ZhUQnaYk1dNzC6ZhA2W9Vv5Jl4n0RbE=", + "lastModified": 1764922999, + "narHash": "sha256-LSvUxKm6S6ZAd/otQSkAHd3+8KJhi8OwGJGSe0K//B8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "96023dcc9a0febaaa3b91f447b9ae2fbe86f2923", + "rev": "9b9ead1b5591b68f4048e7205ba1397bc85ce6c4", "type": "github" }, "original": { @@ -572,11 +571,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1764659906, - "narHash": "sha256-GV5/TfQCW37mZ5R2oyrklptgRdSZrOoXs5cpz1I/8Uk=", + "lastModified": 1765528203, + "narHash": "sha256-DTs3VkvRjW/Quu7y9hzNUrddysBXbcqv5Rpo4rtQYQI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "6e349f78f8df536aac24e04a64fdc79ae0e02ed3", + "rev": "8f74fd85c7b42f2d06347a9c9eaff6d4904854f3", "type": "github" }, "original": { @@ -605,11 +604,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1764485473, - "narHash": "sha256-RlGEcuZFB/IdvYLrYsf0RpgvNtCMyIuBLt3lS+GZvP8=", + "lastModified": 1765524373, + "narHash": "sha256-gi38XWhkb+H8iHhlXgv7MgUaQCuhmaTzKmq3yzYOg9g=", "owner": "YaLTeR", "repo": "niri", - "rev": "311ca6b5da19f5acd7d3e481620de57240ce8f7c", + "rev": "c22d8358c293f5e66748d8ac20600e6b114f9743", "type": "github" }, "original": { @@ -703,11 +702,11 @@ }, "nixos-unstable-small": { "locked": { - "lastModified": 1764635402, - "narHash": "sha256-6rYcajRLe2C5ZYnV1HYskJl+QAkhvseWTzbdQiTN9OI=", + "lastModified": 1765493315, + "narHash": "sha256-kbHgMF9VtVr8YpQs3DK9C1oIQE7CDbfCRXGhontsNJg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5f53b0d46d320352684242d000b36dcfbbf7b0bc", + "rev": "de8efc1c6e7c3cf774a41a075cff70da009b4e9a", "type": "github" }, "original": { @@ -780,27 +779,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1765363881, + "narHash": "sha256-3C3xWn8/2Zzr7sxVBmpc1H1QfxjNfta5IMFe3O9ZEPw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1764560356, - "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6", + "rev": "d2b1213bf5ec5e62d96b003ab4b5cbc42abfc0d0", "type": "github" }, "original": { @@ -810,13 +793,29 @@ "type": "github" } }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1765311797, + "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1764560356, - "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=", + "lastModified": 1765363881, + "narHash": "sha256-3C3xWn8/2Zzr7sxVBmpc1H1QfxjNfta5IMFe3O9ZEPw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6", + "rev": "d2b1213bf5ec5e62d96b003ab4b5cbc42abfc0d0", "type": "github" }, "original": { @@ -860,11 +859,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -985,11 +984,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -1033,11 +1032,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1765186076, + "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", "type": "github" }, "original": { @@ -1059,11 +1058,11 @@ ] }, "locked": { - "lastModified": 1758998580, - "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", + "lastModified": 1764773531, + "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", "owner": "nix-community", "repo": "NUR", - "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", + "rev": "1d9616689e98beded059ad0384b9951e967a17fa", "type": "github" }, "original": { @@ -1080,11 +1079,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1764463024, - "narHash": "sha256-mtiAnSesoc87D0Yl/9mCCRTm18lOQ3J6PlG1j1F82Jo=", + "lastModified": 1765067833, + "narHash": "sha256-gz+qNSbcjplDXLeeMgrL4YbTBJheq/wIRPYamKNt3Os=", "owner": "mahlquistj", "repo": "octotype", - "rev": "f8589c1e21d408492ddb8862b116cbb7694a4a5e", + "rev": "6370a25b76bf293f3102db9267965b5ab51768a3", "type": "github" }, "original": { @@ -1190,11 +1189,11 @@ ] }, "locked": { - "lastModified": 1764211126, - "narHash": "sha256-p5y13PnMZYd5WdHk+XCzyUaLGBUCwnz2n4KYKEZM0Pw=", + "lastModified": 1765075567, + "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "895935bff08cfcfb663fb9c8263c43596e7cd1ed", + "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", "type": "github" }, "original": { @@ -1208,11 +1207,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1764383863, - "narHash": "sha256-KA5F0137hLvk576mfucWvFu8Z8g8MTm+6c3gw2mZcKI=", + "lastModified": 1764988672, + "narHash": "sha256-FIJtt3Zil89/hLy9i7f0R2xXcJDPc3CeqiiCLfsFV0Y=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4f5a90bf043a57add9b3288bbd25ed534bfaffb5", + "rev": "086fd19a68e80fcc8a298e9df4674982e4c498a6", "type": "github" }, "original": { @@ -1264,11 +1263,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1764648840, - "narHash": "sha256-hIj3aKL+G8TXrqvz0wCnUKESN5MEyrD4YxaLLARnkPs=", + "lastModified": 1765474444, + "narHash": "sha256-sDG+c73xEnIw1pFNRWffKDnTWiTuyZiEP+Iub0D3mWA=", "owner": "danth", "repo": "stylix", - "rev": "71054adbc3629404b2f02e8385aec07f87980a2f", + "rev": "dd14de4432a94e93e10d0159f1d411487e435e1e", "type": "github" }, "original": { @@ -1388,11 +1387,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1757716333, - "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", + "lastModified": 1763914658, + "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", "owner": "tinted-theming", "repo": "schemes", - "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", + "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", "type": "github" }, "original": { @@ -1404,11 +1403,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1757811970, - "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", + "lastModified": 1764465359, + "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", + "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", "type": "github" }, "original": { @@ -1420,11 +1419,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1757811247, - "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", + "lastModified": 1764464512, + "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", + "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", "type": "github" }, "original": { @@ -1493,11 +1492,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1764655870, - "narHash": "sha256-YO31FdrzZUjOzjfgs4nvSH2scTtPUaw/eENi+LG+E74=", + "lastModified": 1765343581, + "narHash": "sha256-HtTPbV6z6AJPg2d0bHaJKFrnNha+SEbHvbJafKAQ614=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "6a5150c45c77c16ae4d79a8847a1cc1b2f26cc5c", + "rev": "f0ad674b7009a6afd80cea59d4fbf975dd68ee95", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9c99852..cd85cac 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ affinity-nix.url = "github:mrshmllow/affinity-nix"; emacs = { url = - "github:nix-community/emacs-overlay/dd38645351b6f14cda47c81456131c86b11386db"; + "github:nix-community/emacs-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-bitcoin = { url = "github:fort-nix/nix-bitcoin/release"; }; diff --git a/home/home.nix b/home/home.nix index 8d1239e..7d524a4 100644 --- a/home/home.nix +++ b/home/home.nix @@ -201,7 +201,7 @@ in { services.gpg-agent = { enable = true; - pinentryPackage = pkgs.pinentry-emacs; + pinentry.package = pkgs.pinentry-emacs; # extraConfig = '' # pinentry-program ${pkgs.pinentry.qt}/bin/pinentry # ''; @@ -303,8 +303,12 @@ in { programs.git = { enable = true; - userName = "Chris Cochrun"; - userEmail = "chris@cochrun.xyz"; + settings = { + user = { + name = "Chris Cochrun"; + email = "chris@cochrun.xyz"; + }; + }; }; home.packages = with pkgs; [ ]; diff --git a/modules/desktop.nix b/modules/desktop.nix index 5f8ad97..66c399e 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -300,7 +300,7 @@ in # "guest account" = "nobody"; # "map to guest" = "bad user"; # }; - shares = { + settings = { public = { path = "/home/chris"; "read only" = false; diff --git a/pkgs/base-packages.nix b/pkgs/base-packages.nix index 15cd2ba..5f059c3 100644 --- a/pkgs/base-packages.nix +++ b/pkgs/base-packages.nix @@ -2,7 +2,7 @@ { environment.systemPackages = with pkgs; [ - inputs.anipy-cli.packages.${pkgs.system}.default + # inputs.anipy-cli.packages.${pkgs.system}.default vim wget killall diff --git a/systems/syl/hardware-configuration.nix b/systems/syl/hardware-configuration.nix index 6af0139..ebbd2cd 100644 --- a/systems/syl/hardware-configuration.nix +++ b/systems/syl/hardware-configuration.nix @@ -12,10 +12,10 @@ boot.loader.efi.efiSysMountPoint = "/boot/efi"; - zramSwap = { - enable = true; - writebackDevice = "/dev/nvme0n1p3"; - }; + # zramSwap = { + # enable = true; + # writebackDevice = "/dev/nvme0n1p3"; + # }; fileSystems."/" = { device = "/dev/disk/by-uuid/db28ba7c-a15d-4c81-8373-99f2f171cac5"; @@ -28,7 +28,7 @@ fsType = "vfat"; }; - swapDevices = [ ]; + swapDevices = [ { device = "/dev/disk/by-uuid/db524eed-eafe-44b2-be5e-b4539fb970a2"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's