diff --git a/hosts/Lenni/default.nix b/hosts/Lenni/default.nix index 9f702a8..9064ff8 100644 --- a/hosts/Lenni/default.nix +++ b/hosts/Lenni/default.nix @@ -2,7 +2,7 @@ { imports = [ ./hardware-configuration.nix - ./disko.nix + #./disko.nix ../../modules/default diff --git a/hosts/Lenni/disko.nix b/hosts/Lenni/disko.nix index 89316a3..e467ba0 100644 --- a/hosts/Lenni/disko.nix +++ b/hosts/Lenni/disko.nix @@ -3,7 +3,7 @@ disk = { nvme0n1 = { type = "disk"; - device = "/dev/disk/by-id/nvme-SHGP31-1000GM_KND1N583310801V1L"; + device = "/dev/nvme0n1"; content = { type = "gpt"; partitions = { @@ -23,7 +23,14 @@ size = "100%"; content = { type = "luks"; - name = "cryptroot"; + name = "crypted"; + # disable settings.keyFile if you want to use interactive password entry + #passwordFile = "/tmp/secret.key"; # Interactive + settings = { + allowDiscards = true; + keyFile = "/tmp/secret.key"; + }; + additionalKeyFiles = [ "/tmp/additionalSecret.key" ]; content = { type = "btrfs"; extraArgs = [ "-f" ]; @@ -46,7 +53,7 @@ }; "/swap" = { mountpoint = "/.swapvol"; - swap.swapfile.size = "40G"; + swap.swapfile.size = "20M"; }; }; }; diff --git a/modules/default/home-manager/desktop/compositors/niri.nix b/modules/default/home-manager/desktop/compositors/niri.nix index 827577c..5b620b8 100644 --- a/modules/default/home-manager/desktop/compositors/niri.nix +++ b/modules/default/home-manager/desktop/compositors/niri.nix @@ -1,10 +1,6 @@ { inputs, lib, config, pkgs, ... }: let SCRIPTS = "$XDG_CONFIG_HOME/desktop-utils/scripts"; - autobrightness = fetchTarball { - url = "https://git.huwe.mooo.com/willifan/Mac-like-automatic-brightness/archive/0.1.0.tar.gz"; - sha256 = "1andyln5vmm934nl1lsid2gpc88h9il83b84yd9dmqr7pninwk37"; - }; in lib.mkIf config.desktop.wm.niri.enable { @@ -18,7 +14,6 @@ lib.mkIf config.desktop.wm.niri.enable { home.packages = [ pkgs.xwayland-satellite - pkgs.bc ]; programs.niri.settings = { @@ -31,9 +26,6 @@ lib.mkIf config.desktop.wm.niri.enable { { command = [ "xwayland-satellite" ":0" ]; } - { - command = [ "sh" "${autobrightness}/AutomaticBrightness.sh" ]; - } ]; hotkey-overlay.skip-at-startup = true; @@ -85,8 +77,8 @@ lib.mkIf config.desktop.wm.niri.enable { "XF86AudioPrev".action.spawn = [ "playerctl" "previous" ]; "XF86AudioPlay".action.spawn = [ "playerctl" "play-pause" ]; "XF86AudioNext".action.spawn = [ "playerctl" "next" ]; - "XF86MonBrightnessDown".action.spawn = [ "sh" "${autobrightness}/AutomaticBrightness.sh" "-d" "10" ]; - "XF86MonBrightnessUp".action.spawn = [ "sh" "${autobrightness}/AutomaticBrightness.sh" "-i" "10" ]; + "XF86MonBrightnessDown".action.spawn = [ "light" "-U" "5" ]; + "XF86MonBrightnessUp".action.spawn = [ "light" "-A" "5" ]; "Print".action.screenshot = { }; }; diff --git a/modules/default/nixos/desktop/dev.nix b/modules/default/nixos/desktop/dev.nix index e1eed14..3c5291d 100644 --- a/modules/default/nixos/desktop/dev.nix +++ b/modules/default/nixos/desktop/dev.nix @@ -4,8 +4,5 @@ lib.mkIf config.desktop.dev.enable { environment.systemPackages = with pkgs; [ jetbrains.rust-rover jetbrains.pycharm-community-bin - clang - clang-tools - gcc ]; }