magpie/gitea: add typst syntax higlight

blue/configuration.nix

@@ -2,8 +2,7 @@
   config,
   pkgs,
   ...
-}:
+}: {
-{
   imports = [
   ];
 
@@ -15,10 +14,7 @@
     gc.automatic = true;
     gc.options = "--delete-older-than 7d";
     package = pkgs.nixVersions.latest;
-    settings.experimental-features = [
+    settings.experimental-features = ["nix-command" "flakes"];
-      "nix-command"
-      "flakes"
-    ];
   };
 
   boot = {
@@ -57,16 +53,15 @@
   networking = {
     firewall.enable = true;
     hostName = "blue";
-    nameservers = [
+    nameservers = ["127.0.0.1" "::1"];
-      "127.0.0.1"
-      "::1"
-    ];
     dhcpcd.extraConfig = "nohook resolv.conf";
 
     networkmanager = {
       enable = true;
       dns = "none";
-      # wifi.backend = "iwd";
+      /*
+      wifi.backend = "iwd";
+      */
     };
   };
 
@@ -157,10 +152,7 @@
       windowManager.i3.enable = true;
     };
 
-    udev.packages = [
+    udev.packages = [pkgs.rtl-sdr pkgs.openhantek6022];
-      pkgs.rtl-sdr
-      pkgs.openhantek6022
-    ];
 
     tlp = {
       enable = true;
@@ -177,19 +169,13 @@
 
         {
           keys = [114];
-          events = [
+          events = ["key" "rep"];
-            "key"
-            "rep"
-          ];
           command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%- unmute'";
         }
 
         {
           keys = [115];
-          events = [
+          events = ["key" "rep"];
-            "key"
-            "rep"
-          ];
           command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%+ unmute'";
         }
 
@@ -320,14 +306,6 @@
   users.users.akill = {
     isNormalUser = true;
     shell = pkgs.zsh;
-    extraGroups = [
+    extraGroups = ["wireshark" "kvm" "tty" "audio" "sound" "adbusers" "dialout"];
-      "wireshark"
-      "kvm"
-      "tty"
-      "audio"
-      "sound"
-      "adbusers"
-      "dialout"
-    ];
   };
 }

blue/hardware-configuration.nix

@@ -6,21 +6,12 @@
   lib,
   modulesPath,
   ...
-}:
+}: {
-{
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod"];
-    "xhci_pci"
-    "ahci"
-    "nvme"
-    "usbhid"
-    "usb_storage"
-    "sd_mod"
-    "sr_mod"
-  ];
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
@@ -28,55 +19,34 @@
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
     fsType = "btrfs";
-    options = [
+    options = ["subvol=root" "compress=zstd" "noatime"];
-      "subvol=root"
-      "compress=zstd"
-      "noatime"
-    ];
   };
 
-  boot.initrd.luks.devices."enc_root".device =
+  boot.initrd.luks.devices."enc_root".device = "/dev/disk/by-uuid/8eb8ac22-d89d-4406-bfbd-ce43e283649f";
-    "/dev/disk/by-uuid/8eb8ac22-d89d-4406-bfbd-ce43e283649f";
 
   fileSystems."/home" = {
     device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
     fsType = "btrfs";
-    options = [
+    options = ["subvol=home" "compress=zstd" "noatime"];
-      "subvol=home"
-      "compress=zstd"
-      "noatime"
-    ];
   };
 
   fileSystems."/nix" = {
     device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
     fsType = "btrfs";
-    options = [
+    options = ["subvol=nix" "compress=zstd" "noatime"];
-      "subvol=nix"
-      "compress=zstd"
-      "noatime"
-    ];
   };
 
   fileSystems."/var/log" = {
     device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
     fsType = "btrfs";
-    options = [
+    options = ["subvol=log" "compress=zstd" "noatime"];
-      "subvol=log"
-      "compress=zstd"
-      "noatime"
-    ];
     neededForBoot = true;
   };
 
   fileSystems."/persist" = {
     device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
     fsType = "btrfs";
-    options = [
+    options = ["subvol=persist" "compress=zstd" "noatime"];
-      "subvol=persist"
-      "compress=zstd"
-      "noatime"
-    ];
   };
 
   fileSystems."/boot" = {

common/packages.nix

@@ -3,13 +3,10 @@
   nix-xilinx,
   system,
   ...
-}:
+}: {
-{
+  environment.systemPackages = with pkgs;
-  environment.systemPackages =
-    with pkgs;
     [
       acpi
-      aria2
       binutils
       binwalk
       bluez
@@ -24,7 +21,6 @@
       dnsmasq
       dnsutils
       dtach
-      ethtool
       f2fs-tools
       fd
       file
@@ -95,11 +91,5 @@
       zip
       z-lua
     ]
-    ++ (with nix-xilinx.packages.${system}; [
+    ++ (with nix-xilinx.packages.${system}; [vivado vitis vitis_hls model_composer xilinx-shell]);
-      vivado
-      vitis
-      vitis_hls
-      model_composer
-      xilinx-shell
-    ]);
 }

common/suspend.nix

@@ -4,11 +4,9 @@
   pkgs,
   ...
 }:
