From 83f9f0d9e68ec9052d249c9a1421bfa08dff4d6c Mon Sep 17 00:00:00 2001 From: Thatoo Date: Sun, 25 May 2025 21:52:52 +0200 Subject: [PATCH] cleaning_apres_maj_25_05 --- configuration.nix | 2 + desktop_environnement.nix | 77 +-------------------------------------- flake.lock | 6 +-- flake.nix | 2 - 4 files changed, 6 insertions(+), 81 deletions(-) diff --git a/configuration.nix b/configuration.nix index a82c6a3..4f5e083 100644 --- a/configuration.nix +++ b/configuration.nix @@ -70,6 +70,8 @@ services.xserver = { xkb.layout = "fr"; xkb.variant = ""; + xkb.extraLayouts = { + }; }; # Configure console keymap diff --git a/desktop_environnement.nix b/desktop_environnement.nix index 4b2b8fc..ba6e943 100644 --- a/desktop_environnement.nix +++ b/desktop_environnement.nix @@ -5,14 +5,9 @@ { config, pkgs, lib, inputs, ... }: { - # Enable the X11 windowing system. -# services.xserver = { -# enable = true; -# displayManager.gdm.enable = lib.mkDefault true; -# desktopManager.gnome.enable = lib.mkDefault true; -# }; services = { + # Enable the X11 windowing system. xserver.enable = true; # Enable the login manager displayManager.cosmic-greeter.enable = lib.mkDefault true; @@ -27,49 +22,7 @@ systemd.user.extraConfig = ''DefaultEnvironment="PATH=/run/wrappers/bin:/etc/profiles/per-user/%u/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin"''; specialisation = { -# cosmic.configuration = { - # Cosmic conflicts with gnome -# services.xserver.desktopManager.gnome.enable = false; -# services.desktopManager.cosmic.enable = true; - # Cosmic requires cosmic-greeter -# services.xserver.displayManager.gdm.enable = false; -# services.displayManager.cosmic-greeter.enable = true; - -# environment.systemPackages = with pkgs; [ -# adw-gtk3 -# evince -# loupe -# cosmic-ext-applet-clipboard-manager -# cosmic-ext-applet-external-monitor-brightness -# cosmic-ext-calculator -# cosmic-ext-examine -# cosmic-ext-forecast -# cosmic-ext-tweaks -# cosmic-player -# cosmic-reader -# cosmic-wallpapers -# quick-webapps -# ]; - -# services.flatpak.enable = true; -# systemd.services.flatpak-repo = { -# wantedBy = [ "multi-user.target" ]; -# path = [ pkgs.flatpak ]; -# script = '' -# flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo -# ''; -# }; - -# environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1; # to make Clipboard Manager work - -# system.nixos.tags = [ "Cosmic" ]; -# }; - gnome.configuration = { -# services.xserver = { -# desktopManager.gnome.enable = true; -# displayManager.gdm.enable = true; -# }; # Cosmic conflicts with gnome services.xserver.desktopManager.gnome.enable = true; services.desktopManager.cosmic.enable = false; @@ -215,34 +168,6 @@ }; system.nixos.tags = [ "Gnome" ]; }; - -# budgie.configuration = { -# services.xserver = { - # Budgie conflicts with gnome -# desktopManager = { -# gnome.enable = false; -# budgie.enable = true; -# }; - # Budgie requires lightdm -# displayManager = { -# gdm.enable = false; -# lightdm.enable = true; -# }; -# }; -# programs.dconf.profiles = { -# user.databases = [{ -# settings = with lib.gvariant; { -# "org/gnome/desktop/interface" = { -# cursor-theme = "breeze_cursors"; -# gtk-theme = "Adwaita"; -# icon-theme = "hicolor"; -# }; -# "org/gnome/shell/extensions/user-theme".name = "Custom-Accent-Colors"; -# }; -# }]; -# }; -# system.nixos.tags = [ "Budgie" ]; -# }; }; } diff --git a/flake.lock b/flake.lock index 85ec5fd..95fe46c 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747953325, - "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=", + "lastModified": 1748162331, + "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d1f923c480dadce40f5231feb472e81b0bab48", + "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 77be8bd..8d800a2 100644 --- a/flake.nix +++ b/flake.nix @@ -17,8 +17,6 @@ system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ - { - } lix-module.nixosModules.default ./hardware-configuration.nix ./configuration.nix