chore: remove unneeded toString

.git-blame-ignore-revs

@@ -1,2 +1,3 @@
-# nix fmt
+# nix fmt & statix
 f011c8d71ba09bd94ab04b8d771858b90a03fbf9
+3aff25b4486a143cd6282f8845c16216598e1c7e

.pre-commit-config.yaml

@@ -4,3 +4,11 @@ repos:
     hooks:
       - id: nixfmt-nix
         args: [--, --check]
+  - repo: local
+    hooks:
+      - id: statix
+        name: statix
+        entry: statix check
+        language: system
+        files: \.nix$
+        pass_filenames: false

flake.nix

@@ -50,9 +50,21 @@
     }:
 
     let
-      my-lib = import ./lib { lib = nixpkgs.lib; };
+      my-lib = import ./lib { inherit (nixpkgs) lib; };
 
-      overlays = [ ];
+      overlays = [
+        (_: prev: {
+          inherit
+            (
+              (import inputs.nixpkgs-unstable {
+                inherit (prev.stdenv.hostPlatform) system;
+                config.allowUnfree = true;
+              })
+            )
+            claude-code
+            ;
+        })
+      ];
 
       mkHost = my-lib.mkHost {
         inherit
@@ -86,7 +98,7 @@
 
       nixosModules = import ./modules/nixos {
         inherit my-lib;
-        lib = nixpkgs.lib;
+        inherit (nixpkgs) lib;
       } { };
     }
     // flake-utils.lib.eachDefaultSystem (
@@ -95,15 +107,25 @@
         pkgs = nixpkgs.legacyPackages.${system};
       in
       {
-        packages = import ./packages {
+        packages =
+          import ./packages
+            {
               inherit my-lib;
-          lib = nixpkgs.lib;
+              inherit (nixpkgs) lib;
-        } (inputs // { inherit system; });
+            }
+            {
+              pkgs = nixpkgs.legacyPackages.${system};
+              pkgs-unstable = inputs.nixpkgs-unstable.legacyPackages.${system};
+              pkgs-master = inputs.nixpkgs-master.legacyPackages.${system};
+            };
 
         formatter = pkgs.nixfmt-tree;
 
         devShells.default = pkgs.mkShell {
-          packages = [ pkgs.pre-commit ];
+          packages = [
+            pkgs.pre-commit
+            pkgs.statix
+          ];
         };
       }
     );

hosts/matej-nixos/configuration.nix

@@ -27,7 +27,6 @@ in
     inputs.self.nixosModules.initrd-ssh
   ];
 
-  # Modules
   yubikey.enable = true;
   openssh.enable = true;
   desktop.enable = true;
@@ -58,7 +57,6 @@ in
     };
   };
 
-  # Stylix theming
   stylix = {
     enable = true;
     polarity = "dark";
@@ -66,28 +64,22 @@ in
     base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-medium.yaml";
   };
 
-  # Boot
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  # Locale
   time.timeZone = "Europe/Ljubljana";
   environment.variables.TZ = "America/New_York";
   i18n.defaultLocale = "en_US.UTF-8";
 
-  # nix-ld for pip-installed binaries
+  # WARN:(@janezicmatej) nix-ld for running pip-installed binaries outside nix, probably want to drop this
-  # WARN:(matej) probably want to drop this in the future
   programs.nix-ld.enable = true;
   programs.nix-ld.libraries = options.programs.nix-ld.libraries.default;
 
-  # Security
   security.pki.certificateFiles = [ packages.ca-matheo-si ];
   services.gnome.gnome-keyring.enable = true;
 
-  # Services
   services.teamviewer.enable = true;
 
-  # Programs
   programs.thunderbird.enable = true;
   programs._1password.enable = true;
   programs._1password-gui.enable = true;
@@ -99,12 +91,10 @@ in
     localNetworkGameTransfers.openFirewall = true;
   };
 
-  # Hardware
   hardware.keyboard.zsa.enable = true;
   hardware.ledger.enable = true;
   hardware.bluetooth.powerOnBoot = true;
 
