From 0ae272d7c6fd1eb31e942c8c8c649734b3ecad0e Mon Sep 17 00:00:00 2001 From: Laurent Gueret Date: Sat, 24 Jan 2026 18:07:44 +0100 Subject: [PATCH] Remove on all import AND remove of flake.lock --- .gitignore | 1 + flake.lock | 66 ----------------------------- modules/apps/default.nix | 8 ++-- modules/apps/services/gnome.nix | 4 +- modules/apps/services/shell.nix | 8 ++-- modules/nixos/default.nix | 12 +++--- modules/nixos/services/audio.nix | 2 +- modules/nixos/services/boot.nix | 4 +- modules/nixos/services/graphics.nix | 4 +- modules/nixos/services/keyboard.nix | 2 +- modules/nixos/services/networks.nix | 4 +- nixos/configuration.nix | 8 +--- 12 files changed, 29 insertions(+), 94 deletions(-) create mode 100644 .gitignore delete mode 100755 flake.lock diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e43b0f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store diff --git a/flake.lock b/flake.lock deleted file mode 100755 index cf2a756..0000000 --- a/flake.lock +++ /dev/null @@ -1,66 +0,0 @@ -{ - "nodes": { - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1714043624, - "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-23.11", - "repo": "home-manager", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1713995372, - "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "dd37924974b9202f8226ed5d74a252a9785aedf8", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1714076141, - "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/modules/apps/default.nix b/modules/apps/default.nix index 12abdaf..460194a 100755 --- a/modules/apps/default.nix +++ b/modules/apps/default.nix @@ -1,5 +1,7 @@ { - shell = import ./services/shell.nix; - gnome = import ./services/gnome.nix; - zed = import ./submodules/zed.nix; + within = { + shell = ./services/shell.nix; + gnome = ./services/gnome.nix; + zed = ./submodules/zed.nix; + }; } diff --git a/modules/apps/services/gnome.nix b/modules/apps/services/gnome.nix index 0c4d407..7f71b73 100644 --- a/modules/apps/services/gnome.nix +++ b/modules/apps/services/gnome.nix @@ -1,4 +1,4 @@ { - shell = import ../submodules/gnome-shell.nix; - apps = import ../submodules/gnome-apps.nix; + shell = ../submodules/gnome-shell.nix; + apps = ../submodules/gnome-apps.nix; } diff --git a/modules/apps/services/shell.nix b/modules/apps/services/shell.nix index ab8acd9..b46679d 100644 --- a/modules/apps/services/shell.nix +++ b/modules/apps/services/shell.nix @@ -1,6 +1,6 @@ { - zsh = import ../submodules/zsh.nix; - nh = import ../submodules/nh.nix; - git = import ../submodules/git.nix; - docker = import ../submodules/docker.nix; + zsh = ../submodules/zsh.nix; + nh = ../submodules/nh.nix; + git = ../submodules/git.nix; + docker = ../submodules/docker.nix; } diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 54fde2e..dac45c0 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -1,7 +1,9 @@ { - boot = import ./services/boot.nix; - graphics = import ./services/graphics.nix; - networks = import ./services/networks.nix; - audio = import ./services/audio.nix; - keyboard = import ./services/keyboard.nix; + within = { + boot = ./services/boot.nix; + graphics = ./services/graphics.nix; + networks = ./services/networks.nix; + audio = ./services/audio.nix; + keyboard = ./services/keyboard.nix; + }; } diff --git a/modules/nixos/services/audio.nix b/modules/nixos/services/audio.nix index c2676e1..c4bc690 100644 --- a/modules/nixos/services/audio.nix +++ b/modules/nixos/services/audio.nix @@ -1,3 +1,3 @@ { - pipewire = import ../submodules/pipewire.nix; + pipewire = ../submodules/pipewire.nix; } diff --git a/modules/nixos/services/boot.nix b/modules/nixos/services/boot.nix index 69ed3a3..5df2f3a 100644 --- a/modules/nixos/services/boot.nix +++ b/modules/nixos/services/boot.nix @@ -1,4 +1,4 @@ { - systemd = import ../submodules/systemd-boot.nix; - plymouth = import ../submodules/plymouth.nix; + systemd = ../submodules/systemd-boot.nix; + plymouth = ../submodules/plymouth.nix; } diff --git a/modules/nixos/services/graphics.nix b/modules/nixos/services/graphics.nix index c20ff3a..38092b9 100644 --- a/modules/nixos/services/graphics.nix +++ b/modules/nixos/services/graphics.nix @@ -1,6 +1,6 @@ { nvidia = { - base = import ../submodules/nvidia.nix; - prime = import ../submodules/nvidia-prime.nix; + base = ../submodules/nvidia.nix; + prime = ../submodules/nvidia-prime.nix; }; } diff --git a/modules/nixos/services/keyboard.nix b/modules/nixos/services/keyboard.nix index 941f4da..4d248fb 100644 --- a/modules/nixos/services/keyboard.nix +++ b/modules/nixos/services/keyboard.nix @@ -1,3 +1,3 @@ { - apple = import ../submodules/keyboard-apple.nix; + apple = ../submodules/keyboard-apple.nix; } diff --git a/modules/nixos/services/networks.nix b/modules/nixos/services/networks.nix index e8bcc24..fa58c56 100755 --- a/modules/nixos/services/networks.nix +++ b/modules/nixos/services/networks.nix @@ -1,4 +1,4 @@ { - dns = import ../submodules/dns.nix; - manager = import ../submodules/manager.nix; + dns = ../submodules/dns.nix; + manager = ../submodules/manager.nix; } diff --git a/nixos/configuration.nix b/nixos/configuration.nix index f28d9ca..e200dec 100755 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -17,11 +17,7 @@ ./configurations/home-manager.nix # Modules - inputs.self.nixos.boot - inputs.self.nixos.graphics - inputs.self.nixos.audio - inputs.self.nixos.networks - inputs.self.nixos.keyboard + inputs.self.nixos.within ]; @@ -53,7 +49,7 @@ time.timeZone = "Europe/Brussels"; # System services - within.boot.systemd.enable = true; + within.boot.bootd.enable = true; within.boot.plymouth.enable = true; within.graphics.nvidia.base.enable = true; within.audio.pipewire.enable = true;