magpie/gitea: add typst syntax higlight

common/packages.nix

@@ -28,6 +28,8 @@
       fzf
       fzy
       git
+      adwaita-icon-theme
+      gnomeExtensions.appindicator
       gnupg
       gptfdisk
       hcxdumptool

flake.lock

@@ -19,11 +19,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
+        "lastModified": 1732722421,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
         "type": "github"
       },
       "original": {
@@ -33,22 +33,6 @@
       }
     },
     "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_3": {
       "flake": false,
       "locked": {
         "lastModified": 1673956053,
@@ -64,7 +48,7 @@
         "type": "github"
       }
     },
-    "flake-compat_4": {
+    "flake-compat_3": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -80,39 +64,6 @@
         "type": "github"
       }
     },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1701473968,
-        "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-root": {
-      "locked": {
-        "lastModified": 1692742795,
-        "narHash": "sha256-f+Y0YhVCIJ06LemO+3Xx00lIcqQxSKJHXT/yk1RTKxw=",
-        "owner": "srid",
-        "repo": "flake-root",
-        "rev": "d9a70d9c7a5fd7f3258ccf48da9335e9b47c3937",
-        "type": "github"
-      },
-      "original": {
-        "owner": "srid",
-        "repo": "flake-root",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -131,30 +82,6 @@
         "type": "github"
       }
     },
-    "goatcounter": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
-        "flake-root": "flake-root",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1705880453,
-        "narHash": "sha256-Y1O6tia2Pc1MA5ZoFH3B2y7FwjZuIDiNT4C9+bBawrY=",
-        "owner": "asmir-abdulahovic",
-        "repo": "goatcounter-flake",
-        "rev": "f912ab7024cbc47d5fa80a416b643707a9b50b06",
-        "type": "github"
-      },
-      "original": {
-        "owner": "asmir-abdulahovic",
-        "repo": "goatcounter-flake",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -162,11 +89,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715077503,
+        "lastModified": 1730016908,
-        "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
+        "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6e277d9566de9976f47228dd8c580b97488734d4",
+        "rev": "e83414058edd339148dc142a8437edb9450574c8",
         "type": "github"
       },
       "original": {
@@ -177,17 +104,17 @@
     },
     "nix-xilinx": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1699035130,
+        "lastModified": 1732892167,
-        "narHash": "sha256-emK4aJCC2gW94b2P3N2LjkQ6PEMLUcDduVWwYQ7aq+o=",
+        "narHash": "sha256-AZ0rgM9xj+Bf2C8RfGMUvuVdcqkvQU5/Wm8u6A5xYJg=",
         "owner": "asmir.abdulahovic",
         "repo": "nix-xilinx",
