use hyprlock as lockscreen

hm update
os update
2026-03-14 22:06:39 +01:00 · 2026-03-14 16:53:49 +01:00 · 2026-03-14 16:42:09 +01:00 · 2026-03-14 16:33:42 +01:00 · 2026-03-10 23:22:08 +01:00
41 changed files with 537 additions and 441 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,6 @@ gqrx/
 gtk-*.0/
 htop/
 inkscape/
-hypr/
 lazygit/
 libreoffice/
 libvirt/
--- a/Kvantum/Base16Kvantum
+++ b/Kvantum/Base16Kvantum
@@ -1 +1 @@
-/nix/store/l0q94ic1jhpljkank0472nd55mqhnnqf-home-manager-files/.config/Kvantum/Base16Kvantum
+/nix/store/p19lx2ymg13qw3abnkc5x1v3hj8r6zix-home-manager-files/.config/Kvantum/Base16Kvantum
--- a/Kvantum/kvantum.kvconfig
+++ b/Kvantum/kvantum.kvconfig
@@ -1 +1 @@
-/nix/store/l0q94ic1jhpljkank0472nd55mqhnnqf-home-manager-files/.config/Kvantum/kvantum.kvconfig
+/nix/store/p19lx2ymg13qw3abnkc5x1v3hj8r6zix-home-manager-files/.config/Kvantum/kvantum.kvconfig
--- a/autostart/stylix-activate-gnome.desktop
+++ b/autostart/stylix-activate-gnome.desktop
@@ -1 +1 @@
-/nix/store/l0q94ic1jhpljkank0472nd55mqhnnqf-home-manager-files/.config/autostart/stylix-activate-gnome.desktop
+/nix/store/p19lx2ymg13qw3abnkc5x1v3hj8r6zix-home-manager-files/.config/autostart/stylix-activate-gnome.desktop
--- a/autostart/stylix-activate-kde.desktop
+++ b/autostart/stylix-activate-kde.desktop
@@ -1 +1 @@
-/nix/store/l0q94ic1jhpljkank0472nd55mqhnnqf-home-manager-files/.config/autostart/stylix-activate-kde.desktop
+/nix/store/p19lx2ymg13qw3abnkc5x1v3hj8r6zix-home-manager-files/.config/autostart/stylix-activate-kde.desktop
--- a/home-manager/flake.lock
+++ b/home-manager/flake.lock
@@ -97,11 +97,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1773106230,
-        "narHash": "sha256-ob/uMOU6CyRES+/SIxnMDhDAZUQr228JdBPKkGu8m/c=",
+        "lastModified": 1773451839,
+        "narHash": "sha256-a7yGiEC2Nh4z7b5aR9sTPDnFOt7ykYQ3yU/MEdhKUWA=",
        "owner": "sadjow",
        "repo": "claude-code-nix",
