Compare commits

..

No commits in common. "f6ec76d301ba319d3e05a80e773a20c0890a5cdf" and "d4bcb07147cebd862c1f301b64de0ee9b99c5062" have entirely different histories.

4 changed files with 13 additions and 17 deletions

View file

@ -2,7 +2,7 @@
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./disko.nix #./disko.nix
../../modules/default ../../modules/default

View file

@ -3,7 +3,7 @@
disk = { disk = {
nvme0n1 = { nvme0n1 = {
type = "disk"; type = "disk";
device = "/dev/disk/by-id/nvme-SHGP31-1000GM_KND1N583310801V1L"; device = "/dev/nvme0n1";
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {
@ -23,7 +23,14 @@
size = "100%"; size = "100%";
content = { content = {
type = "luks"; 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 = { content = {
type = "btrfs"; type = "btrfs";
extraArgs = [ "-f" ]; extraArgs = [ "-f" ];
@ -46,7 +53,7 @@
}; };
"/swap" = { "/swap" = {
mountpoint = "/.swapvol"; mountpoint = "/.swapvol";
swap.swapfile.size = "40G"; swap.swapfile.size = "20M";
}; };
}; };
}; };

View file

@ -1,10 +1,6 @@
{ inputs, lib, config, pkgs, ... }: { inputs, lib, config, pkgs, ... }:
let let
SCRIPTS = "$XDG_CONFIG_HOME/desktop-utils/scripts"; 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 in
lib.mkIf config.desktop.wm.niri.enable { lib.mkIf config.desktop.wm.niri.enable {
@ -18,7 +14,6 @@ lib.mkIf config.desktop.wm.niri.enable {
home.packages = [ home.packages = [
pkgs.xwayland-satellite pkgs.xwayland-satellite
pkgs.bc
]; ];
programs.niri.settings = { programs.niri.settings = {
@ -31,9 +26,6 @@ lib.mkIf config.desktop.wm.niri.enable {
{ {
command = [ "xwayland-satellite" ":0" ]; command = [ "xwayland-satellite" ":0" ];
} }
{
command = [ "sh" "${autobrightness}/AutomaticBrightness.sh" ];
}
]; ];
hotkey-overlay.skip-at-startup = true; hotkey-overlay.skip-at-startup = true;
@ -85,8 +77,8 @@ lib.mkIf config.desktop.wm.niri.enable {
"XF86AudioPrev".action.spawn = [ "playerctl" "previous" ]; "XF86AudioPrev".action.spawn = [ "playerctl" "previous" ];
"XF86AudioPlay".action.spawn = [ "playerctl" "play-pause" ]; "XF86AudioPlay".action.spawn = [ "playerctl" "play-pause" ];
"XF86AudioNext".action.spawn = [ "playerctl" "next" ]; "XF86AudioNext".action.spawn = [ "playerctl" "next" ];
"XF86MonBrightnessDown".action.spawn = [ "sh" "${autobrightness}/AutomaticBrightness.sh" "-d" "10" ]; "XF86MonBrightnessDown".action.spawn = [ "light" "-U" "5" ];
"XF86MonBrightnessUp".action.spawn = [ "sh" "${autobrightness}/AutomaticBrightness.sh" "-i" "10" ]; "XF86MonBrightnessUp".action.spawn = [ "light" "-A" "5" ];
"Print".action.screenshot = { }; "Print".action.screenshot = { };
}; };

View file

@ -4,8 +4,5 @@ lib.mkIf config.desktop.dev.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
jetbrains.rust-rover jetbrains.rust-rover
jetbrains.pycharm-community-bin jetbrains.pycharm-community-bin
clang
clang-tools
gcc
]; ];
} }