fa-t14-2025: Add fake-stable microsoft edge

common/auto-upgrade.nix

@@ -7,7 +7,7 @@
     flags = [
       # Override nixpkgs (only). Notably does not include home-manager, sops or other utility/application flake inputs.
       "--refresh"
-      "--override-input" "nixpkgs" "github:NixOS/nixpkgs/nixos-24.11"
+      "--override-input" "nixpkgs" "github:NixOS/nixpkgs/nixos-25.05"
       "--override-input" "nixpkgs-unstable" "github:nixos/nixpkgs/nixos-unstable"
       "--no-write-lock-file"
     ];

flake.lock

@@ -74,16 +74,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1747688870,
+        "lastModified": 1748665073,
-        "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=",
+        "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d5f1f641b289553927b3801580598d200a501863",
+        "rev": "282e1e029cb6ab4811114fc85110613d72771dea",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -136,16 +136,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1739553546,
+        "lastModified": 1748373722,
-        "narHash": "sha256-L4ou3xfOr17EAe836djRoQ7auVkYOREMtiQa82wVGqU=",
+        "narHash": "sha256-qi6aDGP2W6GyAUNEhg+slQWEpUiJ8LNIrQkmxHpzadI=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "353846417f985e74fdc060555f17939e4472ea2c",
+        "rev": "75b99daa12b1fffd646d6c3cf13b06f1fa5cef63",
         "type": "github"
       },
       "original": {
         "owner": "lnl7",
-        "ref": "nix-darwin-24.11",
+        "ref": "nix-darwin-25.05",
         "repo": "nix-darwin",
         "type": "github"
       }
@@ -243,16 +243,16 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1747676747,
+        "lastModified": 1748889542,
-        "narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=",
+        "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "72841a4a8761d1aed92ef6169a636872c986c76d",
+        "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -2,14 +2,14 @@
   description = "Felixalb System flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; # Remember to update ./common/auto-upgrade.nix
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; # Remember to update ./common/auto-upgrade.nix
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs-2211.url = "https://github.com/NixOS/nixpkgs/archive/34bfa9403e42eece93d1a3740e9d8a02fceafbca.tar.gz"; # old nixpgks for e.g. remmina
 
-    nix-darwin.url = "github:lnl7/nix-darwin/nix-darwin-24.11";
+    nix-darwin.url = "github:lnl7/nix-darwin/nix-darwin-25.05";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
 
-    home-manager.url = "github:nix-community/home-manager/release-24.11";
+    home-manager.url = "github:nix-community/home-manager/release-25.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     matrix-synapse-next.url = "github:dali99/nixos-matrix-modules/v0.6.0";
@@ -104,7 +104,7 @@
         felixalbpc = normalSys "felixalbpc" { };
 
         # Work laptop
-        felixalbpc = normalSys "fa-t14-2025" { };
+        fa-t14-2025 = normalSys "fa-t14-2025" { };
 
         # Web host
         malcolm = normalSys "malcolm" { };

home/zsh.nix

@@ -34,7 +34,7 @@
         ];
       };
 
-      initExtra = ''
+      initContent = ''
         # Autocomplete ../
         zstyle ':completion:*' special-dirs true
         export PATH="$HOME/.config/emacs/bin:$HOME/.cargo/bin:$PATH"

hosts/fa-t14-2025/desktop.nix

@@ -23,8 +23,6 @@
     pulse.enable = true;
     jack.enable = true;
   };
-  hardware.pulseaudio.enable = false;
-
 
   # Fonts
   fonts = {
@@ -36,11 +34,7 @@
       font-awesome
       fira-code
       hack-font
-      (nerdfonts.override {
+      nerd-fonts.hack
-        fonts = [
-          "Hack"
-        ];
-      })
     ];
   };
 

hosts/fa-t14-2025/hardware-configuration.nix

@@ -0,0 +1,37 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/75dd0e39-9411-48c9-822d-bf3c897d0f61";
+      fsType = "ext4";
+    };
+
+  boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/3ecaedab-415c-4cce-a3a9-9f3782acb682";
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/0800-59D9";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices = [ ];
+
+  networking.useDHCP = lib.mkDefault false;
+  # networking.interfaces.enp1s0f0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/fa-t14-2025/home.nix

@@ -25,8 +25,15 @@ in {
     virt-manager
     w3m
 
+    (unstable.microsoft-edge.overrideAttrs ({ installPhase ? "", ... }: {
+      installPhase = installPhase + ''
+        ln -s $out/bin/microsoft-edge $out/bin/microsoft-edge-stable
+      '';
+    }))
+
     # Window Manager Extras
     bibata-cursors
+    brightnessctl
     cliphist
     hyprcursor
     hypridle

hosts/malcolm/configuration.nix

@@ -10,6 +10,7 @@
 
     ./services/mysql.nix
     ./services/nginx.nix
+    ./services/www-ctf-feal-no.nix
     ./services/www-kinealbrigtsen-no.nix
   ];
 

hosts/malcolm/services/www-ctf-feal-no.nix

@@ -0,0 +1,14 @@
+{ config, pkgs, lib, ... }:
+
+{
+  services.nginx.virtualHosts."ctf.feal.no" = {
+    locations = {
+      "/".return = "302 https://www.feal.no/";
+      "/cc/" = {
+        alias = "${pkgs.cyberchef}/share/cyberchef/";
+        index = "index.html";
+      };
+      "= /cc".return = "302 /cc/";
+    };
+  };
+}

hosts/malcolm/services/www-kinealbrigtsen-no.nix

@@ -83,7 +83,6 @@
       set_real_ip_from 192.168.11.0/24;
       real_ip_header X-Forwarded-For;
 
-      add_header Content-Security-Policy "script-src 'self'; object-src 'none'; base-uri 'none';" always;
       add_header 'Referrer-Policy' 'origin-when-cross-origin';
       add_header X-Frame-Options DENY;
       add_header X-Content-Type-Options nosniff;

hosts/worf/configuration.nix

@@ -8,6 +8,8 @@
   nixpkgs.config.allowUnfree = true;
 
   nix = {
+    enable = true;
+
     # gc = {
     #   automatic = true;
     #   options = "--delete-older-than 2d";
@@ -74,6 +76,8 @@
     };
   };
 
+  ids.gids.nixbld = 30000;
+  system.primaryUser = "felixalb";
   users.users.felixalb = {
     home = "/Users/felixalb";
     shell = pkgs.zsh;
@@ -84,16 +88,11 @@
 
 
   fonts.packages = with pkgs; [
-    noto-fonts
-    font-awesome
     fira-code
+    font-awesome
     hack-font
-
+    nerd-fonts.hack
-    (nerdfonts.override {
+    noto-fonts
-      fonts = [
-        "Hack"
-      ];
-    })
   ];
 
   system.defaults = {
@@ -139,9 +138,7 @@
     remapCapsLockToControl = true;
   };
 
-  # Auto upgrade nix package and the daemon service.
+  # nix.package = pkgs.nix;
-  services.nix-daemon.enable = true;
-  nix.package = pkgs.nix;
 
   system.stateVersion = 5;
 }