Bump nixpkgs

flake.lock

@@ -7,11 +7,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1731473366,
+        "lastModified": 1733377410,
-        "narHash": "sha256-sE2WfD3YyNrCROfRZKqMDR77g3KV4FXUaJ7NWe+A7ro=",
+        "narHash": "sha256-tZ9JEAaHIs3TPdRZeZzHsnJmUilkcnVaUTvyprbRb1A=",
         "owner": "tpwrules",
         "repo": "nixos-apple-silicon",
-        "rev": "3eee753e4b074790342fadb1c4e7183d037ddac4",
+        "rev": "e8c07c3ae199b55a8c1c35a7c067c5cef9c7e929",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731454423,
+        "lastModified": 1733570843,
-        "narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=",
+        "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "6c71c49e2448e51ad830ed211024e6d0edc50116",
+        "rev": "a35b08d09efda83625bef267eb24347b446c80b8",
         "type": "github"
       },
       "original": {
@@ -49,11 +49,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1731604406,
+        "lastModified": 1734253225,
-        "narHash": "sha256-CUkO4CXaDcGyUqQ+/ArvekL3hlfgass7LjrnG6m2+g8=",
+        "narHash": "sha256-LnBb8SyY+WGmBtnQ9XmbpKPoGjOrf89T//xQsKZhJzE=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "f6c94b95f529cfbd29848c12816111a2471a5293",
+        "rev": "d6353ce807b7845ffec114d234c90ece44c39122",
         "type": "github"
       },
       "original": {
@@ -82,11 +82,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1701680307,
+        "lastModified": 1731533236,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -102,11 +102,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731604581,
+        "lastModified": 1734093295,
-        "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
+        "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
+        "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8",
         "type": "github"
       },
       "original": {
@@ -129,11 +129,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731139594,
+        "lastModified": 1733212471,
-        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
+        "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
+        "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
         "type": "github"
       },
       "original": {
@@ -145,27 +145,27 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1731386116,
+        "lastModified": 1734083684,
-        "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=",
+        "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "689fed12a013f56d4c4d3f612489634267d86529",
+        "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1731531548,
+        "lastModified": 1733935885,
-        "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=",
+        "narHash": "sha256-xyiHLs6KJ1fxeGmcCxKjJE4yJknVJxbC8Y/ZRYyC8WE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "24f0d4acd634792badd6470134c387a3b039dace",
+        "rev": "5a48e3c2e435e95103d56590188cfed7b70e108c",
         "type": "github"
       },
       "original": {
@@ -177,11 +177,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1695033101,
+        "lastModified": 1734254970,
-        "narHash": "sha256-RQ4m+ycjdLdass7Hr4+Lzwnjw7wGhcUkKqWiJS3YxPM=",
+        "narHash": "sha256-yZzYWWWeOqSFvIirHzY1SJiuSBPmXIYJFhyt+1zkv8A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d941d9491804e0ca01e03468dbf6f8d3a7919a16",
+        "rev": "d388ee0ec8c623389ab3a7caead258a94cec14de",
         "type": "github"
       },
       "original": {
@@ -238,11 +238,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1704121968,
+        "lastModified": 1734268803,
-        "narHash": "sha256-N8FJb+ohJ4Qt/m5RoAbwm3RP4VRjl+hA6PUCfjPhZo8=",
+        "narHash": "sha256-KDfUObdMdMSM7prp2QO4f5DRCv9Z2TSCZEL0kFEBzN4=",
         "owner": "Smaug123",
         "repo": "whisper.cpp",
-        "rev": "04f8e0cdc73abe7c593b2c9405f0f590c51de95a",
+        "rev": "8cbc79c799212037e1c7b45548179f9548ea77a5",
         "type": "github"
       },
       "original": {

home-manager/home.nix

@@ -295,7 +295,6 @@
       nixpkgs.git-lfs
       nixpkgs.imagemagick
       nixpkgs.nixpkgs-fmt
-      nixpkgs.lnav
       nixpkgs.age
       nixpkgs.nodejs
       nixpkgs.pyright
@@ -338,88 +337,4 @@
 
   home.file.".ideavimrc".source = ./ideavimrc;
   home.file.".config/yt-dlp/config".source = ./youtube-dl.conf;
-
-  programs.firefox = {
-    enable = true;
-    package = nixpkgs.firefox-wayland;
-    profiles = {
-      patrick = {
-        isDefault = true;
-        name = "patrick";
-        search = {
-          default = "Google";
-          force = true;
-        };
-        settings = {
-          # see https://github.com/TLATER/dotfiles/blob/b39af91fbd13d338559a05d69f56c5a97f8c905d/home-config/config/graphical-applications/firefox.nix
-          # see https://www.ghacks.net/2015/08/18/a-comprehensive-list-of-firefox-privacy-and-security-settings/
-          "browser.search.isUS" = false;
-          "browser.search.region" = "GB";
-          "gfx.webrender.all" = true; # enable GPU acceleration
-          "media.ffmpeg.vaapi.enabled" = true;
-          "widget.dmabuf.force-enabled" = true;
-          "privacy.webrtc.legacyGlobalIndicator" = false;
-          "app.shield.optoutstudies.enabled" = false;
-          "app.update.enabled" = false;
-          "app.update.auto" = false;
-          "app.update.silent" = false;
-          "app.update.service.enabled" = false;
-          "app.update.staging.enabled" = false;
-          "browser.discovery.enabled" = false;
-          "browser.laterrun.enabled" = false;
-          "browser.shell.checkDefaultBrowser" = false;
-          "browser.rights.3.shown" = true;
-          "browser.search.update" = false;
-          "extensions.update.enabled" = false;
-          "extensions.update.autoUpdateDefault" = false;
-          "extensions.getAddons.cache.enabled" = false;
-          "dom.ipc.plugins.reportCrashURL" = false;
-          "extensions.webservice.discoverURL" = "http://127.0.0.1";
-          "toolkit.telemetry.unified" = false;
-          "toolkit.telemetry.unifiedIsOptIn" = true;
-          "toolkit.telemetry.enabled" = false;
-          "toolkit.telemetry.server" = "";
-          "toolkit.telemetry.archive.enabled" = false;
-          "lightweightThemes.update.enabled" = false;
-          "startup.homepage_welcome_url" = "";
-          "startup.homepage_welcome_url.additional" = "";
-          "startup.homepage_override_url" = "";
-          "datareporting.healthreport.uploadEnabled" = false;
-          "datareporting.healthreport.documentServerURI" = "";
-          "datareporting.healthreport.service.enabled" = false;
-          "datareporting.healthreport.about.reportUrl" = "data:text/plain,";
-          "toolkit.telemetry.cachedClientID" = "";
-          "browser.selfsupport.url" = "";
-          "browser.selfsupport.enabled" = false;
-          "experiments.enabled" = false;
-          "experiments.supported" = false;
-          "experiments.activeExperiment" = false;
-          "experiments.manifest.uri" = "";
-          "network.allow-experiments" = false;
-          "breakpad.reportURL" = "";
-          "browser.tabs.crashReporting.sendReport" = false;
-          "browser.newtab.preload" = false;
-          "browser.newtabpage.directory.ping" = "data:text/plain,";
-          "browser.newtabpage.directory.source" = "data:text/plain,";
-          "browser.newtabpage.enabled" = false;
-          "browser.newtabpage.enhanced" = false;
-          "browser.newtabpage.introShown" = true;
-          "browser.aboutHomeSnippets.updateUrl" = "https://127.0.0.1";
-          "extensions.pocket.enabled" = false;
-          "extensions.pocket.api" = "";
-          "extensions.pocket.site" = "";
-          "extensions.pocket.oAuthConsumerKey" = "";
-          "social.whitelist" = "";
-          "social.toast-notifications.enabled" = false;
-          "social.shareDirectory" = "";
-          "social.remote-install.enabled" = false;
-          "social.directories" = "";
-          "social.share.activationPanelEnabled" = false;
-          "social.enabled" = false;
-          "dom.flyweb.enabled" = false;
-          "services.sync.enabled" = false;
-        };
-      };
-    };
-  };
 }

