From a9e731113a1f0990578980dba7ac25cb48031ff3 Mon Sep 17 00:00:00 2001 From: tdpeuter Date: Mon, 11 Sep 2023 11:06:55 +0200 Subject: [PATCH] Update NixTest --- nixos/flake.lock | 30 ++++----- nixos/hosts/Tibo-NixDesk/default.nix | 24 ++++---- nixos/hosts/Tibo-NixTest/default.nix | 92 +++------------------------- nixos/modules/des/plasma/default.nix | 11 ++-- 4 files changed, 43 insertions(+), 114 deletions(-) diff --git a/nixos/flake.lock b/nixos/flake.lock index ddd7950..eb391d2 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1692793255, - "narHash": "sha256-yVyj0AE280JkccDHuG1XO9oGxN6bW8ksr/xttXcXzK0=", + "lastModified": 1693833206, + "narHash": "sha256-wHOY0nnD6gWj8u9uI85/YlsganYyWRK1hLFZulZwfmY=", "owner": "numtide", "repo": "devshell", - "rev": "2aa26972b951bc05c3632d4e5ae683cb6771a7c6", + "rev": "65114ea495a8d3cc1352368bf170d67ef005aa5a", "type": "github" }, "original": { @@ -62,11 +62,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1693428224, - "narHash": "sha256-FWUUlhYqkGEySUD0blTADRiDQ7fw+H1ikivfu88uy+w=", + "lastModified": 1694304580, + "narHash": "sha256-5tIpNodDpEKT8mM/F5zCzWEAnidOg8eb1/x3SRaaBLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "841889913dfd06a70ffb39f603e29e46f45f0c1a", + "rev": "4c8cf44c5b9481a4f093f1df3b8b7ba997a7c760", "type": "github" }, "original": { @@ -77,11 +77,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1693097136, - "narHash": "sha256-fBZSMdBaoZ0INFbyZ5s0DOF7zDNcLsLxgkwdDh3l9Pc=", + "lastModified": 1693675694, + "narHash": "sha256-2pIOyQwGyy2FtFAUIb8YeKVmOCcPOTVphbAvmshudLE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9117c4e9dc117a6cd0319cca40f2349ed333669d", + "rev": "5601118d39ca9105f8e7b39d4c221d3388c0419d", "type": "github" }, "original": { @@ -93,11 +93,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1693565476, - "narHash": "sha256-ya00zHt7YbPo3ve/wNZ/6nts61xt7wK/APa6aZAfey0=", + "lastModified": 1694183432, + "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa8aa7e2ea35ce655297e8322dc82bf77a31d04b", + "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b", "type": "github" }, "original": { @@ -125,11 +125,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1693404499, - "narHash": "sha256-cx/7yvM/AP+o/3wPJmA9W9F+WHemJk5t+Xcr+Qwkqhg=", + "lastModified": 1693898833, + "narHash": "sha256-OIrMAGNYNeLs6IvBynxcXub7aSW3GEUvWNsb7zx6zuU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d9c5dc41c4b1f74c77f0dbffd0f3a4ebde447b7a", + "rev": "faf21ac162173c2deb54e5fdeed002a9bd6e8623", "type": "github" }, "original": { diff --git a/nixos/hosts/Tibo-NixDesk/default.nix b/nixos/hosts/Tibo-NixDesk/default.nix index 4226342..6132edc 100644 --- a/nixos/hosts/Tibo-NixDesk/default.nix +++ b/nixos/hosts/Tibo-NixDesk/default.nix @@ -11,14 +11,19 @@ ]; # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.efi.efiSysMountPoint = "/boot/efi"; + boot.loader = { + systemd-boot.enable = true; + efi = { + canTouchEfiVariables = true; + efiSysMountPoint = "/boot/efi"; + }; + }; - # Enable networking - networking.hostName = "Tibo-NixDesk"; # Define your hostname. - networking.networkmanager.enable = true; - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + networking = { + hostName = "Tibo-NixDesk"; + networkmanager.enable = true; + # wireless.enable = true; # Enables wireless support via wpa_supplicant. + }; # Set your time zone. time.timeZone = "Europe/Brussels"; @@ -57,11 +62,6 @@ # enableSSHSupport = true; # }; - # List services that you want to enable: - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; diff --git a/nixos/hosts/Tibo-NixTest/default.nix b/nixos/hosts/Tibo-NixTest/default.nix index e983ff6..15022c7 100644 --- a/nixos/hosts/Tibo-NixTest/default.nix +++ b/nixos/hosts/Tibo-NixTest/default.nix @@ -1,22 +1,14 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - { config, pkgs, ... }: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + + ../../modules/des/plasma ]; - # Nix Flakes - nix.package = pkgs.nixFlakes; - nix.extraOptions = '' - experimental-features = nix-command flakes - ''; - - # Use the systemd-boot EFI boot loader.] + # Bootloader boot.loader = { systemd-boot.enable = true; @@ -26,10 +18,11 @@ }; }; - networking.hostName = "Tibo-NixTest"; # Define your hostname. - # Pick only one of the below networking options. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + networking = { + hostName = "Tibo-NixTest"; + # wireless.enable = true; # Enables wireless support via wpa_supplicant. + networkmanager.enable = true; # Easiest to use and most distros use this by default. + }; # Set your time zone. time.timeZone = "Europe/Brussels"; @@ -53,29 +46,6 @@ # "caps:escape" # map caps to escape. # }; - - services.xserver = { - # Enable the X11 windowing system. - enable = true; - - # Enable the Plasma 5 Desktop Environment. - displayManager.sddm.enable = true; - displayManager.defaultSession = "plasmawayland"; - - desktopManager.plasma5 = { - enable = true; - excludePackages = with pkgs.libsForQt5; [ - elisa - okular - plasma-browser-integration - khelpcenter - kwalletmanager - oxygen - ]; - }; - - }; - # Enable CUPS to print documents. # services.printing.enable = true; @@ -89,44 +59,6 @@ # Enable touchpad support (enabled default in most desktopManager). services.xserver.libinput.enable = true; - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.tdpeuter = { - description = "Tibo De Peuter"; - isNormalUser = true; - extraGroups = [ "wheel" "networkmanager" ]; - initialPassword = "ChangeMe"; - packages = with pkgs; [ - home-manager - ]; - }; - - # List packages installed in system profile. To search, run: - # $ nix search wget - environment.systemPackages = with pkgs; [ - firefox - git - mongodb - vim - wget - ]; - - nixpkgs.config = { - allowUnfree = true; - }; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; @@ -138,13 +70,7 @@ # accidentally delete configuration.nix. # system.copySystemConfiguration = true; - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "22.11"; # Did you read the comment? + system.stateVersion = "23.05"; } diff --git a/nixos/modules/des/plasma/default.nix b/nixos/modules/des/plasma/default.nix index 55c69bb..542c012 100644 --- a/nixos/modules/des/plasma/default.nix +++ b/nixos/modules/des/plasma/default.nix @@ -4,10 +4,13 @@ services.xserver = { enable = true; - displayManager.sddm = { - enable = true; - # https://discourse.nixos.org/t/plasma-wayland-session-not-available-from-sddm/13447/2 - settings.Wayland.SessionDir = "${pkgs.plasma5Packages.plasma-workspace}/share/wayland-sessions"; + displayManager = { + defaultSession = "plasmawayland"; + sddm = { + enable = true; + # https://discourse.nixos.org/t/plasma-wayland-session-not-available-from-sddm/13447/2 + settings.Wayland.SessionDir = "${pkgs.plasma5Packages.plasma-workspace}/share/wayland-sessions"; + }; }; desktopManager.plasma5 = {