nixos: 24.11 -> 25.05

nixy: enable switchNg; disable nix-ld
2025-05-25 20:52:16 +02:00 · 2025-05-25 20:51:54 +02:00 · 2025-05-25 20:50:57 +02:00 · 2025-05-25 20:50:30 +02:00 · 2025-05-25 20:49:47 +02:00 · 2025-05-25 20:49:20 +02:00
8 changed files with 58 additions and 154 deletions
--- a/flake.lock
+++ b/flake.lock
@ -33,22 +33,6 @@
      }
    },
    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_3": {
      "flake": false,
      "locked": {
        "lastModified": 1696426674,
@ -64,24 +48,6 @@
        "type": "github"
      }
    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@ -89,16 +55,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1739757849,
-        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
+        "lastModified": 1747556831,
+        "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
+        "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
        "repo": "home-manager",
        "type": "github"
      }
@ -126,16 +92,16 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1741445498,
-        "narHash": "sha256-F5Em0iv/CxkN5mZ9hRn3vPknpoWdcdCyR0e4WklHwiE=",
+        "lastModified": 1747953325,
+        "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "52e3095f6d812b91b22fb7ad0bfc1ab416453634",
+        "rev": "55d1f923c480dadce40f5231feb472e81b0bab48",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
        "repo": "nixpkgs",
        "type": "github"
      }
@ -162,11 +128,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1736528609,
-        "narHash": "sha256-p0tYmTVnnFghamXEXD4w/lldCi604zIWDV4Ol9ubQ5g=",
+        "lastModified": 1748077877,
+        "narHash": "sha256-sxWrjcRygvs7Fz9gxjSm54ul8+NtU29V+PLAPR6ZfY0=",
        "ref": "refs/heads/master",
-        "rev": "8245a48cc75cc74dea1b3ca89cb58f24f8e14f85",
-        "revCount": 42,
+        "rev": "b23265403c87af272c74cda484a840b0f22306f5",
+        "revCount": 43,
        "type": "git",
        "url": "https://git.project-cloud.net/asmir/nvim_flake"
      },
@ -175,28 +141,6 @@
        "url": "https://git.project-cloud.net/asmir/nvim_flake"
      }
    },
-    "peerix": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1684706914,
-        "narHash": "sha256-pBlTtsC28e/5MUTe4NWeNNOc/4Kf6EzGQGppQEQ/ioo=",
-        "owner": "asmir.abdulahovic",
-        "repo": "peerix",
-        "rev": "8fdbbd0039240e05b4f93bbd5b454d5643e8a8d1",
-        "type": "gitlab"
-      },
-      "original": {
-        "owner": "asmir.abdulahovic",
-        "repo": "peerix",
-        "type": "gitlab"
-      }
-    },
    "project-cloud": {
      "inputs": {
        "nixpkgs": [
@ -225,7 +169,6 @@
        "nix-xilinx": "nix-xilinx",
        "nixpkgs": "nixpkgs",
        "nvim": "nvim",
-        "peerix": "peerix",
        "project-cloud": "project-cloud",
        "simple-nixos-mailserver": "simple-nixos-mailserver",
        "sops-nix": "sops-nix",
@ -236,18 +179,18 @@
    "simple-nixos-mailserver": {
      "inputs": {
        "blobs": "blobs",
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_2",
        "nixpkgs": [
          "nixpkgs"
        ],
        "nixpkgs-24_11": "nixpkgs-24_11"
      },
      "locked": {
-        "lastModified": 1740437053,
-        "narHash": "sha256-exPTta4qI1ka9sk+jPcLogGffJ1OVXnAsTRqpeAXeNw=",
+        "lastModified": 1746937334,
+        "narHash": "sha256-7g2GSePdYbpD1v5BxEVSCJ2Ogf4K5rc9sBB81FervUY=",
        "owner": "simple-nixos-mailserver",
        "repo": "nixos-mailserver",
-        "rev": "c8ec4d5e432f5df4838eacd39c11828d23ce66ec",
+        "rev": "da66510f688b7eac54e3cac7c75be4b8dd78ce8b",
        "type": "gitlab"
      },
      "original": {
@ -263,11 +206,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741043164,
-        "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=",
+        "lastModified": 1746485181,
+        "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "3f2412536eeece783f0d0ad3861417f347219f4d",
+        "rev": "e93ee1d900ad264d65e9701a5c6f895683433386",
        "type": "github"
      },
      "original": {
@ -296,21 +239,6 @@
        "url": "https://git.project-cloud.net/asmir/swaysw"
      }
    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
    "theme_anemone": {
      "flake": false,
      "locked": {
--- a/flake.nix
+++ b/flake.nix
@ -2,18 +2,13 @@
  description = "NixOS configuration";

  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";

    nix-xilinx = {
      url = "gitlab:asmir.abdulahovic/nix-xilinx";
      inputs.nixpkgs.follows = "nixpkgs";
    };

-    peerix = {
-      url = "gitlab:asmir.abdulahovic/peerix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
    zremap = {
      url = "git+https://git.project-cloud.net/asmir/zremap";
      inputs.nixpkgs.follows = "nixpkgs";
@ -35,7 +30,7 @@
    };

    home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
+      url = "github:nix-community/home-manager/release-25.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };

@ -56,7 +51,6 @@
      nixpkgs,
      nix-xilinx,
      nvim,
-      peerix,
      project-cloud,
      simple-nixos-mailserver,
      sops-nix,
@ -88,18 +82,6 @@
              home-manager.extraSpecialArgs = { inherit inputs system; };
              home-manager.backupFileExtension = "home_backup";
            }
-            peerix.nixosModules.peerix
-            {
-              services.peerix = {
-                enable = true;
-                globalCacheTTL = 10;
-                package = peerix.packages.x86_64-linux.peerix;
-                openFirewall = true; # UDP/12304
-                privateKeyFile = nixy.config.sops.secrets."peerix/private".path;
-                publicKeyFile = ./nixy/peerix-public;
-                publicKey = "peerix-mediabox:UDgG3xdQYv7bmx2l4ZPNRPJtp2zMmY++H/fnGeJ9BQw=";
-              };
-            }
          ];
        };

@ -122,18 +104,6 @@
              home-manager.users.akill = import ./home/home.nix;
              home-manager.extraSpecialArgs = { inherit inputs system; };
            }
-            peerix.nixosModules.peerix
-            {
-              services.peerix = {
-                enable = true;
-                globalCacheTTL = 10;
-                package = peerix.packages.x86_64-linux.peerix;
-                openFirewall = true; # UDP/12304
-                privateKeyFile = mediabox.config.sops.secrets."peerix/private".path;
-                publicKeyFile = ./mediabox/peerix-public;
-                publicKey = "peerix-nixy:8THqS0R2zWF/47ai0RFmqJnieYTZ1jaWOD9tnzpvA6s=";
-              };
-            }
          ];
        };

--- a/home/home.nix
+++ b/home/home.nix
@ -88,7 +88,7 @@ in
        ao = "pipewire";
        osd-bar = "no";
        border = "no";
-        script-opts-set = "ytdl_hook-ytdl_path=yt-dlp,sponsorblock-local_database=no,sponsorblock-skip_categories=[sponsor,intro,selfpromo]";
+        script-opts-set = "";
        ytdl-format = "bestvideo[height<=?1080]+bestaudio/best";
      };