-  # Networking
   networking = {
     hostName = "matej-nixos";
     useDHCP = false;
@@ -123,7 +113,6 @@ in
     ];
   };
 
-  # XDG
   xdg.mime.defaultApplications = {
     "application/pdf" = "org.pwmt.zathura.desktop";
   };

hosts/matej-tower/configuration.nix

@@ -25,7 +25,6 @@
     inputs.self.nixosModules.initrd-ssh
   ];
 
-  # Modules
   yubikey.enable = true;
   openssh.enable = true;
   desktop.enable = true;
@@ -44,7 +43,6 @@
     networkModule = "r8169";
   };
 
-  # Stylix theming
   stylix = {
     enable = true;
     polarity = "dark";
@@ -52,7 +50,8 @@
     base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-medium.yaml";
   };
 
-  # Boot - Lanzaboote secure boot
+  # lanzaboote secure boot
+  boot.kernelParams = [ "btusb.reset=1" ];
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.systemd-boot.enable = lib.mkForce false;
   boot.lanzaboote = {
@@ -60,18 +59,15 @@
     pkiBundle = "/var/lib/sbctl";
   };
 
-  # Locale
   time.timeZone = "Europe/Ljubljana";
   environment.variables.TZ = "Europe/Ljubljana";
 
-  # Services
   services.udisks2.enable = true;
 
-  # Programs
   programs._1password.enable = true;
   programs._1password-gui.enable = true;
 
-  # Higher sample rate pipewire for audio equipment
+  # higher sample rate for audio equipment
   services.pipewire.extraConfig.pipewire.adjust-sample-rate = {
     "context.properties" = {
       "default.clock.rate" = 192000;
@@ -79,12 +75,10 @@
     };
   };
 
-  # System packages
   environment.systemPackages = with pkgs; [
     easyeffects
   ];
 
-  # XDG
   xdg.mime.defaultApplications = {
     "application/pdf" = "org.pwmt.zathura.desktop";
   };

lib/autoDir.nix

@@ -1,6 +1,6 @@
 lib:
 
-# takes dir as an argument and creates an attribute set by importing all .nix files in that directory
+# import all .nix files in dir as attribute set
 dir:
 let
   readDir = builtins.readDir dir;

lib/mkHost.nix

@@ -15,12 +15,10 @@ let
   hostHWConfig = ../hosts/${name}/hardware-configuration.nix;
   hasHWConfig = builtins.pathExists hostHWConfig;
 
-  # Load NixOS-level user config (account, groups, SSH keys)
   userNixosConfigs = map (user: ../users/${user}/nixos.nix) (
     builtins.filter (user: builtins.pathExists ../users/${user}/nixos.nix) users
   );
 
-  # Load home-manager user config
   userHMConfigs = nixpkgs.lib.genAttrs users (user: import ../users/${user}/home-manager.nix);
 
 in

modules/nixos/desktop.nix

@@ -12,26 +12,20 @@
   };
 
   config = lib.mkIf config.desktop.enable {
-    # Audio
     services.pipewire = {
       enable = true;
       pulse.enable = true;
     };
 
-    # Bluetooth
     hardware.bluetooth.enable = true;
     services.blueman.enable = true;
 
-    # Security
     security.polkit.enable = true;
 
-    # D-Bus
     services.dbus.enable = true;
 
-    # Player control
     services.playerctld.enable = true;
 
-    # XDG Portals
     xdg.portal = {
       enable = true;
       xdgOpenUsePortal = true;
@@ -41,7 +35,6 @@
       ];
     };
 