-with lib;
+with lib; let
-let
   cfg = config.services.batteryNotifier;
-in
+in {
-{
   options = {
     services.batteryNotifier = {
       enable = mkOption {

flake.lock

@@ -89,16 +89,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1736373539,
+        "lastModified": 1730016908,
-        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
+        "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
+        "rev": "e83414058edd339148dc142a8437edb9450574c8",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -126,11 +125,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1737672001,
+        "lastModified": 1732981179,
-        "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=",
+        "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8",
+        "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",
         "type": "github"
       },
       "original": {
@@ -140,21 +139,37 @@
         "type": "github"
       }
     },
-    "nixpkgs-24_11": {
+    "nixpkgs-24_05": {
       "locked": {
-        "lastModified": 1734083684,
+        "lastModified": 1717144377,
-        "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
+        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
+        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-24.11",
+        "ref": "nixos-24.05",
         "type": "indirect"
       }
     },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1729973466,
+        "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nvim": {
       "inputs": {
         "nixpkgs": [
@@ -162,11 +177,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736528609,
+        "lastModified": 1733261583,
-        "narHash": "sha256-p0tYmTVnnFghamXEXD4w/lldCi604zIWDV4Ol9ubQ5g=",
+        "narHash": "sha256-HOVUtrhtJ16umPuEODuVE9fx+JmDCRp7wIxnEART0Eg=",
         "ref": "refs/heads/master",
-        "rev": "8245a48cc75cc74dea1b3ca89cb58f24f8e14f85",
+        "rev": "a09a34997ce692c7a2e8e434b44433156a73088c",
-        "revCount": 42,
+        "revCount": 38,
         "type": "git",
         "url": "https://git.project-cloud.net/asmir/nvim_flake"
       },
@@ -240,14 +255,14 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-24_11": "nixpkgs-24_11"
+        "nixpkgs-24_05": "nixpkgs-24_05"
       },
       "locked": {
-        "lastModified": 1737201600,
+        "lastModified": 1722877200,
-        "narHash": "sha256-JBh5+g8oQteQdQqbO07dGHBRQo/NGI61JPlTjdfQ1pk=",
+        "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "ade37b2765032f83d2d4bd50b6204a40a4c05eb4",
+        "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
         "type": "gitlab"
       },
       "original": {
@@ -260,14 +275,15 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1737411508,
+        "lastModified": 1729999681,
-        "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=",
+        "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4",
+        "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
         "type": "github"
       },
       "original": {
@@ -350,11 +366,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737802495,
+        "lastModified": 1721120316,
-        "narHash": "sha256-Q+bZnH7uQM5T/G+xCGSRU3bTJqD70NeE4vLXLXLCm7k=",
+        "narHash": "sha256-CaAMnU6LKqJrsZmR9k0/2brpULnAekpgG5S0BjtFhaQ=",
         "ref": "refs/heads/master",
-        "rev": "4962f12867b0b6c4c4d39b98e6016e7f925a802c",
+        "rev": "8a7923bd4e5d36b186408d5432568a91ac67b695",
-        "revCount": 23,
+        "revCount": 21,
         "type": "git",
         "url": "https://git.project-cloud.net/asmir/zremap"
       },

flake.nix

@@ -35,7 +35,7 @@
     };
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
+      url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -50,8 +50,7 @@
     };
   };
 
-  outputs =
+  outputs = inputs @ {
-    inputs@{
     home-manager,
     nixpkgs,
     nix-xilinx,
@@ -63,11 +62,9 @@
     swaysw,
     zremap,
     ...
-    }:
+  }: let
-    let
     pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
-    in
+  in {
-    {
     nixosConfigurations = rec {
       nixy = nixpkgs.lib.nixosSystem rec {
         system = "x86_64-linux";
@@ -171,11 +168,7 @@
     };
 
     devShell.x86_64-linux = pkgs.mkShell {
-        buildInputs = with pkgs; [
+      buildInputs = with pkgs; [sops ssh-to-age age];
-          sops
-          ssh-to-age
-          age
-        ];
       shellHook = ''
         echo "Configuring NixOS!"
       '';

home/home.nix

@@ -2,21 +2,12 @@
   lib,
   pkgs,
   ...
-}:
+}: let
-let
   qutebrowser_firejail = pkgs.writeShellScriptBin "qutebrowser" ''
     firejail -- ${lib.getExe pkgs.qutebrowser} "$@"
   '';
-in
+in {
-{
+  imports = [./zsh.nix ./i3status-rust.nix ./sway.nix ./i3.nix ./home_packages.nix ./whatsapp-for-linux.nix];
-  imports = [
-    ./zsh.nix
-    ./i3status-rust.nix
-    ./sway.nix
-    ./i3.nix
-    ./home_packages.nix
-    ./whatsapp-for-linux.nix
-  ];
 
   home.stateVersion = "22.11";
   home.username = "akill";
@@ -50,9 +41,7 @@ in
     WLR_RENDERER = "vulkan";
   };
 
-  wayland.windowManager.sway = {
+  wayland.windowManager.sway = {enable = true;};
-    enable = true;
-  };
 
   programs = {
     home-manager.enable = true;
@@ -71,11 +60,7 @@ in
       clock24 = true;
       keyMode = "vi";
       terminal = "screen-256color";
-      plugins = with pkgs.tmuxPlugins; [
+      plugins = with pkgs.tmuxPlugins; [sysstat net-speed gruvbox];
-        sysstat
-        net-speed
-        gruvbox
-      ];
     };
 
     mpv = {
@@ -152,9 +137,7 @@ in
           font = "JetBrainsMono:size=10";
           dpi-aware = "yes";
         };
-        mouse = {
+        mouse = {hide-when-typing = "yes";};
-          hide-when-typing = "yes";
-        };
       };
     };
 
@@ -200,12 +183,8 @@ in
       userEmail = "asmir.abdulahovic@gmail.com";
       extraConfig = {
         init.defaultBranch = "master";
-        pull = {
+        pull = {rebase = true;};
-          rebase = true;
+        credential = {helper = "store";};
-        };
-        credential = {
-          helper = "store";
-        };
       };
       signing.key = "020C42B7A9ABA3E2";
       signing.signByDefault = true;
@@ -213,14 +192,7 @@ in
 
     obs-studio = {
       enable = true;
-      plugins = with pkgs.obs-studio-plugins; [
+      plugins = with pkgs.obs-studio-plugins; [obs-vkcapture input-overlay obs-multi-rtmp obs-pipewire-audio-capture wlrobs obs-vaapi];
-        obs-vkcapture
-        input-overlay
-        obs-multi-rtmp
-        obs-pipewire-audio-capture
-        wlrobs
-        obs-vaapi
-      ];
     };
 
     i3status-rust.enable = true;
@@ -248,16 +220,14 @@ in
       enableSshSupport = true;
     };
 
-    swayidle =
+    swayidle = let
-      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/rm "$TMP_FILE"
       '';
-      in
+    in {
-      {
       enable = true;
       events = [
         {

home/home_packages.nix

@@ -4,8 +4,7 @@
   inputs,
   system,
   ...
-}:
+}: let
-let
   chromium_teams = pkgs.writeShellScriptBin "chromium_teams" ''
     ${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://teams.microsoft.com/
   '';
@@ -26,8 +25,7 @@ let
     PROXY_PORT="1337"
     ${lib.getExe pkgs.openssh} -D "$PROXY_PORT" -q -N "$@"
   '';
-  wrap_sh =
+  wrap_sh = let
-    let
     bubblewrap = pkgs.callPackage ../packages/bubblewrap/default.nix {};
   in
     pkgs.writeShellScriptBin "wrap.sh" ''
@@ -43,10 +41,8 @@ let
         --tmp-overlay "$FULL_PATH" \
         "$SHELL"
     '';
-in
+in {
-{
+  home.packages = with pkgs;
-  home.packages =
-    with pkgs;
     [
       anydesk
       appimage-run
@@ -61,7 +57,7 @@ in
       ungoogled-chromium
       cmake
       compsize
-      # cura
+      /*cura*/
       deluge
       dfu-util
       discord
@@ -124,7 +120,6 @@ in
       python3Packages.west
       remmina
       river
-      rizin
       rtorrent
       sbcl
       screen
@@ -158,7 +153,7 @@ in
       yt-dlp
       zapzap
       zathura
-      # zeal-qt6
+      /*zeal-qt6*/
       zig
     ]
     ++ [

home/i3.nix

@@ -2,11 +2,9 @@
   lib,
   pkgs,
   ...
-}:
+}: let
-let
   scratchpad_cmd = "floating enable, resize set 1502 845, move position center, move scratchpad, scratchpad show";
-in
+in {
-{
   xsession.windowManager.i3 = {
     enable = true;
     package = pkgs.i3;
@@ -55,28 +53,24 @@ in
         "${modifier}+Escape" = "workspace back_and_forth";
         "${modifier}+p" = "exec ${pkgs.dmenu}/bin/dmenu_run";
 
-        "Mod4+l" =
+        "Mod4+l" = "exec i3-msg [instance=\"python3_scr\"] scratchpad show || exec alacritty --class python3_scr -e python3";
-          "exec i3-msg [instance=\"python3_scr\"] scratchpad show || exec alacritty --class python3_scr -e python3";
         "Mod4+j" = "exec i3-msg [class=\"ViberPC\"] scratchpad show || exec viber";
         "Mod4+m" = "exec i3-msg [class=\"Thunderbird\"] scratchpad show || exec thunderbird";
-        "Mod4+y" =
+        "Mod4+y" = "exec i3-msg [instance=\"pulsemixer_scr\"] scratchpad show || exec alacritty --class pulsemixer_scr -e pulsemixer";
-          "exec i3-msg [instance=\"pulsemixer_scr\"] scratchpad show || exec alacritty --class pulsemixer_scr -e pulsemixer";
       };
 
       window = {
-        # border = 4;
+        /*
+        border = 4;
+        */
         commands = [
           {
             command = scratchpad_cmd;
-            criteria = {
+            criteria = {instance = "pulsemixer_scr|python3_scr";};
-              instance = "pulsemixer_scr|python3_scr";
-            };
           }
           {
             command = scratchpad_cmd;
-            criteria = {
+            criteria = {class = "Thunderbird";};
-              class = "Thunderbird";
-            };
           }
           {
             command = scratchpad_cmd;
@@ -87,9 +81,7 @@ in
           }
           {
             command = "focus child, layout tabbed, focus";
-            criteria = {
+            criteria = {class = "qutebrowser";};
-              class = "qutebrowser";
-            };
           }
         ];
       };
@@ -98,10 +90,7 @@ in
         {
           position = "top";
           fonts = {
-            names = [
+            names = ["DejaVu Sans Mono" "FontAwesome5Free"];
-              "DejaVu Sans Mono"
-              "FontAwesome5Free"
-            ];
             style = "Fixed Bold SemiCondensed";
             size = 7.0;
           };

home/i3status-rust.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   programs.i3status-rust = {
     bars.top = {
       icons = "awesome5";

home/sway.nix

@@ -1,11 +1,11 @@
 {
+  config,
   pkgs,
   inputs,
   system,
   lib,
   ...
-}:
+}: let
-let
   cliphist_sway = pkgs.writeShellScriptBin "cliphist_sway" ''
     ${lib.getExe pkgs.cliphist} list | \
     ${lib.getExe pkgs.wofi} --dmenu --insensitive | \
@@ -19,8 +19,7 @@ let
   swaysw = inputs.swaysw.packages.${system}.swaysw;
   viber = pkgs.callPackage ../packages/viber/default.nix {};
   term = "${pkgs.foot}/bin/footclient";
-in
+in {
-{
   wayland.windowManager.sway = {
     enable = true;
     extraSessionCommands = "";
@@ -36,21 +35,15 @@ in
       window.commands = [
         {
           command = "move scratchpad, resize set 1152 648";
-          criteria = {
+          criteria = {app_id = "pulsemixer|python3|com.rtosta.zapzap|whatsapp-for-linux|com.viber";};
-            app_id = "pulsemixer|python3|com.rtosta.zapzap|whatsapp-for-linux|com.viber";
-          };
         }
         {
           command = "move scratchpad, resize set 1502 845";
-          criteria = {
+          criteria = {app_id = "com.viber";};
-            app_id = "com.viber";
-          };
         }
         {
           command = "floating enable";
-          criteria = {
+          criteria = {app_id = "sws_cli";};
-            app_id = "sws_cli";
-          };
         }
       ];
 
@@ -69,25 +62,16 @@ in
       };
 
       input = {
-        "type:keyboard" = {
+        "type:keyboard" = {repeat_delay = "150";};
-          repeat_delay = "150";
+        "type:keyboard" = {repeat_rate = "70";};
-        };
+        "type:touchpad" = {tap = "enabled";};
-        "type:keyboard" = {
-          repeat_rate = "70";
-        };
-        "type:touchpad" = {
-          tap = "enabled";
-        };
       };
 
       bars = [
         {
           position = "top";
           fonts = {
-            names = [
+            names = ["Iosevka" "FontAwesome"];
-              "Iosevka"
-              "FontAwesome"
-            ];
             style = "Bold Semi-Condensed";
             size = 12.0;
           };
@@ -141,14 +125,12 @@ in
         "Alt+bracketright" = "focus output right";
         "Alt+bracketleft" = "focus output left";
 
-        "Mod4+l" =
+        "Mod4+l" = ''
-          ''exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${lib.getExe pkgs.python3}'';
+          exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${lib.getExe pkgs.python3}'';
-        "Mod4+j" =
+        "Mod4+h" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${lib.getExe pkgs.zapzap}";
-          "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+h" =
+        "Mod4+y" = ''
-          "exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${viber}/bin/viber";
+          exec ${pkgs.sway}/bin/swaymsg [app_id="pulsemixer"] scratchpad show || exec ${term} -a pulsemixer ${lib.getExe pkgs.pulsemixer}'';
-        "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";
       };
     };

home/whatsapp-for-linux.nix

@@ -1,6 +1,5 @@
 {lib, ...}:
-with lib;
+with lib; {
-{
   xdg.configFile."whatsapp-for-linux/settings.conf".source = builtins.toFile "settings.conf" (
     generators.toINI {} {
       General = {

home/zsh.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   programs.z-lua = {
     enableAliases = true;
     enableZshIntegration = true;
@@ -8,6 +7,7 @@
   programs.zsh = {
     autocd = true;
     enableCompletion = false;
+    syntaxHighlighting.enable = true;
     defaultKeymap = "viins";
 
     shellAliases = {
@@ -43,8 +43,8 @@
         src = pkgs.fetchFromGitHub {
           owner = "sindresorhus";
           repo = "pure";
-          rev = "92b8e9057988566b37ff695e70e2e9bbeb7196c8";
+          rev = "a02209d36c8509c0e62f44324127632999c9c0cf";
-          hash = "sha256-TbOrnhLHgOvcfsgmL0l3bWY33yLIhG1KSi4ITIPq1+A=";
+          hash = "sha256-BmQO4xqd/3QnpLUitD2obVxL0UulpboT8jGNEh4ri8k=";
         };
         file = "pure.plugin.zsh";
       }
@@ -63,11 +63,6 @@
         };
         file = "sudo.plugin.zsh";
       }
-      {
-        name = "zsh-fast-syntax-highlighting";
-        src = pkgs.zsh-fast-syntax-highlighting;
-        file = "share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh";
-      }
     ];
 
     envExtra = '''';

magpie/configuration.nix

@@ -6,15 +6,11 @@
   nvim,
   system,
   ...
-}:
+}: {
-{
   imports = [];
 
   nix.optimise.automatic = true;
-  nix.settings.experimental-features = [
+  nix.settings.experimental-features = ["nix-command" "flakes"];
-    "nix-command"
-    "flakes"
-  ];
   system.switch = {
     enable = false;
     enableNg = true;
@@ -25,10 +21,7 @@
   boot.loader.systemd-boot.configurationLimit = 2;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.kernelParams = [
+  boot.kernelParams = ["ip=dhcp"];
-    "ip=dhcp"
-    "console=tty"
-  ];
   boot.kernel.sysctl = {
     "net.core.default_qdisc" = "fq";
     "net.ipv4.tcp_congestion_control" = "bbr";
@@ -36,10 +29,7 @@
 
   boot.initrd = {
     compressor = "zstd";
-    availableKernelModules = [
+    availableKernelModules = ["virtio-pci"];
-      "virtio-pci"
-      "virtio-gpu"
-    ];
     systemd.enable = true;
     network = {
       enable = true;
@@ -246,21 +236,22 @@
       REGISTER_EMAIL_CONFIRM = true;
     };
 
-    settings."markup.restructuredtext" =
+    settings."markup.restructuredtext" = let
-      let
+      docutils =
-        docutils = pkgs.python3.withPackages (
+        pkgs.python3.withPackages (ps: with ps; [docutils pygments]);
-          ps: with ps; [
+    in {
-            docutils
-            pygments
-          ]
-        );
-      in
-      {
       ENABLED = true;
       FILE_EXTENSIONS = ".rst";
       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;
@@ -295,7 +286,9 @@
     adminEmail = "asmir.abdulahovic" + "@" + "gmail.com";
   };
 
-  # needed for sendmail mail functionality
+  /*
+  needed for sendmail mail functionality
+  */
   users.users.gitea.extraGroups = ["postdrop"];
   systemd.services.gitea.serviceConfig = {
     RestrictAddressFamilies = ["AF_NETLINK"];
@@ -335,16 +328,8 @@
   networking.hostName = "magpie";
 
   networking.firewall.enable = true;
-  networking.firewall.allowedTCPPorts = [
+  networking.firewall.allowedTCPPorts = [80 443 587 2049]; # http, mail, mail, nfs
-    80
+  networking.firewall.allowedUDPPorts = [443 51820]; #mail, wireguard
-    443
-    587
-    2049
-  ]; # http, mail, mail, nfs
-  networking.firewall.allowedUDPPorts = [
-    443
-    51820
-  ]; # mail, wireguard
   networking.firewall.allowPing = true;
   networking.firewall.logRefusedConnections = lib.mkDefault false;
 

magpie/hardware-configuration.nix

@@ -5,18 +5,12 @@
   lib,
   modulesPath,
   ...
-}:
+}: {
-{
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = ["xhci_pci" "virtio_pci" "usbhid" "sr_mod"];
-    "xhci_pci"
-    "virtio_pci"
-    "usbhid"
-    "sr_mod"
-  ];
   boot.initrd.kernelModules = [];
   boot.kernelModules = [];
   boot.extraModulePackages = [];

mediabox/configuration.nix

@@ -8,8 +8,7 @@
   system,
   nvim,
   ...
-}:
+}: {
-{
   imports = [];
 
   system.stateVersion = "23.05";
@@ -37,10 +36,7 @@
     gc.options = "--delete-older-than 7d";
     package = pkgs.nixVersions.latest;
     settings = {
-      experimental-features = [
+      experimental-features = ["nix-command" "flakes"];
-        "nix-command"
-        "flakes"
-      ];
     };
   };
 
@@ -93,11 +89,7 @@
   networking = {
     firewall = {
       enable = true;
-      allowedTCPPorts = [
+      allowedTCPPorts = [80 443 51820];
-        80
-        443
-        51820
-      ];
     };
 
     hostName = "mediabox";
@@ -106,10 +98,7 @@
     useDHCP = false;
     wireless.enable = false;
     wireless.interfaces = ["wlp3s0"];
-    nameservers = [
+    nameservers = ["127.0.0.1" "::1"];
-      "127.0.0.1"
-      "::1"
-    ];
     dhcpcd.extraConfig = "nohook resolv.conf";
     networkmanager.dns = "none";
     extraHosts = ''
@@ -196,11 +185,7 @@
           Type = "oneshot";
           ExecStart = "${pkgs.ethtool}/sbin/ethtool -s enp0s25 wol m";
         };
-        wantedBy = [
+        wantedBy = ["default.target" "suspend.target" "shutdown.target"];
-          "default.target"
-          "suspend.target"
-          "shutdown.target"
-        ];
       };
 
       /*
@@ -345,18 +330,12 @@
         }
         {
           keys = [122];
-          events = [
+          events = ["key" "rep"];
-            "key"
-            "rep"
-          ];
           command = "${pkgs.alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}- unmute";
         }
         {
           keys = [123];
-          events = [
+          events = ["key" "rep"];
-            "key"
-            "rep"
-          ];
           command = "${pkgs.alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}+ unmute";
         }
         {
@@ -459,16 +438,7 @@
   users.users.akill = {
     isNormalUser = true;
     shell = pkgs.zsh;
-    extraGroups = [
+    extraGroups = ["wireshark" "wheel" "kvm" "tty" "audio" "sound" "adbusers" "transmission"];
-      "wireshark"
-      "wheel"
-      "kvm"
-      "tty"
-      "audio"
-      "sound"
-      "adbusers"
-      "transmission"
-    ];
     openssh.authorizedKeys.keys = [
       (builtins.readFile ../nixy/ssh_pubkey)
     ];
@@ -477,16 +447,7 @@
   users.users.ado = {
     isNormalUser = true;
     shell = pkgs.zsh;
-    extraGroups = [
+    extraGroups = ["wireshark" "wheel" "kvm" "tty" "audio" "sound" "adbusers" "transmission"];
-      "wireshark"
-      "wheel"
-      "kvm"
-      "tty"
-      "audio"
-      "sound"
-      "adbusers"
-      "transmission"
-    ];
   };
 
   users.users.mediauser = {

mediabox/hardware-configuration.nix

@@ -5,20 +5,12 @@
   lib,
   modulesPath,
   ...
-}:
+}: {
-{
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
-    "xhci_pci"
-    "ehci_pci"
-    "ahci"
-    "usb_storage"
-    "sd_mod"
-    "rtsx_pci_sdmmc"
-  ];
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
@@ -26,11 +18,7 @@
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
     fsType = "btrfs";
-    options = [
+    options = ["subvol=root" "compress=lzo" "noatime"];
-      "subvol=root"
-      "compress=lzo"
-      "noatime"
-    ];
   };
 
   boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/60aa7671-bfee-451b-b871-ac7c5a4a9f3a";
@@ -38,41 +26,25 @@
   fileSystems."/home" = {
     device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
     fsType = "btrfs";
-    options = [
+    options = ["subvol=home" "compress=lzo" "noatime"];
-      "subvol=home"
-      "compress=lzo"
-      "noatime"
-    ];
   };
 
   fileSystems."/nix" = {
     device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
     fsType = "btrfs";
-    options = [
+    options = ["subvol=nix" "compress=lzo" "noatime"];
-      "subvol=nix"
-      "compress=lzo"
-      "noatime"
-    ];
   };
 
   fileSystems."/persist" = {
     device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
     fsType = "btrfs";
-    options = [
+    options = ["subvol=persist" "compress=lzo" "noatime"];
-      "subvol=persist"
-      "compress=lzo"
-      "noatime"
-    ];
   };
 
   fileSystems."/var/log" = {
     device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
     fsType = "btrfs";
-    options = [
+    options = ["subvol=log" "compress=lzo" "noatime"];
-      "subvol=log"
-      "compress=lzo"
-      "noatime"
-    ];
     neededForBoot = true;
   };
 

modules/nextcloud.nix

@@ -2,8 +2,7 @@
   config,
   pkgs,
   ...
-}:
+}: {
-{
   # Enable Nginx
   services.nginx = {
     enable = true;

modules/qbittorrent.nix

@@ -4,13 +4,11 @@
   pkgs,
   ...
 }:
-with lib;
+with lib; let
-let
   cfg = config.services.qbittorrent;
   configDir = "${cfg.dataDir}/.config";
   openFilesLimit = 4096;
-in
+in {
-{
   options.services.qbittorrent = {
     enable = mkOption {
       type = types.bool;
@@ -112,10 +110,7 @@ in
       };
     };
 
-    users.groups = mkIf (cfg.group == "qbittorrent") {
+    users.groups =
-      qbittorrent = {
+      mkIf (cfg.group == "qbittorrent") {qbittorrent = {gid = null;};};
-        gid = null;
-      };
-    };
   };
 }

nixy/configuration.nix

@@ -6,11 +6,7 @@
   system,
   zremap,
   ...
-}:
+}: {
-let
-  USER = "akill";
-in
-{
   imports = [];
 
   system.stateVersion = "23.05";
@@ -48,12 +44,12 @@ in
 
       "borgbase_enc_key" = {
         sopsFile = ./secrets/borgbase_enc_key.yaml;
-        owner = config.users.users.${USER}.name;
+        owner = config.users.users.akill.name;
       };
 
       "borgbase_ssh_key" = {
         sopsFile = ./secrets/borgbase_ssh_key.yaml;
-        owner = config.users.users.${USER}.name;
+        owner = config.users.users.akill.name;
       };
     };
   };
@@ -65,30 +61,18 @@ in
     package = pkgs.nixVersions.latest;
     settings = {
       sandbox = true;
-      experimental-features = [
+      experimental-features = ["nix-command" "flakes"];
-        "nix-command"
-        "flakes"
-      ];
     };
   };
 
   boot = {
-    extraModulePackages = with config.boot.kernelPackages; [
+    extraModulePackages = with config.boot.kernelPackages; [usbip v4l2loopback];
-      usbip
-      v4l2loopback
-    ];
     initrd.compressor = "zstd";
     initrd.kernelModules = [];
     initrd.systemd.enable = true;
-    binfmt.emulatedSystems = [
+    binfmt.emulatedSystems = ["wasm32-wasi" "x86_64-windows"];
-      "wasm32-wasi"
-      "x86_64-windows"
-    ];
-    kernelParams = [
-      "psmouse.synaptics_intertouch=0"
-      "mem_sleep_default=deep"
-    ];
     kernelPackages = pkgs.linuxPackages_latest;
+    kernelParams = ["psmouse.synaptics_intertouch=0" "mem_sleep_default=deep"];
     kernel.sysctl = {
       "net.core.default_qdisc" = "fq";
       "net.ipv4.tcp_congestion_control" = "bbr";
@@ -100,9 +84,7 @@ in
       memtest86.enable = true;
     };
     readOnlyNixStore = true;
-    supportedFilesystems = [
+    supportedFilesystems = ["f2fs" "xfs"];
-      "xfs"
-    ];
     tmp.useTmpfs = true;
   };
 
@@ -113,7 +95,7 @@ in
     doas.enable = true;
     doas.extraRules = [
       {
-        users = [ USER ];
+        users = ["akill"];
         keepEnv = true;
         persist = true;
       }
@@ -125,22 +107,13 @@ in
   };
 
   networking = {
-    nftables.enable = true;
     firewall = {
       enable = true;
-      allowedTCPPorts = [
+      allowedTCPPorts = [80 443 51820 8020];
-        80
-        443
-        51820
-        8020
-      ];
     };
 
     hostName = "nixy";
-    nameservers = [
+    nameservers = ["127.0.0.1" "::1"];
-      "127.0.0.1"
-      "::1"
-    ];
     dhcpcd.extraConfig = "nohook resolv.conf";
 
     extraHosts = ''
@@ -202,10 +175,7 @@ in
   time.timeZone = "Europe/Sarajevo";
 
   nixpkgs.config.allowUnfree = true;
-  nixpkgs.overlays = [
+  nixpkgs.overlays = [nix-xilinx.overlay nvim.overlays.${system}.overlay];
-    nix-xilinx.overlay
-    nvim.overlays.${system}.overlay
-  ];
   environment = {
     etc = {
       "firejail/qutebrowser.local".text = ''
@@ -290,9 +260,7 @@ in
             ${pkgs.iproute2}/bin/ip link set proton_wg netns wg
             ${pkgs.iproute2}/bin/ip -n wg address add 10.2.0.2/32 dev proton_wg
             ${pkgs.iproute2}/bin/ip netns exec wg \
-              ${pkgs.wireguard-tools}/bin/wg set "proton_wg" private-key "${
+              ${pkgs.wireguard-tools}/bin/wg set "proton_wg" private-key "${config.sops.secrets."wg_privkey_proton".path}"
-                config.sops.secrets."wg_privkey_proton".path
-              }"
             ${pkgs.iproute2}/bin/ip netns exec wg \
               ${pkgs.wireguard-tools}/bin/wg set "proton_wg" peer "g6DkXWKI/68RsLjROIwCEcyB/ZhyK5Q7OWcz1TtqER0=" \
                 endpoint "$ENDPOINT_IP:51820" \
@@ -361,7 +329,6 @@ in
       };
     };
 
-    coredump.enable = false;
     extraConfig = ''
       DefaultTimeoutStartSec=30s
       DefaultTimeoutStopSec=30s
@@ -404,10 +371,7 @@ in
     };
 
     udev = {
-      packages = [
+      packages = [pkgs.openhantek6022 pkgs.openocd];
-        pkgs.openhantek6022
-        pkgs.openocd
-      ];
       extraRules = ''
         #Xilinx FTDI
         ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Xilinx", MODE:="666"
@@ -440,25 +404,19 @@ in
         {
           keys = [113];
           events = ["key"];
-          command = "/run/current-system/sw/bin/runuser -l ${USER} -c 'amixer -q set Master toggle'";
+          command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master toggle'";
         }
 
         {
           keys = [114];
-          events = [
+          events = ["key" "rep"];
-            "key"
+          command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%- unmute'";
-            "rep"
-          ];
-          command = "/run/current-system/sw/bin/runuser -l ${USER} -c 'amixer -q set Master 5%- unmute'";
         }
 
         {
           keys = [115];
-          events = [
+          events = ["key" "rep"];
-            "key"
+          command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%+ unmute'";
-            "rep"
-          ];
-          command = "/run/current-system/sw/bin/runuser -l ${USER} -c 'amixer -q set Master 5%+ unmute'";
         }
 
         {
@@ -489,18 +447,16 @@ in
             "https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md"
             "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
           ];
-          cache_file = "/var/lib/dnscrypt-proxy/public-resolvers.md";
+          cache_file = "public-resolvers.md";
           minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
         };
       };
     };
 
-    borgbackup.jobs."borgbase" =
+    borgbackup.jobs."borgbase" = let
-      let
+      user = config.users.users.akill;
-        user = config.users.users.${USER};
       home = user.home;
-      in
+    in {
-      {
       user = user.name;
       paths = [
         (home + "/pic/priv")
@@ -591,13 +547,6 @@ in
   };
 
   virtualisation = {
-    libvirtd = {
-      enable = true;
-      allowedBridges = [
-        "virbr0"
-        "br0"
-      ];
-    };
   spiceUSBRedirection.enable = true;
     containers.storage.settings = {
       storage = {
@@ -634,18 +583,9 @@ in
     algorithm = "zstd";
   };
 
-  users.users.${USER} = {
+  users.users.akill = {
     isNormalUser = true;
     shell = pkgs.zsh;
-    extraGroups = [
+    extraGroups = ["wireshark" "kvm" "tty" "audio" "sound" "adbusers" "dialout" "wheel"];
-      "wireshark"
-      "kvm"
-      "tty"
-      "audio"
-      "sound"
-      "adbusers"
-      "dialout"
-      "wheel"
-    ];
   };
 }

nixy/hardware-configuration.nix

@@ -1,60 +1,39 @@
 # 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, ... }:
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
 
 {
-  imports = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.luks.devices."crypt_dev".device =
+  boot.initrd.luks.devices."crypt_dev".device = "/dev/disk/by-uuid/e10821b9-5426-4f03-b716-1645a64fcd6a";
-    "/dev/disk/by-uuid/e10821b9-5426-4f03-b716-1645a64fcd6a";
   boot.initrd.luks.devices."crypt_dev".allowDiscards = true;
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "uas" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-    "nvme"
-    "ehci_pci"
-    "xhci_pci"
-    "uas"
-    "usb_storage"
-    "sd_mod"
-    "rtsx_pci_sdmmc"
-  ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [
+  boot.kernelModules = [ "kvm-amd" "amd-gpu" ];
-    "kvm-amd"
-    "amd-gpu"
-  ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/c461c971-54ca-4fb7-91e8-6ac70de53ef2";
+    { device = "/dev/disk/by-uuid/c461c971-54ca-4fb7-91e8-6ac70de53ef2";
       fsType = "xfs";
     };
 
-  fileSystems."/nix" = {
+  fileSystems."/nix" =
-    device = "/dev/disk/by-uuid/eeaa6fab-d67d-400f-b6d4-b1f44c2e0047";
+    { device = "/dev/disk/by-uuid/eeaa6fab-d67d-400f-b6d4-b1f44c2e0047";
       fsType = "xfs";
     };
 
-  fileSystems."/home" = {
+  fileSystems."/home" =
-    device = "/dev/disk/by-uuid/aeaa71ca-a439-4ef3-9ab8-db7ae8f59376";
+    { device = "/dev/disk/by-uuid/aeaa71ca-a439-4ef3-9ab8-db7ae8f59376";
       fsType = "xfs";
     };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/828E-F3C3";
+    { device = "/dev/disk/by-uuid/828E-F3C3";
       fsType = "vfat";
-    options = [
+      options = [ "fmask=0022" "dmask=0022" ];
-      "fmask=0022"
-      "dmask=0022"
-    ];
     };
 
   swapDevices = [ ];

packages/viber/default.nix

@@ -115,8 +115,7 @@ stdenv.mkDerivation {
     xorg.libxkbfile
   ];
 
-  installPhase =
+  installPhase = let
-    let
     viberWrap = writeShellScriptBin "viberWrap" ''
       ${bubblewrap}/bin/bwrap --bind / / \
       --dev /dev \
@@ -125,8 +124,7 @@ stdenv.mkDerivation {
       --bind  $HOME/Downloads/ $HOME/Downloads \
       $@
     '';
-    in
+  in ''
-    ''
     dpkg-deb -x $src $out
     mkdir -p $out/bin