From c50f3e25785db244d5c0c7d8405b725fb79bbcf4 Mon Sep 17 00:00:00 2001 From: larstvei Date: Thu, 11 Sep 2025 20:06:49 +0200 Subject: [PATCH] Restructure the configuration --- flake.nix | 4 +-- .../{configuration.nix => default.nix} | 17 ++++++------- machines/macbook/variables.nix | 5 ---- .../{configuration.nix => default.nix} | 25 ++++++++----------- .../default.nix} | 0 .../{keyboard.nix => keyboard/default.nix} | 0 machines/thinkpad/variables.nix | 5 ---- {system => modules/base}/default.nix | 0 {system => modules}/darwin/default.nix | 2 +- {home => modules}/desktop/default.nix | 0 .../desktop/hyprland/default.nix | 0 {home => modules}/desktop/theme/default.nix | 0 {home => modules}/fonts/default.nix | 0 {home => modules/home}/default.nix | 4 +-- {home => modules}/languages/bqn/default.nix | 0 {home => modules}/languages/c/default.nix | 0 .../languages/clojure/default.nix | 0 {home => modules}/languages/default.nix | 0 {home => modules}/languages/go/default.nix | 0 .../languages/haskell/default.nix | 0 {home => modules}/languages/java/default.nix | 0 {home => modules}/languages/maude/default.nix | 0 .../languages/minizinc/default.nix | 0 {home => modules}/languages/nix/default.nix | 0 .../languages/python/default.nix | 0 {home => modules}/languages/rust/default.nix | 0 .../languages/scheme/default.nix | 0 {home => modules}/languages/tex/default.nix | 0 {home => modules}/languages/zig/default.nix | 0 {system => modules}/nixos/default.nix | 2 +- {home => modules}/tools/academic/default.nix | 0 {home => modules}/tools/default.nix | 0 {home => modules}/tools/editor/default.nix | 0 {home => modules}/tools/git/default.nix | 0 {home => modules}/tools/learning/default.nix | 0 .../tools/multimedia/default.nix | 0 {home => modules}/tools/shell/default.nix | 0 {home => modules}/tools/spelling/default.nix | 0 {home => modules}/tools/utils/default.nix | 0 39 files changed, 24 insertions(+), 40 deletions(-) rename machines/macbook/{configuration.nix => default.nix} (73%) delete mode 100644 machines/macbook/variables.nix rename machines/thinkpad/{configuration.nix => default.nix} (84%) rename machines/thinkpad/{hardware-configuration.nix => hardware/default.nix} (100%) rename machines/thinkpad/{keyboard.nix => keyboard/default.nix} (100%) delete mode 100644 machines/thinkpad/variables.nix rename {system => modules/base}/default.nix (100%) rename {system => modules}/darwin/default.nix (97%) rename {home => modules}/desktop/default.nix (100%) rename {home => modules}/desktop/hyprland/default.nix (100%) rename {home => modules}/desktop/theme/default.nix (100%) rename {home => modules}/fonts/default.nix (100%) rename {home => modules/home}/default.nix (93%) rename {home => modules}/languages/bqn/default.nix (100%) rename {home => modules}/languages/c/default.nix (100%) rename {home => modules}/languages/clojure/default.nix (100%) rename {home => modules}/languages/default.nix (100%) rename {home => modules}/languages/go/default.nix (100%) rename {home => modules}/languages/haskell/default.nix (100%) rename {home => modules}/languages/java/default.nix (100%) rename {home => modules}/languages/maude/default.nix (100%) rename {home => modules}/languages/minizinc/default.nix (100%) rename {home => modules}/languages/nix/default.nix (100%) rename {home => modules}/languages/python/default.nix (100%) rename {home => modules}/languages/rust/default.nix (100%) rename {home => modules}/languages/scheme/default.nix (100%) rename {home => modules}/languages/tex/default.nix (100%) rename {home => modules}/languages/zig/default.nix (100%) rename {system => modules}/nixos/default.nix (96%) rename {home => modules}/tools/academic/default.nix (100%) rename {home => modules}/tools/default.nix (100%) rename {home => modules}/tools/editor/default.nix (100%) rename {home => modules}/tools/git/default.nix (100%) rename {home => modules}/tools/learning/default.nix (100%) rename {home => modules}/tools/multimedia/default.nix (100%) rename {home => modules}/tools/shell/default.nix (100%) rename {home => modules}/tools/spelling/default.nix (100%) rename {home => modules}/tools/utils/default.nix (100%) diff --git a/flake.nix b/flake.nix index 170a7c3..f4a0f85 100644 --- a/flake.nix +++ b/flake.nix @@ -45,7 +45,7 @@ modules = [ home-manager.darwinModules.default - ./machines/macbook/configuration.nix + ./machines/macbook nix-rosetta-builder.darwinModules.default { nix-rosetta-builder.onDemand = true; } ]; @@ -61,7 +61,7 @@ }; modules = [ home-manager.nixosModules.default - ./machines/thinkpad/configuration.nix + ./machines/thinkpad ]; }; }; diff --git a/machines/macbook/configuration.nix b/machines/macbook/default.nix similarity index 73% rename from machines/macbook/configuration.nix rename to machines/macbook/default.nix index 3cd4039..bcb6e5e 100644 --- a/machines/macbook/configuration.nix +++ b/machines/macbook/default.nix @@ -1,19 +1,16 @@ { pkgs, emacs-larstvei, ... }: -let - v = import ./variables.nix; -in { imports = [ - ../../system - ../../system/darwin + ../../modules/base + ../../modules/darwin ]; - system.primaryUser = v.username; + system.primaryUser = "larstvei"; - networking.hostName = v.hostName; + networking.hostName = "larstvei-macbookpro"; - users.users.${v.username} = { - home = v.userHome; + users.users.larstvei = { + home = "/Users/larstvei"; shell = pkgs.fish; }; @@ -21,7 +18,7 @@ in useGlobalPkgs = true; useUserPackages = true; extraSpecialArgs = { inherit emacs-larstvei; }; - users.${v.username}.imports = [ ../../home ]; + users.larstvei.imports = [ ../../modules/home ]; }; homebrew = { diff --git a/machines/macbook/variables.nix b/machines/macbook/variables.nix deleted file mode 100644 index 601a680..0000000 --- a/machines/macbook/variables.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - username = "larstvei"; - userHome = "/Users/larstvei"; - hostName = "larstvei-macbookpro"; -} diff --git a/machines/thinkpad/configuration.nix b/machines/thinkpad/default.nix similarity index 84% rename from machines/thinkpad/configuration.nix rename to machines/thinkpad/default.nix index c561551..ac5bb66 100644 --- a/machines/thinkpad/configuration.nix +++ b/machines/thinkpad/default.nix @@ -5,15 +5,12 @@ zen-browser, ... }: -let - v = import ./variables.nix; -in { imports = [ - ../../system - ../../system/nixos - ./keyboard.nix - ./hardware-configuration.nix + ./keyboard + ./hardware + ../../modules/base + ../../modules/nixos ]; home-manager = { @@ -24,9 +21,9 @@ in inherit emacs-larstvei; inherit zen-browser; }; - users.${v.username}.imports = [ - ../../home - ../../home/desktop + users.larstvei.imports = [ + ../../modules/home + ../../modules/desktop ]; }; @@ -35,15 +32,15 @@ in settings = { default_session = { command = "hyprland"; - user = v.username; + user = "larstvei"; }; }; }; - users.users.${v.username} = { + users.users.larstvei = { isNormalUser = true; description = "Lars Tveito"; - home = v.userHome; + home = "/home/larstvei"; shell = pkgs.fish; extraGroups = [ "networkmanager" @@ -51,7 +48,7 @@ in ]; }; - networking.hostName = v.hostName; + networking.hostName = "larstvei-think"; console.keyMap = "us"; diff --git a/machines/thinkpad/hardware-configuration.nix b/machines/thinkpad/hardware/default.nix similarity index 100% rename from machines/thinkpad/hardware-configuration.nix rename to machines/thinkpad/hardware/default.nix diff --git a/machines/thinkpad/keyboard.nix b/machines/thinkpad/keyboard/default.nix similarity index 100% rename from machines/thinkpad/keyboard.nix rename to machines/thinkpad/keyboard/default.nix diff --git a/machines/thinkpad/variables.nix b/machines/thinkpad/variables.nix deleted file mode 100644 index c686a53..0000000 --- a/machines/thinkpad/variables.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - username = "larstvei"; - userHome = "/home/larstvei"; - hostName = "larstvei-think"; -} diff --git a/system/default.nix b/modules/base/default.nix similarity index 100% rename from system/default.nix rename to modules/base/default.nix diff --git a/system/darwin/default.nix b/modules/darwin/default.nix similarity index 97% rename from system/darwin/default.nix rename to modules/darwin/default.nix index f1b1d97..f9e7433 100644 --- a/system/darwin/default.nix +++ b/modules/darwin/default.nix @@ -2,7 +2,7 @@ { imports = [ - ../../home/fonts + ../fonts ]; nix.linux-builder.enable = true; diff --git a/home/desktop/default.nix b/modules/desktop/default.nix similarity index 100% rename from home/desktop/default.nix rename to modules/desktop/default.nix diff --git a/home/desktop/hyprland/default.nix b/modules/desktop/hyprland/default.nix similarity index 100% rename from home/desktop/hyprland/default.nix rename to modules/desktop/hyprland/default.nix diff --git a/home/desktop/theme/default.nix b/modules/desktop/theme/default.nix similarity index 100% rename from home/desktop/theme/default.nix rename to modules/desktop/theme/default.nix diff --git a/home/fonts/default.nix b/modules/fonts/default.nix similarity index 100% rename from home/fonts/default.nix rename to modules/fonts/default.nix diff --git a/home/default.nix b/modules/home/default.nix similarity index 93% rename from home/default.nix rename to modules/home/default.nix index ce0d513..dbaffc4 100644 --- a/home/default.nix +++ b/modules/home/default.nix @@ -1,7 +1,7 @@ { imports = [ - ./languages - ./tools + ../languages + ../tools ]; programs.home-manager.enable = true; diff --git a/home/languages/bqn/default.nix b/modules/languages/bqn/default.nix similarity index 100% rename from home/languages/bqn/default.nix rename to modules/languages/bqn/default.nix diff --git a/home/languages/c/default.nix b/modules/languages/c/default.nix similarity index 100% rename from home/languages/c/default.nix rename to modules/languages/c/default.nix diff --git a/home/languages/clojure/default.nix b/modules/languages/clojure/default.nix similarity index 100% rename from home/languages/clojure/default.nix rename to modules/languages/clojure/default.nix diff --git a/home/languages/default.nix b/modules/languages/default.nix similarity index 100% rename from home/languages/default.nix rename to modules/languages/default.nix diff --git a/home/languages/go/default.nix b/modules/languages/go/default.nix similarity index 100% rename from home/languages/go/default.nix rename to modules/languages/go/default.nix diff --git a/home/languages/haskell/default.nix b/modules/languages/haskell/default.nix similarity index 100% rename from home/languages/haskell/default.nix rename to modules/languages/haskell/default.nix diff --git a/home/languages/java/default.nix b/modules/languages/java/default.nix similarity index 100% rename from home/languages/java/default.nix rename to modules/languages/java/default.nix diff --git a/home/languages/maude/default.nix b/modules/languages/maude/default.nix similarity index 100% rename from home/languages/maude/default.nix rename to modules/languages/maude/default.nix diff --git a/home/languages/minizinc/default.nix b/modules/languages/minizinc/default.nix similarity index 100% rename from home/languages/minizinc/default.nix rename to modules/languages/minizinc/default.nix diff --git a/home/languages/nix/default.nix b/modules/languages/nix/default.nix similarity index 100% rename from home/languages/nix/default.nix rename to modules/languages/nix/default.nix diff --git a/home/languages/python/default.nix b/modules/languages/python/default.nix similarity index 100% rename from home/languages/python/default.nix rename to modules/languages/python/default.nix diff --git a/home/languages/rust/default.nix b/modules/languages/rust/default.nix similarity index 100% rename from home/languages/rust/default.nix rename to modules/languages/rust/default.nix diff --git a/home/languages/scheme/default.nix b/modules/languages/scheme/default.nix similarity index 100% rename from home/languages/scheme/default.nix rename to modules/languages/scheme/default.nix diff --git a/home/languages/tex/default.nix b/modules/languages/tex/default.nix similarity index 100% rename from home/languages/tex/default.nix rename to modules/languages/tex/default.nix diff --git a/home/languages/zig/default.nix b/modules/languages/zig/default.nix similarity index 100% rename from home/languages/zig/default.nix rename to modules/languages/zig/default.nix diff --git a/system/nixos/default.nix b/modules/nixos/default.nix similarity index 96% rename from system/nixos/default.nix rename to modules/nixos/default.nix index 8ec2d52..331ab63 100644 --- a/system/nixos/default.nix +++ b/modules/nixos/default.nix @@ -2,7 +2,7 @@ { imports = [ - ../../home/fonts + ../fonts ]; fonts = { diff --git a/home/tools/academic/default.nix b/modules/tools/academic/default.nix similarity index 100% rename from home/tools/academic/default.nix rename to modules/tools/academic/default.nix diff --git a/home/tools/default.nix b/modules/tools/default.nix similarity index 100% rename from home/tools/default.nix rename to modules/tools/default.nix diff --git a/home/tools/editor/default.nix b/modules/tools/editor/default.nix similarity index 100% rename from home/tools/editor/default.nix rename to modules/tools/editor/default.nix diff --git a/home/tools/git/default.nix b/modules/tools/git/default.nix similarity index 100% rename from home/tools/git/default.nix rename to modules/tools/git/default.nix diff --git a/home/tools/learning/default.nix b/modules/tools/learning/default.nix similarity index 100% rename from home/tools/learning/default.nix rename to modules/tools/learning/default.nix diff --git a/home/tools/multimedia/default.nix b/modules/tools/multimedia/default.nix similarity index 100% rename from home/tools/multimedia/default.nix rename to modules/tools/multimedia/default.nix diff --git a/home/tools/shell/default.nix b/modules/tools/shell/default.nix similarity index 100% rename from home/tools/shell/default.nix rename to modules/tools/shell/default.nix diff --git a/home/tools/spelling/default.nix b/modules/tools/spelling/default.nix similarity index 100% rename from home/tools/spelling/default.nix rename to modules/tools/spelling/default.nix diff --git a/home/tools/utils/default.nix b/modules/tools/utils/default.nix similarity index 100% rename from home/tools/utils/default.nix rename to modules/tools/utils/default.nix