diff --git a/.sops.yaml b/.sops.yaml index 9c73342..5cb0661 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -21,7 +21,7 @@ creation_rules: - *nixos-virtualbox - *nixos-vm - *thinkpad - - path_regex: secrets-desktop.y`aml$ + - path_regex: secrets-desktop.yaml$ key_groups: - age: - *alex diff --git a/configs/filesystem.nix b/configs/filesystem.nix index ec5b9be..d8488eb 100644 --- a/configs/filesystem.nix +++ b/configs/filesystem.nix @@ -62,4 +62,4 @@ options = ["fmask=0022" "dmask=0022"]; }; }; -}; \ No newline at end of file +} diff --git a/configs/plasma.nix b/configs/plasma.nix index 66accec..a69d467 100644 --- a/configs/plasma.nix +++ b/configs/plasma.nix @@ -52,7 +52,7 @@ kdiskmark maliit-keyboard - deskflow + # deskflow ]; persistence."/persist" = { diff --git a/configs/user.nix b/configs/user.nix index 801b1db..20b89e4 100644 --- a/configs/user.nix +++ b/configs/user.nix @@ -90,13 +90,15 @@ in { serverAliveInterval = 60; forwardAgent = true; - matchBlocks."szczepan.ski" = {hostname = "szczepan.ski";}; - matchBlocks."mini" = {hostname = "mini";}; - matchBlocks."desktop" = {hostname = "desktop";}; - matchBlocks."framework" = {hostname = "framework";}; - matchBlocks."nixos-vm" = { - hostname = "127.0.0.1"; - port = 1337; + matchBlocks = { + "szczepan.ski" = {hostname = "szczepan.ski";}; + "mini" = {hostname = "mini";}; + "desktop" = {hostname = "desktop";}; + "framework" = {hostname = "framework";}; + "nixos-vm" = { + hostname = "127.0.0.1"; + port = 1337; + }; }; }; diff --git a/machine/desktop/configuration.nix b/machine/desktop/configuration.nix index d962e2f..9711458 100644 --- a/machine/desktop/configuration.nix +++ b/machine/desktop/configuration.nix @@ -46,7 +46,6 @@ in { "big-parallel" "kvm" "gccarch-znver3" - # "gccarch-x86-64-v3" ]; max-jobs = 4; @@ -66,7 +65,6 @@ in { kernelParams = ["clearcpuid=514" "ip=dhcp"]; kernelModules = ["nct6775"]; kernel.sysctl = { - "vm.max_map_count" = 262144; "vm.nr_hugepages" = 1280; }; extraModulePackages = with pkgs.linuxPackages_cachyos; [ryzen-smu]; @@ -74,7 +72,7 @@ in { availableKernelModules = ["r8169"]; systemd.users.root.shell = "/bin/cryptsetup-askpass"; network = { - enable = true;z + enable = true; ssh = { enable = true; port = 22; @@ -166,8 +164,6 @@ in { # cpu.x86.msr = { # enable = true; # }; - - pulseaudio.enable = false; }; # powerManagement = {