Compare commits

...

3 Commits

3 changed files with 64 additions and 51 deletions

View File

@ -24,11 +24,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1657362523, "lastModified": 1659725244,
"narHash": "sha256-hoYYqpCKsuHqYwMnK9lcUYHnuf5OaDFPqCt/RavKsRw=", "narHash": "sha256-/oaW2+SP6OfRtbN+wnfL9kr0wnkYKL9Ph7BCpMXHjok=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "e1c34ef6f6eb7d966af5011eeeec6342017cd535", "rev": "9f5f21345981a89c1ddaf13eb2b7b8417c8e1716",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -154,11 +154,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1657241847, "lastModified": 1659484873,
"narHash": "sha256-/aN3p2LaRNVXf7w92GWgXq9H5f23YRQPOvsm3BrBqzU=", "narHash": "sha256-6VoPiGyDdjBHOJ3IpS24lY1lrDiOHeuEefOFI0qz3WE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8160b3b45b8457d58d2b3af2aeb2eb6f47042e0f", "rev": "d8d9ff0b2df77defa10375c6665b51f0251c34d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -304,11 +304,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1656933710, "lastModified": 1659356074,
"narHash": "sha256-SVG8EqY1OTJWBRY4hpct2ZR2Rk0L8hCFkug3m0ABoZE=", "narHash": "sha256-UwV6hZZEtchvtiTCCD/ODEv1226eam8kEgEyQb7xB0E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "3bf48d3587d3f34f745a19ebc968b002ef5b5c5a", "rev": "ea3efc80f8ab83cb73aec39f4e76fe87afb15a08",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -337,8 +337,8 @@
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 0, "lastModified": 0,
"narHash": "sha256-rlmmw6lIlkMQIiB+NsnO8wQYWTfle8TA41UREPLP5VY=", "narHash": "sha256-PUQ9C7mfi0/BnaAUX2R/PIkoNCb/Jtx9EpnhMBNrO/o=",
"path": "/nix/store/8mik2m5inkjin29v5gv5zc2jji4lab3l-source", "path": "/nix/store/xjy7dk6ps8vzlghg3f27mrzp0gpy6vxx-source",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -380,11 +380,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1654230545, "lastModified": 1654953433,
"narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=", "narHash": "sha256-TwEeh4r50NdWHFAHQSyjCk2cZxgwUfcCCAJOhPdXB28=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec", "rev": "90cd5459a1fd707819b9a3fb9c852beaaac3b79a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -396,11 +396,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1657265485, "lastModified": 1659522808,
"narHash": "sha256-PUQ9C7mfi0/BnaAUX2R/PIkoNCb/Jtx9EpnhMBNrO/o=", "narHash": "sha256-HBcM19nGhI3IWwPNVlYb0MZ8VW6iKp4JbAVkeIHVykc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b39924fc7764c08ae3b51beef9a3518c414cdb7d", "rev": "168d1c578909dc143ba52dbed661c36e76b12b36",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -499,11 +499,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1657372868, "lastModified": 1659725711,
"narHash": "sha256-yXzNQRlQMCYJJn4fA+zZNj3W0t9w+WDeCKG7D86YkTE=", "narHash": "sha256-NuGn7APbFomuhacyLAdHnNw4GL9RNTNpYemrT1oF5d4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "38f00cf4ee1dab9c10883b1d464486f0c040bb80", "rev": "9c33c27c4ac86945dbb9864ee3fe9833c15c9707",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -673,11 +673,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1655034179, "lastModified": 1659451223,
"narHash": "sha256-rf1/7AbzuYDw6+8Xvvf3PtEOygymLBrFsFxvext5ZjI=", "narHash": "sha256-PExF4Niw8xYe2tK6qrDtD1ASDoChJfeio99lvGoF8Zo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "046ee4af7a9f016a364f8f78eeaa356ba524ac31", "rev": "7ca652795e39b1c61250546492e4f417185246cb",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -149,14 +149,18 @@
"kvm.report_ignored_msrs=N" "kvm.report_ignored_msrs=N"
"fbcon=rotate:3" "fbcon=rotate:3"
"quiet" "quiet"
"nopti"
"nospectre_v2"
"nospec"
"clocksource=tsc" "clocksource=tsc"
"tsc=reliable" "tsc=reliable"
"pci=noaer" "pci=noaer"
# Disable mitigations
"mitigations=off"
"rhgb"
# Enable ZSwap
"zswap.enabled=1"
# Enable Apparmor # Enable Apparmor
"lsm=landlock,lockdown,yama,integrity,apparmor,bpf" "lsm=landlock,lockdown,yama,integrity,apparmor,bpf"
# Prevent sequential probing
"libahci.ignore_sss=1"
]; ];
kernel.sysctl = { kernel.sysctl = {
# League of Legends under Linux # League of Legends under Linux

View File

@ -146,31 +146,40 @@ in {
extraPortals = [ pkgs.xdg-desktop-portal-kde ]; extraPortals = [ pkgs.xdg-desktop-portal-kde ];
}; };
environment.systemPackages = let environment = {
plasmaMobilePackages = with pkgs.libsForQt5; with plasma5; with kdeApplications; with kdeFrameworks; [ systemPackages = let
plasma-mobile plasmaMobilePackages = with pkgs.libsForQt5; with plasma5; with kdeApplications; with kdeFrameworks; [
plasma-nano plasma-mobile
pkgs.maliit-framework plasma-nano
pkgs.maliit-keyboard pkgs.maliit-framework
]; pkgs.maliit-keyboard
kdePackages = with pkgs.libsForQt5; [ ];
okular kdePackages = with pkgs.libsForQt5; [
kdeconnect-kde okular
breeze-gtk kdeconnect-kde
bismuth breeze-gtk
gwenview bismuth
yakuake gwenview
] ++ lib.optionals cfg.mobile.enable plasmaMobilePackages; yakuake
packages = with pkgs; [ ] ++ lib.optionals cfg.mobile.enable plasmaMobilePackages;
index-fm packages = with pkgs; [
rsibreak index-fm
kalendar rsibreak
kate kalendar
okular kate
okular
# Some Gnome software # Some Gnome software
gnome.totem gnome.totem
]; ];
in kdePackages ++ packages; in kdePackages ++ packages;
sessionVariables = let
askPass = "${pkgs.libsForQt5.ksshaskpass}/bin/ksshaskpass";
in {
SSH_ASKPASS = askPass;
SSH_ASKPASS_REQUIRE = "prefer";
GIT_ASKPASS = askPass;
};
};
}; };
} }