-        "rev": "5cbf0a4eba950cdc7d7982774a9bc189ab21cb99",
+        "rev": "e64e47c888e3eb19d8c58c91046310582634271c",
        "type": "github"
      },
      "original": {
@@ -118,11 +118,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1773123705,
-        "narHash": "sha256-DMPua84KZeJqOVIVX0f6ptZubNUylRx5bCNak2+DYlY=",
+        "lastModified": 1773189244,
+        "narHash": "sha256-ctI2WntyGzjz7tCcGcG+l+ryV6fJsDvAySPtJH7ia+4=",
        "owner": "sadjow",
        "repo": "codex-cli-nix",
-        "rev": "e64cdc2717566a86aad7b67db4039349d76cf1ea",
+        "rev": "60da592dbbfceec9adb8b84ea49e88b6663976ae",
        "type": "github"
      },
      "original": {
@@ -264,11 +264,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1773093840,
-        "narHash": "sha256-u/96NoAyN8BSRuM3ZimGf7vyYgXa3pLx4MYWjokuoH4=",
+        "lastModified": 1773422513,
+        "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "bb014746edb2a98d975abde4dd40fa240de4cf86",
+        "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056",
        "type": "github"
      },
      "original": {
@@ -285,11 +285,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1772873838,
-        "narHash": "sha256-pFh7J2fBqsZvZrD26zfOj30qTM8+7PLZsNSLX+VOcUA=",
+        "lastModified": 1773171230,
+        "narHash": "sha256-ZiGGjRL2H67GcL6BvZV99khW++aHpJ2NA4n71qZiJ9A=",
        "owner": "niri-wm",
        "repo": "niri",
-        "rev": "5393902dd22e9d540438ee178775f1e488eea724",
+        "rev": "4a7e443b6c816e4f673f6e25cc0a5aa37697d667",
        "type": "github"
      },
      "original": {
@@ -301,11 +301,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1772963539,
-        "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
+        "lastModified": 1773389992,
+        "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
+        "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda",
        "type": "github"
      },
      "original": {
@@ -339,11 +339,11 @@
        "noctalia-qs": "noctalia-qs"
      },
      "locked": {
-        "lastModified": 1773115433,
-        "narHash": "sha256-HFAf46oF74JfCSaDmdyjE7nyoW5mtyjb6fAsXaCAO58=",
+        "lastModified": 1773498808,
+        "narHash": "sha256-YnSRPOQC+fwSE3aA2C1rt9zaI4i3S4LTYY/3fqmRM4s=",
        "owner": "noctalia-dev",
        "repo": "noctalia-shell",
-        "rev": "7bb88e69194779d701e9927dd1edabaab082887d",
+        "rev": "793771cd770431443d71e30ceede201048435a04",
        "type": "github"
      },
      "original": {
@@ -357,14 +357,15 @@
        "nixpkgs": [
          "noctalia",
          "nixpkgs"
-        ]
+        ],
+        "systems": "systems_4"
      },
      "locked": {
-        "lastModified": 1772673824,
-        "narHash": "sha256-TLHXPoELZA6VeuzC1Zpx+MnSsYzrJs+DSieMgfjAOJc=",
+        "lastModified": 1773175685,
+        "narHash": "sha256-YOkWzVq7opym1ovJvSCvqpG6OCDGJwPo/EPeRxcGay4=",
        "owner": "noctalia-dev",
        "repo": "noctalia-qs",
-        "rev": "f8531192cd09b9ea2e78d18e9cfc9d3dba498690",
+        "rev": "6b9eceefde3d47ca83c544b54bcdd358be4cbd2f",
        "type": "github"
      },
      "original": {
@@ -405,11 +406,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1773129285,
-        "narHash": "sha256-7G6x33z271v/jhBC5Le7NPOZhv9902+MfCkC9poMwf0=",
+        "lastModified": 1773480707,
+        "narHash": "sha256-VkuO1LWpK7tS/YDmxJSDeONEwt1RFLPfOucQJwKnsV0=",
        "owner": "outfoxxed",
        "repo": "quickshell",
-        "rev": "bd6217927739a79c1c4ff279051f9625cd4b2b5e",
+        "rev": "1b2519d9f3d963e575b8a1ef08fab47c7af0d1b3",
        "type": "github"
      },
      "original": {
@@ -461,11 +462,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1773115373,
-        "narHash": "sha256-bfK9FJFcQth6f3ydYggS5m0z2NRGF/PY6Y2XgZDJ6pg=",
+        "lastModified": 1773457417,
+        "narHash": "sha256-waABTSxPdbxml4BhcabHhyQF02Qnj27qRU4ard0mTQo=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "1924b4672a2b8e4aee6e6652ec2e59a8d3c5648e",
+        "rev": "055977c30249484010750e03074c744dcdaa0d23",
        "type": "github"
      },
      "original": {
@@ -487,7 +488,7 @@
          "nixpkgs"
        ],
        "nur": "nur",
-        "systems": "systems_4",
+        "systems": "systems_5",
        "tinted-foot": "tinted-foot",
        "tinted-kitty": "tinted-kitty",
        "tinted-schemes": "tinted-schemes",
