From 0fded27ad57e0a33c5df3699deb7552a00bfed39 Mon Sep 17 00:00:00 2001 From: fwastring Date: Sun, 14 Dec 2025 16:04:21 +0100 Subject: [PATCH] laptop --- flake.nix | 8 ++++---- maskiner/{legacy => laptop}/configuration.nix | 0 maskiner/laptop/hardware-configuration.nix | 18 ++++++++++++++++++ .../legacy-disk.nix => laptop/laptop-disk.nix} | 0 maskiner/legacy/hardware-configuration.nix | 4 ++-- moduler/programs/hyprland/default.nix | 10 +++++++--- 6 files changed, 31 insertions(+), 9 deletions(-) rename maskiner/{legacy => laptop}/configuration.nix (100%) create mode 100644 maskiner/laptop/hardware-configuration.nix rename maskiner/{legacy/legacy-disk.nix => laptop/laptop-disk.nix} (100%) diff --git a/flake.nix b/flake.nix index 561d6e8..82ba93f 100644 --- a/flake.nix +++ b/flake.nix @@ -54,14 +54,14 @@ in { nixosConfigurations = { - legacy = nixpkgs.lib.nixosSystem { + laptop = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs; - myhostname = "legacy"; + myhostname = "laptop"; }; modules = [ - ./maskiner/legacy/configuration.nix - ./maskiner/legacy/legacy-disk.nix + ./maskiner/laptop/configuration.nix + ./maskiner/laptop/laptop-disk.nix stylix.nixosModules.stylix home-manager.nixosModules.home-manager sops-nix.nixosModules.sops diff --git a/maskiner/legacy/configuration.nix b/maskiner/laptop/configuration.nix similarity index 100% rename from maskiner/legacy/configuration.nix rename to maskiner/laptop/configuration.nix diff --git a/maskiner/laptop/hardware-configuration.nix b/maskiner/laptop/hardware-configuration.nix new file mode 100644 index 0000000..e41d1fc --- /dev/null +++ b/maskiner/laptop/hardware-configuration.nix @@ -0,0 +1,18 @@ +# 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, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/maskiner/legacy/legacy-disk.nix b/maskiner/laptop/laptop-disk.nix similarity index 100% rename from maskiner/legacy/legacy-disk.nix rename to maskiner/laptop/laptop-disk.nix diff --git a/maskiner/legacy/hardware-configuration.nix b/maskiner/legacy/hardware-configuration.nix index e41d1fc..3870e49 100644 --- a/maskiner/legacy/hardware-configuration.nix +++ b/maskiner/legacy/hardware-configuration.nix @@ -8,9 +8,9 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; + boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/moduler/programs/hyprland/default.nix b/moduler/programs/hyprland/default.nix index 47c5d50..2b4fd2f 100644 --- a/moduler/programs/hyprland/default.nix +++ b/moduler/programs/hyprland/default.nix @@ -140,8 +140,10 @@ with lib; }; general = { - gaps_in = 7; - gaps_out = 14; + # gaps_in = 7; + # gaps_out = 14; + gaps_in = 0; + gaps_out = 0; border_size = 1; layout = "dwindle"; allow_tearing = true; @@ -162,7 +164,8 @@ with lib; }; decoration = { - rounding = 10; + # rounding = 10; + rounding = 0; active_opacity = 0.9; inactive_opacity = 0.8; fullscreen_opacity = 0.9; @@ -244,6 +247,7 @@ with lib; "$mod, u, focusurgentorlast" "$mod, tab, focuscurrentorlast" "$mod, f, fullscreen" + "$mod, b, exec, pkill -USR1 waybar" # Screen resize "$mod CTRL, h, resizeactive, -20 0"