From c6275855310f51338d106156dd7520e0488ee571 Mon Sep 17 00:00:00 2001 From: Alexandre LUCAZEAU Date: Sat, 17 Jun 2023 20:39:14 +0200 Subject: [PATCH] UPGRADE TO 23.05 --- hosts/x201/{nixpkgs => home-manager}/colorschemes/nord.theme | 0 hosts/x201/{nixpkgs => home-manager}/configs/i3config | 0 hosts/x201/{nixpkgs => home-manager}/configs/init.el | 0 hosts/x201/{nixpkgs => home-manager}/configs/starship.toml | 0 hosts/x201/{nixpkgs => home-manager}/emacs.nix | 0 hosts/x201/{nixpkgs => home-manager}/git.nix | 0 hosts/x201/{nixpkgs => home-manager}/gnupg.nix | 0 hosts/x201/{nixpkgs => home-manager}/himalaya.nix | 0 hosts/x201/{nixpkgs => home-manager}/home.nix | 0 hosts/x201/{nixpkgs => home-manager}/i3status.nix | 0 hosts/x201/{nixpkgs => home-manager}/mails.nix | 0 hosts/x201/{nixpkgs => home-manager}/mpd.nix | 0 hosts/x201/{nixpkgs => home-manager}/nixpkgs | 0 hosts/x201/{nixpkgs => home-manager}/packages.nix | 0 hosts/x201/{nixpkgs => home-manager}/polybar.nix | 0 hosts/x201/{nixpkgs => home-manager}/starship.nix | 0 hosts/x201/{nixpkgs => home-manager}/terminalrc | 0 hosts/x201/{nixpkgs => home-manager}/variables.nix | 0 hosts/x201/nixos/configuration.nix | 5 ++--- 19 files changed, 2 insertions(+), 3 deletions(-) rename hosts/x201/{nixpkgs => home-manager}/colorschemes/nord.theme (100%) rename hosts/x201/{nixpkgs => home-manager}/configs/i3config (100%) rename hosts/x201/{nixpkgs => home-manager}/configs/init.el (100%) rename hosts/x201/{nixpkgs => home-manager}/configs/starship.toml (100%) rename hosts/x201/{nixpkgs => home-manager}/emacs.nix (100%) rename hosts/x201/{nixpkgs => home-manager}/git.nix (100%) rename hosts/x201/{nixpkgs => home-manager}/gnupg.nix (100%) rename hosts/x201/{nixpkgs => home-manager}/himalaya.nix (100%) rename hosts/x201/{nixpkgs => home-manager}/home.nix (100%) rename hosts/x201/{nixpkgs => home-manager}/i3status.nix (100%) rename hosts/x201/{nixpkgs => home-manager}/mails.nix (100%) rename hosts/x201/{nixpkgs => home-manager}/mpd.nix (100%) rename hosts/x201/{nixpkgs => home-manager}/nixpkgs (100%) rename hosts/x201/{nixpkgs => home-manager}/packages.nix (100%) rename hosts/x201/{nixpkgs => home-manager}/polybar.nix (100%) rename hosts/x201/{nixpkgs => home-manager}/starship.nix (100%) rename hosts/x201/{nixpkgs => home-manager}/terminalrc (100%) rename hosts/x201/{nixpkgs => home-manager}/variables.nix (100%) diff --git a/hosts/x201/nixpkgs/colorschemes/nord.theme b/hosts/x201/home-manager/colorschemes/nord.theme similarity index 100% rename from hosts/x201/nixpkgs/colorschemes/nord.theme rename to hosts/x201/home-manager/colorschemes/nord.theme diff --git a/hosts/x201/nixpkgs/configs/i3config b/hosts/x201/home-manager/configs/i3config similarity index 100% rename from hosts/x201/nixpkgs/configs/i3config rename to hosts/x201/home-manager/configs/i3config diff --git a/hosts/x201/nixpkgs/configs/init.el b/hosts/x201/home-manager/configs/init.el similarity index 100% rename from hosts/x201/nixpkgs/configs/init.el rename to hosts/x201/home-manager/configs/init.el diff --git a/hosts/x201/nixpkgs/configs/starship.toml b/hosts/x201/home-manager/configs/starship.toml similarity index 100% rename from hosts/x201/nixpkgs/configs/starship.toml rename to hosts/x201/home-manager/configs/starship.toml diff --git a/hosts/x201/nixpkgs/emacs.nix b/hosts/x201/home-manager/emacs.nix similarity index 100% rename from hosts/x201/nixpkgs/emacs.nix rename to hosts/x201/home-manager/emacs.nix diff --git a/hosts/x201/nixpkgs/git.nix b/hosts/x201/home-manager/git.nix similarity index 100% rename from hosts/x201/nixpkgs/git.nix rename to hosts/x201/home-manager/git.nix diff --git a/hosts/x201/nixpkgs/gnupg.nix b/hosts/x201/home-manager/gnupg.nix similarity index 100% rename from hosts/x201/nixpkgs/gnupg.nix rename to hosts/x201/home-manager/gnupg.nix diff --git a/hosts/x201/nixpkgs/himalaya.nix b/hosts/x201/home-manager/himalaya.nix similarity index 100% rename from hosts/x201/nixpkgs/himalaya.nix rename to hosts/x201/home-manager/himalaya.nix diff --git a/hosts/x201/nixpkgs/home.nix b/hosts/x201/home-manager/home.nix similarity index 100% rename from hosts/x201/nixpkgs/home.nix rename to hosts/x201/home-manager/home.nix diff --git a/hosts/x201/nixpkgs/i3status.nix b/hosts/x201/home-manager/i3status.nix similarity index 100% rename from hosts/x201/nixpkgs/i3status.nix rename to hosts/x201/home-manager/i3status.nix diff --git a/hosts/x201/nixpkgs/mails.nix b/hosts/x201/home-manager/mails.nix similarity index 100% rename from hosts/x201/nixpkgs/mails.nix rename to hosts/x201/home-manager/mails.nix diff --git a/hosts/x201/nixpkgs/mpd.nix b/hosts/x201/home-manager/mpd.nix similarity index 100% rename from hosts/x201/nixpkgs/mpd.nix rename to hosts/x201/home-manager/mpd.nix diff --git a/hosts/x201/nixpkgs/nixpkgs b/hosts/x201/home-manager/nixpkgs similarity index 100% rename from hosts/x201/nixpkgs/nixpkgs rename to hosts/x201/home-manager/nixpkgs diff --git a/hosts/x201/nixpkgs/packages.nix b/hosts/x201/home-manager/packages.nix similarity index 100% rename from hosts/x201/nixpkgs/packages.nix rename to hosts/x201/home-manager/packages.nix diff --git a/hosts/x201/nixpkgs/polybar.nix b/hosts/x201/home-manager/polybar.nix similarity index 100% rename from hosts/x201/nixpkgs/polybar.nix rename to hosts/x201/home-manager/polybar.nix diff --git a/hosts/x201/nixpkgs/starship.nix b/hosts/x201/home-manager/starship.nix similarity index 100% rename from hosts/x201/nixpkgs/starship.nix rename to hosts/x201/home-manager/starship.nix diff --git a/hosts/x201/nixpkgs/terminalrc b/hosts/x201/home-manager/terminalrc similarity index 100% rename from hosts/x201/nixpkgs/terminalrc rename to hosts/x201/home-manager/terminalrc diff --git a/hosts/x201/nixpkgs/variables.nix b/hosts/x201/home-manager/variables.nix similarity index 100% rename from hosts/x201/nixpkgs/variables.nix rename to hosts/x201/home-manager/variables.nix diff --git a/hosts/x201/nixos/configuration.nix b/hosts/x201/nixos/configuration.nix index 275e638..8df7b48 100644 --- a/hosts/x201/nixos/configuration.nix +++ b/hosts/x201/nixos/configuration.nix @@ -19,7 +19,6 @@ # Use the GRUB 2 boot loader. boot.loader.grub.devices = [ "/dev/sda" ]; boot.loader.grub.enable = true; - boot.loader.grub.version = 2; boot.loader.grub.enableCryptodisk = true; boot.loader.supportsInitrdSecrets = true; # boot.loader.grub.efiSupport = true; @@ -35,7 +34,7 @@ boot.plymouth.enable = true; # Clear /tmp during boot - boot.cleanTmpDir = true; + boot.tmp.cleanOnBoot = true; boot.initrd.kernelModules = [ "i915" ]; boot.kernelParams = [ "i915.enable_fbc=1" ]; # Enable microcode updates for Intel CPU @@ -181,7 +180,7 @@ fonts = { # Enable the OpenSSH daemon. services.openssh.enable = true; - services.openssh.permitRootLogin = "no"; + services.openssh.settings.PermitRootLogin = "no"; # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; networking.firewall.allowedTCPPorts = [ 24800 6600 ];