@@ -554,6 +555,21 @@
      }
    },
    "systems_4": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "systems_5": {
      "locked": {
        "lastModified": 1681028828,
        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
--- a/home-manager/modules/packages.nix
+++ b/home-manager/modules/packages.nix
@@ -11,6 +11,7 @@ in {
    swayidle
    swww
    kanshi
+    hyprlock

    # System utilities & monitoring
    btop
--- a/hypr/hyprlock.conf
+++ b/hypr/hyprlock.conf
@@ -0,0 +1,73 @@
+$font = Monospace
+
+general {
+    hide_cursor = false
+}
+
+animations {
+    enabled = true
+    bezier = linear, 1, 1, 0, 0
+    animation = fadeIn, 1, 5, linear
+    animation = fadeOut, 1, 5, linear
+    animation = inputFieldDots, 1, 2, linear
+}
+
+background {
+    monitor =
+    path = screenshot
+    blur_passes = 4
+}
+
+source = $HOME/.cache/wal/colors-hyprland.conf
+
+input-field {
+    monitor =
+    size = 20%, 5%
+    outline_thickness = 3
+    inner_color = rgba(0, 0, 0, 0.0) # no fill
+
+    outer_color = $color1 $color2 45deg
+    check_color = $color3 $color4 120deg
+    fail_color =  $color5 $color6 40deg
+
+    font_color = $color15
+    fade_on_empty = false
+    rounding = 32
+
+    font_family = $font
+    placeholder_text = unlock me :3
+    fail_text = wrong you fucking idiot >:3
+
+    dots_text_format = ❤
+    dots_size = 0.5
+    dots_spacing = 0.3
+
+    position = 0, -20
+    halign = center
+    valign = center
+}
+
+# TIME
+label {
+    monitor =
+    text = $TIME
+    font_size = 90
+    font_family = $font
+
+    position = 0, 165
+    halign = center
+    valign = center
+}
+
+# DATE
+label {
+    monitor =
+    text = cmd[update:60000] date +"%A, %d %B %Y"
+    font_size = 25
+    font_family = $font
+
+    position = 0, 75
+    halign = center
+    valign = center
+}
+
--- a/niri/config.kdl
+++ b/niri/config.kdl
@@ -164,7 +164,7 @@ binds {
    }
    // Utility shortcuts
    Mod+L {
-        spawn "noctalia-shell" "ipc" "call" "lockScreen" "lock"
+        spawn "hyprlock"
    }
    // Mod-Shift-/, which is usually the same as Mod-?,
    // shows a list of important hotkeys.
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -1,360 +1,53 @@
 { config, lib, pkgs, ... }:

 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
+  imports = [
+    ./hardware-configuration.nix

-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.resumeDevice = "/dev/mapper/luksroot";
+    ./modules/boot/bootloader.nix
+    ./modules/boot/kernel.nix
+    ./modules/boot/plymouth.nix
+    ./modules/boot/tpm.nix

-  boot.extraModprobeConfig = ''
-    options mt7921_common disable_clc=1
-    options atkbd reset=1 softrepeat=1
-    options i8042 nomux=1 reset=1 nopnp=1 kbdreset=1 direct=1 dumbkbd=1
-  '';
+    ./modules/desktop/fonts.nix
+    ./modules/desktop/greetd.nix
+    ./modules/desktop/xdg.nix
+    ./modules/desktop/xwayland.nix

-  # Blacklist built-in RTL modules
-  boot.blacklistedKernelModules = [
-    "dvb_usb_rtl28xxu"
-    "rtl2832"
-    "rtl2830"
+    ./modules/filesystems.nix
+
+    ./modules/hardware/bluetooth.nix
+    ./modules/hardware/gpu.nix
+    ./modules/hardware/power.nix
+    ./modules/hardware/rtl-sdr.nix
+    ./modules/hardware/scanner.nix
+    ./modules/hardware/tablet.nix
+    ./modules/hardware/udev.nix
+
+    ./modules/networking/general.nix
+    ./modules/networking/tailscale.nix
+    ./modules/networking/vpn.nix
+
+    ./modules/packages.nix
+
+    ./modules/services/flatpak.nix
+    ./modules/services/printing.nix
+    ./modules/services/smb.nix
+    ./modules/services/ssh.nix
+
+    ./modules/users.nix
+    ./modules/virtualization.nix
+    ./modules/wireshark.nix
  ];

-  # Kernel parameters for power saving
-    boot.kernelParams = [
-      # CRITICAL FIX: Disable ACPI for i8042 (ASUS BIOS bug workaround)
-      "i8042.noacpi"                         # Disable buggy ASUS ACPI keyboard controller
-      "i8042.reset=1"                        # Force reset i8042
-      "i8042.nomux=1"                        # No multiplexing
-      "i8042.nopnp=1"                        # Ignore PnP detection
-      "atkbd.softrepeat=1"                   # Software key repeat
-      "amd_pstate=active"                    # Use AMD P-State driver for better power management
-      "amd_pstate.shared_mem=1"
-      # "pcie_aspm.policy=powersupersave"      # Aggressive PCIe power management
-      "amdgpu.gpu_recovery=1"                # Enable automatic GPU recovery
-      "amdgpu.runpm=0"                      # Disable runtime PM (major hang cause)
-      ###"amdgpu.dcdebugmask=0x400" 
-      #"amdgpu.dcdebugmask=0x10"             # Disable PSR (panel self-refresh)
-    #"amdgpu.ppfeaturemask=0xf7fff"        # Disable GFXOFF
-  ]; 
-
-  # Disable TPM
-  systemd.tpm2.enable = false;
-  boot.initrd.systemd.tpm2.enable = false;
-
-  # Enable swap file
-  swapDevices = [{ device = "/swap/swapfile"; }];
-
-  # Override btrfs mount options from hardware-configuration.nix
-  fileSystems."/" = {
-    options = [ "subvol=@" "compress=zstd" "space_cache=v2" "noatime"
-  "lazytime" "ssd" "discard=async" ];
-  };
-
-  fileSystems."/home" = {
-    options = [ "subvol=@home" "compress=zstd" "space_cache=v2" "noatime"
-   "lazytime" "ssd" "discard=async" ];
-  };
-
-  fileSystems."/var/log" = {
-    options = [ "subvol=@log" "compress=zstd" "space_cache=v2" "noatime"
-  "lazytime" "ssd" "discard=async" ];
-  };
-
-  fileSystems."/swap" = {
-    options = [ "subvol=@swap" "noatime" "ssd" "discard=async" ];
-  };
-
-  # Enable NetworkManager and set network host name
-  networking.networkmanager.enable = true;
-  networking.hostName = "lusia-laptop";
-
-  # NetworkManager power saving for WiFi
-  networking.networkmanager.wifi.powersave = true;
-
-  # Enable Tailscale
-  services.tailscale.enable = true;
-
-  # Trust the Tailscale interface
-  networking.firewall.trustedInterfaces = [ "tailscale0" ];
-
-  # Disable reverse path filtering for Tailscale, change kernel writeback options
-  boot.kernel.sysctl = {
-    "net.ipv4.conf.tailscale0.rp_filter" = 0;
-    "vm.dirty_ratio" = 10;
-    "vm.dirty_background_ratio" = 5;
-    "vm.swappiness" = 10;
-  };
-
-  # Enable resolved
-  services.resolved.enable = true;
-
-  # Set DNS
-  networking.nameservers = [ "9.9.9.9" ];
-
-  # OpenVPN services
-  # VSTech VPN (with DNS for bgs.local domain)
-  services.openvpn.servers.vstech = {
-    config = ''
-      client
-      remote 51.83.143.81
-      proto udp
-      port 649
-      dev tun
-      topology subnet
-      ca /home/lusia/VSTech-vpn/ca.crt
-      cert /home/lusia/VSTech-vpn/Klient251.crt
-      key /home/lusia/VSTech-vpn/Klient251.inline
-      tls-crypt /home/lusia/VSTech-vpn/ta.key
-
-      auth sha512
-      data-ciphers aes-256-cbc
-      data-ciphers-fallback aes-256-cbc
-      key-direction 1
-      keepalive 10 120
-    '';
-    updateResolvConf = false;
-
-    # Manually set DNS after connection
-    up = ''
-      ${pkgs.systemd}/bin/resolvectl dns $dev 10.10.10.1
-      ${pkgs.systemd}/bin/resolvectl domain $dev bgs.local
-    '';
-
-    down = ''
-      ${pkgs.systemd}/bin/resolvectl revert $dev
-    '';
-  }; 
-
-  # CAT VPN
-  services.openvpn.servers.cat = {
-    config = ''
-      client
-      remote 79.133.193.211
-      proto tcp
-      port 1194
-      dev tun
-      topology subnet
-      ca /home/lusia/vpn/ca.crt
-      cert /home/lusia/vpn/client18.crt
-      key /home/lusia/vpn/client18.key
-
-      auth sha256
-      data-ciphers AES-256-CBC
-      key-direction 1
-    '';
-    updateResolvConf = true;
-  };
-
-  # Enable upower service
-  services.upower.enable = true;
-
-  # Set your time zone.
  time.timeZone = "Europe/Warsaw";

-  # Select internationalisation properties.
  i18n.defaultLocale = "en_US.UTF-8";
-  console = {
-    keyMap = "pl";
-  };
-
-  # Enable fish
-  programs.fish.enable = true;
-
-  # Enable greetd with tuigreet
-  services.greetd = {
-    enable = true;
-    settings = {
-      default_session = {
-        command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd niri-session";
-        user = "greeter";
-      };
-    };
-  };
-
-  # Essential for niri
-  security.polkit.enable = true;
-  services.gnome.gnome-keyring.enable = true;
-
-  # XDG Portal for file pickers or screen sharing
-  xdg.portal = {
-    enable = true;
-    extraPortals = [ pkgs.xdg-desktop-portal-gtk
-                     pkgs.xdg-desktop-portal-gnome ];
-    config = {
-      common = {
-        default = [ "gtk" ];
-        "org.freedesktop.impl.portal.ScreenCast" = [ "gnome" ];
-        "org.freedesktop.impl.portal.Screenshot" = [ "gnome" ];
-      };
-    };
-  };
-
-  # Enable dconf
-  programs.dconf.enable = true;
-
-  users.groups.plugdev = {};
-
-  users.users.lusia = {
-    isNormalUser = true;
-    description = "Lukrecja";
-    extraGroups = [ "wheel" "networkmanager" "docker" "plugdev" "scanner" "lp" "wireshark" "libvirtd" "kvm" "vboxusers" "dialout" ];
-    initialPassword = "pass";
-    shell = pkgs.fish;
-  };
-
-  # Import udev rules for probe-rs
-  services.udev.packages = [
-    (pkgs.writeTextFile {
-      name = "probe-rs-udev-rules";
-      destination = "/etc/udev/rules.d/69-probe-rs.rules";
-      text = builtins.readFile ./udev-rules/69-probe-rs.rules;
-    })
-  ];
+  console.keyMap = "pl";

  hardware.enableAllFirmware = true;
-  services.openssh.enable = true;
-  security.sudo.enable = true;
-
-  # Enable virtualisation
-  virtualisation.libvirtd.enable = true;
-
-  # Enable VirtualBox
-  virtualisation.virtualbox.host.enable = true;
-  virtualisation.virtualbox.host.enableExtensionPack = true;
-
-  # Enable xwayland
-  programs.xwayland.enable = true;
-
-  # Set a session variable for icon theme
-  environment.sessionVariables = rec {
-    QT_QPA_PLATFORMTHEME = "qt5ct";
-  };
-
-  environment.systemPackages = with pkgs; [
-    git
-    curl
-    wget
-    vim
-    fish
-    kitty
-    #asusctl
-    powertop  # For monitoring power consumption
-    openvpn
-    nodejs
-    gnumake
-    gcc
-    cmake
-    xwayland-satellite
-    busybox
-    libdecor
-    file
-    cifs-utils
-    samba
-    gvfs
-  ];
-
-  # Enable Wireshark with proper groups
-  programs.wireshark.enable = true;
-  programs.wireshark.package = pkgs.wireshark;
-
-  # Fonts
-  fonts.packages = with pkgs; [
-    noto-fonts
-    noto-fonts-cjk-sans
-    noto-fonts-color-emoji
-    pkgs.nerd-fonts.fira-code
-  ];
-
-  # For SMB shares
-  services.gvfs.enable = true;
-
-  # Printers
-  services.avahi = {
-    enable = true;
-    nssmdns4 = true;
-    openFirewall = true;
-  };
-
-  services.printing = {
-    enable = true;
-    drivers = with pkgs; [
-      cups-filters
-      cups-browsed
-    ];
-  };
-
-  # Enable Flatpaks
-  services.flatpak.enable = true;
-
-  # Enable Docker
-  virtualisation.docker.enable = true;
-
  nixpkgs.config.allowUnfree = true;
  nix.settings.experimental-features = [ "nix-command" "flakes" ];

-  # Enable Bluetooth (but it will be blocked by default to save power)
-  hardware.bluetooth.enable = true;
-  hardware.bluetooth.powerOnBoot = false;  # Don't power on bluetooth at boot
-
-  hardware.sane.enable = true;
-
-  # Configure epsonds for network scanning
-  environment.etc."sane.d/epsonds.conf".text = ''
-    net EPSOND80395.local
-  '';
- 
-  # Enable OpenTabletDriver
-  hardware.opentabletdriver.enable = true;
-  hardware.uinput.enable = true;
-
-  # Enable kernel modules
-  boot.kernelModules = [ "uinput" "usbmon" "kvm-amd" ];
-
-  # Enable PPD for power options
-  services.power-profiles-daemon.enable = true;
-
-  # Enable AMD GPU graphics acceleration
-  hardware.graphics = {
-    enable = true;
-    enable32Bit = true;  # For 32-bit applications/games
-  };
-
-  # Enable RTL-SDL module
-  hardware.rtl-sdr.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # Copy the NixOS configuration file and link it from the resulting system
-  # (/run/current-system/configuration.nix). This is useful in case you
-  # accidentally delete configuration.nix.
-  # system.copySystemConfiguration = true;
-
-  # This option defines the first version of NixOS you have installed on this particular machine,
-  # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
-  #
-  # Most users should NEVER change this value after the initial install, for any reason,
-  # even if you've upgraded your system to a new NixOS release.
-  #
-  # This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
-  # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
-  # to actually do that.
-  #
-  # This value being lower than the current NixOS release does NOT mean your system is
-  # out of date, out of support, or vulnerable.
-  #
-  # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
-  # and migrated your data accordingly.
-  #
-  # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
-  system.stateVersion = "24.11"; # Did you read the comment?
-
+  system.stateVersion = "24.11";
 }
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -1,45 +1,12 @@
 {
  "nodes": {
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1773093840,
-        "narHash": "sha256-u/96NoAyN8BSRuM3ZimGf7vyYgXa3pLx4MYWjokuoH4=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "bb014746edb2a98d975abde4dd40fa240de4cf86",
-        "type": "github"
-      },
-      "original": {
-        "id": "home-manager",
-        "type": "indirect"
-      }
-    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1772773019,
-        "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "aca4d95fce4914b3892661bcb80b8087293536c6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1772963539,
-        "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
+        "lastModified": 1773389992,
+        "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
+        "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda",
        "type": "github"
      },
      "original": {
@@ -51,8 +18,7 @@
    },
    "root": {
      "inputs": {
-        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
      }
    }
  },
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -5,14 +5,10 @@
    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
  };

-  outputs = inputs@{ nixpkgs, home-manager, ... }: {
-    nixosConfigurations = {
-      lusia-laptop = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          ./configuration.nix
-        ];
-      };
+  outputs = inputs: {
+    nixosConfigurations.lusia-laptop = inputs.nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      modules = [ ./configuration.nix ];
    };
-  };  
+  };
 }
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -1,13 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  home.username = "lusia";
-  home.homeDirectory = "/home/lusia";
-  home.stateVersion = "24.11";
-
-  programs.kitty = {
-    enable = true;
-  };
-
-  programs.home-manager.enable = true;
-}
--- a/nixos/modules/boot/bootloader.nix
+++ b/nixos/modules/boot/bootloader.nix
@@ -0,0 +1,11 @@
+{ ... }:
+
+{
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.resumeDevice = "/dev/mapper/luksroot";
+  boot.consoleLogLevel = 3;
+  boot.initrd.systemd.enable = true;
+  boot.initrd.verbose = false;
+  boot.loader.timeout = 0;
+}
--- a/nixos/modules/boot/kernel.nix
+++ b/nixos/modules/boot/kernel.nix
@@ -0,0 +1,29 @@
+{ ... }:
+
+{
+  boot.extraModprobeConfig = ''
+    options mt7921_common disable_clc=1
+    options atkbd reset=1 softrepeat=1
+    options i8042 nomux=1 reset=1 nopnp=1 kbdreset=1 direct=1 dumbkbd=1
+  '';
+
+  boot.kernelParams = [
+    # CRITICAL FIX: Disable ACPI for i8042 (ASUS BIOS bug workaround)
+    "i8042.noacpi"
+    "i8042.reset=1"
+    "i8042.nomux=1"
+    "i8042.nopnp=1"
+    "atkbd.softrepeat=1"
+    # AMD P-State driver for better power management
+    "amd_pstate=active"
+    "amd_pstate.shared_mem=1"
+    # GPU
+    "amdgpu.gpu_recovery=1"
+    "amdgpu.runpm=0"
+    "quiet"
+    "udev.log_level=3"
+    "systemd.show_status=auto"
+  ];
+
+  boot.kernelModules = [ "usbmon" ];
+}
--- a/nixos/modules/boot/plymouth.nix
+++ b/nixos/modules/boot/plymouth.nix
@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  boot.plymouth = {
+    enable = true;
+    theme = "bgrt";
+  };
+}
--- a/nixos/modules/boot/tpm.nix
+++ b/nixos/modules/boot/tpm.nix
@@ -0,0 +1,6 @@
+{ ... }:
+
+{
+  systemd.tpm2.enable = false;
+  boot.initrd.systemd.tpm2.enable = false;
+}
--- a/nixos/modules/desktop/fonts.nix
+++ b/nixos/modules/desktop/fonts.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+{
+  fonts.packages = with pkgs; [
+    noto-fonts
+    noto-fonts-cjk-sans
+    noto-fonts-color-emoji
+    nerd-fonts.fira-code
+  ];
+}
--- a/nixos/modules/desktop/greetd.nix
+++ b/nixos/modules/desktop/greetd.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+{
+  services.greetd = {
+    enable = true;
+    settings = {
+      default_session = {
+        command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd niri-session";
+        user = "greeter";
+      };
+    };
+  };
+}
--- a/nixos/modules/desktop/xdg.nix
+++ b/nixos/modules/desktop/xdg.nix
@@ -0,0 +1,22 @@
+{ pkgs, ... }:
+
+{
+  security.polkit.enable = true;
+  services.gnome.gnome-keyring.enable = true;
+  programs.dconf.enable = true;
+
+  xdg.portal = {
+    enable = true;
+    extraPortals = [
+      pkgs.xdg-desktop-portal-gtk
+      pkgs.xdg-desktop-portal-gnome
+    ];
+    config = {
+      common = {
+        default = [ "gtk" ];
+        "org.freedesktop.impl.portal.ScreenCast" = [ "gnome" ];
+        "org.freedesktop.impl.portal.Screenshot" = [ "gnome" ];
+      };
+    };
+  };
+}
--- a/nixos/modules/desktop/xwayland.nix
+++ b/nixos/modules/desktop/xwayland.nix
@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+  programs.xwayland.enable = true;
+
+  environment.sessionVariables = {
+    QT_QPA_PLATFORMTHEME = "qt5ct";
+  };
+}
--- a/nixos/modules/filesystems.nix
+++ b/nixos/modules/filesystems.nix
@@ -0,0 +1,27 @@
+{ ... }:
+
+{
+  fileSystems."/" = {
+    options = [ "subvol=@" "compress=zstd" "space_cache=v2" "noatime" "lazytime" "ssd" "discard=async" ];
+  };
+
+  fileSystems."/home" = {
+    options = [ "subvol=@home" "compress=zstd" "space_cache=v2" "noatime" "lazytime" "ssd" "discard=async" ];
+  };
+
+  fileSystems."/var/log" = {
+    options = [ "subvol=@log" "compress=zstd" "space_cache=v2" "noatime" "lazytime" "ssd" "discard=async" ];
+  };
+
+  fileSystems."/swap" = {
+    options = [ "subvol=@swap" "noatime" "ssd" "discard=async" ];
+  };
+
+  swapDevices = [{ device = "/swap/swapfile"; }];
+
+  boot.kernel.sysctl = {
+    "vm.dirty_ratio" = 10;
+    "vm.dirty_background_ratio" = 5;
+    "vm.swappiness" = 10;
+  };
+}
--- a/nixos/modules/hardware/bluetooth.nix
+++ b/nixos/modules/hardware/bluetooth.nix
@@ -0,0 +1,6 @@
+{ ... }:
+
+{
+  hardware.bluetooth.enable = true;
+  hardware.bluetooth.powerOnBoot = false;
+}
--- a/nixos/modules/hardware/gpu.nix
+++ b/nixos/modules/hardware/gpu.nix
@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
+  };
+}
--- a/nixos/modules/hardware/power.nix
+++ b/nixos/modules/hardware/power.nix
@@ -0,0 +1,6 @@
+{ ... }:
+
+{
+  services.upower.enable = true;
+  services.power-profiles-daemon.enable = true;
+}
--- a/nixos/modules/hardware/rtl-sdr.nix
+++ b/nixos/modules/hardware/rtl-sdr.nix
@@ -0,0 +1,11 @@
+{ ... }:
+
+{
+  hardware.rtl-sdr.enable = true;
+
+  boot.blacklistedKernelModules = [
+    "dvb_usb_rtl28xxu"
+    "rtl2832"
+    "rtl2830"
+  ];
+}
--- a/nixos/modules/hardware/scanner.nix
+++ b/nixos/modules/hardware/scanner.nix
@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+  hardware.sane.enable = true;
+
+  environment.etc."sane.d/epsonds.conf".text = ''
+    net EPSOND80395.local
+  '';
+}
--- a/nixos/modules/hardware/tablet.nix
+++ b/nixos/modules/hardware/tablet.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  hardware.opentabletdriver.enable = true;
+  hardware.uinput.enable = true;
+  boot.kernelModules = [ "uinput" ];
+}
--- a/nixos/modules/hardware/udev.nix
+++ b/nixos/modules/hardware/udev.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{
+  services.udev.packages = [
+    (pkgs.writeTextFile {
+      name = "probe-rs-udev-rules";
+      destination = "/etc/udev/rules.d/69-probe-rs.rules";
+      text = builtins.readFile ../../udev-rules/69-probe-rs.rules;
+    })
+  ];
+}
--- a/nixos/modules/networking/general.nix
+++ b/nixos/modules/networking/general.nix
@@ -0,0 +1,11 @@
+{ ... }:
+
+{
+  networking.hostName = "lusia-laptop";
+  networking.networkmanager.enable = true;
+  networking.networkmanager.wifi.powersave = true;
+
+  networking.nameservers = [ "9.9.9.9" ];
+
+  services.resolved.enable = true;
+}
--- a/nixos/modules/networking/tailscale.nix
+++ b/nixos/modules/networking/tailscale.nix
@@ -0,0 +1,11 @@
+{ ... }:
+
+{
+  services.tailscale.enable = true;
+
+  networking.firewall.trustedInterfaces = [ "tailscale0" ];
+
+  boot.kernel.sysctl = {
+    "net.ipv4.conf.tailscale0.rp_filter" = 0;
+  };
+}
--- a/nixos/modules/networking/vpn.nix
+++ b/nixos/modules/networking/vpn.nix
@@ -0,0 +1,55 @@
+{ pkgs, ... }:
+
+{
+  # VSTech VPN (with DNS for bgs.local domain)
+  services.openvpn.servers.vstech = {
+    config = ''
+      client
+      remote 51.83.143.81
+      proto udp
+      port 649
+      dev tun
+      topology subnet
+      ca /home/lusia/VSTech-vpn/ca.crt
+      cert /home/lusia/VSTech-vpn/Klient251.crt
+      key /home/lusia/VSTech-vpn/Klient251.inline
+      tls-crypt /home/lusia/VSTech-vpn/ta.key
+
+      auth sha512
+      data-ciphers aes-256-cbc
+      data-ciphers-fallback aes-256-cbc
+      key-direction 1
+      keepalive 10 120
+    '';
+    updateResolvConf = false;
+
+    up = ''
+      ${pkgs.systemd}/bin/resolvectl dns $dev 10.10.10.1
+      ${pkgs.systemd}/bin/resolvectl domain $dev bgs.local
+    '';
+
+    down = ''
+      ${pkgs.systemd}/bin/resolvectl revert $dev
+    '';
+  };
+
+  # CAT VPN
+  services.openvpn.servers.cat = {
+    config = ''
+      client
+      remote 79.133.193.211
+      proto tcp
+      port 1194
+      dev tun
+      topology subnet
+      ca /home/lusia/vpn/ca.crt
+      cert /home/lusia/vpn/client18.crt
+      key /home/lusia/vpn/client18.key
+
+      auth sha256
+      data-ciphers AES-256-CBC
+      key-direction 1
+    '';
+    updateResolvConf = true;
+  };
+}
--- a/nixos/modules/packages.nix
+++ b/nixos/modules/packages.nix
@@ -0,0 +1,25 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    git
+    curl
+    wget
+    vim
+    fish
+    kitty
+    powertop
+    openvpn
+    nodejs
+    gnumake
+    gcc
+    cmake
+    xwayland-satellite
+    busybox
+    libdecor
+    file
+    cifs-utils
+    samba
+    gvfs
+  ];
+}
--- a/nixos/modules/services/flatpak.nix
+++ b/nixos/modules/services/flatpak.nix
@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  services.flatpak.enable = true;
+}
--- a/nixos/modules/services/printing.nix
+++ b/nixos/modules/services/printing.nix
@@ -0,0 +1,17 @@
+{ pkgs, ... }:
+
+{
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    openFirewall = true;
+  };
+
+  services.printing = {
+    enable = true;
+    drivers = with pkgs; [
+      cups-filters
+      cups-browsed
+    ];
+  };
+}
--- a/nixos/modules/services/smb.nix
+++ b/nixos/modules/services/smb.nix
@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  services.gvfs.enable = true;
+}
--- a/nixos/modules/services/ssh.nix
+++ b/nixos/modules/services/ssh.nix
@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  services.openssh.enable = true;
+}
--- a/nixos/modules/users.nix
+++ b/nixos/modules/users.nix
@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+
+{
+  users.groups.plugdev = {};
+
+  users.users.lusia = {
+    isNormalUser = true;
+    description = "Lukrecja";
+    extraGroups = [ "wheel" "networkmanager" "docker" "plugdev" "scanner" "lp" "wireshark" "libvirtd" "kvm" "vboxusers" "dialout" ];
+    initialPassword = "pass";
+    shell = pkgs.fish;
+  };
+
+  programs.fish.enable = true;
+  security.sudo.enable = true;
+}
--- a/nixos/modules/virtualization.nix
+++ b/nixos/modules/virtualization.nix
@@ -0,0 +1,12 @@
+{ ... }:
+
+{
+  virtualisation.libvirtd.enable = true;
+
+  virtualisation.virtualbox.host.enable = true;
+  virtualisation.virtualbox.host.enableExtensionPack = true;
+
+  virtualisation.docker.enable = true;
+
+  boot.kernelModules = [ "kvm-amd" ];
+}
--- a/nixos/modules/wireshark.nix
+++ b/nixos/modules/wireshark.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+
+{
+  programs.wireshark.enable = true;
+  programs.wireshark.package = pkgs.wireshark;
+}
--- a/noctalia/settings.json
+++ b/noctalia/settings.json
@@ -8,7 +8,9 @@
        "customLaunchPrefixEnabled": false,
        "density": "default",
        "enableClipPreview": true,