-    # Fonts
     fonts.packages = with pkgs; [
       font-awesome
       nerd-fonts.jetbrains-mono

modules/nixos/initrd-ssh.nix

@@ -7,9 +7,7 @@ let
   # TODO:(@janezicmatej) restructure keys import
   keys = import ../../users/matej/keys.nix;
 
-  cfg = config.initrd-ssh;
+  # generate host keys for new machines: ./scripts/initrd-ssh-keygen.sh
-
-  # Generate keys on new machines: ./scripts/initrd-ssh-keygen.sh
   keyDir = "/etc/secrets/initrd";
 
   mkIpString =
@@ -32,25 +30,21 @@ in
 
         address = lib.mkOption {
           type = lib.types.str;
-          description = "Static IP address";
           example = "10.222.0.247";
         };
 
         gateway = lib.mkOption {
           type = lib.types.str;
-          description = "Gateway address";
           example = "10.222.0.1";
         };
 
         netmask = lib.mkOption {
           type = lib.types.str;
           default = "255.255.255.0";
-          description = "Network mask";
         };
 
         interface = lib.mkOption {
           type = lib.types.str;
-          description = "Network interface";
           example = "enp5s0";
         };
       };
@@ -58,21 +52,19 @@ in
       authorizedKeys = lib.mkOption {
         type = lib.types.listOf lib.types.str;
         default = keys.sshAuthorizedKeys;
-        description = "SSH public keys authorized for initrd unlock";
       };
 
       networkModule = lib.mkOption {
         type = lib.types.str;
-        description = "Kernel module for network interface (e.g., r8169, e1000e)";
         example = "r8169";
       };
     };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf config.initrd-ssh.enable {
-    boot.initrd.kernelModules = [ cfg.networkModule ];
+    boot.initrd.kernelModules = [ config.initrd-ssh.networkModule ];
-    boot.kernelParams = lib.mkIf cfg.ip.enable [
+    boot.kernelParams = lib.mkIf config.initrd-ssh.ip.enable [
-      "ip=${mkIpString cfg.ip}"
+      "ip=${mkIpString config.initrd-ssh.ip}"
     ];
 
     boot.initrd.network = {
@@ -84,7 +76,7 @@ in
           "${keyDir}/ssh_host_rsa_key"
           "${keyDir}/ssh_host_ed25519_key"
         ];
-        authorizedKeys = cfg.authorizedKeys;
+        inherit (config.initrd-ssh) authorizedKeys;
       };
       postCommands = ''
         echo 'cryptsetup-askpass' >> /root/.profile

modules/nixos/openssh.nix

@@ -10,7 +10,6 @@
       port = lib.mkOption {
         type = lib.types.port;
         default = 22;
-        description = "SSH server port";
       };
     };
   };

modules/nixos/sway.nix

@@ -12,7 +12,6 @@
       cmdFlags = lib.mkOption {
         type = lib.types.listOf lib.types.str;
         default = [ ];
-        description = "additional command line flags to pass to sway";
       };
     };
   };
@@ -24,23 +23,20 @@
       wrapperFeatures.gtk = true;
       extraOptions = config.sway.cmdFlags;
       extraSessionCommands = ''