-        "rev": "0323990db46c32e361e4fd70600d859eb90862af",
+        "rev": "3071f40914fe2db3837a40a72a97af6f0a442f16",
         "type": "gitlab"
       },
       "original": {
@@ -198,50 +125,47 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1714906307,
+        "lastModified": 1732981179,
-        "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=",
+        "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588",
+        "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs-lib": {
+    "nixpkgs-24_05": {
       "locked": {
-        "dir": "lib",
+        "lastModified": 1717144377,
-        "lastModified": 1701253981,
+        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
-        "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
+        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
         "type": "github"
       },
       "original": {
-        "dir": "lib",
+        "id": "nixpkgs",
-        "owner": "NixOS",
+        "ref": "nixos-24.05",
-        "ref": "nixos-unstable",
+        "type": "indirect"
-        "repo": "nixpkgs",
-        "type": "github"
       }
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1714858427,
+        "lastModified": 1729973466,
-        "narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=",
+        "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76",
+        "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -253,11 +177,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712935714,
+        "lastModified": 1733261583,
-        "narHash": "sha256-zGo9wiDH+qn4Mky70CJEvST1gGgMM/VMajAjsgNdOqk=",
+        "narHash": "sha256-HOVUtrhtJ16umPuEODuVE9fx+JmDCRp7wIxnEART0Eg=",
         "ref": "refs/heads/master",
-        "rev": "ba6b926cc4f6d65015271ebe7edd22269af77840",
+        "rev": "a09a34997ce692c7a2e8e434b44433156a73088c",
-        "revCount": 31,
+        "revCount": 38,
         "type": "git",
         "url": "https://git.project-cloud.net/asmir/nvim_flake"
       },
@@ -268,7 +192,7 @@
     },
     "peerix": {
       "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_2",
         "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
@@ -297,11 +221,11 @@
         "theme_deepthought": "theme_deepthought"
       },
       "locked": {
-        "lastModified": 1705870326,
+        "lastModified": 1729077289,
-        "narHash": "sha256-ojdGSeqztnnGMyLKjnSCGq0muGh3U+Zb9iwzaaDsaF4=",
+        "narHash": "sha256-z5LEPxOJq2LjhPhY4QE1IOt0lBD39cipR6Lw8vRTNlI=",
         "ref": "refs/heads/master",
-        "rev": "ad6af66a6142279789db8967b285eb04c6d18c02",
+        "rev": "eab712e42139d33911ba767c2ff1bfbdf05c254d",
-        "revCount": 26,
+        "revCount": 27,
         "type": "git",
         "url": "https://git.project-cloud.net/asmir/project-cloud"
       },
@@ -312,7 +236,6 @@
     },
     "root": {
       "inputs": {
-        "goatcounter": "goatcounter",
         "home-manager": "home-manager",
         "nix-xilinx": "nix-xilinx",
         "nixpkgs": "nixpkgs",
@@ -328,18 +251,18 @@
     "simple-nixos-mailserver": {
       "inputs": {
         "blobs": "blobs",
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_3",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "utils": "utils"
+        "nixpkgs-24_05": "nixpkgs-24_05"
       },
       "locked": {
-        "lastModified": 1714720456,
+        "lastModified": 1722877200,
-        "narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=",
+        "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f",
+        "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
         "type": "gitlab"
       },
       "original": {
@@ -356,11 +279,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1715035358,
+        "lastModified": 1729999681,
-        "narHash": "sha256-RY6kqhpCPa/q3vbqt3iYRyjO3hJz9KZnshMjbpPon8o=",
+        "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "893e3df091f6838f4f9d71c61ab079d5c5dedbd1",
+        "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
         "type": "github"
       },
       "original": {
@@ -404,21 +327,6 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "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": {
@@ -451,45 +359,6 @@
         "type": "github"
       }
     },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "goatcounter",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1702461037,
-        "narHash": "sha256-ssyGxfGHRuuLHuMex+vV6RMOt7nAo07nwufg9L5GkLg=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "d06b70e5163a903f19009c3f97770014787a080f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1709126324,
-        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "zremap": {
       "inputs": {
         "nixpkgs": [
@@ -497,11 +366,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715088685,
+        "lastModified": 1721120316,
-        "narHash": "sha256-XNfKniDIFbjtkPm4FdBC+yJJJ6OsYb+/VFXLqo2MUHA=",
+        "narHash": "sha256-CaAMnU6LKqJrsZmR9k0/2brpULnAekpgG5S0BjtFhaQ=",
         "ref": "refs/heads/master",
-        "rev": "5d14340f989e3570614c92e2041451b6508bdab0",
+        "rev": "8a7923bd4e5d36b186408d5432568a91ac67b695",
-        "revCount": 17,
+        "revCount": 21,
         "type": "git",
         "url": "https://git.project-cloud.net/asmir/zremap"
       },

flake.nix

@@ -2,7 +2,7 @@
   description = "NixOS configuration";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
 
     nix-xilinx = {
       url = "gitlab:asmir.abdulahovic/nix-xilinx";
@@ -34,11 +34,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    goatcounter = {
-      url = "github:asmir-abdulahovic/goatcounter-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -56,7 +51,6 @@
   };
 
   outputs = inputs @ {
-    goatcounter,
     home-manager,
     nixpkgs,
     nix-xilinx,
@@ -89,6 +83,7 @@
             home-manager.useUserPackages = true;
             home-manager.users.akill = import ./home/home.nix;
             home-manager.extraSpecialArgs = {inherit inputs system;};
+            home-manager.backupFileExtension = "home_backup";
           }
           peerix.nixosModules.peerix
           {
@@ -165,7 +160,6 @@
           {nix.registry.nixpkgs.flake = nixpkgs;}
           ./magpie/configuration.nix
           ./magpie/hardware-configuration.nix
-          goatcounter.nixosModules.goatcounter
           simple-nixos-mailserver.nixosModule
           sops-nix.nixosModules.sops
           (builtins.toPath "${nixpkgs}/nixos/modules/profiles/qemu-guest.nix")

home/home.nix

@@ -1,10 +1,10 @@
 {
+  lib,
   pkgs,
-  config,
   ...
 }: let
   qutebrowser_firejail = pkgs.writeShellScriptBin "qutebrowser" ''
-    firejail -- ${pkgs.qutebrowser}/bin/qutebrowser "$@"
+    firejail -- ${lib.getExe pkgs.qutebrowser} "$@"
   '';
 in {
   imports = [./zsh.nix ./i3status-rust.nix ./sway.nix ./i3.nix ./home_packages.nix ./whatsapp-for-linux.nix];
@@ -18,6 +18,7 @@ in {
     enable = true;
     defaultApplications = {
       "application/pdf" = "sioyek.desktop";
+      "default-web-browser" = "org.qutebrowser.qutebrowser.desktop";
       "text/html" = "org.qutebrowser.qutebrowser.desktop";
       "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop";
       "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop";
@@ -29,11 +30,12 @@ in {
   fonts.fontconfig.enable = true;
 
   home.sessionVariables = rec {
-    BROWSER = "${qutebrowser_firejail}/bin/qutebrowser";
+    BROWSER = lib.getExe qutebrowser_firejail;
     DEFAULT_BROWSER = "${BROWSER}";
     EDITOR = "nvim";
     _JAVA_AWT_WM_NONREPARENTING = "1";
     MOZ_ENABLE_WAYLAND = "1";
+    NIXOS_OZONE_WL = "1";
     QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
     SUDO_EDITOR = "nvim";
     WLR_RENDERER = "vulkan";
@@ -180,6 +182,7 @@ in {
       userName = "Asmir A";
       userEmail = "asmir.abdulahovic@gmail.com";
       extraConfig = {
+        init.defaultBranch = "master";
         pull = {rebase = true;};
         credential = {helper = "store";};
       };
@@ -220,8 +223,8 @@ in {
     swayidle = let
       locker = pkgs.writeShellScriptBin "swaylock_fancy" ''
         TMP_FILE=$(${pkgs.coreutils}/bin/mktemp /tmp/.swaylock_ss_XXXXXX.jpg)
-        ${pkgs.grim}/bin/grim -t ppm - | ${pkgs.imagemagick}/bin/convert - -blur 0x12 "$TMP_FILE"
+        ${lib.getExe pkgs.grim} -t ppm - | ${pkgs.imagemagick}/bin/convert - -blur 0x12 "$TMP_FILE"
-        ${pkgs.swaylock}/bin/swaylock -f -i "$TMP_FILE"
+        ${lib.getExe pkgs.swaylock} -f -i "$TMP_FILE"
         ${pkgs.coreutils}/bin/rm "$TMP_FILE"
       '';
     in {

home/home_packages.nix

@@ -1,17 +1,21 @@
 {
+  lib,
   pkgs,
   inputs,
   system,
   ...
 }: let
   chromium_teams = pkgs.writeShellScriptBin "chromium_teams" ''
-    ${pkgs.chromium}/bin/chromium --socket=wayland org.chromium.Chromium --app=https://teams.microsoft.com/
+    ${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://teams.microsoft.com/
   '';
   chromium_discord = pkgs.writeShellScriptBin "chromium_discord" ''
-    ${pkgs.chromium}/bin/chromium --socket=wayland org.chromium.Chromium --app=https://discordapp.com/channels/@me
+    ${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://discordapp.com/channels/@me
   '';
   chromium_stackfield = pkgs.writeShellScriptBin "chromium_stackfield" ''
-    ${pkgs.chromium}/bin/chromium --socket=wayland org.chromium.Chromium --app=https://stackfield.com/
+    ${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://stackfield.com/
+  '';
+  qcad = pkgs.writeShellScriptBin "qcad" ''
+    QT_QPA_PLATFORM=xcb ${lib.getExe pkgs.qcad} $@
   '';
   ssh_proxy = pkgs.writeShellScriptBin "ssh_proxy" ''
     if ${pkgs.coreutils}/bin/test $# -ne 1; then
@@ -19,7 +23,7 @@
       exit
     fi
     PROXY_PORT="1337"
-    ${pkgs.openssh}/bin/ssh -D "$PROXY_PORT" -q -N "$@"
+    ${lib.getExe pkgs.openssh} -D "$PROXY_PORT" -q -N "$@"
   '';
   wrap_sh = let
     bubblewrap = pkgs.callPackage ../packages/bubblewrap/default.nix {};
@@ -50,13 +54,16 @@ in {
       cached-nix-shell
       caddy
       cargo
-      chromium
+      ungoogled-chromium
       cmake
       compsize
-      cura
+      /*cura*/
       deluge
+      dfu-util
       discord
       dmenu-wayland
+      drawio
+      dualsensectl
       ffmpeg-full
       firefox
       freecad
@@ -68,7 +75,9 @@ in {
       gnumake
       go
       grim
+      heimdall
       hyperfine
+      icestorm
       imagemagick
       imv
       inkscape
@@ -78,45 +87,60 @@ in {
       kodi-wayland
       krita
       libnotify
-      libreoffice
+      libreoffice-qt6-fresh
       libva-utils
+      linuxPackages_latest.perf
+      lsix
+      lsix
       mediainfo
       ncdu
       neovide
+      nextpnr
       ngspice
       nix-init
       nixpkgs-fmt
       nix-prefetch-git
       nodePackages.peerflix
       nom
+      openems
       openocd
       openscad
       pandoc
+      paraview
       pass-wayland
       patchelf
       pavucontrol
+      pay-respects
       pirate-get
       poppler_utils
       powertop
       pulsemixer
+      pwvucontrol
       python3
       python3Packages.west
       remmina
       river
       rtorrent
+      sbcl
       screen
       seer
       sioyek
       skypeforlinux
       slurp
+      steam-run
       stm32cubemx
+      swayimg
       tea
       teams-for-linux
+      tectonic
+      tessen
       texlive.combined.scheme-full
       thunderbird
+      typst
       upx
       waybar
       wdisplays
+      weechat
       whatsapp-for-linux
       wine
       wireshark
@@ -125,10 +149,11 @@ in {
       wofi
       x2goclient
       yewtube
+      yosys
       yt-dlp
       zapzap
       zathura
-      zeal-qt6
+      /*zeal-qt6*/
       zig
     ]
     ++ [
@@ -137,6 +162,7 @@ in {
       chromium_teams
       ssh_proxy
       wrap_sh
+      qcad
     ]
     ++ [
       inputs.swaysw.packages.${system}.swaysw

home/i3.nix

@@ -1,5 +1,4 @@
 {
-  config,
   lib,
   pkgs,
   ...

home/sway.nix

@@ -3,17 +3,18 @@
   pkgs,
   inputs,
   system,
+  lib,
   ...
 }: let
   cliphist_sway = pkgs.writeShellScriptBin "cliphist_sway" ''
-    ${pkgs.cliphist}/bin/cliphist list | \
+    ${lib.getExe pkgs.cliphist} list | \
-    ${pkgs.wofi}/bin/wofi --dmenu --insensitive | \
+    ${lib.getExe pkgs.wofi} --dmenu --insensitive | \
-    ${pkgs.cliphist}/bin/cliphist decode | \
+    ${lib.getExe pkgs.cliphist} decode | \
     ${pkgs.wl-clipboard}/bin/wl-copy
   '';
   screenshot_clip = pkgs.writeShellScriptBin "screenshot_clip" ''
-    GEOM="$(${pkgs.slurp}/bin/slurp -d)"
+    GEOM="$(${lib.getExe pkgs.slurp} -d)"
-    ${pkgs.grim}/bin/grim -g "$GEOM" - | ${pkgs.wl-clipboard}/bin/wl-copy
+    ${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 {};
@@ -22,6 +23,7 @@ in {
   wayland.windowManager.sway = {
     enable = true;
     extraSessionCommands = "";
+    extraConfigEarly = '''';
 
     config = {
       fonts = {
@@ -73,7 +75,7 @@ in {
             style = "Bold Semi-Condensed";
             size = 12.0;
           };
-          statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ~/.config/i3status-rust/config-top.toml";
+          statusCommand = "${lib.getExe pkgs.i3status-rust} ~/.config/i3status-rust/config-top.toml";
         }
       ];
 
@@ -120,15 +122,16 @@ in {
         "Alt+slash" = "exec ${pkgs.moreutils}/bin/lckdo swaysw ${swaysw}/bin/swaysw";
         "Alt+Escape" = "workspace back_and_forth";
         "Alt+f" = "fullscreen enable";
-	"Alt+bracketright" = "focus output right";
+        "Alt+bracketright" = "focus output right";
-	"Alt+bracketleft" = "focus output left";
+        "Alt+bracketleft" = "focus output left";
 
         "Mod4+l" = ''
-          exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${pkgs.python3}/bin/python3'';
+          exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${lib.getExe pkgs.python3}'';
-        "Mod4+h" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${pkgs.zapzap}/bin/zapzap";
+        "Mod4+h" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${lib.getExe pkgs.zapzap}";
         "Mod4+j" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${viber}/bin/viber";
         "Mod4+y" = ''
-          exec ${pkgs.sway}/bin/swaymsg [app_id="pulsemixer"] scratchpad show || exec ${term} -a pulsemixer ${pkgs.pulsemixer}/bin/pulsemixer'';
+          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";
       };
     };
   };

home/zsh.nix

@@ -17,6 +17,7 @@
       cp = "cp -v";
       rm = "rm -v";
       ip = "ip --color=auto";
+      f = "''$(pay-respects zsh)";
     };
 
     history = {
@@ -37,11 +38,6 @@
         src = pkgs.nix-zsh-completions;
         file = "share/zsh/plugins/nix/nix-zsh-completions.plugin.zsh";
       }
-      {
-        name = "fast_syntax_highlight";
-        src = pkgs.zsh-fast-syntax-highlighting;
-        file = "share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh";
-      }
       {
         name = "pure_prompt";
         src = pkgs.fetchFromGitHub {

magpie/configuration.nix

@@ -3,7 +3,6 @@
   pkgs,
   lib,
   project-cloud,
-  goatcounter,
   nvim,
   system,
   ...
@@ -12,12 +11,17 @@
 
   nix.optimise.automatic = true;
   nix.settings.experimental-features = ["nix-command" "flakes"];
+  system.switch = {
+    enable = false;
+    enableNg = true;
+  };
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.systemd-boot.configurationLimit = 2;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.kernelParams = ["ip=dhcp"];
   boot.kernel.sysctl = {
     "net.core.default_qdisc" = "fq";
     "net.ipv4.tcp_congestion_control" = "bbr";
@@ -26,9 +30,9 @@
   boot.initrd = {
     compressor = "zstd";
     availableKernelModules = ["virtio-pci"];
+    systemd.enable = true;
     network = {
       enable = true;
-      udhcpc.enable = true;
       ssh = {
         enable = true;
         hostKeys = [/etc/ssh_dummy_ed25519_key];
@@ -52,7 +56,6 @@
     fzf
     fzy
     git
-    goatcounter.packages.${system}.goatcounter
     nvim.packages.${system}.nvim
     htop-vim
     nvim
@@ -114,18 +117,13 @@
 
   services.goatcounter = {
     enable = true;
-    environmentFile = "/var/lib/goatcounter.env";
+    port = 8002;
-    extraArgs = ["-listen='*:8002'" "-tls=proxy"];
+    proxy = true;
-    database = {
+    address = "127.0.0.1";
-      backend = "sqlite";
-      name = "goatcounter";
-      user = "goatcounter";
-      automigrate = true;
-    };
   };
 
   services.nextcloud = {
-    enable = true;
+    enable = false;
     package = pkgs.nextcloud28;
     config.adminpassFile = config.sops.secrets."nextcloud_admin".path;
     configureRedis = true;
@@ -171,12 +169,14 @@
       root = "${project-cloud.packages.${system}.default}/public";
     };
 
+    /*
     virtualHosts.${config.services.nextcloud.hostName} = {
       quic = true;
       http3 = true;
       forceSSL = true;
       enableACME = true;
     };
+    */
 
     virtualHosts."miniflux.project-cloud.net" = {
       quic = true;
@@ -194,7 +194,7 @@
       forceSSL = true;
       enableACME = true;
       locations."/" = {
-        proxyPass = "http://localhost:${toString config.services.gitea.settings.server.HTTP_PORT}";
+        proxyPass = "http://unix:${toString config.services.gitea.settings.server.HTTP_ADDR}";
       };
     };
 
@@ -222,6 +222,7 @@
       DISABLE_SSH = true;
       HTTP_PORT = 3001;
       LANDING_PAGE = "explore";
+      PROTOCOL = "http+unix";
     };
     settings.mailer = {
       ENABLED = true;
@@ -244,6 +245,13 @@
       RENDER_COMMAND = "${docutils}/bin/rst2html.py";
       IS_INPUT_FILE = false;
     };
+
+    settings."markup.typst" = {
+      ENABLED = true;
+      FILE_EXTENSIONS = ".typ";
+      RENDER_COMMAND = "timeout 30s ${lib.getExe pkgs.python3Packages.pygments} -f html -O full";
+      IS_INPUT_FILE = false;
+    };
   };
 
   services.nfs.server.enable = false;
@@ -273,7 +281,7 @@
   };
 
   services.seafile = {
-    enable = true;
+    enable = false;
     initialAdminPassword = "admin";
     adminEmail = "asmir.abdulahovic" + "@" + "gmail.com";
   };
@@ -308,10 +316,12 @@
         sopsFile = ./secrets/gitea_db.yaml;
         owner = config.users.users.gitea.name;
       };
+      /*
       "nextcloud_admin" = {
         sopsFile = ./secrets/nextcloud_admin.yaml;
         owner = config.users.users.nextcloud.name;
       };
+      */
     };
   };
 

nixy/configuration.nix

@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   nix-xilinx,
   nvim,
   pkgs,
@@ -12,6 +11,10 @@
 
   system.stateVersion = "23.05";
   system.autoUpgrade.enable = false;
+  system.switch = {
+    enable = false;
+    enableNg = true;
+  };
 
   sops = {
     age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
@@ -65,7 +68,8 @@
   boot = {
     extraModulePackages = with config.boot.kernelPackages; [usbip v4l2loopback];
     initrd.compressor = "zstd";
-    initrd.kernelModules = ["amdgpu"];
+    initrd.kernelModules = [];
+    initrd.systemd.enable = true;
     binfmt.emulatedSystems = ["wasm32-wasi" "x86_64-windows"];
     kernelPackages = pkgs.linuxPackages_latest;
     kernelParams = ["psmouse.synaptics_intertouch=0" "mem_sleep_default=deep"];
@@ -152,6 +156,19 @@
           }
         ];
       };
+
+      neox_wg = {
+        ips = ["192.168.51.2/32"];
+        privateKeyFile = config.sops.secrets."wg_privkey".path;
+        peers = [
+          {
+            publicKey = builtins.readFile ../nixy/wg_pubkey_nx;
+            allowedIPs = ["192.168.2.0/24"];
+            endpoint = "185.194.64.26:51820";
+            persistentKeepalive = 25;
+          }
+        ];
+      };
     };
   };
 
@@ -160,6 +177,11 @@
   nixpkgs.config.allowUnfree = true;
   nixpkgs.overlays = [nix-xilinx.overlay nvim.overlays.${system}.overlay];
   environment = {
+    etc = {
+      "firejail/qutebrowser.local".text = ''
+        whitelist ''${RUNUSER}/qutebrowser
+      '';
+    };
     extraInit = ''
       unset -v SSH_ASKPASS
     '';
@@ -170,6 +192,12 @@
   };
 
   programs = {
+    steam = {
+      enable = true;
+      remotePlay.openFirewall = true;
+      dedicatedServer.openFirewall = false;
+      localNetworkGameTransfers.openFirewall = true;
+    };
     gnupg.agent = {
       enable = true;
       enableSSHSupport = true;
@@ -210,8 +238,8 @@
         serviceConfig = {
           Type = "oneshot";
           RemainAfterExit = true;
-          ExecStart = "${pkgs.iproute}/bin/ip netns add %I";
+          ExecStart = "${pkgs.iproute2}/bin/ip netns add %I";
-          ExecStop = "${pkgs.iproute}/bin/ip netns del %I";
+          ExecStop = "${pkgs.iproute2}/bin/ip netns del %I";
         };
       };
 
@@ -228,23 +256,23 @@
           ExecStart = pkgs.writers.writeBash "wg-up" ''
             set -e
             ENDPOINT_IP=$(${pkgs.coreutils-full}/bin/cat "${config.sops.secrets."wg_endpoint_proton".path}")
-            ${pkgs.iproute}/bin/ip link add proton_wg type wireguard
+            ${pkgs.iproute2}/bin/ip link add proton_wg type wireguard
-            ${pkgs.iproute}/bin/ip link set proton_wg netns wg
+            ${pkgs.iproute2}/bin/ip link set proton_wg netns wg
-            ${pkgs.iproute}/bin/ip -n wg address add 10.2.0.2/32 dev proton_wg
+            ${pkgs.iproute2}/bin/ip -n wg address add 10.2.0.2/32 dev proton_wg
-            ${pkgs.iproute}/bin/ip netns exec wg \
+            ${pkgs.iproute2}/bin/ip netns exec wg \
               ${pkgs.wireguard-tools}/bin/wg set "proton_wg" private-key "${config.sops.secrets."wg_privkey_proton".path}"
-            ${pkgs.iproute}/bin/ip netns exec wg \
+            ${pkgs.iproute2}/bin/ip netns exec wg \
               ${pkgs.wireguard-tools}/bin/wg set "proton_wg" peer "g6DkXWKI/68RsLjROIwCEcyB/ZhyK5Q7OWcz1TtqER0=" \
                 endpoint "$ENDPOINT_IP:51820" \
                 persistent-keepalive "25" \
                 allowed-ips "0.0.0.0/0"
-            ${pkgs.iproute}/bin/ip -n wg link set lo up
+            ${pkgs.iproute2}/bin/ip -n wg link set lo up
-            ${pkgs.iproute}/bin/ip -n wg link set proton_wg up
+            ${pkgs.iproute2}/bin/ip -n wg link set proton_wg up
-            ${pkgs.iproute}/bin/ip -n wg route add default dev proton_wg
+            ${pkgs.iproute2}/bin/ip -n wg route add default dev proton_wg
           '';
           ExecStop = pkgs.writers.writeBash "wg-down" ''
-            ${pkgs.iproute}/bin/ip -n wg route del default dev proton_wg
+            ${pkgs.iproute2}/bin/ip -n wg route del default dev proton_wg
-            ${pkgs.iproute}/bin/ip -n wg link del proton_wg
+            ${pkgs.iproute2}/bin/ip -n wg link del proton_wg
           '';
         };
       };
@@ -309,8 +337,8 @@
 
   services = {
     acpid.enable = true;
-    btrfs.autoScrub.enable = false;
     dbus.enable = true;
+    dbus.implementation = "broker";
     fstrim.enable = true;
     fwupd.enable = true;
     ntp.enable = true;
@@ -324,6 +352,12 @@
       pulse.enable = true;
     };
 
+    avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
+
     libinput.enable = true;
     xserver = {
       enable = true;
@@ -493,27 +527,29 @@
       dina-font
       fira-code
       fira-code-symbols
-      font-awesome
+      font-awesome_6
-      font-awesome_4
       inconsolata
       iosevka
       jetbrains-mono
       liberation_ttf
+      libertine
       noto-fonts
-      noto-fonts-cjk
+      noto-fonts-cjk-sans
+      noto-fonts-color-emoji
       noto-fonts-emoji
       proggyfonts
       siji
       terminus_font
       terminus_font_ttf
       ubuntu_font_family
+      vistafonts
     ];
   };
 
   virtualisation = {
+  spiceUSBRedirection.enable = true;
     containers.storage.settings = {
       storage = {
-        #driver = lib.mkForce "btrfs";
         graphroot = "/var/lib/containers/storage";
         runroot = "/run/containers/storage";
       };
@@ -525,8 +561,6 @@
     };
   };
 
-  sound.enable = true;
-
   hardware = {
     bluetooth = {
       enable = true;
@@ -537,10 +571,8 @@
       };
     };
 
-    opengl = {
+    graphics = {
       enable = true;
-      driSupport = true;
-      driSupport32Bit = true;
       extraPackages = [];
     };
     rtl-sdr.enable = true;

nixy/hardware-configuration.nix

@@ -8,9 +8,10 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
+  boot.initrd.luks.devices."crypt_dev".device = "/dev/disk/by-uuid/e10821b9-5426-4f03-b716-1645a64fcd6a";
+  boot.initrd.luks.devices."crypt_dev".allowDiscards = true;
   boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "uas" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.initrd.luks.devices."crypt_dev".device = "/dev/disk/by-uuid/e10821b9-5426-4f03-b716-1645a64fcd6a";
   boot.kernelModules = [ "kvm-amd" "amd-gpu" ];
   boot.extraModulePackages = [ ];
 
@@ -20,9 +21,8 @@
     };
 
   fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/6b8d9a11-3bc4-4c63-afd3-336975abe987";
+    { device = "/dev/disk/by-uuid/eeaa6fab-d67d-400f-b6d4-b1f44c2e0047";
-      fsType = "f2fs";
+      fsType = "xfs";
-      options = [ "atgc" "gc_merge" "lazytime" ];
     };
 
   fileSystems."/home" =
@@ -38,8 +38,7 @@
 
   swapDevices = [ ];
 
-
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode = true;
-
+  hardware.enableRedistributableFirmware = true;
 }

nixy/wg_pubkey_nx

@@ -0,0 +1 @@
+eoYSDh27qQFpvOcDmuVFzSTuPnrHQYXDMqatKmDAth0=

packages/viber/default.nix

@@ -44,12 +44,12 @@
 }:
 stdenv.mkDerivation {
   pname = "viber";
-  version = "21.8.0.11";
+  version = "23.2.0.3";
 
   src = fetchurl {
     # Official link: https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb
     url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb";
-    hash = "sha256-RrObmN21QOm5nk0R2avgCH0ulrfiUIo2PnyYWvQaGVw=";
+    hash = "sha256-9WHiI2WlsgEhCPkrQoAunmF6lSb2n5RgQJ2+sdnSShM=";
   };
 
   nativeBuildInputs = [makeWrapper];