From 0afa535473a27903a154fa2fd438c27fc2b1567d Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Tue, 26 Mar 2024 22:24:51 +0800 Subject: [PATCH] flake: use nixos-sensible --- flake.lock | 16 ++++++++++++++++ flake.nix | 3 +++ hosts/aristotle/default.nix | 1 - hosts/aristotle/hardware-configuration.nix | 1 + hosts/blacksteel/default.nix | 1 - hosts/blacksteel/hardware-configuration.nix | 1 + nixos/profiles/common/core/default.nix | 14 +------------- nixos/profiles/common/core/nix/flake.nix | 3 +-- nixos/profiles/common/opt-in/zram-generator.nix | 17 ----------------- 9 files changed, 23 insertions(+), 34 deletions(-) delete mode 100644 nixos/profiles/common/opt-in/zram-generator.nix diff --git a/flake.lock b/flake.lock index c1c36fe..99e6edd 100755 --- a/flake.lock +++ b/flake.lock @@ -378,6 +378,21 @@ "type": "github" } }, + "nixos-sensible": { + "locked": { + "lastModified": 1711449784, + "narHash": "sha256-DEMOWReMJ3gCi/0czu9hCJH716dmofhtDc2FWfbB0ew=", + "owner": "Guanran928", + "repo": "nixos-sensible", + "rev": "f278a4775e668760a6f2da5f9de6bc512f507871", + "type": "github" + }, + "original": { + "owner": "Guanran928", + "repo": "nixos-sensible", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1711106783, @@ -557,6 +572,7 @@ "nix-on-droid": "nix-on-droid", "nixcasks": "nixcasks", "nixos-hardware": "nixos-hardware", + "nixos-sensible": "nixos-sensible", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", "nmd": "nmd", diff --git a/flake.nix b/flake.nix index 930fa2d..b4dbf94 100755 --- a/flake.nix +++ b/flake.nix @@ -59,6 +59,9 @@ nixos-hardware = { url = "github:NixOS/nixos-hardware"; }; + nixos-sensible = { + url = "github:Guanran928/nixos-sensible"; + }; nix-on-droid = { url = "github:nix-community/nix-on-droid/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/aristotle/default.nix b/hosts/aristotle/default.nix index 39d5156..364cd28 100644 --- a/hosts/aristotle/default.nix +++ b/hosts/aristotle/default.nix @@ -2,7 +2,6 @@ imports = [ # OS ../../nixos/profiles/laptop - ../../nixos/profiles/common/opt-in/zram-generator.nix ../../nixos/profiles/common/opt-in/clash-meta-client ../../nixos/profiles/common/opt-in/gaming diff --git a/hosts/aristotle/hardware-configuration.nix b/hosts/aristotle/hardware-configuration.nix index ecd6394..2b32bb7 100644 --- a/hosts/aristotle/hardware-configuration.nix +++ b/hosts/aristotle/hardware-configuration.nix @@ -2,6 +2,7 @@ imports = [ inputs.nixpkgs.nixosModules.notDetected inputs.nixos-hardware.nixosModules.lenovo-legion-y530-15ich + inputs.nixos-sensible.nixosModules.zram ]; services.hdapsd.enable = false; diff --git a/hosts/blacksteel/default.nix b/hosts/blacksteel/default.nix index b0d9172..98b092c 100644 --- a/hosts/blacksteel/default.nix +++ b/hosts/blacksteel/default.nix @@ -6,7 +6,6 @@ imports = [ # OS ../../nixos/profiles/laptop - ../../nixos/profiles/common/opt-in/zram-generator.nix ../../nixos/profiles/common/opt-in/clash-meta-client # Hardware diff --git a/hosts/blacksteel/hardware-configuration.nix b/hosts/blacksteel/hardware-configuration.nix index 6e43adf..f530974 100644 --- a/hosts/blacksteel/hardware-configuration.nix +++ b/hosts/blacksteel/hardware-configuration.nix @@ -12,6 +12,7 @@ inputs.nixos-hardware.nixosModules.common-hidpi inputs.nixos-hardware.nixosModules.common-pc-laptop inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd + inputs.nixos-sensible.nixosModules.zram ]; myFlake.hardware.components = { diff --git a/nixos/profiles/common/core/default.nix b/nixos/profiles/common/core/default.nix index f0d951e..a068da4 100644 --- a/nixos/profiles/common/core/default.nix +++ b/nixos/profiles/common/core/default.nix @@ -19,6 +19,7 @@ inputs.nur.nixosModules.nur inputs.self.nixosModules.default inputs.sops-nix.nixosModules.sops + inputs.nixos-sensible.nixosModules.default ]; nixpkgs.overlays = [ @@ -30,7 +31,6 @@ ### home-manager home-manager.users.guanranwang = import ../../../../home; - users.mutableUsers = false; home-manager = { useGlobalPkgs = true; useUserPackages = true; @@ -38,7 +38,6 @@ }; ### Boot - boot.initrd.systemd.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.loader.systemd-boot.enable = lib.mkDefault true; # mkDefault for Lanzaboote boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_zen; # mkDefault for server @@ -61,14 +60,6 @@ usbutils ]; - programs.nano.enable = false; - programs.neovim = { - enable = true; - viAlias = true; - vimAlias = true; - defaultEditor = true; # important! - }; - services.openssh = { enable = true; settings.PermitRootLogin = "no"; @@ -85,9 +76,6 @@ "[ 5.996722] amdgpu 0000:67:00.0: Fatal error during GPU init"} ''; - # https://archlinux.org/news/making-dbus-broker-our-default-d-bus-daemon/ - services.dbus.implementation = "broker"; - ### WORKAROUND: Use NVIDIA beta version 550.40.07 due to performance issues introduced in version 545.29.06, # this shouldn't affect non-nvidia machines. hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta; diff --git a/nixos/profiles/common/core/nix/flake.nix b/nixos/profiles/common/core/nix/flake.nix index 8feab2a..eafaa5d 100755 --- a/nixos/profiles/common/core/nix/flake.nix +++ b/nixos/profiles/common/core/nix/flake.nix @@ -1,3 +1,4 @@ +# ref: https://github.com/Misterio77/nix-config/blob/main/hosts/common/global/nix.nix { pkgs, inputs, @@ -11,12 +12,10 @@ nix.channel.enable = false; # Disable flake-registry - # https://nixos-and-flakes.thiscute.world/best-practices/nix-path-and-flake-registry nix.settings.flake-registry = ""; # Add each flake input as a registry # To make nix3 commands consistent with the flake - # https://github.com/Misterio77/nix-config/blob/main/hosts/common/global/nix.nix nix.registry = lib.mapAttrs (_: value: {flake = value;}) inputs; # Install Git diff --git a/nixos/profiles/common/opt-in/zram-generator.nix b/nixos/profiles/common/opt-in/zram-generator.nix deleted file mode 100644 index 14425f6..0000000 --- a/nixos/profiles/common/opt-in/zram-generator.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - services.zram-generator = { - enable = true; - settings.zram0 = { - compression-algorithm = "zstd"; - zram-size = "ram"; - }; - }; - - # https://wiki.archlinux.org/title/Zram#Optimizing_swap_on_zram - boot.kernel.sysctl = { - "vm.swappiness" = 180; - "vm.watermark_boost_factor" = 0; - "vm.watermark_scale_factor" = 125; - "vm.page-cluster" = 0; - }; -}