merge with m3-ares

flake.lock

@@ -151,11 +151,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742957044,
-        "narHash": "sha256-gwW0tBIA77g6qq45y220drTy0DmThF3fJMwVFUtYV9c=",
+        "lastModified": 1743082807,
+        "narHash": "sha256-qmrCYHVqE6j0TQApfxGx8aRYNdNsqtOrZuH09A+cjTU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ce287a5cd3ef78203bc78021447f937a988d9f6f",
+        "rev": "171915bfce41018528fda9960211e81946d999b7",
         "type": "github"
       },
       "original": {
@@ -237,13 +237,29 @@
         "type": "github"
       }
     },
-    "nixpkgs-master": {
+    "nixpkgs-locked": {
       "locked": {
-        "lastModified": 1742985284,
-        "narHash": "sha256-XAy5ItiMImfhFGs9XSfNBB61/2bKvff+GCtPbFyEJ/w=",
+        "lastModified": 1739661218,
+        "narHash": "sha256-hEGW0SKD0ORTEmoTuEEONxgENP5kMqe+NCtJug0U6R0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d95226c428ab1957a956784b2b29e854c52794eb",
+        "rev": "2744d988fa116fc6d46cdfa3d1c936d0abd7d121",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "2744d988fa116fc6d46cdfa3d1c936d0abd7d121",
+        "type": "github"
+      }
+    },
+    "nixpkgs-master": {
+      "locked": {
+        "lastModified": 1743083181,
+        "narHash": "sha256-vAqnMEo26wJ0IM3LV+oheEuG3M8yBl3lC7Hwv7OGE0A=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "ef65b42f08469c7f9fdab66b78ea5cd32ff0287c",
         "type": "github"
       },
       "original": {
@@ -255,11 +271,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1742751704,
-        "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=",
+        "lastModified": 1742937945,
+        "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092",
+        "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7",
         "type": "github"
       },
       "original": {
@@ -326,6 +342,7 @@
         "hyprpanel": "hyprpanel",
         "nixpkgs": "nixpkgs_3",
         "nixpkgs-2744d98": "nixpkgs-2744d98",
+        "nixpkgs-locked": "nixpkgs-locked",
         "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-stable": "nixpkgs-stable",
         "rose-pine-hyprcursor": "rose-pine-hyprcursor"

flake.nix

@@ -18,6 +18,7 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
     nixpkgs-2744d98.url = "github:nixos/nixpkgs/2744d988fa116fc6d46cdfa3d1c936d0abd7d121";
+    nixpkgs-locked.url = "github:nixos/nixpkgs/2744d988fa116fc6d46cdfa3d1c936d0abd7d121";
     nixpkgs-master.url = "github:nixos/nixpkgs/master";
 
     agenix.url = "github:ryantm/agenix";

home/common/default.nix

@@ -16,6 +16,7 @@
       outputs.overlays.modifications
       outputs.overlays.stable-packages
       outputs.overlays.pinned-packages
+      outputs.overlays.locked-packages
       outputs.overlays.master-packages
 
       # You can also add overlays exported from other flakes:

home/features/desktop/hyprland.nix

@@ -129,6 +129,7 @@
         "$mainMod SHIFT, e, exec, kitty -e zellij_nvim"
         "$mainMod, o, exec, hyprctl setprop activewindow opaque toggle"
         "$mainMod, b, exec, thunar"
+        "$mainMod SHIFT, B, exec, vivaldi"
         "$mainMod, Escape, exec, wlogout -p layer-shell"
         "$mainMod, Space, togglefloating"
         "$mainMod, q, killactive"

hosts/common/default.nix

@@ -29,6 +29,7 @@
       outputs.overlays.modifications
       outputs.overlays.stable-packages
       outputs.overlays.pinned-packages
+      outputs.overlays.locked-packages
       outputs.overlays.master-packages
 
       # You can also add overlays exported from other flakes:

hosts/common/extraServices/ollama.nix

@@ -12,10 +12,6 @@ in {
   config = mkIf cfg.enable {
     services.ollama = {
       enable = true;
-      package =
-        if config.services.xserver.videoDrivers == ["amdgpu"] # rocblas-6.0.2 broken
-        then pkgs.pinned.ollama
-        else pkgs.ollama;
       acceleration =
         if config.services.xserver.videoDrivers == ["amdgpu"]
         then "rocm"

hosts/common/extraServices/virtualisation.nix

@@ -20,7 +20,8 @@ in {
           ovmf = {
             enable = true;
             packages = [
-              (pkgs.OVMF.override {
+              pkgs.locked.OVMFFull.fd
+              (pkgs.locked.OVMF.override {
                 secureBoot = true;
                 tpmSupport = true;
               })
@@ -32,7 +33,7 @@ in {
     };
     programs.virt-manager.enable = true;
     environment.systemPackages = with pkgs; [
-      OVMFFull
+      # locked.OVMFFull
     ];
   };
 }

hosts/m3-ares/configuration.nix

@@ -36,10 +36,10 @@
 
   networking.hostName = "m3-ares"; # Define your hostname.
   # warp-terminal update fix
-  networking.extraHosts = ''
-    127.0.0.1 releases.warp.dev
-    127.0.0.1 app.warp.dev
-  '';
+  # networking.extraHosts = ''
+  #   127.0.0.1 releases.warp.dev
+  #   127.0.0.1 app.warp.dev
+  # '';
   # Pick only one of the below networking options.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
   networking.networkmanager.enable =

overlays/default.nix

@@ -13,6 +13,9 @@
     brave = prev.brave.override {
       commandLineArgs = "--password-store=gnome-libsecret";
     };
+<<<<<<< Updated upstream
+    OVMF = inputs.nixpkgs-2744d98.legacyPackages.${prev.system}.OVMF;
+    auto-cpufreq = inputs.nixpkgs-2744d98.legacyPackages.${prev.system}.auto-cpufreq;
     # hyprpanel = inputs.hyprpanel.packages.${prev.system}.default.overrideAttrs (prev: {
     #   version = "latest"; # or whatever version you want
     #   src = final.fetchFromGitHub {
@@ -39,6 +42,13 @@
     };
   };
 
+  locked-packages = final: _prev: {
+    pinned = import inputs.nixpkgs-locked {
+      system = final.system;
+      config.allowUnfree = true;
+    };
+  };
+
   master-packages = final: _prev: {
     master = import inputs.nixpkgs-master {
       system = final.system;

pkgs/msty/default.nix

@@ -7,7 +7,7 @@
   version = "1.7";
   src = fetchurl {
     url = "https://assets.msty.app/prod/latest/linux/amd64/Msty_x86_64_amd64.AppImage";
-    sha256 = "sha256-82VCuwKwHF2CTdtf0GAUge+d4RyIGpd997chD/pCXYk=";
+    sha256 = "sha256-EWP9q1HDyYTl86BUjrWLQF9kS3mTLc3WvB4lfNRjTB8=";
   };
   appimageContents = appimageTools.extractType2 {inherit pname version src;};
 in