-        # Fix for some Java AWT applications (e.g. Android Studio),
+        # fix for java awt apps not rendering
-        # use this if they aren't displayed properly:
         export _JAVA_AWT_WM_NONREPARENTING=1
       '';
     };
 
     environment.systemPackages = with pkgs; [
-      # default extra packages
       brightnessctl
       foot
       grim
       pulseaudio
       swayidle
-      # swaylock - use swaylock-effects instead
+      # use swaylock-effects instead of swaylock
       swaylock-effects
       wmenu
-      # additional things i like
       slurp
       wofi
       wl-clipboard

modules/nixos/tuigreet.nix

@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-let
-  cfg = config.tuigreet;
-in
 {
   options = {
     tuigreet = {
@@ -14,23 +11,20 @@ in
 
       command = lib.mkOption {
         type = lib.types.str;
-        description = "Session command to launch";
       };
     };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf config.tuigreet.enable {
     services.greetd = {
       enable = true;
       useTextGreeter = true;
       settings = {
         default_session = {
-          command = builtins.toString (
+          command = pkgs.writeShellScript "tuigreet-session" ''
-            pkgs.writeShellScript "tuigreet-session" ''
             ${pkgs.util-linux}/bin/setterm --blank 1 --powersave powerdown --powerdown 1
-              exec ${pkgs.tuigreet}/bin/tuigreet --time --remember --cmd ${cfg.command}
+            exec ${pkgs.tuigreet}/bin/tuigreet --time --remember --cmd ${config.tuigreet.command}
-            ''
+          '';
-          );
           user = "greeter";
         };
       };

modules/nixos/workstation.nix

@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-let
-  cfg = config.workstation;
-in
 {
   options = {
     workstation = {
@@ -14,7 +11,7 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf config.workstation.enable {
     virtualisation.docker = {
       enable = true;
       logDriver = "json-file";

packages/ahab.nix

@@ -1,7 +1,6 @@
-{ nixpkgs, system, ... }:
+{ pkgs, ... }:
 
 let
-  pkgs = import nixpkgs { inherit system; };
   version = "v0.3.2";
 in
 pkgs.rustPlatform.buildRustPackage {

packages/ca-matheo-si.nix

@@ -1,13 +1,12 @@
-{ nixpkgs, system, ... }:
+{ pkgs, ... }:
 
 let
-  pkgs = import nixpkgs { inherit system; };
   version = "C6r62em";
 in
 
 pkgs.stdenv.mkDerivation {
   pname = "ca-matheo-si";
-  version = version;
+  inherit version;
 
   src = pkgs.fetchurl {
     url = "http://ipa2.matheo.si/ipa/config/ca.crt";

packages/ggman.nix

@@ -1,8 +1,7 @@
-{ nixpkgs-master, system, ... }:
+{ pkgs-master, ... }:
 
 let
-  nixpkgs = nixpkgs-master;
+  pkgs = pkgs-master;
-  pkgs = import nixpkgs { inherit system; };
   version = "e24855c";
 in
 pkgs.buildGoModule.override

packages/git-linearize.nix

@@ -1,7 +1,6 @@
-{ nixpkgs, system, ... }:
+{ pkgs, ... }:
 
 let
-  pkgs = import nixpkgs { inherit system; };
   version = "main";
 in
 pkgs.stdenv.mkDerivation {

packages/releasectl.nix

@@ -1,28 +0,0 @@
-{ nixpkgs-master, system, ... }:
-
-let
-  nixpkgs = nixpkgs-master;
-  pkgs = import nixpkgs { inherit system; };
-  version = "v1.25.0";
-  python = pkgs.python313;
-in
-
-python.pkgs.buildPythonPackage rec {
-  pname = "releasectl";
-  version = "1.2.0";
-
-  src = pkgs.fetchurl {
-    url = "https://gitlab.com/flarenetwork/infra-public/pipeliner/-/package_files/216813866/download";
-    sha256 = "sha256-ScBG8BoOKDdOAHTFP+zwyk+Kfu31WoKQSRkutOvnJ5E";
-  };
-
-  format = "wheel"; # if it uses poetry/PEP517, otherwise "setuptools"
-  # nativeBuildInputs = [ python.pkgs.setuptools python.pkgs.wheel ];
-  # propagatedBuildInputs = with python.pkgs; [
-  #   # add runtime deps here if needed
-  # ];
-
-  # pyproject = true;
-  # build-system =  [ pkgs.python313Packages.hatchling ];
-
-}

statix.toml

@@ -0,0 +1 @@
+disabled = ["repeated_keys"]

users/matej/home-manager.nix

@@ -13,7 +13,7 @@ in
 {
   home.stateVersion = "24.11";
 
-  # TODO:(janezicmatej) do i need this here?
+  # TODO:(@janezicmatej) do i need this here?
   services.dunst.enable = true;
 
   home.packages = [
@@ -99,7 +99,6 @@ in
       luajit
       nodejs_22 # copilot
 
-      # treesitter
       tree-sitter
 
       # lua_fzf
@@ -109,7 +108,6 @@ in
       gnumake
       delta
 
-      # language server
       pyright
       typescript-language-server
       lua-language-server
@@ -117,7 +115,6 @@ in
       nil
       nixd
 
-      # formatters
       nixpkgs-fmt
       stylua
     ];