home-manager/linux.nix

@@ -1,13 +1,6 @@
-{
+{nixpkgs, ...}: {
-  nixpkgs,
+  home.packages = [nixpkgs.firefox-wayland nixpkgs.jetbrains.rider];
-  username,
+  nixpkgs.config.firefox.speechSynthesisSupport = true;
-  dotnet,
-  ...
-}: {
-  home.packages = [nixpkgs.wl-clipboard nixpkgs.jetbrains.rider];
-  nixpkgs.config.firefox = {
-    speechSynthesisSupport = true;
-  };
 
   wayland.windowManager.sway = {
     enable = true;
@@ -20,7 +13,7 @@
         {command = "${nixpkgs.waybar}/bin/waybar";}
       ];
     };
-    extraConfig = builtins.readFile ./sway.conf;
+    extraConfig = builtins.replaceStrings ["@@WL-COPY@@" "@@GRIM@@" "@@SLURP@@"] ["${nixpkgs.wl-clipboard}/bin/wl-copy" "${nixpkgs.grim}/bin/grim" "${nixpkgs.slurp}/bin/slurp"] (builtins.readFile ./sway.conf);
   };
 
   programs.waybar = {
@@ -185,7 +178,7 @@
           "menu" = "on-click";
           "menu-file" = ./modules/waybar/power_menu.xml;
           "menu-actions" = {
-            "shutdown" = "shutdown";
+            "shutdown" = "shutdown now";
             "reboot" = "reboot";
             "suspend" = "systemctl suspend";
             "hibernate" = "systemctl hibernate";

home-manager/modules/alacritty.nix

@@ -13,6 +13,7 @@
 
   home.packages = [
     pkgs.alacritty
-    (pkgs.nerdfonts.override {fonts = ["FiraCode" "DroidSansMono"];})
+    pkgs.nerd-fonts.fira-code
+    pkgs.nerd-fonts.droid-sans-mono
   ];
 }

home-manager/modules/zsh/zshrc

@@ -34,3 +34,5 @@ PATH="$PATH:$HOME/.cargo/bin"
 if [[ -z "$TMUX" ]]; then
     tmux new-session -A -s default
 fi
+
+ttyctl -f

home-manager/sway.conf

@@ -2,3 +2,12 @@ output Unknown-1 scale 2
 input * {
     xkb_layout "gb"
 }
+
+# capture all screens to clipboard    
+bindsym Shift+Print exec @@GRIM@@ - | @@WL-COPY@@
+    
+# capture the specified screen area to clipboard    
+bindsym Shift+Alt+Print exec @@GRIM@@ -g "$(@@SLURP@@)" - | @@WL-COPY@@
+    
+# capture the focused monitor to clipboard    
+bindsym Shift+Control+Print exec @@GRIM@@ -o $(swaymsg -t get_outputs | jq -r '.[] | select(.focused) | .name') - | @@WL-COPY@@