@ -162,7 +162,6 @@ in

    qutebrowser = {
      enable = true;
-      package = qutebrowser_firejail;
      keyBindings = {
        normal = {
          "j" = "scroll-px 0 25";
@ -253,18 +252,26 @@ in
    swayidle =
      let
        locker = pkgs.writeShellScriptBin "swaylock_fancy" ''
-          TMP_FILE=$(${pkgs.coreutils}/bin/mktemp /tmp/.swaylock_ss_XXXXXX.jpg)
-          ${lib.getExe pkgs.grim} -t ppm - | ${pkgs.imagemagick}/bin/convert - -blur 0x12 "$TMP_FILE"
-          ${lib.getExe pkgs.swaylock} -f -i "$TMP_FILE"
-          ${pkgs.coreutils}/bin/shred "$TMP_FILE"
-          ${pkgs.coreutils}/bin/rm "$TMP_FILE"
+          ALL_IMGS=""
+          LOCK_ARGS=""
+          for OUTPUT in $(${pkgs.sway}/bin/swaymsg -t get_outputs | ${lib.getExe pkgs.jq} -r '.[].name')
+          do
+            TMP_FILE=$(${pkgs.coreutils}/bin/mktemp /tmp/.swaylock_ss_XXXXXX.jpg)
+            ${lib.getExe pkgs.grim} -t ppm -o $OUTPUT - | \
+              ${lib.getExe pkgs.ffmpeg} -y -loglevel 0 -i - -vframes 1 -vf "boxblur=10" "$TMP_FILE"
+            LOCK_ARGS="$LOCK_ARGS --image $OUTPUT:$TMP_FILE"
+            ALL_IMGS="$ALL_IMGS $TMP_FILE"
+          done
+            ${lib.getExe pkgs.swaylock} -f $LOCK_ARGS
+            ${pkgs.coreutils}/bin/shred $ALL_IMGS
+            ${pkgs.coreutils}/bin/rm $ALL_IMGS
        '';
-	/*
+      in
+      /*
        refresh_i3status = pkgs.writeShellScriptBin "refresh_i3status" ''
          ${pkgs.coreutils}/bin/sleep 1 && ${pkgs.procps}/bin/pkill -USR1 i3status-rs
        '';
-	*/
-      in
+      */
      {
        enable = true;
        events = [
@ -276,12 +283,12 @@ in
            event = "lock";
            command = "${locker}/bin/swaylock_fancy";
          }
-	  /*
-          {
-            event = "after-resume";
-            command = "${refresh_i3status}/bin/refresh_i3status";
-          }
-	  */
+          /*
+            {
+              event = "after-resume";
+              command = "${refresh_i3status}/bin/refresh_i3status";
+            }
+          */
        ];
        timeouts = [
          {
--- a/home/home_packages.nix
+++ b/home/home_packages.nix
@ -55,7 +55,6 @@ in
    [
      anydesk
      appimage-run
-      ark
      arp-scan
      birdtray
      blackmagic
@ -64,9 +63,10 @@ in
      cached-nix-shell
      caddy
      cargo
-      ungoogled-chromium
      cmake
      compsize
+      kdePackages.ark
+      ungoogled-chromium
      # cura
      deluge
      dfu-util
@ -92,7 +92,7 @@ in
      imv
      inkscape
      jellyfin-media-player
-      kdenlive
+      kdePackages.kdenlive
      kicad
      kodi-wayland
      krita
@ -148,6 +148,7 @@ in
      thunderbird
      typst
      upx
+      viber
      waybar
      wdisplays
      weechat
@ -177,7 +178,6 @@ in
    ]
    ++ [
      inputs.swaysw.packages.${system}.swaysw
-      (pkgs.callPackage ../packages/viber/default.nix { })
      (pkgs.callPackage ../packages/bubblewrap/default.nix { })
    ];
 }
--- a/home/sway.nix
+++ b/home/sway.nix
@ -17,7 +17,6 @@ let
    ${lib.getExe pkgs.grim} -g "$GEOM" - | ${pkgs.wl-clipboard}/bin/wl-copy
  '';
  swaysw = inputs.swaysw.packages.${system}.swaysw;
-  viber = pkgs.callPackage ../packages/viber/default.nix { };
  term = "${pkgs.foot}/bin/footclient";
 in
 {
@ -146,7 +145,7 @@ in
        "Mod4+j" =
          "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${lib.getExe pkgs.zapzap}";
        "Mod4+h" =
-          "exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${viber}/bin/viber";
+          "exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${pkgs.viber}/bin/viber";
        "Mod4+y" =
          ''exec ${pkgs.sway}/bin/swaymsg [app_id="pulsemixer"] scratchpad show || exec ${term} -a pulsemixer ${lib.getExe pkgs.pulsemixer}'';
        "Mod4+p" = "exec ${lib.getExe pkgs.tessen} -a copy";
--- a/home/zsh.nix
+++ b/home/zsh.nix
@ -72,7 +72,7 @@

    envExtra = '''';

-    initExtra = ''
+    initContent = ''
      # binds
      bindkey '^K' fzf-file-widget

--- a/magpie/configuration.nix
+++ b/magpie/configuration.nix
@ -366,13 +366,13 @@

      # This allows the wireguard server to route your traffic to the internet and hence be like a VPN
      # For this to work you have to set the dnsserver IP of your router (or dnsserver of choice) in your clients
-      postSetup = ''
-        ${pkgs.nftables}/bin/nft add rule ip nat POSTROUTING oifname "eth0" ip saddr 10.100.0.0/24 counter masquerade
-      '';
+      #postSetup = ''
+      #  ${pkgs.nftables}/bin/nft add rule ip nat POSTROUTING oifname "eth0" ip saddr 10.100.0.0/24 counter masquerade
+      #'';
      # This undoes the above command, TODO fix command below to be more specific
-      postShutdown = ''
-        ${pkgs.nftables}/bin/nft flush table ip nat
-      '';
+      #postShutdown = ''
+      #  ${pkgs.nftables}/bin/nft flush table ip nat
+      #'';
      privateKeyFile = config.sops.secrets."wg_privkey".path;

      peers = [
--- a/nixy/configuration.nix
+++ b/nixy/configuration.nix
@ -16,7 +16,7 @@ in
  system.stateVersion = "23.05";
  system.autoUpgrade.enable = false;
  system.switch = {
-    enable = false;
+    enable = true;
    enableNg = true;
  };

@ -237,7 +237,7 @@ in
      binfmt = true;
    };
    nix-ld = {
-      enable = true;
+      enable = false;
      libraries = with pkgs; [
        stdenv.cc.cc.lib
        zlib
Author	SHA1	Message	Date
Asmir A	6e32ea5dee	nixos: 24.11 -> 25.05	2025-05-25 20:52:16 +02:00
Asmir A	e6e1ed7618	nixos: 24.11 -> 25.05	2025-05-25 20:51:54 +02:00
Asmir A	9b73aabd3c	nixy: enable switchNg; disable nix-ld	2025-05-25 20:50:57 +02:00
Asmir A	3380128587	magpie/wireguard: remove hooks with bad nft syntax	2025-05-25 20:50:30 +02:00
Asmir A	a64d8bfdc9	home/zsh: update for new 25.05 syntax	2025-05-25 20:49:47 +02:00
Asmir A	b86aa2cd0c	home/sway: switch to viber from nixpkgs	2025-05-25 20:49:20 +02:00
Asmir A	266a5ef3f2	home/packages: rename for 25.05; remove custom viber package	2025-05-25 20:48:30 +02:00
Asmir A	250eb6f2e2	home/qutebrowser: temporary disable firejail	2025-05-25 20:47:55 +02:00
Asmir A	bc722d1df4	home/mpv: remove yt-dlp args	2025-05-25 20:47:19 +02:00
Asmir A	431d1659a4	home/swaylock: update locker script	2025-05-24 11:02:50 +02:00