+        "enableClipboardChips": true,
        "enableClipboardHistory": false,
+        "enableClipboardSmartIcons": true,
        "enableSessionSearch": true,
        "enableSettingsSearch": true,
        "enableWindowsSearch": true,
@@ -23,7 +25,6 @@
        "showIconBackground": true,
        "sortByMostUsed": true,
        "terminalCommand": "kitty -e",
-        "useApp2Unit": false,
        "viewMode": "list"
    },
    "audio": {
@@ -47,6 +48,7 @@
        "contentPadding": 2,
        "density": "default",
        "displayMode": "always_visible",
+        "enableExclusionZoneInset": true,
        "floating": true,
        "fontScale": 1,
        "frameRadius": 12,
@@ -276,6 +278,7 @@
    "desktopWidgets": {
        "enabled": false,
        "gridSnap": false,
+        "gridSnapScale": false,
        "monitorWidgets": [
            {
                "name": "eDP-1",
@@ -560,7 +563,7 @@
        "showHeader": true,
        "showKeybinds": true
    },
-    "settingsVersion": 57,
+    "settingsVersion": 58,
    "systemMonitor": {
        "batteryCriticalThreshold": 5,
        "batteryWarningThreshold": 20,
@@ -600,7 +603,8 @@
        "scrollbarAlwaysVisible": true,
        "settingsPanelMode": "centered",
        "settingsPanelSideBarCardStyle": false,
-        "tooltipsEnabled": true
+        "tooltipsEnabled": true,
+        "translucentWidgets": false
    },
    "wallpaper": {
        "automationEnabled": false,
Author	SHA1	Message	Date
Lukrecja Pleskaczyńska	cc938db477	use hyprlock as lockscreen	2026-03-14 22:06:39 +01:00
Lukrecja Pleskaczyńska	b372f990c3	hm update	2026-03-14 16:53:49 +01:00
Lukrecja Pleskaczyńska	5c02123317	os update	2026-03-14 16:42:09 +01:00
Lukrecja Pleskaczyńska	fd8cb9c0c8	use plymouth for boot screen	2026-03-14 16:33:42 +01:00
Lukrecja Pleskaczyńska	e58d5a7a18	refactor into modules	2026-03-10 23:22:08 +01:00